[Kimchi-devel] [PATCH] [Kimchi 2/9] Issue 770: New template is not shown right after creation

From: samhenri <samuel.guimaraes(a)eldorado.org.br&gt; Signed-off-by: samhenri <samuel.guimaraes(a)eldorado.org.br&gt; --- ui/js/src/kimchi.template_main.js | 34 ++++++-------------- ui/pages/tabs/templates.html.tmpl | 66 +++++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 55 deletions(-) diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 36112fa..3062856 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -20,33 +20,17 @@ kimchi.doListTemplates = function() { if (result && result.length) { $('#noTemplates').hide(); var listHtml = '<li class="wok-vm-header">' + - '<span class="column-name">Template Name (ID)</span><!--' + - '--><span class="column-type">OS</span><!--' + - '--><span class="column-version">Version</span><!--' + - '--><span class="column-processors">CPUs</span><!--' + - '--><span class="column-memory">Memory</span><!-- ' + + '<span class="column-name">'+i18n['KCHTMPL6004M']+'</span><!--' + + '--><span class="column-type">'+i18n['KCHTMPL6005M']+'</span><!--' + + '--><span class="column-version">'+i18n['KCHTMPL6006M']+'</span><!--' + + '--><span class="column-processors">'+i18n['KCHTMPL6007M']+'</span><!--' + + '--><span class="column-memory">'+i18n['KCHTMPL6008M']+'</span><!-- ' + '--><span class="column-action" style="display:none"> ' + - ' <span class="sr-only">Actions</span><!-- ' + + ' <span class="sr-only">'+i18n['KCHTMPL6009M']+'</span><!-- ' + '--></span> ' + '</li>'; var templateHtml = $('#templateTmpl').html(); $.each(result, function(index, value) { - var isLocal; - if (value.cdrom) { - isLocal = /^\//.test(value['cdrom']); - } else { - for (var i = 0; i < value.disks.length; i++) { - if (value.disks[i].base) { - isLocal = /^\//.test(value.disks[i].base); - break; - } - } - } - if (isLocal) { - value.location = "plugins/kimchi/images/theme-default/icon-local.png"; - } else { - value.location = "plugins/kimchi/images/theme-default/icon-remote.png"; - } listHtml += wok.substitute(templateHtml, value); }); $('#templateList').html(listHtml); @@ -55,10 +39,10 @@ kimchi.doListTemplates = function() { $('#templateList').html(''); $('#noTemplates').show(); } - $('html').removeClass('processing'); + $('.wok-mask').addClass('hidden'); }, function(err) { wok.message.error(err.responseJSON.reason); - $('html').removeClass('processing'); + $('.wok-mask').addClass('hidden'); }); }; @@ -72,7 +56,7 @@ kimchi.templateBindClick = function() { $('.template-clone a').on('click', function(event) { event.preventDefault(); kimchi.selectedTemplate = $(this).data('template'); - $('html').addClass('processing'); + $('.wok-mask').removeClass('hidden'); kimchi.cloneTemplate(kimchi.selectedTemplate, function() { kimchi.doListTemplates(); }, function(err) { diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 1031f52..e5b5720 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -43,7 +43,7 @@ <!-- Collect the nav links, forms, and other content for toggling --> <div class="collapse navbar-collapse" id="toolbar"> <ul class="nav navbar-nav navbar-right tools" display="none"> - <li><a id="template-add" class="btn-tool" href="javascript:void(0);"><i class="fa fa-plus-circle"></i><span>Add a Template</span></a></li> + <li><a id="template-add" class="btn-tool" href="javascript:void(0);"><i class="fa fa-plus-circle"></i><span>$_("Add Template")</span></a></li> </ul> </div> </div> @@ -62,41 +62,47 @@ </div> <div id="alert-container"></div> <ul id="templateList" class="wok-vm-list empty-when-logged-off"> - <script id="templateTmpl" type="html/text"> - <li class="wok-vm-body"> - <span class='column-name' title="{name}" val="{name}">{name}</span><!-- - --><span class='column-action pull-right'> - <span class="pull-right"> - <div class="dropdown menu-flat"> - <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span> - </button> - <ul class="dropdown-menu" role="menu"> - <li role="presentation" nwAct="edit" class='template-edit'><a href="#" data-template='{name}'><i class="fa fa-pencil"></i>$_("Edit")</a></li> - <li role="presentation" nwAct="clone" class='template-clone'><a href="#" data-template='{name}'><i class="fa fa-files-o"></i>$_("Clone")</a></li> - <li role="presentation" nwAct="delete" class='critical template-delete'><a href="#" data-template='{name}'><i class="fa fa-minus-circle"></i>$_("Delete")</a></li> - </ul> - </div> - </span> - </span><!-- - --><span class='column-type distro-icon icon-{os_distro}' val="{os_distro}">{os_distro}</span><!-- - --><span class="item-hidden">$_("OS")</span><!-- - --><span class='column-version' val="{os_version}">{os_version}</span><!-- - --><span class="item-hidden">$_("Version")</span><!-- - --><span class='column-processors' val="{cpus}"><strong>{cpus}</strong> cores</span><!-- - --><span class="item-hidden">$_("CPUs")</span><!-- - --><span class='column-memory' val="{memory}"><strong>{memory}</strong> M</span><!-- - --><span class="item-hidden">$_("Memory")</span> - </li> - - </script> </ul> </div> </div> - - <div id="modalWindow" class="modal fade host-modal templates-modal" tabindex="-1" role="dialog" aria-labelledby="templatesModalLabel" aria-hidden="true"> + <div class="wok-mask hidden"> + <div class="wok-mask-loader-container"> + <div class="wok-mask-loading"> + <div class="wok-mask-loading-icon"></div> + <div class="wok-mask-loading-text">$_("Loading...")</div> + </div> + </div> + </div> + <div id="modalWindow" class="modal fade host-modal templates-modal" data-keyboard="false" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="templatesModalLabel" aria-hidden="true"> </div> <script> kimchi.template_main(); </script> + <script id="templateTmpl" type="html/text"> + <li class="wok-vm-body"> + <span class='column-name' title="{name}" val="{name}">{name}</span><!-- + --><span class='column-action pull-right'> + <span class="pull-right"> + <div class="dropdown menu-flat"> + <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span> + </button> + <ul class="dropdown-menu" role="menu"> + <li role="presentation" nwAct="edit" class='template-edit'><a href="#" data-template='{name}'><i class="fa fa-pencil"></i>$_("Edit")</a></li> + <li role="presentation" nwAct="clone" class='template-clone'><a href="#" data-template='{name}'><i class="fa fa-files-o"></i>$_("Clone")</a></li> + <li role="presentation" nwAct="delete" class='critical template-delete'><a href="#" data-template='{name}'><i class="fa fa-minus-circle"></i>$_("Delete")</a></li> + </ul> + </div> + </span> + </span><!-- + --><span class='column-type distro-icon icon-{os_distro}' val="{os_distro}">{os_distro}</span><!-- + --><span class="item-hidden">$_("OS")</span><!-- + --><span class='column-version' val="{os_version}">{os_version}</span><!-- + --><span class="item-hidden">$_("Version")</span><!-- + --><span class='column-processors' val="{cpus}"><strong>{cpus}</strong> cores</span><!-- + --><span class="item-hidden">$_("CPUs")</span><!-- + --><span class='column-memory' val="{memory}"><strong>{memory}</strong> M</span><!-- + --><span class="item-hidden">$_("Memory")</span> + </li> + </script> </body> </html> -- 1.9.3