shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Feature #4363: Rename right- and left- layout classes to avoid foundation style injection

Browse Source 
The dropdowns were placed to the right of the buttons
because of the only-right-info class
This commit is contained in:
Carlos Martín 2016-04-28 14:53:54 +02:00
parent 5a9ae39947
commit 9dc679840c
28 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/sunstone/public/app/sunstone.js
View File

@ -154,9 +154,9 @@ define(function(require) {
dataTable.initialize();
if (dataTable.labelsColumn) {
$('#' + tabName + 'labels_buttons').html(
'<button type="button" data-toggle="' + tabName + 'LabelsDropdown" class="only-right-info only-right-list top_button secondary button dropdown">' +
'<button type="button" data-toggle="' + tabName + 'LabelsDropdown" class="only-sunstone-info only-sunstone-list top_button secondary button dropdown">' +
'<i class="fa fa-tags"/></button>' +
'<div id="' + tabName + 'LabelsDropdown" class="only-right-info only-right-list labels-dropdown dropdown-pane menu vertical" data-dropdown data-close-on-click="true"></div>').foundation();
'<div id="' + tabName + 'LabelsDropdown" class="only-sunstone-info only-sunstone-list labels-dropdown dropdown-pane menu vertical" data-dropdown data-close-on-click="true"></div>').foundation();
}
}
@ -179,7 +179,7 @@ define(function(require) {
} else {
tabInfo['tabName'] = tabName;
var TabTemplate = require('hbs!sunstone/tab')
$('div.right-content').append(TabTemplate(tabInfo));
$('div.sunstone-content').append(TabTemplate(tabInfo));
}
var liItem;
@ -227,7 +227,7 @@ define(function(require) {
}
if (tabInfo.setup) {
var context = $('div#' + tabName, $('div.right-content'));
var context = $('div#' + tabName, $('div.sunstone-content'));
tabInfo.setup(context);
}
@ -246,7 +246,7 @@ define(function(require) {
context = customContext;
} else {
customId = tabName;
context = $('div#' + tabName, $('div.right-content'));
context = $('div#' + tabName, $('div.sunstone-content'));
}
var actionBlock = $('div.action_blocks', context)
@ -313,7 +313,7 @@ define(function(require) {
'<i class="fa fa-refresh fa-stack-2x" style="color: #dfdfdf"></i>' +
'<i class="fa fa-play fa-stack-1x"></i>' +
'</span>';
strClass.push("toggle_top_button", "only-right-list", "button", "hollow");
strClass.push("toggle_top_button", "only-sunstone-list", "button", "hollow");
buttonCode = '<a class="' + strClass.join(' ') + '" style="padding-left:0px; margin-right: 20px">' + text + '</a>';
break;
case "main":
@ -504,9 +504,9 @@ define(function(require) {
var _setupTabs = function() {
Foundation.reflow($('#menu'), 'accordion-menu');
Foundation.reflow($('div.right-content'), 'sticky')
var topTabs = $(".left-content ul li.topTab");
var subTabs = $(".left-content ul li.subTab > a");
Foundation.reflow($('div.sunstone-content'), 'sticky')
var topTabs = $(".sunstone-menu-content ul li.topTab");
var subTabs = $(".sunstone-menu-content ul li.subTab > a");
subTabs.on("click", function() {
if ($(this).closest('li').hasClass('topTab')) {
@ -540,12 +540,12 @@ define(function(require) {
$(".tab").hide();
tab.show();
$(".right-info", tab).hide();
$(".right-form", tab).hide();
$(".right-list", tab).fadeIn();
$(".only-right-info", tab).hide();
$(".only-right-form", tab).hide();
$(".only-right-list", tab).fadeIn();
$(".sunstone-info", tab).hide();
$(".sunstone-form", tab).hide();
$(".sunstone-list", tab).fadeIn();
$(".only-sunstone-info", tab).hide();
$(".only-sunstone-form", tab).hide();
$(".only-sunstone-list", tab).fadeIn();
$('.action_blocks', tab).removeClass('large-12').addClass('large-9');
};
@ -554,12 +554,12 @@ define(function(require) {
$(".tab").hide();
tab.show();
$(".right-list", tab).hide();
$(".right-form", tab).hide();
$(".right-info", tab).fadeIn();
$(".only-right-list", tab).hide();
$(".only-right-form", tab).hide();
$(".only-right-info", tab).fadeIn();
$(".sunstone-list", tab).hide();
$(".sunstone-form", tab).hide();
$(".sunstone-info", tab).fadeIn();
$(".only-sunstone-list", tab).hide();
$(".only-sunstone-form", tab).hide();
$(".only-sunstone-info", tab).fadeIn();
$('.action_blocks', tab).removeClass('large-9').addClass('large-12');
}
@ -611,7 +611,7 @@ define(function(require) {
$(".resource-info-header", context).text("");
var loading = '<div style="margin-top: 20px; text-align: center; width: 100%"><img src="images/pbar.gif" alt="loading..." /></div>';
$(".right-info", context).html(loading);
$(".sunstone-info", context).html(loading);
_showRighInfo(tabName);
Sunstone.runAction(infoAction, elementId);
@ -621,12 +621,12 @@ define(function(require) {
// Returns the element that is currently shown in the right info
var _getElementRightInfo = function(tabName, context) {
var context = context || $(".right-info", $("#" + tabName));
var context = context || $(".sunstone-info", $("#" + tabName));
return context.data('element');
}
var _insertPanels = function(tabName, info, contextTabId, context) {
var context = context || $(".right-info", $("#" + tabName));
var context = context || $(".sunstone-info", $("#" + tabName));
context.data('element', info[Object.keys(info)[0]]);
@ -894,7 +894,7 @@ define(function(require) {
// Workaround until Foundation.abide support hidden forms
var context = $("#" + tabId);
$(".right-form-title", context).text(Locale.tr("Submitting..."));
$(".sunstone-form-title", context).text(Locale.tr("Submitting..."));
$(".submit_button", context).text(Locale.tr("Submitting..."));
setTimeout(function() {
@ -951,7 +951,7 @@ define(function(require) {
context = $(".tab:visible"); // current tab
tabId = context.attr("id");
}
//$(".right-form", context).html(content);
//$(".sunstone-form", context).html(content);
$(".loadingForm", context).hide();
$(".tabs-contentForm", context).hide();
@ -959,7 +959,7 @@ define(function(require) {
var formPanelInstance = SunstoneCfg["tabs"][tabId].activeFormPanel;
if (formPanelInstance) {
// Set title and button strings
$(".right-form-title", context).text(formPanelInstance.title());
$(".sunstone-form-title", context).text(formPanelInstance.title());
$(".submit_button", context).text(formPanelInstance.buttonText());
$("div[form-panel-id="+formPanelInstance.formPanelId+"]", context).fadeIn();
@ -974,15 +974,15 @@ define(function(require) {
function _popFormPanelLoading(tabId) {
var context = $("#" + tabId);
$(".right-list", context).hide();
$(".right-info", context).hide();
$(".right-form", context).show();
$(".only-right-list", context).hide();
$(".only-right-info", context).hide();
$(".only-right-form", context).show();
$(".sunstone-list", context).hide();
$(".sunstone-info", context).hide();
$(".sunstone-form", context).show();
$(".only-sunstone-list", context).hide();
$(".only-sunstone-info", context).hide();
$(".only-sunstone-form", context).show();
$('.action_blocks', context).removeClass('large-9').addClass('large-12');
$(".right-form-title", context).text(Locale.tr("Loading..."));
$(".sunstone-form-title", context).text(Locale.tr("Loading..."));
$(".submit_button", context).text(Locale.tr("Loading..."));
$(".tabs-contentForm", context).hide();
@ -1025,11 +1025,11 @@ define(function(require) {
}
var _rightInfoVisible = function(context) {
return $(".right-info", context).is(':visible');
return $(".sunstone-info", context).is(':visible');
}
var _rightListVisible = function(context) {
return $(".right-list", context).is(':visible');
return $(".sunstone-list", context).is(':visible');
}
var _rightInfoResourceId = function(context) {

46
src/sunstone/public/app/sunstone/buttons.hbs
View File

@ -16,13 +16,13 @@
<span>
{{#unless customContext}}
<span id="{{customId}}back_button" class=" only-right-info only-right-form">
<span id="{{customId}}back_button" class=" only-sunstone-info only-sunstone-form">
<button class="button radius" href="back"> <i class="fa fa-arrow-left"></i> <i class="fa fa-list"></i>
</button>
</span>
{{/unless}}
<span id='{{customId}}form_buttons' class='only-right-form' hidden>
<span id='{{customId}}form_buttons' class='only-sunstone-form' hidden>
<span id="{{customId}}reset_button">
<button class="button secondary radius reset_button" href="submit">{{tr "Reset"}}</button>
</span>
@ -31,54 +31,54 @@
</span>
</span>
<span id="{{customId}}create_buttons" class=" only-right-list"></span>
<span id="{{customId}}refresh_buttons" class=" only-right-info only-right-list"></span>
<span id="{{customId}}create_buttons" class=" only-sunstone-list"></span>
<span id="{{customId}}refresh_buttons" class=" only-sunstone-info only-sunstone-list"></span>
</span>
<span>
<span id="{{customId}}main_buttons" class="only-right-info only-right-list"></span>
<span id="{{customId}}main_buttons" class="only-sunstone-info only-sunstone-list"></span>
<span id="{{customId}}vmsplay_buttons" class='only-right-info only-right-list'></span>
<span id="{{customId}}vmsplay_buttons" class='only-sunstone-info only-sunstone-list'></span>
<button type='button' data-toggle='{{customId}}vmspause_buttons' class='only-right-info only-right-list top_button button secondary dropdown'>
<button type='button' data-toggle='{{customId}}vmspause_buttons' class='only-sunstone-info only-sunstone-list top_button button secondary dropdown'>
<i class='fa fa-pause'/>
</button>
<ul id='{{customId}}vmspause_buttons' class='only-right-info only-right-list dropdown-pane menu vertical' data-dropdown></ul>
<ul id='{{customId}}vmspause_buttons' class='only-sunstone-info only-sunstone-list dropdown-pane menu vertical' data-dropdown></ul>
<button type='button' data-toggle='{{customId}}vmsstop_buttons' class='only-right-info only-right-list top_button button secondary dropdown'>
<button type='button' data-toggle='{{customId}}vmsstop_buttons' class='only-sunstone-info only-sunstone-list top_button button secondary dropdown'>
<i class='fa fa-stop'/>
</button>
<ul id='{{customId}}vmsstop_buttons' class='only-right-info only-right-list dropdown-pane menu vertical' data-dropdown></ul>
<ul id='{{customId}}vmsstop_buttons' class='only-sunstone-info only-sunstone-list dropdown-pane menu vertical' data-dropdown></ul>
<button type='button' data-toggle='{{customId}}vmsrepeat_buttons' class='only-right-info only-right-list top_button button secondary dropdown'>
<button type='button' data-toggle='{{customId}}vmsrepeat_buttons' class='only-sunstone-info only-sunstone-list top_button button secondary dropdown'>
<i class='fa fa-repeat'/>
</button>
<ul id='{{customId}}vmsrepeat_buttons' class='only-right-info only-right-list dropdown-pane menu vertical' data-dropdown></ul>
<ul id='{{customId}}vmsrepeat_buttons' class='only-sunstone-info only-sunstone-list dropdown-pane menu vertical' data-dropdown></ul>
<button type='button' data-toggle='{{customId}}vmsplanification_buttons' class='only-right-info only-right-list top_button button secondary dropdown'>
<button type='button' data-toggle='{{customId}}vmsplanification_buttons' class='only-sunstone-info only-sunstone-list top_button button secondary dropdown'>
<i class='fa fa-th-list'/>
</button>
<ul id='{{customId}}vmsplanification_buttons' class='only-right-info only-right-list dropdown-pane menu vertical' data-dropdown></ul>
<ul id='{{customId}}vmsplanification_buttons' class='only-sunstone-info only-sunstone-list dropdown-pane menu vertical' data-dropdown></ul>
</span>
<span>
<button type='button' data-toggle='{{customId}}more_buttons' class='only-right-info only-right-list top_button button secondary dropdown'>
<button type='button' data-toggle='{{customId}}more_buttons' class='only-sunstone-info only-sunstone-list top_button button secondary dropdown'>
<i class='fa fa-ellipsis-v'/>
</button>
<ul id='{{customId}}more_buttons' class='only-right-info only-right-list dropdown-pane menu vertical' data-dropdown></ul>
<ul id='{{customId}}more_buttons' class='only-sunstone-info only-sunstone-list dropdown-pane menu vertical' data-dropdown></ul>
<button type='button' data-toggle='{{customId}}user_buttons' class='only-right-info only-right-list top_button secondary button dropdown'>
<button type='button' data-toggle='{{customId}}user_buttons' class='only-sunstone-info only-sunstone-list top_button secondary button dropdown'>
<i class='fa fa-user'/></button>
<ul id='{{customId}}user_buttons' class='only-right-info only-right-list dropdown-pane menu vertical' data-dropdown></ul>
<ul id='{{customId}}user_buttons' class='only-sunstone-info only-sunstone-list dropdown-pane menu vertical' data-dropdown></ul>
<span id='{{customId}}labels_buttons' class='only-right-info only-right-list'></span>
<span id='{{customId}}labels_buttons' class='only-sunstone-info only-sunstone-list'></span>
<button type='button' data-toggle='{{customId}}vmsdelete_buttons' class='only-right-info only-right-list top_button button alert dropdown'>
<button type='button' data-toggle='{{customId}}vmsdelete_buttons' class='only-sunstone-info only-sunstone-list top_button button alert dropdown'>
<i class='fa fa-trash-o'/></button>
<ul id='{{customId}}vmsdelete_buttons' class='only-right-info only-right-list dropdown-pane menu vertical' data-dropdown></ul>
<ul id='{{customId}}vmsdelete_buttons' class='only-sunstone-info only-sunstone-list dropdown-pane menu vertical' data-dropdown></ul>
<span id='{{customId}}delete_buttons' class='only-right-info only-right-list'></span>
<span id='{{customId}}delete_buttons' class='only-sunstone-info only-sunstone-list'></span>
<ul id="{{customId}}FormTabs" class="tabs right wizard_tabs only-right-form" hidden data-tabs>
<ul id="{{customId}}FormTabs" class="tabs right wizard_tabs only-sunstone-form" hidden data-tabs>
<li id="wizard_mode" class="tabs-title is-active">
<a href="#{{customId}}-wizardForms">{{tr "Wizard"}}</a>
</li>

2
src/sunstone/public/app/sunstone/panels.hbs
View File

@ -15,7 +15,7 @@
{{! -------------------------------------------------------------------------- }}
<div id="{{containerId}}">
<ul id="{{containerId}}Tabs" class="tabs right-info-tabs text-center" data-tabs>
<ul id="{{containerId}}Tabs" class="tabs sunstone-info-tabs text-center" data-tabs>
{{#each panels}}
<li class="tabs-title {{#if active}}is-active{{/if}}">
<a href="#{{panelName}}">

16
src/sunstone/public/app/sunstone/tab.hbs
View File

@ -17,10 +17,10 @@
{{#if listHeader }}
<div class="row header-row">
<div class="large-12 columns">
<h5 class="header-title only-right-list">
<h5 class="header-title only-sunstone-list">
<span class="header-resource">{{{listHeader}}}</span>
</h5>
<h5 class="header-title only-right-info" hidden>
<h5 class="header-title only-sunstone-info" hidden>
<span class="header-resource">
{{{infoHeader}}}
<small class="resource-id"></small>
@ -28,15 +28,15 @@
<small class="resource-info-header-small"></small>
</span>
</h5>
<h5 class="header-title only-right-form" hidden>
<span class="right-form-title"></span>
<h5 class="header-title only-sunstone-form" hidden>
<span class="sunstone-form-title"></span>
</h5>
</div>
{{#if buttons}}
<div class="actions_row">
<div class="medium-12 large-9 columns action_blocks"></div>
<div class="medium-4 large-3 columns">
<div class="only-right-list">
<div class="only-sunstone-list">
{{#if dataTable.searchInputHTML}}
{{{dataTable.searchInputHTML}}}
{{/if}}
@ -47,7 +47,7 @@
</div>
{{/if}}
<div class="right-list">
<div class="sunstone-list">
{{#if dataTable.dataTableHTML}}
<div class="row">
<div class="large-12 columns">{{{dataTable.dataTableHTML}}}</div>
@ -71,9 +71,9 @@
{{/if}}
</div>
<div class="right-info" hidden></div>
<div class="sunstone-info" hidden></div>
<div class="large-12 small-12 right-form" hidden>
<div class="large-12 small-12 sunstone-form" hidden>
<div class="loadingForm">
<br>
<br>

2
src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs
View File

@ -21,7 +21,7 @@
<input type="text" required name="name" id="name" />
</div>
<div class="medium-6 columns">
<dl id="{{formPanelId}}Tabs" class="tabs right-info-tabs text-center right" data-tabs>
<dl id="{{formPanelId}}Tabs" class="tabs sunstone-info-tabs text-center right" data-tabs>
<dd class="tabs-title is-active">
<a href="#tab-hostsTab">
<i class="fa fa-hdd-o"></i><br>{{tr "Hosts"}}

2
src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs
View File

@ -22,7 +22,7 @@
</label>
</div>
<div class="columns medium-7">
<dl id="{{formPanelId}}Tabs" class="tabs right-info-tabs text-center right" data-tabs>
<dl id="{{formPanelId}}Tabs" class="tabs sunstone-info-tabs text-center right" data-tabs>
<dd class="tabs-title is-active">
<a href="#resource_views"> <i class="fa fa-eye"></i>
<br>{{tr "Views"}}</a>

2
src/sunstone/public/app/tabs/provision-tab.js
View File

@ -688,7 +688,7 @@ define(function(require) {
var tab = $("#"+tab_name);
if (Config.isTabEnabled(tab_name)) {
$(".right-content").addClass("large-centered small-centered");
$(".sunstone-content").addClass("large-centered small-centered");
$("#footer").removeClass("right");
$("#footer").addClass("large-centered small-centered");

2
src/sunstone/public/app/tabs/provision-tab/vms/info.hbs
View File

@ -212,6 +212,6 @@
<br>
<br>
<div class="row">
<div class="large-12 columns provision-right-info"></div>
<div class="large-12 columns provision-sunstone-info"></div>
</div>
</div>

2
src/sunstone/public/app/tabs/provision-tab/vms/list.js
View File

@ -249,7 +249,7 @@ define(function(require) {
},
error: Notifier.onError,
success: function(request, response){
Sunstone.insertPanels(TAB_ID, response, TAB_ID, $(".provision-right-info", context));
Sunstone.insertPanels(TAB_ID, response, TAB_ID, $(".provision-sunstone-info", context));
var data = response.VM
var state = get_provision_vm_state(data);

2
src/sunstone/public/app/tabs/settings-tab.js
View File

@ -67,7 +67,7 @@ define(function(require) {
id: -1
},
success: function(request, user_json) {
Sunstone.insertPanels(TAB_ID, user_json, TAB_ID, $(".right-list", $("#" + TAB_ID)))
Sunstone.insertPanels(TAB_ID, user_json, TAB_ID, $(".sunstone-list", $("#" + TAB_ID)))
}
});
}

2
src/sunstone/public/app/tabs/support-tab/buttons.js
View File

@ -27,7 +27,7 @@ define(function(require) {
type: "action",
layout: "main",
text: '<i class="fa fa-cloud-upload" style="color: rgb(111, 111, 111)"/> '+Locale.tr("Upload a file"),
custom_classes: "only-right-info"
custom_classes: "only-sunstone-info"
},
"Support.signout" : {
type: "action",

2
src/sunstone/public/app/tabs/support-tab/panels/info.js
View File

@ -103,7 +103,7 @@ define(function(require) {
});
$(".accordion_advanced_toggle", context).trigger("click");
$("dl.right-info-tabs", context).hide();
$("dl.sunstone-info-tabs", context).hide();
return false;
}

2
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs
View File

@ -16,7 +16,7 @@
<form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
<div>
<dl id="{{formPanelId}}Tabs" class="tabs right-info-tabs" data-tabs>
<dl id="{{formPanelId}}Tabs" class="tabs sunstone-info-tabs" data-tabs>
{{#each wizardTabs}}
<dd class='tabs-title {{classes}}'>
<a href='#{{wizardTabId}}'> <i class='fa {{icon}}'></i>

2
src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/wizard.hbs
View File

@ -16,7 +16,7 @@
<form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
<div>
<dl id="{{formPanelId}}Tabs" class="tabs right-info-tabs text-center" data-tabs>
<dl id="{{formPanelId}}Tabs" class="tabs sunstone-info-tabs text-center" data-tabs>
<dd class="tabs-title is-active"><a href="#vdcCreateGeneralTab"><i class="fa fa-th"></i><br>{{tr "General"}}</a></dd>
<dd class="tabs-title"><a href="#vdcCreateGroupsTab"><i class="fa fa-users"></i><br>{{tr "Groups"}}</a></dd>
<dd class="tabs-title"><a href="#vdcCreateResourcesTab"><i class="fa fa-hdd-o"></i><br>{{tr "Resources"}}</a></dd>

2
src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone/html.hbs
View File

@ -16,7 +16,7 @@
<div class="row">
<div class="large-12 columns">
<dl id="{{unique_id}}Tabs" class="tabs right-info-tabs" data-tabs>
<dl id="{{unique_id}}Tabs" class="tabs sunstone-info-tabs" data-tabs>
<dd class="tabs-title is-active"><a href="#vdcClustersTab_{{unique_id}}"><i class="fa fa-th"></i><br>{{tr "Clusters"}}</a></dd>
<dd class="tabs-title"><a href="#vdcHostsTab_{{unique_id}}"><i class="fa fa-hdd-o"></i><br>{{tr "Hosts"}}</a></dd>
<dd class="tabs-title"><a href="#vdcVnetsTab_{{unique_id}}"><i class="fa fa-globe"></i><br>{{tr "VNets"}}</a></dd>

4
src/sunstone/public/app/tabs/vms-tab/buttons.js
View File

@ -201,13 +201,13 @@ define(function(require) {
"VM.startvnc" : {
type: "action",
text: '<i class="fa fa-desktop" style="color: rgb(111, 111, 111)"/> ' + Locale.tr("VNC"),
custom_classes: "only-right-info vnc-right-info",
custom_classes: "only-sunstone-info vnc-sunstone-info",
tip: Locale.tr("VNC")
},
"VM.startspice" : {
type: "action",
text: '<i class="fa fa-desktop" style="color: rgb(111, 111, 111)"/> ' + Locale.tr("SPICE"),
custom_classes: "only-right-info spice-right-info",
custom_classes: "only-sunstone-info spice-sunstone-info",
tip: Locale.tr("SPICE")
},
"VM.saveas_template" : {

2
src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs
View File

@ -16,7 +16,7 @@
<form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
<div>
<dl id="{{formPanelId}}Tabs" class="tabs right-info-tabs" data-tabs>
<dl id="{{formPanelId}}Tabs" class="tabs sunstone-info-tabs" data-tabs>
{{#each wizardTabs}}
<dd class='tabs-title {{classes}}'>
<a href='#{{wizardTabId}}'> <i class='fa {{icon}}'></i>

8
src/sunstone/public/app/tabs/vms-tab/hooks/state.js
View File

@ -43,15 +43,15 @@ define(function(require) {
// Enable / disable vnc button
if (OpenNebulaVM.isVNCSupported(element)) {
$(".vnc-right-info").show();
$(".vnc-sunstone-info").show();
} else {
$(".vnc-right-info").hide();
$(".vnc-sunstone-info").hide();
}
if (OpenNebulaVM.isSPICESupported(element)) {
$(".spice-right-info").show();
$(".spice-sunstone-info").show();
} else {
$(".spice-right-info").hide();
$(".spice-sunstone-info").hide();
}
}

2
src/sunstone/public/app/tabs/vnets-tab/buttons.js
View File

@ -43,7 +43,7 @@ define(function(require) {
type: "action",
layout: "main",
text: Locale.tr("Reserve"),
custom_classes: "only-right-info reserve-right-info",
custom_classes: "only-sunstone-info reserve-sunstone-info",
},
"Network.addtocluster" : {
type : "action",

2
src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
View File

@ -14,7 +14,7 @@
{{! limitations under the License. }}
{{! -------------------------------------------------------------------------- }}
<form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
<dl id="vnet_create_tabs" class="tabs right-info-tabs text-center" data-tabs>
<dl id="vnet_create_tabs" class="tabs sunstone-info-tabs text-center" data-tabs>
<dd class="tabs-title is-active">
<a href="#vnetCreateGeneralTab"> <i class="fa fa-globe"></i>
<br>{{tr "General"}}</a>

12
src/sunstone/public/app/tabs/vnets-tab/panels/info.js
View File

@ -86,13 +86,13 @@ define(function(require) {
<td></td>\
</tr>';
$(".reserve-right-info").prop("disabled", true);
$(".reserve-right-info").addClass("has-tip");
$(".reserve-right-info").attr("title", Locale.tr("This Network is already a reservation"));
$(".reserve-sunstone-info").prop("disabled", true);
$(".reserve-sunstone-info").addClass("has-tip");
$(".reserve-sunstone-info").attr("title", Locale.tr("This Network is already a reservation"));
} else{
$(".reserve-right-info").prop("disabled", false);
$(".reserve-right-info").removeClass("has-tip");
$(".reserve-right-info").removeAttr("title");
$(".reserve-sunstone-info").prop("disabled", false);
$(".reserve-sunstone-info").removeClass("has-tip");
$(".reserve-sunstone-info").removeAttr("title");
}
//====

10
src/sunstone/public/app/utils/menu.js
View File

@ -43,17 +43,17 @@ define(function(require) {
function _setup(){
$('#menu-toggle').on('click', function(){
var hiding = $('.right-content').hasClass("large-10");
var hiding = $('.sunstone-content').hasClass("large-10");
if(!hiding){
$('.right-content').toggleClass('large-10');
$('.right-content').toggleClass('large-12');
$('.sunstone-content').toggleClass('large-10');
$('.sunstone-content').toggleClass('large-12');
}
$('#menu-wrapper').toggle(200, function(){
if(hiding){
$('.right-content').toggleClass('large-10');
$('.right-content').toggleClass('large-12');
$('.sunstone-content').toggleClass('large-10');
$('.sunstone-content').toggleClass('large-12');
}
});
});

2
src/sunstone/public/app/utils/menu/provision-top-row.hbs
View File

@ -14,7 +14,7 @@
{{! limitations under the License. }}
{{! -------------------------------------------------------------------------- }}
<div class="right-content small-12 large-10 columns">
<div class="sunstone-content small-12 large-10 columns">
<div class="row">
<div class="small-12 medium-8 columns">
<ul class="menu provision-header text-center">

2
src/sunstone/public/app/utils/menu/top-row.hbs
View File

@ -15,7 +15,7 @@
{{! -------------------------------------------------------------------------- }}
<div class="small-12 columns">
<div id="" class="row left-body left-header media-object">
<div id="" class="row sunstone-menu-body sunstone-menu-header media-object">
<ul class="logo-header menu small-8 medium-4 large-4 columns">
<li>
<button id="menu-toggle" class="button secondary small">

2
src/sunstone/public/app/utils/quotas/quota-widgets.js
View File

@ -1160,7 +1160,7 @@ define(function(require) {
function _quotas_tmpl(uniqueId){
return '<div class="row">\
<div class="large-12 columns">\
<dl id="' + uniqueId + 'Tabs" class="tabs right-info-tabs text-center" data-tabs>\
<dl id="' + uniqueId + 'Tabs" class="tabs sunstone-info-tabs text-center" data-tabs>\
<dd class="tabs-title is-active"><a href="#vm_quota"><i class="fa fa-cloud"></i><br>'+Locale.tr("VM")+'</a></dd>\
<dd class="tabs-title"><a href="#datastore_quota"><i class="fa fa-folder-open"></i><br>'+Locale.tr("Datastore")+'</a></dd>\
<dd class="tabs-title"><a href="#image_quota"><i class="fa fa-upload"></i><br>'+Locale.tr("Image")+'</a></dd>\

2
src/sunstone/public/app/utils/tab-datatable.js
View File

@ -326,7 +326,7 @@ define(function(require) {
context = this.conf.customTabContext;
} else {
context = table.parents('.tab');
if ($(".right-info", context).is(':visible')) {
if ($(".sunstone-info", context).is(':visible')) {
return;
}
}

10
src/sunstone/public/scss/_layout.scss
View File

@ -6,15 +6,15 @@
}
}
.right-list,
.right-info,
.right-form,
.left-header,
.sunstone-list,
.sunstone-info,
.sunstone-form,
.sunstone-menu-header,
.actions_row {
padding: 0 2rem;
}
.left-header {
.sunstone-menu-header {
padding: 0 1rem;
}

8
src/sunstone/views/index.erb
View File

@ -61,8 +61,8 @@
</div>
<div class="row">
<div id="menu-wrapper" class="small-6 medium-3 large-2 columns left-content">
<div id="menu" class="row left-body">
<div id="menu-wrapper" class="small-6 medium-3 large-2 columns sunstone-menu-content">
<div id="menu" class="row sunstone-menu-body">
<ul class="vertical menu" id="navigation" data-accordion-menu>
</ul>
</div>
@ -73,8 +73,8 @@
</div>
</div>
<div class="small-12 large-10 columns right-content">
<div class="right-header">
<div class="small-12 large-10 columns sunstone-content">
<div class="sunstone-header">
</div>
</div>
<div id="loading" class="text-center">