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 #4320: Fix tab navigation removing duplicated IDs

Browse Source
This commit is contained in:
Carlos Martín 2016-04-26 11:45:06 +02:00
parent b78ccaad25
commit dca4a79b16
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
View File

@ -80,6 +80,7 @@ define(function(require) {
function _html() {
return TemplateHTML({
'uniqueId': UniqueId.id(),
'userInputsHTML': UserInputs.html(),
'customTagsTableHTML': CustomTagsTable.html(),
'contextFilesTableHTML': this.contextFilesTable.dataTableHTML

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

@ -36,19 +36,19 @@
<div class="medium-2 columns">
<ul id="context_tabs" class="tabs vertical" data-tabs>
<li class="tabs-title is-active">
<a href="#netsshTab">{{tr "Configuration"}}</a>
<a href="#netsshTab{{uniqueId}}">{{tr "Configuration"}}</a>
</li>
<li class="tabs-title">
<a href="#filesTab">{{tr "Files"}}</a>
<a href="#filesTab{{uniqueId}}">{{tr "Files"}}</a>
</li>
<li class="tabs-title">
<a href="#zcustomTab">{{tr "Custom vars"}}</a>
<a href="#customTab{{uniqueId}}">{{tr "Custom vars"}}</a>
</li>
</ul>
</div>
<div class="medium-10 columns">
<div class="tabs-content vertical" data-tabs-content="context_tabs">
<div class="wizard_internal_tab is-active tabs-panel" id="netsshTab">
<div class="wizard_internal_tab is-active tabs-panel netsshTab" id="netsshTab{{uniqueId}}">
<div class="row">
<div class="columns medium-6">
<div class="row">
@ -112,7 +112,7 @@
</fieldset>
</div>
</div>
<div class="wizard_internal_tab tabs-panel" id="filesTab">
<div class="wizard_internal_tab tabs-panel filesTab" id="filesTab{{uniqueId}}">
{{{contextFilesTableHTML}}}
<div class="row">
<div class="large-12 columns">
@ -133,7 +133,7 @@
</div>
</div>
</div>
<div class="wizard_internal_tab tabs-panel" id="zcustomTab">{{{customTagsTableHTML}}}</div>
<div class="wizard_internal_tab tabs-panel customTab" id="customTab{{uniqueId}}">{{{customTagsTableHTML}}}</div>
</div>
</div>
</div>

9
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
View File

@ -178,6 +178,7 @@ define(function(require) {
function _html() {
return TemplateHTML({
'uniqueId': UniqueId.id(),
'guestOS': GUESTOS,
'kernelFilesTableHTML': this.kernelFilesTable.dataTableHTML,
'initrdFilesTableHTML': this.initrdFilesTable.dataTableHTML
@ -246,9 +247,9 @@ define(function(require) {
function _retrieve(context) {
var templateJSON = {};
var osJSON = {}
$.extend(osJSON, WizardFields.retrieve('#bootTab', context));
$.extend(osJSON, WizardFields.retrieve('#kernelTab', context));
$.extend(osJSON, WizardFields.retrieve('#ramdiskTab', context));
$.extend(osJSON, WizardFields.retrieve('.bootTab', context));
$.extend(osJSON, WizardFields.retrieve('.kernelTab', context));
$.extend(osJSON, WizardFields.retrieve('.ramdiskTab', context));
var boot = "";
var val;
@ -266,7 +267,7 @@ define(function(require) {
if (!$.isEmptyObject(osJSON)) { templateJSON['OS'] = osJSON; };
var featuresJSON = WizardFields.retrieve('#featuresTab', context)
var featuresJSON = WizardFields.retrieve('.featuresTab', context)
if (!$.isEmptyObject(featuresJSON)) { templateJSON['FEATURES'] = featuresJSON; };
return templateJSON;

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

@ -17,22 +17,22 @@
<div class="medium-2 columns">
<ul class="tabs vertical" id="osTabs" data-tabs>
<li class="tabs-title is-active">
<a href="#bootTab">{{tr "Boot"}}</a>
<a href="#bootTab{{uniqueId}}">{{tr "Boot"}}</a>
</li>
<li class="tabs-title">
<a href="#kernelTab">{{tr "Kernel"}}</a>
<a href="#kernelTab{{uniqueId}}">{{tr "Kernel"}}</a>
</li>
<li class="tabs-title">
<a href="#ramdiskTab">{{tr "Ramdisk"}}</a>
<a href="#ramdiskTab{{uniqueId}}">{{tr "Ramdisk"}}</a>
</li>
<li class="tabs-title">
<a href="#featuresTab">{{tr "Features"}}</a>
<a href="#featuresTab{{uniqueId}}">{{tr "Features"}}</a>
</li>
</ul>
</div>
<div class="medium-10 columns">
<div class="tabs-content vertical" data-tabs-content="osTabs">
<div class="wizard_internal_tab is-active tabs-panel" id="bootTab">
<div class="wizard_internal_tab is-active tabs-panel bootTab" id="bootTab{{uniqueId}}">
<div class="row">
<div class="medium-4 columns">
<label for="ARCH">
@ -123,7 +123,7 @@
</div>
</div>
</div>
<div id="kernelTab" class="wizard_internal_tab tabs-panel">
<div id="kernelTab{{uniqueId}}" class="wizard_internal_tab tabs-panel kernelTab">
<div class="row">
<div class="large-12 columns text-center">
<input id="radioKernelDs" type="radio" name="kernel_type" value="kernel_ds" checked/>
@ -152,7 +152,7 @@
</div>
</div>
</div>
<div id="ramdiskTab" class="wizard_internal_tab tabs-panel">
<div id="ramdiskTab{{uniqueId}}" class="wizard_internal_tab tabs-panel ramdiskTab">
<div class="row">
<div class="large-12 columns text-center">
<input id="radioInintrdDs" type="radio" name="initrd_type" value="initrd_ds" checked>
@ -183,7 +183,7 @@
</div>
</div>
</div>
<div class="wizard_internal_tab tabs-panel" id="featuresTab">
<div class="wizard_internal_tab tabs-panel featuresTab" id="featuresTab{{uniqueId}}">
<div class="row">
<div class="medium-6 columns">
<label for="ACPI">