September 2017 - Kimchi-devel - oVirt List Archives

[PATCH] [Wok 0/2] Update error.html layout and code clean up
by Aline Manera 13 Sep '17

13 Sep '17

Aline Manera (2): Adjust error.html layout according to Wok styling Code clean up IBM-license-blacklist | 1 - ui/css/Makefile.am | 7 - ui/css/jquery-ui.custom.css | 8 +- ui/css/src/modules/_menu-flat.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 1 - ui/css/src/wok.scss | 5 + ui/css/theme-default/about.css | 23 -- ui/css/theme-default/base.css | 74 ----- ui/css/theme-default/button-flat.css | 137 ---------- ui/css/theme-default/button.css | 441 ------------------------------ ui/css/theme-default/checkbox-flat.css | 27 -- ui/css/theme-default/circleGauge.css | 25 -- ui/css/theme-default/datagrid.css | 60 ---- ui/css/theme-default/dialog-flat.css | 69 ----- ui/css/theme-default/error.css | 90 ------ ui/css/theme-default/form.css | 64 ----- ui/css/theme-default/framework.css | 35 --- ui/css/theme-default/gauge-flat.css | 54 ---- ui/css/theme-default/grid.css | 264 ------------------ ui/css/theme-default/jquery-ui.custom.css | 205 -------------- ui/css/theme-default/line-chart.css | 75 ----- ui/css/theme-default/line.css | 36 --- ui/css/theme-default/list-flat.css | 85 ------ ui/css/theme-default/login-window.css | 92 ------- ui/css/theme-default/menu-flat.css | 91 ------ ui/css/theme-default/message-flat.css | 89 ------ ui/css/theme-default/message.css | 147 ---------- ui/css/theme-default/messagebar-flat.css | 66 ----- ui/css/theme-default/nav-tree.css | 119 -------- ui/css/theme-default/navbar.css | 61 ----- ui/css/theme-default/popover.css | 126 --------- ui/css/theme-default/radio-flat.css | 32 --- ui/css/theme-default/reset.css | 60 ---- ui/css/theme-default/selectmenu-flat.css | 90 ------ ui/css/theme-default/tabs.css | 48 ---- ui/css/theme-default/textbox-flat.css | 24 -- ui/css/theme-default/theme.css | 52 ---- ui/css/theme-default/tile-check.css | 47 ---- ui/css/theme-default/toolbar.css | 55 ---- ui/css/theme-default/topbar.css | 182 ------------ ui/css/theme-default/window.css | 86 ------ ui/css/wok.css | 5 + ui/images/theme-default/Makefile.am | 4 +- ui/images/theme-default/logo-flat.svg | 113 -------- ui/images/theme-default/logo-white.png | Bin 3229 -> 0 bytes ui/pages/error.html.tmpl | 101 ++++--- 46 files changed, 75 insertions(+), 3403 deletions(-) delete mode 100644 ui/css/theme-default/about.css delete mode 100644 ui/css/theme-default/base.css delete mode 100755 ui/css/theme-default/button-flat.css delete mode 100644 ui/css/theme-default/button.css delete mode 100644 ui/css/theme-default/checkbox-flat.css delete mode 100644 ui/css/theme-default/circleGauge.css delete mode 100644 ui/css/theme-default/datagrid.css delete mode 100644 ui/css/theme-default/dialog-flat.css delete mode 100644 ui/css/theme-default/error.css delete mode 100644 ui/css/theme-default/form.css delete mode 100644 ui/css/theme-default/framework.css delete mode 100755 ui/css/theme-default/gauge-flat.css delete mode 100644 ui/css/theme-default/grid.css delete mode 100644 ui/css/theme-default/jquery-ui.custom.css delete mode 100644 ui/css/theme-default/line-chart.css delete mode 100644 ui/css/theme-default/line.css delete mode 100644 ui/css/theme-default/list-flat.css delete mode 100644 ui/css/theme-default/login-window.css delete mode 100644 ui/css/theme-default/menu-flat.css delete mode 100644 ui/css/theme-default/message-flat.css delete mode 100644 ui/css/theme-default/message.css delete mode 100644 ui/css/theme-default/messagebar-flat.css delete mode 100644 ui/css/theme-default/nav-tree.css delete mode 100644 ui/css/theme-default/navbar.css delete mode 100644 ui/css/theme-default/popover.css delete mode 100644 ui/css/theme-default/radio-flat.css delete mode 100644 ui/css/theme-default/reset.css delete mode 100644 ui/css/theme-default/selectmenu-flat.css delete mode 100644 ui/css/theme-default/tabs.css delete mode 100644 ui/css/theme-default/textbox-flat.css delete mode 100644 ui/css/theme-default/theme.css delete mode 100644 ui/css/theme-default/tile-check.css delete mode 100644 ui/css/theme-default/toolbar.css delete mode 100644 ui/css/theme-default/topbar.css delete mode 100644 ui/css/theme-default/window.css delete mode 100644 ui/images/theme-default/logo-flat.svg delete mode 100644 ui/images/theme-default/logo-white.png -- 2.13.5

2 3

[PATCH] [Kimchi 0/1] Fix VNC 1006: urlencode path
by patrick＠psbarrett.com 12 Sep '17

12 Sep '17

From: Patrick Barrett <patrick(a)psbarrett.com> Currently kimchi directs you to `https://hera.lan:8001/plugins/kimchi/novnc/vnc_auto.html?port=8001&path=/websockify?token=[...]&encrypt=1` when you click on 'View Console`, however this is improperly encoded and Firefox guesses that the second `?` was meant to be an `&`. This means that `token` and `encrypt` are sent to the current page rather than being used for the websocket path. It seems that noVNC should "work" with this, but there's another bug (or kimchi is using path improperly, not sure, could be fixed in either AFAIK) in noVNC where it assumes path is relative and prepends a `/` to it, which then when it uses and anchor tag to reformat the URL (I think) in `WebUtil.injectParamIfMissing`. However when path already has a leading `/` it interprets "websockify" as the host (that is it becomes `//websockify/`) and the path becomes just `/?token=[...]`. That code path is only executed when token is part of the original URL, so this commit urlencodes the path to prevent the interpretation of the token in the original URL and use it only in path. This could also be fixed by changing the `?` to an `&` and removing the leading `/`. However, `encodeURIcomponent` should probably be used regardless since parts of path can come from a config file. **Caveats** This is **UNTESTED** because I don't know how to build it all and wanted to just get this since it's simple, but I have manually tested it with the URL I believe this should produce. I wasn't totally sure about the encrypt param because it was just another & param in the URL and there's nothing to indicate where if it's part of path or part of the page url. However, it doesn't seem to make a visible difference where it's put, or even if it is removed. (This would also make a difference to the alternate solution I suggested above.) Patrick Barrett (1): urlencode path ui/js/src/kimchi.api.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) -- 2.13.5

5 7

[PATCH] [Kimchi 1/1] Use fontawesome spinner icon instead of external image
by Aline Manera 12 Sep '17

12 Sep '17

wok-*-loading-icon CSS class is linked to an external image on Wok. There is no need to use it as fontawesome has the same icon available. Signed-off-by: Aline Manera <aline.manera(a)gmail.com> --- ui/css/kimchi.css | 34 ++++++++-------------------------- ui/css/src/modules/_network.scss | 30 +++++++----------------------- ui/css/src/modules/_storage.scss | 2 +- ui/js/src/kimchi.network.js | 12 ++++++++++++ ui/js/src/kimchi.template_edit_main.js | 4 ++-- ui/pages/guest-add.html.tmpl | 4 ++-- ui/pages/guest-edit.html.tmpl | 4 ++-- ui/pages/guest.html.tmpl | 4 ++-- ui/pages/storagepool-add.html.tmpl | 8 ++++---- ui/pages/tabs/guests.html.tmpl | 2 +- ui/pages/tabs/network.html.tmpl | 4 ++-- ui/pages/tabs/storage.html.tmpl | 8 ++++---- ui/pages/tabs/templates.html.tmpl | 2 +- ui/pages/template-add.html.tmpl | 6 +++--- ui/pages/template-edit.html.tmpl | 7 ++----- 15 files changed, 53 insertions(+), 78 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 4c40fcd5..c6a59051 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2361,39 +2361,21 @@ ul { right: -2px !important; } -#network-root-container .wok-nw-loading-icon { - background: transparent url("../../../images/theme-default/spin5.svg") no-repeat 50% 50%; - -webkit-animation: spin 3s infinite linear; - -o-animation: spin 3s infinite linear; - animation: spin 3s infinite linear; - height: 16px; - width: 16px; - background-size: 100%; - display: block; - position: relative; - top: 12px; - left: 50%; - margin-left: -8px; -} - -#network-root-container .up .wok-nw-loading-icon, -#network-root-container .down .wok-nw-loading-icon { - display: none; -} - #network-root-container .wok-datagrid-body span > .fa { font-size: 22px; - width: 20px; - height: 20px; + width: 22px; position: relative; } -#network-root-container .wok-datagrid-body .up .fa { +#network-root-container .wok-datagrid-body .loading .fa-spinner { + display: inline-block; +} + +#network-root-container .wok-datagrid-body .up .fa-power-off { color: #a8d46f; } -#network-root-container .wok-datagrid-body .loading > .fa, -#network-root-container .wok-datagrid-body .down .fa { +#network-root-container .wok-datagrid-body .down .fa-power-off { display: none; } @@ -2777,7 +2759,7 @@ ul { margin-right: 7px; } -#storage-root-container .volumes .wok-list .volume-inline-progress > span.wok-loading-icon { +#storage-root-container .volumes .wok-list .volume-inline-progress > i.wok-loading-icon { margin-right: 0; } diff --git a/ui/css/src/modules/_network.scss b/ui/css/src/modules/_network.scss index 1ff78671..f4fc82bd 100644 --- a/ui/css/src/modules/_network.scss +++ b/ui/css/src/modules/_network.scss @@ -44,38 +44,22 @@ #network-root-container { - .wok-nw-loading-icon { - background: transparent url('../../#{$wok-icon-path}/spin5.svg') no-repeat 50% 50%; - @include animation(spin 3s infinite linear); - height: 16px; - width: 16px; - background-size: 100%; - display: block; - position: relative; - top: 12px; - left: 50%; - margin-left: -8px; - } - - .up .wok-nw-loading-icon, - .down .wok-nw-loading-icon { - display: none; - } - .wok-datagrid-body { span > .fa { font-size: 22px; - width: 20px; - height: 20px; + width: 22px; position: relative; } - .up .fa { + .loading .fa-spinner { + display: inline-block; + } + + .up .fa-power-off { color: $fa-green; } - .loading > .fa, - .down .fa { + .down .fa-power-off { display: none; } } diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss index cf81d1b2..704b94be 100644 --- a/ui/css/src/modules/_storage.scss +++ b/ui/css/src/modules/_storage.scss @@ -339,7 +339,7 @@ margin-right: 7px; } - .volume-inline-progress > span.wok-loading-icon { + .volume-inline-progress > i.wok-loading-icon { margin-right: 0; } diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 720314d8..84ba1cb4 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -115,6 +115,8 @@ kimchi.getNetworkItemHtml = function(network) { kimchi.stopNetwork = function(network,menu) { $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("up", "loading"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).removeClass(); + $(".network-state i", $("#" + wok.escapeStr(network.name))).addClass("fa fa-spinner fa-pulse fa-3x fa-fw"); $("[nwAct='stop']", menu).addClass("disabled"); kimchi.toggleNetwork(network.name, false, function() { $("[nwAct='start']", menu).removeClass("wok-hide-action-item"); @@ -127,8 +129,12 @@ kimchi.stopNetwork = function(network,menu) { $(":first-child", $("[nwAct='edit']", menu)).removeAttr("disabled"); } $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("loading", "down"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).removeClass("fa-power-off"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).addClass("fa fa-power-off"); }, function(err) { $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("loading", "up"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).removeClass("fa-power-off"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).addClass("fa fa-power-off"); if (!network.in_use) { $("[nwAct='stop']", menu).removeClass("disabled"); } @@ -143,6 +149,8 @@ kimchi.addNetworkActions = function(network) { var menu = $(evt.currentTarget).parent(); if ($(evt.currentTarget).attr("nwAct") === "start") { $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("down", "loading"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).removeClass("fa-power-off"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).addClass("fa fa-spinner fa-pulse fa-3x fa-fw"); $("[nwAct='start']", menu).addClass("disabled"); $("[nwAct='delete']", menu).addClass("disabled"); $(":first-child", $("[nwAct='delete']", menu)).attr("disabled", true); @@ -157,8 +165,12 @@ kimchi.addNetworkActions = function(network) { $("[nwAct='stop']", menu).addClass("disabled"); } $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("loading", "up"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).removeClass("fa-power-off"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).addClass("fa fa-power-off"); }, function(err) { $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("loading","down"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).removeClass("fa-power-off"); + $(".network-state i", $("#" + wok.escapeStr(network.name))).addClass("fa fa-power-off"); $("[nwAct='start']", menu).removeClass("disabled"); if (!network.in_use) { $("[nwAct='delete']", menu).removeClass("disabled"); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 05bf1f48..e132bb56 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -795,7 +795,7 @@ kimchi.template_edit_main = function() { $('#tmpl-edit-button-save').on('click', function() { $button = $(this); - $button.html('<span class="wok-loading-icon" /> ' + i18n['KCHAPI6010M']); + $button.html('<i class="wok-loading-icon fa fa-spinner fa-pulse fa-3x fa-fw"></i>' + i18n['KCHAPI6010M']); $button.prop('disabled', true); $('.modal .wok-mask').removeClass('hidden'); $('.modal input[type="text"]').prop('disabled', true); diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl index 8289a7f4..55bf28a4 100644 --- a/ui/pages/guest-add.html.tmpl +++ b/ui/pages/guest-add.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ </div> <div class="modal-footer"> <button id="vm-doAdd" class="btn btn-default" disabled="disabled" href="javascript:void(0);">$_("Create")</button> - <button id="vm-doAdding" class="btn btn-default" disabled="disabled" style="display:none" href="javascript:void(0);"><span class="wok-loading-icon"></span> $_("Creating...")</button> + <button id="vm-doAdding" class="btn btn-default" disabled="disabled" style="display:none" href="javascript:void(0);"><i class="wok-loading-icon fa fa-spinner fa-pulse fa-3x fa-fw"></i> $_("Creating...")</button> <button id="vm-add=cancel" class="btn btn-default" data-dismiss="modal" type="button">$_("Cancel")</button> </div> </div> diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 15052570..03e959bb 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -181,7 +181,7 @@ <div class="wok-mask" role="presentation" class="hidden"> <div class="wok-mask-loader-container"> <div class="wok-mask-loading"> - <div class="wok-mask-loading-icon"></div> + <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <div class="wok-mask-loading-text">$_("Loading")...</div> </div> </div> @@ -378,7 +378,7 @@ <script id="snapshot-tmpl" type="text/html"> <div class="item" id="{name}"> <span class="cell column-sel"> - <span class="wok-loading-icon {createMode}"></span> + <i class="wok-loading-icon {createMode} fa fa-spinner fa-pulse fa-3x fa-fw"></i> <i class="fa fa-check hide"></i> </span> <span class="cell column-snapshot-name name"><input type="text" readonly="readonly" value="{name}" class="form-control" /></span> diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index cc09aa05..eabfe9c4 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ --><span class="caret"></span> </span> <span class="guest-pending hidden"> - <span class="wok-loading-icon"></span> + <i class="wok-loading-icon fa fa-spinner fa-pulse fa-3x fa-fw"></i> <span class="text"></span> </span> </button> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 68a52d01..6db68071 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,12 +90,12 @@ </div> <div class="lvm-group hidden"> <div class="lvm-partition"> - <span class="wok-loading-icon"></span><span>$_("Looking for existing lvms ...")</span> + <i class="wok-loading-icon fa fa-spinner fa-pulse fa-3x fa-fw"></i><span>$_("Looking for existing lvms ...")</span> </div> </div> <div class="form-group disk-group storageType"> <div class="host-partition"> - <span class="wok-loading-icon"></span><span>$_("Looking for available partitions ...")</span> + <i class="wok-loading-icon fa fa-spinner fa-pulse fa-3x fa-fw"></i><span>$_("Looking for available partitions ...")</span> </div> </div> </div> @@ -158,7 +158,7 @@ </div> <div class="modal-footer"> <button id="pool-doAdd" class="btn btn-default">$_("Create")</button> - <button class="btn btn-default" id="pool-loading" style="display: none"><span class="wok-loading-icon"></span>$_("Please, wait...")</button> + <button class="btn btn-default" id="pool-loading" style="display: none"><i class="wok-loading-icon fa fa-spinner fa-pulse fa-3x fa-fw"></i>$_("Please, wait...")</button> <button class="btn btn-default" type="button" data-dismiss="modal">$_("Cancel")</button> </div> </div> diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index d19fe150..c3f18cdf 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -74,7 +74,7 @@ <div class="wok-mask hidden"> <div class="wok-mask-loader-container"> <div class="wok-mask-loading"> - <div class="wok-mask-loading-icon"></div> + <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <div class="wok-mask-loading-text">$_("Loading...")</div> </div> </div> diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index bd7aca06..5cee7cbb 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -57,7 +57,7 @@ <div class="wok-mask"> <div class="wok-mask-loader-container"> <div class="wok-mask-loading"> - <div class="wok-mask-loading-icon"></div> + <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <div class="wok-mask-loading-text">$_("Loading...")</div> </div> </div> @@ -66,7 +66,7 @@ <div id="modalWindow" class="modal fade network-modal" tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" aria-hidden="true"> </div> <script id="networkItem" type="text/html"> <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> - <span class='column-state' val="{state}"><span class='network-state {state}'><i class="fa fa-power-off"></i><span class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" val="{name}">{name}</span><span class='column-type' val="{type}">{type}</span><span class='column-interface' data-placement="top" data-toggle="tooltip" title="{interface}" val="{interface}">{interface}</span></span><span class="column-used"><span role="presentation" class="volume-icon {capacityIcon}"></span> {capacityLevel}%</span><span class="column-used-by volume-used-by-filter"><i class="fa fa-exclamation-circle" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}"></i><span class="format-text" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}">{used_by_text}</span></span> <div id="local-iso-field" class="iso-field" style="display: none;"> @@ -107,7 +107,7 @@ </div> <div class="row"> <button class="btn btn-primary" id="iso-more" style="display: none"><span class="text">$_("Search more ISOs")</span></button> - <button class="btn btn-primary" id="iso-more-loading" style="display: none"><span class="wok-loading-icon"></span> $_("Please, wait...")</button> + <button class="btn btn-primary" id="iso-more-loading" style="display: none"><i class="wok-loading-icon fa fa-spinner fa-pulse fa-3x fa-fw"></i> $_("Please, wait...")</button> </div> </div> </div> @@ -117,7 +117,7 @@ <div id="loading-isos"> <div class="wok-mask-loader-container"> <div class="wok-mask-loading"> - <div class="wok-mask-loading-icon"></div> + <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <div class="wok-mask-loading-text">$_("Loading...")</div> </div> </div> diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 4b5a4075..c5e2c948 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -198,10 +198,7 @@ </div> <div class="wok-mask hidden" role="presentation"> <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 class="wok-mask-loading"></div> </div> </div> </div> -- 2.13.5

2 1

[PATCH] [Kimchi 1/1] Use fontawesome icon instead of external image
by Aline Manera 12 Sep '17

12 Sep '17

edit-alt class is linked to an external image on Wok. There is no need to use it as fontawesome has the same icon available. Signed-off-by: Aline Manera <aline.manera(a)gmail.com> --- ui/css/kimchi.css | 4 ++-- ui/css/src/modules/_guests.scss | 2 +- ui/js/src/kimchi.guest_main.js | 2 +- ui/pages/guest.html.tmpl | 4 +--- ui/pages/tabs/network.html.tmpl | 3 ++- ui/pages/tabs/storage.html.tmpl | 8 ++++++-- ui/pages/tabs/templates.html.tmpl | 3 ++- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 4c40fcd5..c3d61ffa 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2015-2017 + * Copyright IBM Corp, 2015-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -798,7 +798,7 @@ display: none; } -#guest-content-container .wok-guest-gallery .wok-guest-list-item .guest-done { +#guest-content-container .wok-guest-gallery .wok-guest-list-item .guest-actions { display: none; } diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 37654dd7..ce3838f8 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -492,7 +492,7 @@ } } } - .guest-done { + .guest-actions { display: none; } .guest-state { diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 8cfd229c..e9b3e8d2 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -766,7 +766,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { }); } else { guestActions.find('.btn').attr('disabled', true); - result.find('.guest-done').addClass('hidden'); + result.find('.guest-actions').addClass('hidden'); result.find('.guest-state').addClass('hidden'); result.find('.guest-pending').removeClass('hidden'); pendingText = result.find('.guest-pending .text') diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index cc09aa05..7e3658b5 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -39,9 +39,7 @@ <span class="pull-right"> <div class="dropdown menu-flat guest-actions" name="guest-actions"> <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false"> - <span class="guest-done"> - <span class="edit-alt"></span>$_("Actions")<span class="caret"></span> - </span> + <i class="fa fa-pencil-square-o" aria-hidden="true"> </i>$_("Actions")<span class="caret"></span> <span class="guest-state"> <span class="running"><i class="fa fa-power-off"></i><span class="text-status">$_("Running")</span></span><span class="shutoff shutdown blocked"><i class="fa fa-ban"></i><span class="text-status">$_("Disconnected")</span></span><span class='column-action' style="display:none"> <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 class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false"> + <i class="fa fa-pencil-square-o" aria-hidden="true"> </i>$_("Actions")<span class="caret"></span> </button> <ul class="dropdown-menu" role="menu"> <li role="presentation" nwAct="start" class='{startClass}'><a><i class="fa fa-undo"></i>$_("Start")</a></li> diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 06bfab52..fed79847 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -94,7 +94,9 @@ --><span class="column-action storage-button" style="display:none"> <span class="pull-right"> <div class="dropdown menu-flat storage-action" data-state="{state}" data-type="{type}" data-name="{name}"> - <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span></button> + <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"> + <i class="fa fa-pencil-square-o" aria-hidden="true"> </i>$_("Actions")<span class="caret"></span> + </button> <ul class="dropdown-menu actionsheet"> <li><a href="#" class="pool-deactivate" data-inuse="{in_use}" data-stat="{state}" data-name="{name}" data-persistent="{persistent}"><i class="fa fa-minus-circle"></i>$_("Deactivate")</a></li> <li><a href="#" class="pool-activate" data-stat="{state}" data-name="{name}"><i class="fa fa-power-off"></i>$_("Activate")</a></li> @@ -110,7 +112,9 @@ <div class="col-sm-7"> <div class="btn-group"> <div class="dropdown menu-flat pool-action"> - <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span></button> + <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"> + <i class="fa fa-pencil-square-o" aria-hidden="true"> </i>$_("Actions")<span class="caret"></span> + </button> <ul class="dropdown-menu actionsheet"> <li class="disabled"><a href="#" class="volume-add" data-stat="{state}" data-name="{name}" data-type="{type}"><i class="fa fa-plus-circle"></i> $_("Add Volume")</a></li> <li class="disabled"><a href="#" class="volume-resize" data-name="{name}"><i class="fa fa-external-link-square"></i> $_("Resize")</a></li> diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 86427705..a5a272cb 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -96,7 +96,8 @@ --><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 class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false"> + <i class="fa fa-pencil-square-o" aria-hidden="true"> </i>$_("Actions")<span class="caret"></span> </button> <ul class="dropdown-menu" role="menu"> <li nwAct="edit" class='template-edit'><a href="#" data-template='{name}'><i class="fa fa-pencil"></i>$_("Edit")</a></li> -- 2.13.5

2 1

[PATCH] [Wok 00/16 RFC] Use CDNs to load external JS libs
by Aline Manera 12 Sep '17

12 Sep '17

With this patch set, Wok will not import/package external JS libs which has a CDN related. That way, may be easier to get Wok package on Debian/Fedora offical repositories. In the other hand, the client browser which will access Wok interface MUST have internet access to be able to load external URLs. As it is not common scenario and the CDN is mostly used by web servers, it should not be a big deal. Aline Manera (16): Remove fontawesome-fonts as Wok dependency Use a CDN to get bootstrap.min.js content Use a CDN to get jquery.min.js content Use a CDN to get moment.min.js content Use a CDN to get dataTables JS and CSS files Remove lodash JS file as it is not in use Use a CDN to get JQuery bootgrid JS and CSS files Use a CDN to get typeahead.bundle.min.js content Use a CDN to get Bootstrap Editable JS and CSS files Use a CDN to get Bootstrap switch JS and CSS files Use a CDN to get bootstrap-select.min.js content Remove es5-shim JS file as it is not in use Use a CDN to get list.min.js content Use a CDN to get JQuery UI JS and CSS files Remove jquery.i18n.min.js as it is not in use Use a CDN to get base64.min.js content COPYING | 74 - IBM-license-blacklist | 35 - configure.ac | 35 - contrib/wok.spec.fedora.in | 1 - contrib/wok.spec.suse.in | 1 - docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- docs/ubuntu-deps.md | 2 +- src/wok/config.py.in | 35 - tests/test_config.py.in | 13 - tests/test_server.py | 1 - ui/Makefile.am | 4 +- ui/base64/Makefile.am | 21 - ui/base64/README.md | 27 - ui/base64/jquery.base64.js | 122 - ui/css/Makefile.am | 8 +- ui/css/datatables.bootstrap.css | 271 -- ui/css/fontawesome/Makefile.am | 21 - ui/css/fontawesome/fontawesome.css | 2671 -------------------- ui/css/src/datatables.bootstrap.scss | 318 --- ui/css/src/modules/_wok-variables.scss | 2 +- ui/css/src/wok.scss | 12 + ui/css/wok.css | 11 + ui/js/src/wok.confirm.js | 6 +- ui/js/src/wok.message.js | 4 +- ui/js/src/wok.utils.js | 4 +- ui/libs/Makefile.am | 4 +- ui/libs/bootstrap-editable/LICENSE | 19 - ui/libs/bootstrap-editable/Makefile.am | 18 - ui/libs/bootstrap-editable/dist/Makefile.am | 18 - ui/libs/bootstrap-editable/dist/css/Makefile.am | 20 - .../dist/css/bootstrap-editable.css | 663 ----- ui/libs/bootstrap-editable/dist/js/Makefile.am | 20 - .../dist/js/bootstrap-editable.min.js | 7 - ui/libs/bootstrap-select/LICENSE | 21 - ui/libs/bootstrap-select/Makefile.am | 20 - ui/libs/bootstrap-select/dist/Makefile.am | 20 - ui/libs/bootstrap-select/dist/css/Makefile.am | 22 - .../dist/css/bootstrap-select.min.css | 6 - ui/libs/bootstrap-select/dist/js/Makefile.am | 22 - .../dist/js/bootstrap-select.min.js | 8 - ui/libs/bootstrap-switch/LICENSE | 21 - ui/libs/bootstrap-switch/Makefile.am | 18 - ui/libs/bootstrap-switch/dist/Makefile.am | 18 - ui/libs/bootstrap-switch/dist/css/Makefile.am | 20 - .../dist/css/bootstrap-switch.min.css | 22 - ui/libs/bootstrap-switch/dist/js/Makefile.am | 20 - .../dist/js/bootstrap-switch.min.js | 22 - ui/libs/bootstrap/LICENSE | 21 - ui/libs/bootstrap/Makefile.am | 22 - ui/libs/bootstrap/bootstrap.min.js | 7 - ui/libs/datatables/LICENSE | 22 - ui/libs/datatables/Makefile.am | 19 - ui/libs/datatables/css/Makefile.am | 21 - ui/libs/datatables/css/datatables.min.css | 24 - ui/libs/datatables/js/Makefile.am | 23 - ui/libs/datatables/js/datatables.min.js | 273 -- ui/libs/datatables/js/plugins/Makefile.am | 19 - ui/libs/datatables/js/plugins/ip-address/LICENSE | 20 - .../datatables/js/plugins/ip-address/Makefile.am | 21 - .../datatables/js/plugins/ip-address/ip-address.js | 103 - ui/libs/es5-shim/LICENSE | 22 - ui/libs/es5-shim/Makefile.am | 22 - ui/libs/es5-shim/es5-shim.min.js | 7 - ui/libs/jquery-bootgrid/LICENSE | 17 - ui/libs/jquery-bootgrid/Makefile.am | 18 - ui/libs/jquery-bootgrid/dist/Makefile.am | 18 - ui/libs/jquery-bootgrid/dist/css/Makefile.am | 20 - .../dist/css/jquery.bootgrid.min.css | 5 - ui/libs/jquery-bootgrid/dist/js/Makefile.am | 20 - .../jquery-bootgrid/dist/js/jquery.bootgrid.min.js | 6 - ui/libs/jquery-i18n/LICENSE | 19 - ui/libs/jquery-i18n/Makefile.am | 22 - ui/libs/jquery-i18n/jquery.i18n.min.js | 1 - ui/libs/jquery-ui/LICENSE | 44 - ui/libs/jquery-ui/Makefile.am | 24 - ui/libs/jquery-ui/jquery-ui-i18n.min.js | 7 - ui/libs/jquery-ui/jquery-ui.min.js | 13 - ui/libs/jquery-ui/themes/Makefile.am | 20 - ui/libs/jquery-ui/themes/base/Makefile.am | 24 - ui/libs/jquery-ui/themes/base/images/Makefile.am | 22 - .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 457 -> 0 bytes .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 351 -> 0 bytes .../base/images/ui-bg_flat_10_000000_40x100.png | Bin 244 -> 0 bytes .../base/images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 301 -> 0 bytes .../base/images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 387 -> 0 bytes .../base/images/ui-bg_glass_65_ffffff_1x400.png | Bin 246 -> 0 bytes .../images/ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 5854 -> 0 bytes .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 317 -> 0 bytes .../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 367 -> 0 bytes .../themes/base/images/ui-icons_222222_256x240.png | Bin 7006 -> 0 bytes .../themes/base/images/ui-icons_228ef1_256x240.png | Bin 4599 -> 0 bytes .../themes/base/images/ui-icons_ef8c08_256x240.png | Bin 4599 -> 0 bytes .../themes/base/images/ui-icons_ffd27a_256x240.png | Bin 4599 -> 0 bytes .../themes/base/images/ui-icons_ffffff_256x240.png | Bin 6468 -> 0 bytes ui/libs/jquery-ui/themes/base/jquery-ui.min.css | 7 - ui/libs/jquery/LICENSE | 21 - ui/libs/jquery/Makefile.am | 22 - ui/libs/jquery/jquery.min.js | 6 - ui/libs/list-js/LICENSE | 21 - ui/libs/list-js/Makefile.am | 22 - ui/libs/list-js/list.min.js | 1 - ui/libs/lodash/LICENSE | 24 - ui/libs/lodash/Makefile.am | 21 - ui/libs/lodash/lodash.min.js | 136 - ui/libs/moment/LICENSE | 22 - ui/libs/moment/Makefile.am | 21 - ui/libs/moment/moment-with-locales.min.js | 76 - ui/libs/typeahead/LICENSE | 19 - ui/libs/typeahead/Makefile.am | 20 - ui/libs/typeahead/typeahead.bundle.min.js | 8 - ui/pages/login.html.tmpl | 26 +- ui/pages/wok-ui.html.tmpl | 47 +- 113 files changed, 72 insertions(+), 6126 deletions(-) delete mode 100644 ui/base64/Makefile.am delete mode 100644 ui/base64/README.md delete mode 100644 ui/base64/jquery.base64.js delete mode 100644 ui/css/fontawesome/Makefile.am delete mode 100644 ui/css/fontawesome/fontawesome.css delete mode 100644 ui/libs/bootstrap-editable/LICENSE delete mode 100644 ui/libs/bootstrap-editable/Makefile.am delete mode 100644 ui/libs/bootstrap-editable/dist/Makefile.am delete mode 100644 ui/libs/bootstrap-editable/dist/css/Makefile.am delete mode 100644 ui/libs/bootstrap-editable/dist/css/bootstrap-editable.css delete mode 100644 ui/libs/bootstrap-editable/dist/js/Makefile.am delete mode 100644 ui/libs/bootstrap-editable/dist/js/bootstrap-editable.min.js delete mode 100644 ui/libs/bootstrap-select/LICENSE delete mode 100644 ui/libs/bootstrap-select/Makefile.am delete mode 100644 ui/libs/bootstrap-select/dist/Makefile.am delete mode 100644 ui/libs/bootstrap-select/dist/css/Makefile.am delete mode 100644 ui/libs/bootstrap-select/dist/css/bootstrap-select.min.css delete mode 100644 ui/libs/bootstrap-select/dist/js/Makefile.am delete mode 100644 ui/libs/bootstrap-select/dist/js/bootstrap-select.min.js delete mode 100644 ui/libs/bootstrap-switch/LICENSE delete mode 100644 ui/libs/bootstrap-switch/Makefile.am delete mode 100644 ui/libs/bootstrap-switch/dist/Makefile.am delete mode 100644 ui/libs/bootstrap-switch/dist/css/Makefile.am delete mode 100644 ui/libs/bootstrap-switch/dist/css/bootstrap-switch.min.css delete mode 100644 ui/libs/bootstrap-switch/dist/js/Makefile.am delete mode 100644 ui/libs/bootstrap-switch/dist/js/bootstrap-switch.min.js delete mode 100644 ui/libs/bootstrap/LICENSE delete mode 100644 ui/libs/bootstrap/Makefile.am delete mode 100644 ui/libs/bootstrap/bootstrap.min.js delete mode 100644 ui/libs/datatables/LICENSE delete mode 100644 ui/libs/datatables/Makefile.am delete mode 100644 ui/libs/datatables/css/Makefile.am delete mode 100644 ui/libs/datatables/css/datatables.min.css delete mode 100644 ui/libs/datatables/js/Makefile.am delete mode 100644 ui/libs/datatables/js/datatables.min.js delete mode 100644 ui/libs/datatables/js/plugins/Makefile.am delete mode 100644 ui/libs/datatables/js/plugins/ip-address/LICENSE delete mode 100644 ui/libs/datatables/js/plugins/ip-address/Makefile.am delete mode 100644 ui/libs/datatables/js/plugins/ip-address/ip-address.js delete mode 100644 ui/libs/es5-shim/LICENSE delete mode 100644 ui/libs/es5-shim/Makefile.am delete mode 100644 ui/libs/es5-shim/es5-shim.min.js delete mode 100644 ui/libs/jquery-bootgrid/LICENSE delete mode 100644 ui/libs/jquery-bootgrid/Makefile.am delete mode 100644 ui/libs/jquery-bootgrid/dist/Makefile.am delete mode 100644 ui/libs/jquery-bootgrid/dist/css/Makefile.am delete mode 100644 ui/libs/jquery-bootgrid/dist/css/jquery.bootgrid.min.css delete mode 100644 ui/libs/jquery-bootgrid/dist/js/Makefile.am delete mode 100644 ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js delete mode 100644 ui/libs/jquery-i18n/LICENSE delete mode 100644 ui/libs/jquery-i18n/Makefile.am delete mode 100644 ui/libs/jquery-i18n/jquery.i18n.min.js delete mode 100644 ui/libs/jquery-ui/LICENSE delete mode 100644 ui/libs/jquery-ui/Makefile.am delete mode 100644 ui/libs/jquery-ui/jquery-ui-i18n.min.js delete mode 100644 ui/libs/jquery-ui/jquery-ui.min.js delete mode 100644 ui/libs/jquery-ui/themes/Makefile.am delete mode 100644 ui/libs/jquery-ui/themes/base/Makefile.am delete mode 100644 ui/libs/jquery-ui/themes/base/images/Makefile.am delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_diagonals-thick_20_666666_40x40.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_flat_10_000000_40x100.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_glass_100_f6f6f6_1x400.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_glass_100_fdf5ce_1x400.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-icons_222222_256x240.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-icons_228ef1_256x240.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-icons_ef8c08_256x240.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-icons_ffd27a_256x240.png delete mode 100644 ui/libs/jquery-ui/themes/base/images/ui-icons_ffffff_256x240.png delete mode 100644 ui/libs/jquery-ui/themes/base/jquery-ui.min.css delete mode 100644 ui/libs/jquery/LICENSE delete mode 100644 ui/libs/jquery/Makefile.am delete mode 100644 ui/libs/jquery/jquery.min.js delete mode 100644 ui/libs/list-js/LICENSE delete mode 100644 ui/libs/list-js/Makefile.am delete mode 100644 ui/libs/list-js/list.min.js delete mode 100644 ui/libs/lodash/LICENSE delete mode 100644 ui/libs/lodash/Makefile.am delete mode 100644 ui/libs/lodash/lodash.min.js delete mode 100644 ui/libs/moment/LICENSE delete mode 100644 ui/libs/moment/Makefile.am delete mode 100644 ui/libs/moment/moment-with-locales.min.js delete mode 100644 ui/libs/typeahead/LICENSE delete mode 100644 ui/libs/typeahead/Makefile.am delete mode 100644 ui/libs/typeahead/typeahead.bundle.min.js -- 2.13.5

2 17

Re: [Kimchi-devel] [PATCH] [Wok 1/1] Remove icons only related to Kimchi
by Aline Manera 12 Sep '17

12 Sep '17

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Wok 1/1] Use fontawesome spinner instead of external image
by Aline Manera 12 Sep '17

12 Sep '17

Remove spin5.svg as there is no need to use an external image file as it is available on fontawesome icons. Signed-off-by: Aline Manera <aline.manera(a)gmail.com> --- COPYING | 4 --- ui/css/src/modules/_loaders.scss | 14 ++++------ ui/css/src/modules/_wok-grid.scss | 10 ++++---- ui/css/wok.css | 24 +++++------------ ui/images/theme-default/spin5.svg | 54 --------------------------------------- ui/js/src/wok.grid.js | 4 +-- ui/js/src/wok.list.js | 6 ++--- ui/js/wok.bootgrid.js | 2 +- ui/pages/tabs/settings.html.tmpl | 2 +- 9 files changed, 24 insertions(+), 96 deletions(-) delete mode 100644 ui/images/theme-default/spin5.svg diff --git a/COPYING b/COPYING index 980d0248..358e9e68 100644 --- a/COPYING +++ b/COPYING @@ -29,10 +29,6 @@ Files: ui/images/theme-default/edit-alt.svg Source: http://elusiveicons.com License: SIL-1.1 -Files: ui/images/theme-default/spin5.svg -Source: http://fontello.com -License: CC-BY-3.0 - Files: ui/libs/bootstrap/bootstrap.min.js Source: http://getbootstrap.com License: MIT diff --git a/ui/css/src/modules/_loaders.scss b/ui/css/src/modules/_loaders.scss index f7ef4c91..90a9b358 100644 --- a/ui/css/src/modules/_loaders.scss +++ b/ui/css/src/modules/_loaders.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM Corp, 2015-2016 +// Copyright IBM Corp, 2015-2017 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,13 +17,12 @@ // .wok-loading-icon { - background: transparent url('#{$wok-icon-path}/spin5.svg') no-repeat 50% 50%; - @include animation(spin 3s infinite linear); height: 16px; width: 16px; background-size: 100%; display: inline-block; margin-right: 5px; + font-size: 16px; } .wok-mask, .wok-grid-mask, .wok-list-mask { @@ -54,16 +53,13 @@ @extend .absolute-middle; } -.wok-mask-loading-icon, .wok-grid-loading-icon, .wok-list-loading-icon{ - background: transparent url('#{$wok-icon-path}/spin5.svg') no-repeat 50% 50%; - @include animation(spin 2s infinite linear); - height: 20px; +.wok-list-loading-icon{ width: 20px; @extend .absolute-middle; } .wok-mask-loading-text, .wok-grid-loading-text, .wok-list-loading-text { color: $gray; - padding-top: 40px; + padding-top: 15px; text-shadow: 0px 0px 10px #fff; -} \ No newline at end of file +} diff --git a/ui/css/src/modules/_wok-grid.scss b/ui/css/src/modules/_wok-grid.scss index b6c2a9ec..b2ad0bd5 100644 --- a/ui/css/src/modules/_wok-grid.scss +++ b/ui/css/src/modules/_wok-grid.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM Corp, 2015-2016 +// Copyright IBM Corp, 2015-2017 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -92,8 +92,6 @@ } .wok-list-loading-icon-inline { - background: transparent url('#{$wok-icon-path}/spin5.svg') no-repeat 50% 50%; - @include animation(spin 3s infinite linear); height: 16px; width: 16px; background-size: 100%; @@ -108,8 +106,10 @@ .generating .wok-list-loading-icon-inline { display: block; position: absolute; - top: 27px; + top: 26px; left: 34px; + font-size: 16px; + width: 16px; } .wok-list > ul { @@ -288,4 +288,4 @@ outline: auto 5px -webkit-focus-ring-color; // Set default webkit focus ring color for webkit browsers } -} \ No newline at end of file +} diff --git a/ui/css/wok.css b/ui/css/wok.css index d46ea86f..b8fb721b 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -829,10 +829,6 @@ fieldset[disabled] .btn-group > span > .btn.active { } .wok-list-loading-icon-inline { - background: transparent url("../images/theme-default/spin5.svg") no-repeat 50% 50%; - -webkit-animation: spin 3s infinite linear; - -o-animation: spin 3s infinite linear; - animation: spin 3s infinite linear; height: 16px; width: 16px; background-size: 100%; @@ -847,8 +843,10 @@ fieldset[disabled] .btn-group > span > .btn.active { .generating .wok-list-loading-icon-inline { display: block; position: absolute; - top: 27px; + top: 26px; left: 34px; + font-size: 16px; + width: 16px; } .wok-list > ul { @@ -1104,15 +1102,12 @@ fieldset[disabled] .btn-group > span > .btn.active { } .wok-loading-icon { - background: transparent url("../images/theme-default/spin5.svg") no-repeat 50% 50%; - -webkit-animation: spin 3s infinite linear; - -o-animation: spin 3s infinite linear; - animation: spin 3s infinite linear; height: 16px; width: 16px; background-size: 100%; display: inline-block; margin-right: 5px; + font-size: 16px; } .wok-mask, .wok-grid-mask, .wok-list-mask { @@ -1143,18 +1138,13 @@ fieldset[disabled] .btn-group > span > .btn.active { height: 40px; } -.wok-mask-loading-icon, .wok-grid-loading-icon, .wok-list-loading-icon { - background: transparent url("../images/theme-default/spin5.svg") no-repeat 50% 50%; - -webkit-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; - height: 20px; +.wok-list-loading-icon { width: 20px; } .wok-mask-loading-text, .wok-grid-loading-text, .wok-list-loading-text { color: #444; - padding-top: 40px; + padding-top: 15px; text-shadow: 0px 0px 10px #fff; } @@ -1812,7 +1802,7 @@ span.twitter-typeahead { font-weight: 400; } -.absolute-middle, .wok-mask, .wok-grid-mask, .wok-list-mask, .wok-mask-loading, .wok-grid-loading, .wok-list-loading, .wok-mask-loader-container, .wok-grid-loader-container, .wok-list-loader-container, .wok-mask-loading-icon, .wok-grid-loading-icon, .wok-list-loading-icon { +.absolute-middle, .wok-mask, .wok-grid-mask, .wok-list-mask, .wok-mask-loading, .wok-grid-loading, .wok-list-loading, .wok-mask-loader-container, .wok-grid-loader-container, .wok-list-loader-container, .wok-list-loading-icon { margin: auto; position: absolute; top: 0; diff --git a/ui/images/theme-default/spin5.svg b/ui/images/theme-default/spin5.svg deleted file mode 100644 index 350c54e5..00000000 --- a/ui/images/theme-default/spin5.svg +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" id="spin5" height="20" width="20"> - <title id="title4144">spin5</title> - <metadata id="metadata4142"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>spin5</dc:title> - <cc:license rdf:resource="http://creativecommons.org/licenses/by/3.0/" /> - <dc:creator> - <cc:Agent> - <dc:title>Angela Berbentseva</dc:title> - </cc:Agent> - </dc:creator> - <dc:rights> - <cc:Agent> - <dc:title>Fontello project</dc:title> - </cc:Agent> - </dc:rights> - </cc:Work> - <cc:License rdf:about="http://creativecommons.org/licenses/by/3.0/"> - <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" /> - <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /> - <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" /> - <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" /> - <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - </cc:License> - </rdf:RDF> - </metadata> - <path id="path3" d="m 9.23077,19.99992 c -0.11988,0 -0.23976,-0.0999 -0.23976,-0.23976 l 0,-3.63636 c 0,-0.11988 0.0999,-0.23976 0.23976,-0.23976 l 1.37862,0 c 0,0 0.02,0 0.02,0 0.11988,0 0.23976,0.0999 0.23976,0.23976 l 0,3.63636 c 0,0.11988 -0.0999,0.23976 -0.23976,0.23976 l -1.37862,0 c 0,0 -0.02,0 -0.02,0 z m 4.995,-0.93906 c -0.0799,0 -0.15984,-0.04 -0.1998,-0.11988 l -1.81818,-3.15684 c -0.0599,-0.11988 -0.02,-0.25974 0.0799,-0.31968 l 1.1988,-0.69931 c 0,0 0,0 0.02,0 0.11988,-0.0599 0.25974,-0.02 0.31968,0.0799 l 1.81819,3.15685 c 0.0599,0.11988 0.02,0.25974 -0.0799,0.31968 l -1.21879,0.6993 c -0.04,0.02 -0.0799,0.02 -0.0999,0.04 z m -8.55144,-0.0599 c -0.04,0 -0.0799,-0.02 -0.0999,-0.04 l -1.21879,-0.6993 c -0.0999,-0.0599 -0.13986,-0.1998 -0.0799,-0.31968 l 1.81819,-3.13687 c 0,0 0,0 0,-0.02 0.0599,-0.11988 0.1998,-0.13986 0.31968,-0.0799 l 1.21878,0.69931 c 0.0999,0.0599 0.13986,0.1998 0.0799,0.31968 l -1.81818,3.13686 c 0,0 0,0 0,0.02 -0.04,0.0799 -0.11988,0.11988 -0.1998,0.11988 z M 18.06194,15.7642 c -0.04,0 -0.0799,-0.02 -0.0999,-0.04 l -3.13687,-1.81819 c 0,0 0,0 -0.02,0 -0.11988,-0.0599 -0.13986,-0.1998 -0.0799,-0.31968 l 0.69931,-1.21878 c 0.0599,-0.0999 0.1998,-0.13986 0.31968,-0.0799 l 3.13686,1.81818 c 0,0 0,0 0.02,0 0.11988,0.0599 0.13986,0.1998 0.0799,0.31968 l -0.6993,1.21879 c -0.04,0.0799 -0.11988,0.11988 -0.1998,0.11988 z M 1.87812,15.6643 c -0.0799,0 -0.15984,-0.04 -0.1998,-0.11988 l -0.6993,-1.21879 c -0.0599,-0.11988 -0.02,-0.25974 0.0799,-0.31968 l 3.15684,-1.81818 c 0.11988,-0.0599 0.25974,-0.02 0.31968,0.0799 l 0.69931,1.1988 c 0,0 0,0 0,0.02 0.0599,0.11988 0.02,0.25974 -0.0799,0.31968 L 1.998,15.62434 c -0.04,0.02 -0.0799,0.02 -0.0999,0.04 z m 14.24576,-4.67533 c -0.11988,0 -0.23976,-0.0999 -0.23976,-0.23976 l 0,-1.37862 c 0,0 0,-0.02 0,-0.02 0,-0.11988 0.0999,-0.23976 0.23976,-0.23976 l 3.63636,0 C 19.88012,9.11083 20,9.21073 20,9.35059 l 0,1.37862 c 0,0 0,0.02 0,0.02 0,0.11988 -0.0999,0.23976 -0.23976,0.23976 l -3.63636,0 z M 0.23976,10.88907 C 0.11988,10.88907 0,10.78917 0,10.64931 L 0,9.27069 c 0,0 0,-0.02 0,-0.02 C 0,9.13081 0.0999,9.01093 0.23976,9.01093 l 3.63636,0 c 0.11988,0 0.23976,0.0999 0.23976,0.23976 l 0,1.37862 c 0,0 0,0.02 0,0.02 0,0.11988 -0.0999,0.23976 -0.23976,0.23976 l -3.63636,0 z M 15.68432,7.83213 c -0.0799,0 -0.15984,-0.04 -0.1998,-0.11988 l -0.69931,-1.1988 c 0,0 0,0 0,-0.02 -0.0599,-0.11988 -0.02,-0.25974 0.0799,-0.31968 l 3.15685,-1.81819 c 0.11988,-0.0599 0.25974,-0.02 0.31968,0.0799 l 0.6993,1.21879 c 0.0599,0.11988 0.02,0.25974 -0.0799,0.31968 L 15.8042,7.79213 c -0.04,0.02 -0.0799,0.02 -0.0999,0.04 z M 4.37562,7.73223 c -0.04,0 -0.0799,-0.02 -0.0999,-0.04 L 1.13886,5.87405 c 0,0 0,0 -0.02,0 C 0.99898,5.81415 0.979,5.67425 1.03896,5.55437 l 0.6993,-1.21879 c 0.0599,-0.0999 0.1998,-0.13986 0.31968,-0.0799 l 3.13687,1.81819 c 0,0 0,0 0.02,0 0.11988,0.0599 0.13986,0.1998 0.0799,0.31968 L 4.5954,7.61233 c -0.04,0.0799 -0.11988,0.11988 -0.1998,0.11988 z m 9.33067,-2.41758 c -0.04,0 -0.0799,-0.02 -0.0999,-0.04 L 12.38761,4.57534 c -0.0999,-0.0599 -0.13986,-0.1998 -0.0799,-0.31968 L 14.12589,1.1188 c 0,0 0,0 0,-0.02 0.0599,-0.11988 0.1998,-0.13986 0.31968,-0.0799 l 1.21879,0.6993 c 0.0999,0.0599 0.13986,0.1998 0.0799,0.31968 l -1.81819,3.13687 c 0,0 0,0 0,0.02 -0.04,0.0799 -0.11988,0.11988 -0.1998,0.11988 z M 6.39361,5.25475 c -0.0799,0 -0.15984,-0.04 -0.1998,-0.11988 L 4.37562,1.97802 c -0.0599,-0.11988 -0.02,-0.25974 0.0799,-0.31968 l 1.21879,-0.6993 c 0.11988,-0.0599 0.25974,-0.02 0.31968,0.0799 l 1.81818,3.15684 c 0.0599,0.11988 0.02,0.25974 -0.0799,0.31968 l -1.1988,0.69931 c 0,0 0,0 -0.02,0 -0.04,0.02 -0.0799,0.04 -0.0999,0.04 z M 9.35065,4.11588 c -0.11988,0 -0.23976,-0.0999 -0.23976,-0.23976 l 0,-3.63636 C 9.11089,0.11988 9.21079,0 9.35065,0 l 1.37862,0 c 0,0 0.02,0 0.02,0 0.11988,0 0.23976,0.0999 0.23976,0.23976 l 0,3.63636 c 0,0.11988 -0.0999,0.23976 -0.23976,0.23976 l -1.37862,0 c 0,0 -0.02,0 -0.02,0 z" style="fill:#777777;" /> - </svg> diff --git a/ui/js/src/wok.grid.js b/ui/js/src/wok.grid.js index 9d814018..098128e7 100644 --- a/ui/js/src/wok.grid.js +++ b/ui/js/src/wok.grid.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -47,7 +47,7 @@ wok.widget.Grid.prototype = (function() { '<div class="wok-grid-mask hidden">', '<div class="wok-grid-loader-container">', '<div class="wok-grid-loading">', - '<div class="wok-grid-loading-icon"></div>', + '<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>', '<div class="wok-grid-loading-text">', '{loading}', '</div>', diff --git a/ui/js/src/wok.list.js b/ui/js/src/wok.list.js index a92db199..dc15d40a 100644 --- a/ui/js/src/wok.list.js +++ b/ui/js/src/wok.list.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ wok.widget.List.prototype = (function() { '<div class="wok-list-mask hidden">', '<div class="wok-list-loader-container">', '<div class="wok-list-loading">', - '<div class="wok-list-loading-icon"></div>', + '<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>', '<div class="wok-list-loading-text">', '{loading}', '</div>', @@ -143,7 +143,7 @@ wok.widget.List.prototype = (function() { '</span></span>' ].join(''); } - columnData += (field.type === 'name') ? ('<span role="status" class="wok-list-loading-icon-inline"></span><span class="wok-list-name '+field.cssClass+'" title="'+field.label+'">'+value.toString()+'</span>') : (field.type !== 'status' ? '<span class="wok-list-description '+field.cssClass+'" title="'+field.label+'">' + value.toString() + '</span>' : ''); + columnData += (field.type === 'name') ? ('<i class="wok-list-loading-icon-inline fa fa-spinner fa-pulse fa-3x fa-fw"></i><span class="wok-list-name '+field.cssClass+'" title="'+field.label+'">'+value.toString()+'</span>') : (field.type !== 'status' ? '<span class="wok-list-description '+field.cssClass+'" title="'+field.label+'">' + value.toString() + '</span>' : ''); columnNodeHTML = [ '<input class="wok-checkbox" type="checkbox" name="'+checkboxName+'" id="wok-list-',i+1,'-check" />', '<label for="wok-list-',i+1,'-check" class="wok-list-cell', styleClass, '">', diff --git a/ui/js/wok.bootgrid.js b/ui/js/wok.bootgrid.js index e2da3936..344a1c79 100644 --- a/ui/js/wok.bootgrid.js +++ b/ui/js/wok.bootgrid.js @@ -29,7 +29,7 @@ wok.createBootgrid = function(opts) { var gridloadingHtml = ['<div id="' + gridId + '-loading" class="wok-list-mask">', '<div class="wok-list-loader-container">', '<div class="wok-list-loading">', - '<div class="wok-list-loading-icon"></div>', + '<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>', '<div class="wok-list-loading-text">' + gridMessage + '</div>', '</div>', '</div>', diff --git a/ui/pages/tabs/settings.html.tmpl b/ui/pages/tabs/settings.html.tmpl index 5f528390..f05d4647 100644 --- a/ui/pages/tabs/settings.html.tmpl +++ b/ui/pages/tabs/settings.html.tmpl @@ -89,7 +89,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <div class='wok-mask' role='presentation'> <div class='wok-mask-loader-container'> <div class='wok-mask-loading'> - <div class='wok-mask-loading-icon'></div> + <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <div class='wok-mask-loading-text'>$_("Loading...")</div> </div> </div> -- 2.13.5

2 1

[PATCH] [Wok 1/1] Use fontawesome icon instead of external image
by Aline Manera 12 Sep '17

12 Sep '17

Remove edit-alt.svg as there is no need to use an external image file as it is available on fontawesome icons. Signed-off-by: Aline Manera <aline.manera(a)gmail.com> --- COPYING | 4 -- ui/css/src/modules/_menu-flat.scss | 11 --- ui/css/wok.css | 12 ---- ui/images/theme-default/edit-alt.svg | 134 ----------------------------------- ui/js/src/wok.grid.js | 2 +- 5 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 ui/images/theme-default/edit-alt.svg diff --git a/COPYING b/COPYING index 980d0248..826af867 100644 --- a/COPYING +++ b/COPYING @@ -25,10 +25,6 @@ Files: ui/css/src/datatables.bootstrap.scss Source: http://datatables.net License: MIT -Files: ui/images/theme-default/edit-alt.svg -Source: http://elusiveicons.com -License: SIL-1.1 - Files: ui/images/theme-default/spin5.svg Source: http://fontello.com License: CC-BY-3.0 diff --git a/ui/css/src/modules/_menu-flat.scss b/ui/css/src/modules/_menu-flat.scss index 6a4e218b..c30ecf1c 100644 --- a/ui/css/src/modules/_menu-flat.scss +++ b/ui/css/src/modules/_menu-flat.scss @@ -76,17 +76,6 @@ & > i:before { line-height: 40px; } - span.edit-alt { - background: transparent url('#{$wok-icon-path}/edit-alt.svg') no-repeat 50% 50%; - background-size: 100%; - vertical-align: bottom; - width: 22px; - height: 40px; - display: block; - position: absolute; - top: 0; - left: 12px; - } } .caret { position: absolute; diff --git a/ui/css/wok.css b/ui/css/wok.css index d46ea86f..90e7d3b6 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -516,18 +516,6 @@ fieldset[disabled] .btn-group > span > .btn.active { line-height: 40px; } -.menu-flat .btn span.edit-alt { - background: transparent url("../images/theme-default/edit-alt.svg") no-repeat 50% 50%; - background-size: 100%; - vertical-align: bottom; - width: 22px; - height: 40px; - display: block; - position: absolute; - top: 0; - left: 12px; -} - .menu-flat .caret { position: absolute; top: 0; diff --git a/ui/images/theme-default/edit-alt.svg b/ui/images/theme-default/edit-alt.svg deleted file mode 100644 index ce10a74b..00000000 --- a/ui/images/theme-default/edit-alt.svg +++ /dev/null @@ -1,134 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" id="edit-alt" height="20" width="20"> - <title id="title4694">Elusive Icons by Team Redux - http://reduxframework.com/</title> - <metadata id="metadata4152"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Elusive Icons by Team Redux - http://reduxframework.com/</dc:title> - <cc:license rdf:resource="http://scripts.sil.org/OFL" /> - <dc:creator> - <cc:Agent> - <dc:title>Elusive Icons by Dave Gandy - http://elusiveicons.com</dc:title> - </cc:Agent> - </dc:creator> - <dc:rights> - <cc:Agent> - <dc:title>Team Redux</dc:title> - </cc:Agent> - </dc:rights> - </cc:Work> - <cc:License rdf:about="http://scripts.sil.org/OFL"> - <cc:permits rdf:resource="http://scripts.sil.org/pub/OFL/Reproduction" /> - <cc:permits rdf:resource="http://scripts.sil.org/pub/OFL/Distribution" /> - <cc:permits rdf:resource="http://scripts.sil.org/pub/OFL/Embedding" /> - <cc:permits rdf:resource="http://scripts.sil.org/pub/OFL/DerivativeWorks" /> - <cc:requires rdf:resource="http://scripts.sil.org/pub/OFL/Notice" /> - <cc:requires rdf:resource="http://scripts.sil.org/pub/OFL/Attribution" /> - <cc:requires rdf:resource="http://scripts.sil.org/pub/OFL/ShareAlike" /> - <cc:requires rdf:resource="http://scripts.sil.org/pub/OFL/DerivativeRenaming" /> - <cc:requires rdf:resource="http://scripts.sil.org/pub/OFL/BundlingWhenSelling" /> - </cc:License> - </rdf:RDF> - </metadata> - <path id="path4656" d="M 0,20 C 0,13.333333 0,6.666667 0,0 4.3066666,0 8.6133335,0 12.92,0 11.826667,1.093333 10.733334,2.186667 9.6400001,3.28 c -2.12,0 -4.24,0 -6.3600001,0 0,4.48 0,8.96 0,13.44 4.4800001,0 8.96,0 13.44,0 0,-2.126667 0,-4.253333 0,-6.38 1.093333,-1.093333 2.186667,-2.186667 3.28,-3.28 0,4.313333 0,8.626667 0,12.94 -6.666667,0 -13.3333333,0 -20,0 z m 7.2600001,-7.26 c 0,-0.786667 0,-1.573333 0,-2.36 1.2707368,-0.104839 2.347146,1.140345 2.34,2.36 -0.78,0 -1.56,0 -2.34,0 z m 1.02,-3.52 C 10.726667,6.773333 13.173334,4.326667 15.62,1.88 c 0.833334,0.833333 1.666667,1.666667 2.5,2.5 -2.446666,2.446667 -4.893333,4.893333 -7.34,7.34 C 9.9466667,10.886667 9.1133335,10.053333 8.2800001,9.22 Z M 16.22,1.28 C 16.646667,0.853333 17.073334,0.426667 17.5,0 18.333333,0.833333 19.166667,1.666667 20,2.5 19.573333,2.926667 19.146667,3.353333 18.72,3.78 17.886667,2.946667 17.053334,2.113333 16.22,1.28 Z" style="fill:#ffffff" /> - </svg> diff --git a/ui/js/src/wok.grid.js b/ui/js/src/wok.grid.js index 9d814018..00e808db 100644 --- a/ui/js/src/wok.grid.js +++ b/ui/js/src/wok.grid.js @@ -227,7 +227,7 @@ wok.widget.Grid.prototype = (function() { if(toolbarButtons.length > 1) { dropHTML = ['<div class="dropdown menu-flat">', '<button id="wok-dropdown-button-', containerID, '" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">', - '<span class="edit-alt"></span>Actions<span class="caret"></span>', + '<i class="fa fa-pencil-square-o" aria-hidden="true"></i>Actions<span class="caret"></span>', '</button>', '<ul class="dropdown-menu"></ul>', '</div>' -- 2.13.5

2 1

[PATCH] [Kimchi 1/1] Use distro icons exposed by Kimchi URIs
by Aline Manera 12 Sep '17

12 Sep '17

Kimchi was using distro icons exposed by Wok URIs which does not make sense as Kimchi packages those icons and should refer to them. Signed-off-by: Aline Manera <aline.manera(a)gmail.com> --- ui/css/kimchi.css | 56 +++++++++++++++++++------------------- ui/css/src/modules/_guests.scss | 14 +++++----- ui/css/src/modules/_iso-list.scss | 14 +++++----- ui/css/src/modules/_templates.scss | 28 +++++++++---------- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 4c40fcd5..dec3874b 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -231,37 +231,37 @@ #template-add-window.modal-content h3.iso-title.centos, #guest-add-window.modal-content h3.iso-title.centos { - background-image: url("../../../images/theme-default/icon-centos.png"); + background-image: url("../images/icon-centos.png"); } #template-add-window.modal-content h3.iso-title.debian, #guest-add-window.modal-content h3.iso-title.debian { - background-image: url("../../../images/theme-default/icon-debian.png"); + background-image: url("../images/icon-debian.png"); } #template-add-window.modal-content h3.iso-title.fedora, #guest-add-window.modal-content h3.iso-title.fedora { - background-image: url("../../../images/theme-default/icon-fedora.png"); + background-image: url("../images/icon-fedora.png"); } #template-add-window.modal-content h3.iso-title.opensuse, #guest-add-window.modal-content h3.iso-title.opensuse { - background-image: url("../../../images/theme-default/icon-opensuse.png"); + background-image: url("../images/icon-opensuse.png"); } #template-add-window.modal-content h3.iso-title.ubuntu, #guest-add-window.modal-content h3.iso-title.ubuntu { - background-image: url("../../../images/theme-default/icon-ubuntu.png"); + background-image: url("../images/icon-ubuntu.png"); } #template-add-window.modal-content h3.iso-title.gentoo, #guest-add-window.modal-content h3.iso-title.gentoo { - background-image: url("../../../images/theme-default/icon-gentoo.png"); + background-image: url("../images/icon-gentoo.png"); } #template-add-window.modal-content h3.iso-title.unknown, #guest-add-window.modal-content h3.iso-title.unknown { - background-image: url("../../../images/theme-default/icon-unknown.png"); + background-image: url("../images/icon-vm.png"); } /* Create Guest Modal */ @@ -1037,31 +1037,31 @@ } #guest-content-container .distro-icon.icon-centos { - background-image: url("../../../images/theme-default/icon-centos.png"); + background-image: url("../images/icon-centos.png"); } #guest-content-container .distro-icon.icon-debian { - background-image: url("../../../images/theme-default/icon-debian.png"); + background-image: url("../images/icon-debian.png"); } #guest-content-container .distro-icon.icon-fedora { - background-image: url("../../../images/theme-default/icon-fedora.png"); + background-image: url("../images/icon-fedora.png"); } #guest-content-container .distro-icon.icon-opensuse { - background-image: url("../../../images/theme-default/icon-opensuse.png"); + background-image: url("../images/icon-opensuse.png"); } #guest-content-container .distro-icon.icon-ubuntu { - background-image: url("../../../images/theme-default/icon-ubuntu.png"); + background-image: url("../images/icon-ubuntu.png"); } #guest-content-container .distro-icon.icon-gentoo { - background-image: url("../../../images/theme-default/icon-gentoo.png"); + background-image: url("../images/icon-gentoo.png"); } #guest-content-container .distro-icon.icon-unknown { - background-image: url("../../../images/theme-default/icon-unknown.png"); + background-image: url("../images/icon-vm.png"); } body.wok-gallery { @@ -2149,31 +2149,31 @@ ul { } #templates-root-container .wok-vm-list .distro-icon.icon-centos { - background-image: url("../../../images/theme-default/icon-centos.png"); + background-image: url("../images/icon-centos.png"); } #templates-root-container .wok-vm-list .distro-icon.icon-debian { - background-image: url("../../../images/theme-default/icon-debian.png"); + background-image: url("../images/icon-debian.png"); } #templates-root-container .wok-vm-list .distro-icon.icon-fedora { - background-image: url("../../../images/theme-default/icon-fedora.png"); + background-image: url("../images/icon-fedora.png"); } #templates-root-container .wok-vm-list .distro-icon.icon-opensuse { - background-image: url("../../../images/theme-default/icon-opensuse.png"); + background-image: url("../images/icon-opensuse.png"); } #templates-root-container .wok-vm-list .distro-icon.icon-ubuntu { - background-image: url("../../../images/theme-default/icon-ubuntu.png"); + background-image: url("../images/icon-ubuntu.png"); } #templates-root-container .wok-vm-list .distro-icon.icon-gentoo { - background-image: url("../../../images/theme-default/icon-gentoo.png"); + background-image: url("../images/icon-gentoo.png"); } #templates-root-container .wok-vm-list .distro-icon.icon-unknown { - background-image: url("../../../images/theme-default/icon-unknown.png"); + background-image: url("../images/icon-vm.png"); } #templates-root-container .wok-vm-gallery { @@ -2280,31 +2280,31 @@ ul { } #templates-root-container .wok-vm-gallery .name-distro-icon.icon-centos { - background-image: url("../../../images/theme-default/icon-centos.png"); + background-image: url("../images/icon-centos.png"); } #templates-root-container .wok-vm-gallery .name-distro-icon.icon-debian { - background-image: url("../../../images/theme-default/icon-debian.png"); + background-image: url("../images/icon-debian.png"); } #templates-root-container .wok-vm-gallery .name-distro-icon.icon-fedora { - background-image: url("../../../images/theme-default/icon-fedora.png"); + background-image: url("../images/icon-fedora.png"); } #templates-root-container .wok-vm-gallery .name-distro-icon.icon-opensuse { - background-image: url("../../../images/theme-default/icon-opensuse.png"); + background-image: url("../images/icon-opensuse.png"); } #templates-root-container .wok-vm-gallery .name-distro-icon.icon-ubuntu { - background-image: url("../../../images/theme-default/icon-ubuntu.png"); + background-image: url("../images/icon-ubuntu.png"); } #templates-root-container .wok-vm-gallery .name-distro-icon.icon-gentoo { - background-image: url("../../../images/theme-default/icon-gentoo.png"); + background-image: url("../images/icon-gentoo.png"); } #templates-root-container .wok-vm-gallery .name-distro-icon.icon-unknown { - background-image: url("../../../images/theme-default/icon-unknown.png"); + background-image: url("../images/icon-vm.png"); } #templates-root-container span.template-status { diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 37654dd7..efb349f9 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -682,25 +682,25 @@ background-repeat: no-repeat; background-position: 100% 50%; &.icon-centos { - background-image: url('../../#{$wok-icon-path}/icon-centos.png'); + background-image: url('../images/icon-centos.png'); } &.icon-debian { - background-image: url('../../#{$wok-icon-path}/icon-debian.png'); + background-image: url('../images/icon-debian.png'); } &.icon-fedora { - background-image: url('../../#{$wok-icon-path}/icon-fedora.png'); + background-image: url('../images/icon-fedora.png'); } &.icon-opensuse { - background-image: url('../../#{$wok-icon-path}/icon-opensuse.png'); + background-image: url('../images/icon-opensuse.png'); } &.icon-ubuntu { - background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png'); + background-image: url('../images/icon-ubuntu.png'); } &.icon-gentoo { - background-image: url('../../#{$wok-icon-path}/icon-gentoo.png'); + background-image: url('../images/icon-gentoo.png'); } &.icon-unknown { - background-image: url('../../#{$wok-icon-path}/icon-unknown.png'); + background-image: url('../images/icon-vm.png'); } } } diff --git a/ui/css/src/modules/_iso-list.scss b/ui/css/src/modules/_iso-list.scss index 22b51a2b..02122403 100644 --- a/ui/css/src/modules/_iso-list.scss +++ b/ui/css/src/modules/_iso-list.scss @@ -122,25 +122,25 @@ text-overflow: ellipsis; white-space: nowrap; &.centos { - background-image: url('../../#{$wok-icon-path}/icon-centos.png'); + background-image: url('../images/icon-centos.png'); } &.debian { - background-image: url('../../#{$wok-icon-path}/icon-debian.png'); + background-image: url('../images/icon-debian.png'); } &.fedora { - background-image: url('../../#{$wok-icon-path}/icon-fedora.png'); + background-image: url('../images/icon-fedora.png'); } &.opensuse { - background-image: url('../../#{$wok-icon-path}/icon-opensuse.png'); + background-image: url('../images/icon-opensuse.png'); } &.ubuntu { - background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png'); + background-image: url('../images/icon-ubuntu.png'); } &.gentoo { - background-image: url('../../#{$wok-icon-path}/icon-gentoo.png'); + background-image: url('../images/icon-gentoo.png'); } &.unknown { - background-image: url('../../#{$wok-icon-path}/icon-unknown.png'); + background-image: url('../images/icon-vm.png'); } } } diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss index 49a4f1a0..9f183e4a 100644 --- a/ui/css/src/modules/_templates.scss +++ b/ui/css/src/modules/_templates.scss @@ -470,25 +470,25 @@ $kimchi-icon-path: '../images'; background-repeat: no-repeat; background-position: 8px 50%; &.icon-centos { - background-image: url('../../#{$wok-icon-path}/icon-centos.png'); + background-image: url('../images/icon-centos.png'); } &.icon-debian { - background-image: url('../../#{$wok-icon-path}/icon-debian.png'); + background-image: url('../images/icon-debian.png'); } &.icon-fedora { - background-image: url('../../#{$wok-icon-path}/icon-fedora.png'); + background-image: url('../images/icon-fedora.png'); } &.icon-opensuse { - background-image: url('../../#{$wok-icon-path}/icon-opensuse.png'); + background-image: url('../images/icon-opensuse.png'); } &.icon-ubuntu { - background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png'); + background-image: url('../images/icon-ubuntu.png'); } &.icon-gentoo { - background-image: url('../../#{$wok-icon-path}/icon-gentoo.png'); + background-image: url('../images/icon-gentoo.png'); } &.icon-unknown { - background-image: url('../../#{$wok-icon-path}/icon-unknown.png'); + background-image: url('../images/icon-vm.png'); } } } @@ -585,25 +585,25 @@ $kimchi-icon-path: '../images'; background-repeat: no-repeat; background-position: 100% 50%; &.icon-centos { - background-image: url('../../#{$wok-icon-path}/icon-centos.png'); + background-image: url('../images/icon-centos.png'); } &.icon-debian { - background-image: url('../../#{$wok-icon-path}/icon-debian.png'); + background-image: url('../images/icon-debian.png'); } &.icon-fedora { - background-image: url('../../#{$wok-icon-path}/icon-fedora.png'); + background-image: url('../images/icon-fedora.png'); } &.icon-opensuse { - background-image: url('../../#{$wok-icon-path}/icon-opensuse.png'); + background-image: url('../images/icon-opensuse.png'); } &.icon-ubuntu { - background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png'); + background-image: url('../images/icon-ubuntu.png'); } &.icon-gentoo { - background-image: url('../../#{$wok-icon-path}/icon-gentoo.png'); + background-image: url('../images/icon-gentoo.png'); } &.icon-unknown { - background-image: url('../../#{$wok-icon-path}/icon-unknown.png'); + background-image: url('../images/icon-vm.png'); } } } -- 2.13.5

2 1

[PATCH] [Kimchi 1/1] .size() is deprecated on JQuery 3.2.1
by Aline Manera 12 Sep '17

12 Sep '17

JQuery was updated on Wok and .size() is deprecated, so replace it to .length property. For reference: https://api.jquery.com/size/ Signed-off-by: Aline Manera <aline.manera(a)gmail.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index e9fdc078..d28a0891 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -205,7 +205,7 @@ kimchi.guest_edit_main = function() { var addItem = function(data) { var oriID = data.id; if (data.id === -1) { - data.id = $('#form-guest-edit-interface > .body').children().size(); + data.id = $('#form-guest-edit-interface > .body').children().length; } if (data.ips === "" || data.ips === null || data.ips === undefined || data.ips.length === 0) { data.ips = i18n["KCHNET6001M"]; -- 2.13.5

2 1