[PATCH v2] [Wok] Added new Wok logo and script to display installed plugins icons
by sguimaraes943＠gmail.com
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
This patch replaces the old Kimchi logo in Wok with the new Wok logo, following other image assets like iOS, Android and Windows 8/8.1/10 application bookmark icons and Safari pinnable bookmark/panel icon.
It also comes with a new script that checks the installed plugins as well as their versions and if a *.svg or *.png file with the plugin name in ui/images/ is found, the script will append a list with the logos in the desired element.
v2:
*Removed "Powered by" text when no applicable plugin with image and version is installed.
*Displays plugin logo even if plugin version is not available
*Fixed login layout for small screen resolutions
Samuel Guimarães (1):
Added new Wok logo and script to display installed plugins icons and
versions
ui/css/bootstrap.custom.css | 2 +-
ui/css/src/modules/_about.scss | 41 ++++++-
ui/css/src/modules/_animation.scss | 18 ++-
ui/css/src/modules/_login.scss | 50 +++++++++
ui/css/src/modules/_navbar-flat.scss | 2 +-
ui/css/src/modules/_wok-variables.scss | 2 +-
ui/css/src/wok.scss | 65 +++++++++++
ui/css/wok.css | 170 ++++++++++++++++++++++++++++-
ui/images/Makefile.am | 2 +-
ui/images/android-chrome-144x144.png | Bin 0 -> 742 bytes
ui/images/android-chrome-192x192.png | Bin 3508 -> 851 bytes
ui/images/android-chrome-36x36.png | Bin 0 -> 391 bytes
ui/images/android-chrome-48x48.png | Bin 0 -> 443 bytes
ui/images/android-chrome-72x72.png | Bin 0 -> 538 bytes
ui/images/android-chrome-96x96.png | Bin 0 -> 585 bytes
ui/images/apple-touch-icon-114.png | Bin 2360 -> 0 bytes
ui/images/apple-touch-icon-114x114.png | Bin 0 -> 561 bytes
ui/images/apple-touch-icon-120.png | Bin 2382 -> 0 bytes
ui/images/apple-touch-icon-120x120.png | Bin 0 -> 600 bytes
ui/images/apple-touch-icon-144.png | Bin 2758 -> 0 bytes
ui/images/apple-touch-icon-144x144.png | Bin 0 -> 674 bytes
ui/images/apple-touch-icon-152.png | Bin 2962 -> 0 bytes
ui/images/apple-touch-icon-152x152.png | Bin 0 -> 757 bytes
ui/images/apple-touch-icon-180.png | Bin 3404 -> 0 bytes
ui/images/apple-touch-icon-180x180.png | Bin 0 -> 786 bytes
ui/images/apple-touch-icon-57.png | Bin 1449 -> 0 bytes
ui/images/apple-touch-icon-57x57.png | Bin 0 -> 469 bytes
ui/images/apple-touch-icon-60.png | Bin 1476 -> 0 bytes
ui/images/apple-touch-icon-60x60.png | Bin 0 -> 462 bytes
ui/images/apple-touch-icon-72.png | Bin 1718 -> 0 bytes
ui/images/apple-touch-icon-72x72.png | Bin 0 -> 516 bytes
ui/images/apple-touch-icon-76.png | Bin 1734 -> 0 bytes
ui/images/apple-touch-icon-76x76.png | Bin 0 -> 532 bytes
ui/images/apple-touch-icon-precomposed.png | Bin 3673 -> 1139 bytes
ui/images/apple-touch-icon.png | Bin 3404 -> 786 bytes
ui/images/favicon-16x16.png | Bin 0 -> 622 bytes
ui/images/favicon-194x194.png | Bin 0 -> 1868 bytes
ui/images/favicon-32x32.png | Bin 0 -> 755 bytes
ui/images/favicon-96x96.png | Bin 0 -> 1248 bytes
ui/images/favicon.ico | Bin 15086 -> 15086 bytes
ui/images/favicon.png | Bin 17356 -> 1868 bytes
ui/images/large.png | Bin 36434 -> 0 bytes
ui/images/mstile-144x144.png | Bin 0 -> 712 bytes
ui/images/mstile-150x150.png | Bin 0 -> 705 bytes
ui/images/mstile-310x150.png | Bin 0 -> 729 bytes
ui/images/mstile-310x310.png | Bin 0 -> 1067 bytes
ui/images/mstile-70x70.png | Bin 0 -> 601 bytes
ui/images/safari-pinned-tab.svg | 19 ++++
ui/images/square.png | Bin 15679 -> 0 bytes
ui/images/theme-default/logo-white.png | Bin 7583 -> 3229 bytes
ui/images/tiny.png | Bin 6539 -> 0 bytes
ui/images/wide.png | Bin 44544 -> 0 bytes
ui/images/wok-logo.png | Bin 0 -> 3229 bytes
ui/images/wok.png | Bin 0 -> 3327 bytes
ui/images/wok.svg | 45 ++++++++
ui/js/src/wok.login.js | 1 +
ui/js/src/wok.logos.js | 119 ++++++++++++++++++++
ui/js/src/wok.main.js | 2 +
ui/pages/login.html.tmpl | 120 +++++++++++---------
ui/pages/wok-ui.html.tmpl | 67 ++++++++----
60 files changed, 636 insertions(+), 89 deletions(-)
create mode 100644 ui/images/android-chrome-144x144.png
create mode 100644 ui/images/android-chrome-36x36.png
create mode 100644 ui/images/android-chrome-48x48.png
create mode 100644 ui/images/android-chrome-72x72.png
create mode 100644 ui/images/android-chrome-96x96.png
delete mode 100644 ui/images/apple-touch-icon-114.png
create mode 100644 ui/images/apple-touch-icon-114x114.png
delete mode 100644 ui/images/apple-touch-icon-120.png
create mode 100644 ui/images/apple-touch-icon-120x120.png
delete mode 100644 ui/images/apple-touch-icon-144.png
create mode 100644 ui/images/apple-touch-icon-144x144.png
delete mode 100644 ui/images/apple-touch-icon-152.png
create mode 100644 ui/images/apple-touch-icon-152x152.png
delete mode 100644 ui/images/apple-touch-icon-180.png
create mode 100644 ui/images/apple-touch-icon-180x180.png
delete mode 100644 ui/images/apple-touch-icon-57.png
create mode 100644 ui/images/apple-touch-icon-57x57.png
delete mode 100644 ui/images/apple-touch-icon-60.png
create mode 100644 ui/images/apple-touch-icon-60x60.png
delete mode 100644 ui/images/apple-touch-icon-72.png
create mode 100644 ui/images/apple-touch-icon-72x72.png
delete mode 100644 ui/images/apple-touch-icon-76.png
create mode 100644 ui/images/apple-touch-icon-76x76.png
create mode 100644 ui/images/favicon-16x16.png
create mode 100644 ui/images/favicon-194x194.png
create mode 100644 ui/images/favicon-32x32.png
create mode 100644 ui/images/favicon-96x96.png
delete mode 100644 ui/images/large.png
create mode 100644 ui/images/mstile-144x144.png
create mode 100644 ui/images/mstile-150x150.png
create mode 100644 ui/images/mstile-310x150.png
create mode 100644 ui/images/mstile-310x310.png
create mode 100644 ui/images/mstile-70x70.png
create mode 100644 ui/images/safari-pinned-tab.svg
delete mode 100644 ui/images/square.png
delete mode 100644 ui/images/tiny.png
delete mode 100644 ui/images/wide.png
create mode 100644 ui/images/wok-logo.png
create mode 100644 ui/images/wok.png
create mode 100644 ui/images/wok.svg
create mode 100644 ui/js/src/wok.logos.js
--
1.9.3
8 years, 9 months
[PATCH] [Kimchi] Fixed CPU utilization progress bar after changes in Wok SCSS
by sguimaraes943＠gmail.com
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
A change in _wok-variables made Guest CPU utilization progress bar disappear. This patch fixes the progress bar and it also includes a new animation inherited from _animation.scss in Wok.
Samuel Guimarães (1):
Fixed CPU utilization progress bar after changes in Wok SCSS
ui/css/kimchi.css | 33 +++++++++++++++++++++++++++------
ui/css/src/modules/_guests.scss | 2 +-
2 files changed, 28 insertions(+), 7 deletions(-)
--
1.9.3
8 years, 9 months
[PATCH] [Kimchi] Fixed navbar order
by sguimaraes943＠gmail.com
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
This patch fixes Kimchi navbar order after the latests changes on genTabs() method in Wok.
Samuel Guimarães (1):
Fixed navbar order
ui/config/tab-ext.xml | 4 ++++
1 file changed, 4 insertions(+)
--
1.9.3
8 years, 9 months
[PATCH] [Wok] Create file structure to Wok tab
by Aline Manera
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
IBM-license-blacklist | 1 +
configure.ac | 2 ++
src/wok/config.py.in | 6 ++++++
ui/Makefile.am | 2 +-
ui/config/Makefile.am | 22 ++++++++++++++++++++++
ui/config/tab-ext.xml | 10 ++++++++++
ui/pages/Makefile.am | 2 ++
ui/pages/tabs/Makefile.am | 20 ++++++++++++++++++++
ui/pages/tabs/settings.html.tmpl | 31 +++++++++++++++++++++++++++++++
9 files changed, 95 insertions(+), 1 deletion(-)
create mode 100644 ui/config/Makefile.am
create mode 100644 ui/config/tab-ext.xml
create mode 100644 ui/pages/tabs/Makefile.am
create mode 100644 ui/pages/tabs/settings.html.tmpl
diff --git a/IBM-license-blacklist b/IBM-license-blacklist
index 133f119..7210b82 100644
--- a/IBM-license-blacklist
+++ b/IBM-license-blacklist
@@ -65,6 +65,7 @@ ui/css/src/vendor/compass-mixins/lib/compass/utilities/lists/.*.scss
ui/css/src/vendor/compass-mixins/lib/compass/utilities/sprites/.*.scss
ui/css/src/vendor/compass-mixins/lib/compass/utilities/tables/.*.scss
ui/css/src/vendor/compass-mixins/lib/compass/utilities/text/.*.scss
+ui/config/tab-ext.xml
ui/images/theme-default/.*.svg
ui/libs/bootstrap-editable/LICENSE
ui/libs/bootstrap-editable/dist/css/bootstrap-editable.css
diff --git a/configure.ac b/configure.ac
index 9925753..0a5ce80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,8 @@ AC_CONFIG_FILES([
ui/libs/list-js/Makefile
ui/libs/typeahead/Makefile
ui/pages/Makefile
+ ui/pages/tabs/Makefile
+ ui/config/Makefile
contrib/Makefile
contrib/DEBIAN/Makefile
contrib/DEBIAN/control
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 40fbcda..5138d13 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -188,6 +188,12 @@ class WokConfig(dict):
'tools.sessions.timeout': SESSIONSTIMEOUT,
'tools.wokauth.on': False
},
+ '/ui/config/tab-ext.xml': {
+ 'tools.staticfile.on': True,
+ 'tools.staticfile.filename': os.path.join(paths.ui_dir,
+ 'config/tab-ext.xml'),
+ 'tools.nocache.on': True
+ },
'/base64/jquery.base64.js': {
'tools.staticfile.on': True,
'tools.staticfile.filename': '%s/base64/jquery.base64.js' %
diff --git a/ui/Makefile.am b/ui/Makefile.am
index c3ee649..07218dc 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = base64 css images js libs pages
+SUBDIRS = base64 css images js libs pages config
uidir = $(datadir)/wok/ui
diff --git a/ui/config/Makefile.am b/ui/config/Makefile.am
new file mode 100644
index 0000000..a723dff
--- /dev/null
+++ b/ui/config/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2016
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+xmldir = $(datadir)/wok/ui/config
+
+dist_xml_DATA = \
+ tab-ext.xml \
+ $(NULL)
diff --git a/ui/config/tab-ext.xml b/ui/config/tab-ext.xml
new file mode 100644
index 0000000..0b0e2b6
--- /dev/null
+++ b/ui/config/tab-ext.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tabs-ext>
+ <functionality>Wok</functionality>
+ <tab>
+ <access role="admin" mode="admin"/>
+ <access role="user" mode="none"/>
+ <title>Settings</title>
+ <path>tabs/settings.html</path>
+ </tab>
+</tabs-ext>
diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am
index 0b13c0d..5b8370d 100644
--- a/ui/pages/Makefile.am
+++ b/ui/pages/Makefile.am
@@ -17,6 +17,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+SUBDIRS = tabs
+
htmldir = $(datadir)/wok/ui/pages
dist_html_DATA = $(wildcard *.tmpl) $(NULL)
diff --git a/ui/pages/tabs/Makefile.am b/ui/pages/tabs/Makefile.am
new file mode 100644
index 0000000..351ba1b
--- /dev/null
+++ b/ui/pages/tabs/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2013-2016
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+tabshtmldir = $(datadir)/wok/ui/pages/tabs
+
+dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL)
diff --git a/ui/pages/tabs/settings.html.tmpl b/ui/pages/tabs/settings.html.tmpl
new file mode 100644
index 0000000..811f147
--- /dev/null
+++ b/ui/pages/tabs/settings.html.tmpl
@@ -0,0 +1,31 @@
+#*
+* Project Wok
+*
+* Copyright IBM Corp, 2016
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*#
+#unicode UTF-8
+#import gettext
+#from wok.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
+#silent _ = t.gettext
+#silent _t = t.gettext
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<p>Content here</p>
+</body>
+</html>
--
2.5.0
8 years, 9 months
[PATCH] [Wok 0/4] Wok User Activity Log
by sguimaraes943＠gmail.com
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
This patch adds User Activity Log support to Wok. It also includes some minor enhancements in SCSS that can be used by other projects.
Aline Manera (1):
Create file structure to Wok tab
Samuel Guimarães (3):
Enabled Wok tab in navbar
Imported ginger accordion mixin to wok as scss module
Wok User Activity Log
IBM-license-blacklist | 1 +
configure.ac | 2 +
src/wok/config.py.in | 6 +
ui/Makefile.am | 2 +-
ui/config/Makefile.am | 22 +++
ui/config/tab-ext.xml | 11 ++
ui/css/Makefile.am | 8 +-
ui/css/bootstrap.custom.css | 20 ++-
ui/css/settings.css | 195 ++++++++++++++++++++
ui/css/src/modules/_datepicker.scss | 147 +++++++++++++++
ui/css/src/modules/_toolbar.scss | 9 +-
ui/css/src/modules/_typeahead.scss | 127 +++++++++++++
ui/css/src/modules/_wok-accordion.scss | 68 +++++++
ui/css/src/modules/_wok-variables.scss | 6 +-
ui/css/src/settings.scss | 132 ++++++++++++++
ui/css/src/wok.scss | 4 +
ui/css/wok.css | 308 +++++++++++++++++++++++++++++++-
ui/js/src/wok.main.js | 8 +
ui/js/wok.bootgrid.js | 141 +++++++++++++++
ui/js/wok.user-log.js | 246 +++++++++++++++++++++++++
ui/pages/Makefile.am | 2 +
ui/pages/i18n.json.tmpl | 14 +-
ui/pages/tabs/Makefile.am | 20 +++
ui/pages/tabs/settings-search.html.tmpl | 73 ++++++++
ui/pages/tabs/settings.html.tmpl | 76 ++++++++
25 files changed, 1633 insertions(+), 15 deletions(-)
create mode 100644 ui/config/Makefile.am
create mode 100644 ui/config/tab-ext.xml
create mode 100644 ui/css/settings.css
create mode 100644 ui/css/src/modules/_datepicker.scss
create mode 100644 ui/css/src/modules/_typeahead.scss
create mode 100644 ui/css/src/modules/_wok-accordion.scss
create mode 100644 ui/css/src/settings.scss
create mode 100644 ui/js/wok.bootgrid.js
create mode 100644 ui/js/wok.user-log.js
create mode 100644 ui/pages/tabs/Makefile.am
create mode 100644 ui/pages/tabs/settings-search.html.tmpl
create mode 100644 ui/pages/tabs/settings.html.tmpl
--
1.9.3
8 years, 9 months