diff --git a/flow/sunstone/public/js/apptools-appflow-templates.js b/flow/sunstone/public/js/apptools-appflow-templates.js
index 3db9df228b..d97f281f7d 100644
--- a/flow/sunstone/public/js/apptools-appflow-templates.js
+++ b/flow/sunstone/public/js/apptools-appflow-templates.js
@@ -531,7 +531,7 @@ function updateServiceTemplateInfo(request,elem){
// Prepare the creation dialog
function setupCreateServiceTemplateDialog(){
- dialogs_context.append('
';
+var instantiate_env_tmpl ='\
+
\
+
\
+ \
+
\
+ \
+
';
+
var dataTable_appstages;
var $create_appstage_dialog;
@@ -235,6 +302,18 @@ var appstage_actions = {
call: popUpCreateAppStageDialog
},
+ "AppStage.instantiate_dialog" : {
+ type: "custom",
+ call: popUpEnvInstantiateDialog
+ },
+
+ "AppStage.show_to_instantiate" : {
+ type: "single",
+ call: AppStage.show,
+ callback: fillEnvInstantiateDialog,
+ error: onError
+ },
+
"AppStage.list" : {
type: "list",
call: AppStage.list,
@@ -352,22 +431,9 @@ var appstage_actions = {
"AppStage.chmod" : {
type: "single",
call: AppStage.chmod,
-// callback
error: onError,
notify: true
},
-/*
- "AppStage.clone_dialog" : {
- type: "custom",
- call: popUpAppStageCloneDialog
- },
- "AppStage.clone" : {
- type: "single",
- call: AppStage.clone,
- error: onError,
- notify: true
- },
-*/
"AppStage.help" : {
type: "custom",
call: function() {
@@ -391,8 +457,12 @@ var appstage_buttons = {
"AppStage.update_dialog" : {
type: "action",
text: tr("Update"),
- layout: "main",
- alwaysActive: true
+ layout: "main"
+ },
+ "AppStage.instantiate_dialog" : {
+ type: "action",
+ text: tr("Instantiate"),
+ layout: "main"
},
"AppStage.chown" : {
type: "confirm_with_select",
@@ -410,12 +480,6 @@ var appstage_buttons = {
tip: tr("Select the new group")+":",
condition: mustBeAdmin
},
-/*
- "AppStage.clone_dialog" : {
- type: "action",
- text: tr("Clone")
- },
-*/
"AppStage.delete" : {
type: "confirm",
layout: "del",
@@ -445,7 +509,7 @@ var appstages_tab = {
}
Sunstone.addActions(appstage_actions);
-Sunstone.addMainTab('appstages_tab',appstages_tab);
+Sunstone.addMainTab('apptools-appstage',appstages_tab);
Sunstone.addInfoPanel('appstage_info_panel',appstage_info_panel);
@@ -507,35 +571,14 @@ function updateAppStageInfo(request,elem){
var elem_info = elem.DOCUMENT;
elem_info.TEMPLATE.BODY = JSON.parse(elem_info.TEMPLATE.BODY);
- // Form trs for variables
- var vars = '';
var defaults = elem_info.TEMPLATE.BODY.defaults;
- if (!$.isEmptyObject(defaults)){
- for (key in defaults){
- vars += '
\
- | '+ key +' | \
- \
- \
- |
';
- };
- }
-
- // Form options of compatible templates
- var compat_templates = '';
- var templates = elem_info.TEMPLATE.BODY.templates;
- if (templates)
- for (var i = 0; i < templates.length; i++)
- compat_templates += '
';
-
-
-
var info_tab = {
- title: tr("Environment information"),
+ title: tr("Information"),
content:
- '
\
+ '\
+
\
+
\
\
| '+tr("Environment")+' "'+elem_info.NAME+'" '+
tr("information")+' |
\
@@ -552,71 +595,55 @@ function updateAppStageInfo(request,elem){
'+tr("Description")+' | \
'+(elem_info.TEMPLATE.BODY.description ? elem_info.TEMPLATE.BODY.description : "None" )+' | \
\
- \
- | '+tr("Owner")+' | \
- '+elem_info.UNAME+' | \
-
\
- \
- | '+tr("Group")+' | \
- '+elem_info.GNAME+' | \
-
\
'+ (templates ?
'| '+tr("Compatible templates")+' | '+ templates.join(',')+' |
' : "")
+ (elem_info.TEMPLATE.BODY.cookbooks ?
- '| '+tr("Cookbooks")+' | '+elem_info.TEMPLATE.BODY.cookbooks+' |
' : "")+
-' | '+tr("Permissions")+' | |
\
- \
- | '+tr("Owner")+' | \
- '+ownerPermStr(elem_info)+' | \
-
\
- \
- | '+tr("Group")+' | \
- '+groupPermStr(elem_info)+' | \
-
\
- \
- | '+tr("Other")+' | \
- '+otherPermStr(elem_info)+' | \
-
\
-'+ (!$.isEmptyObject(defaults) ?
- '| '+tr("Default variables")+' | |
' +
+ '\
+ | '+tr("Cookbooks")+' | \
+ '+elem_info.TEMPLATE.BODY.cookbooks+' | \
+
' : "")+
+ (!$.isEmptyObject(defaults) ?
+ '| '+tr("Default variables")+' | |
' +
prettyPrintJSON(defaults, 28) : "") + '
\
-\
-
\
- \
- | '+tr("Instantiate this environment")+' |
\
- \
- \
- | '+tr("Template")+': | \
- | \
-
\
- | '+tr("Variables")+': | \
- | \
-
\
-'+ vars +'\
- \
- | \
- | \
-
'
+
\
+
' + insert_permissions_table('apptools-appstage',
+ "AppStage",
+ elem_info.ID,
+ elem_info.UNAME,
+ elem_info.GNAME,
+ elem_info.UID,
+ elem_info.GID) +
+ '
\
+
'
}
var node_tab = {
title: tr("Node"),
- content: '\
+ content: '\
+
\
+
\
| '+tr("Node")+' |
'+
(elem_info.TEMPLATE.BODY.node ? prettyPrintJSON(elem_info.TEMPLATE.BODY.node) : "" )+
- '
'
+ '
\
+ ');
+ dialogs_context.append('');
$create_appstage_dialog = $('#create_appstage_dialog',dialogs_context);
var dialog = $create_appstage_dialog;
@@ -625,7 +652,7 @@ function setupCreateAppStageDialog(){
var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window
//Prepare jquery dialog
- dialog.addClass("reveal-modal xlarge");
+ dialog.addClass("reveal-modal xlarge max-height");
$('select[name="templates"]', dialog).change(function(){
$(this).val("");
@@ -646,31 +673,6 @@ function setupCreateAppStageDialog(){
return false;
});
-/******** UNUSED
- $('#add_custom_var_appstage_button', dialog).click(
- function(){
- var name = $('#custom_var_appstage_name',dialog).val();
- var value = $('#custom_var_appstage_value',dialog).val();
- if (!name.length || !value.length) {
- notifyError("Variable name and value must be filled in");
- return false;
- }
- option= '';
- $('select#custom_var_appstage_box',dialog).append(option);
- return false;
- }
- );
-
- $('#remove_custom_var_appstage_button', dialog).click(
- function(){
- $('select#custom_var_appstage_box :selected',dialog).remove();
- return false;
- }
- );
-*/
-
$('#create_appstage_form',dialog).submit(function(){
var name = $('input[name="name"]', this).val();
@@ -702,20 +704,6 @@ function setupCreateAppStageDialog(){
appstage_obj.templates = tmpls
};
- //UNUSED AT THIS POINT
-/*
- var variables_array = [];
- var variables;
- $('#custom_var_appstage_box option', this).each(function(){
- var attr_name = $(this).attr('name');
- var attr_value = $(this).val();
- variables_array.push(attr_name +'='+ attr_value);
- });
- variables = variables_array.join(',');
-
- if (variables) appstage_obj.variables = variables;
-*/
-
Sunstone.runAction("AppStage.create", { 'DOCUMENT': appstage_obj });
dialog.trigger("reveal:close")
return false;
@@ -731,9 +719,112 @@ function popUpCreateAppStageDialog(){
});
dialog.reveal();
-
}
+function popUpEnvInstantiateDialog(){
+ var selected_nodes = getSelectedNodes(dataTable_appstages);
+
+ if ( selected_nodes.length != 1 )
+ {
+ notifyMessage("Please select one (and just one) environment to instantiate.");
+ return false;
+ }
+
+ var env_id = ""+selected_nodes[0];
+ Sunstone.runAction("AppStage.show_to_instantiate", env_id);
+}
+
+function setupEnvInstantiateDialog(){
+ //Append to DOM
+ dialogs_context.append('');
+ var dialog = $('#appstage_env_instantiate_dialog',dialogs_context);
+
+ //Put HTML in place
+ dialog.html(instantiate_env_tmpl);
+
+ //Convert into jQuery
+ dialog.addClass("reveal-modal large max-height");
+
+ $("#appstage_env_instantiate_dialog").submit(function(){
+ var vars = [];
+
+ var id = $('input[type="hidden"]', this).val();
+ var template_id = $('select', this).val();
+
+ $('input[type="text"]', this).each(function(){
+ var key = $(this).attr('name');
+ var val = $(this).val();
+
+ if (val)
+ vars.push(key +'='+ val)
+ });
+
+ var obj = { vars: vars,
+ template_id: template_id
+ };
+
+ if (vars.length)
+ Sunstone.runAction("AppStage.instantiate", id, obj);
+ return false;
+ })
+}
+
+function fillEnvInstantiateDialog(request, response){
+ var elem_info = response.DOCUMENT;
+ elem_info.TEMPLATE.BODY = JSON.parse(elem_info.TEMPLATE.BODY);
+
+ var str = ''
+
+ // Form options of compatible templates
+ var templates = elem_info.TEMPLATE.BODY.templates;
+ if (templates) {
+ str += '\
+
\
+ \
+
\
+
\
+ \
+
\
+
\
+
\
+
'
+ }
+
+ // Form variables
+ var defaults = elem_info.TEMPLATE.BODY.defaults;
+ if (!$.isEmptyObject(defaults)){
+ str += '\
+
\
+
'
+ }
+
+ $("#instantiate_env_form_content").html(str);
+ $('#appstage_env_instantiate_dialog',dialogs_context).reveal();
+}
function setupAppStageTemplateUpdateDialog(){
@@ -871,34 +962,6 @@ function popUpAppStageTemplateUpdateDialog(){
return false;
};
-function setupAppStageInstantiate(){
- $('button#appstage_instantiate_button').live('click', function(){
- var vars = [];
- var context = $(this).parents('table#appstage_instantiate_table');
-
- var id = $('input[type="hidden"]', context).val();
- var template_id = $('select', context).val();
-
- $('input[type="text"]', context).each(function(){
- var key = $(this).attr('name');
- var val = $(this).val();
-
- if (val)
- vars.push(key +'='+ val)
- });
-
- var obj = { vars: vars,
- template_id: template_id
- };
-
- if (vars.length)
- Sunstone.runAction("AppStage.instantiate", id, obj);
- return false;
- });
-
-}
-
-
// Set the autorefresh interval for the datatable
function setAppStageAutorefresh() {
setInterval(function(){
@@ -911,87 +974,6 @@ function setAppStageAutorefresh() {
},INTERVAL+someTime());
};
-/*
-function setupAppStageCloneDialog(){
- //Append to DOM
- dialogs_context.append('');
- var dialog = $('#appstage_clone_dialog',dialogs_context);
-
- //Put HTML in place
-
- var html = '\
-';
-
- dialog.html(html);
-
- //Convert into jQuery
- dialog.dialog({
- autoOpen:false,
- width:375,
- modal:true,
- resizable:false
- });
-
- $('button',dialog).button();
-
- $('form',dialog).submit(function(){
- var name = $('input', this).val();
- var sel_elems = appStageElements();
- if (!name || !sel_elems.length)
- notifyError('A name or prefix is needed!');
- if (sel_elems.length > 1){
- for (var i=0; i< sel_elems.length; i++)
- //If we are cloning several items we
- //use the name as prefix
- Sunstone.runAction('AppStage.clone',
- sel_elems[i],
- name + getName(sel_elems[i],
- dataTable_appstages,
- 4));
- } else {
- Sunstone.runAction('AppStage.clone',sel_elems[0],name)
- };
- dialog.trigger("reveal:close")
- setTimeout(function(){
- Sunstone.runAction('AppStage.refresh');
- }, 1500);
- return false;
- });
-}
-
-function popUpAppStageCloneDialog(){
- var dialog = $('#appstage_clone_dialog');
- var sel_elems = appStageElements();
- //show different text depending on how many elements are selected
- if (sel_elems.length > 1){
- $('.clone_one',dialog).hide();
- $('.clone_several',dialog).show();
- $('input',dialog).val('Copy of ');
- }
- else {
- $('.clone_one',dialog).show();
- $('.clone_several',dialog).hide();
- $('input',dialog).val('Copy of '+getName(sel_elems[0],
- dataTable_appstages, 4));
- };
-
- $(dialog).addClass("reveal-modal xlarge")
-
-}
-
-*/
-
//The DOM is ready at this point
$(document).ready(function(){
@@ -1017,9 +999,8 @@ $(document).ready(function(){
setupCreateAppStageDialog();
setupAppStageTemplateUpdateDialog();
- setupAppStageInstantiate();
+ setupEnvInstantiateDialog();
setupTips($create_appstage_dialog);
-// setupImageCloneDialog();
setAppStageAutorefresh();
initCheckAllBoxes(dataTable_appstages);
@@ -1027,4 +1008,4 @@ $(document).ready(function(){
infoListener(dataTable_appstages,'AppStage.showinfo');
$('div#appstages_tab div.legend_div').hide();
-});
+ });