[PATCH] [Gingerbase 0/2] Bug fix: Let Wok specify UI configuration on cherrypy settings
1 view
Skip to first unread message
Aline Manera
Apr 3, 2017, 6:59:18 PM4/3/17
to Ginger Devel
Depends on Wok patch:
- [PATCH] [Wok] Bug fix #1109: Specify Content-Type for SVG files
Aline Manera (2):
Bug fix: Let Wok specify UI configuration on cherrypy settings
Remove unused icon-vm.png file
config.py.in | 21 +--------------------
tests/test_config.py.in | 1 +
ui/images/Makefile.am | 2 +-
ui/images/icon-vm.png | Bin 2976 -> 0 bytes
4 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 ui/images/icon-vm.png
--
2.9.3
- [PATCH] [Wok] Bug fix #1109: Specify Content-Type for SVG files
Aline Manera (2):
Bug fix: Let Wok specify UI configuration on cherrypy settings
Remove unused icon-vm.png file
config.py.in | 21 +--------------------
tests/test_config.py.in | 1 +
ui/images/Makefile.am | 2 +-
ui/images/icon-vm.png | Bin 2976 -> 0 bytes
4 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 ui/images/icon-vm.png
--
2.9.3
Aline Manera
Apr 3, 2017, 6:59:20 PM4/3/17
to Ginger Devel
Signed-off-by: Aline Manera <ali...@linux.vnet.ibm.com>
---
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/config.py.in b/config.py.in
index be54f85..ba033c9 100644
--- a/config.py.in
+++ b/config.py.in
@@ -22,7 +22,7 @@ import os
import threading
from cherrypy.lib.reprconf import Parser
-from wok.config import CACHEEXPIRES, PluginConfig, PluginPaths
+from wok.config import PluginConfig, PluginPaths
gingerBaseLock = threading.Lock()
@@ -71,26 +71,7 @@ class GingerBaseConfig(PluginConfig):
'tools.staticdir.dir': os.path.join(gingerBasePaths.ui_dir,
'pages/help'),
'tools.nocache.on': True
- },
- '/images': {
- 'tools.staticdir.on': True,
- 'tools.staticdir.dir': os.path.join(gingerBasePaths.ui_dir,
- 'images'),
- 'tools.wokauth.on': False,
- 'tools.nocache.on': False
}
}
- for dirname in ('css', 'js', 'images'):
- custom_config['/' + dirname] = {
- 'tools.staticdir.on': True,
- 'tools.staticdir.dir': os.path.join(gingerBasePaths.ui_dir,
- dirname),
- 'tools.wokauth.on': False,
- 'tools.nocache.on': False}
- if dirname != 'images':
- custom_config['/' + dirname].update({
- 'tools.expires.on': True,
- 'tools.expires.secs': CACHEEXPIRES})
-
self.update(custom_config)
diff --git a/tests/test_config.py.in b/tests/test_config.py.in
index 8f09975..73e98cf 100644
--- a/tests/test_config.py.in
+++ b/tests/test_config.py.in
@@ -123,6 +123,7 @@ class ConfigTests(unittest.TestCase):
'tools.wokauth.on': False,
'tools.nocache.on': False,
'tools.staticdir.dir': '%s/ui/images' % pluginPrefix,
+ 'tools.staticdir.content_types': {'svg': 'image/svg+xml'},
'tools.staticdir.on': True
},
'/ui/config/tab-ext.xml': {
--
2.9.3
---
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/config.py.in b/config.py.in
index be54f85..ba033c9 100644
--- a/config.py.in
+++ b/config.py.in
@@ -22,7 +22,7 @@ import os
import threading
from cherrypy.lib.reprconf import Parser
-from wok.config import CACHEEXPIRES, PluginConfig, PluginPaths
+from wok.config import PluginConfig, PluginPaths
gingerBaseLock = threading.Lock()
@@ -71,26 +71,7 @@ class GingerBaseConfig(PluginConfig):
'tools.staticdir.dir': os.path.join(gingerBasePaths.ui_dir,
'pages/help'),
'tools.nocache.on': True
- },
- '/images': {
- 'tools.staticdir.on': True,
- 'tools.staticdir.dir': os.path.join(gingerBasePaths.ui_dir,
- 'images'),
- 'tools.wokauth.on': False,
- 'tools.nocache.on': False
}
}
- for dirname in ('css', 'js', 'images'):
- custom_config['/' + dirname] = {
- 'tools.staticdir.on': True,
- 'tools.staticdir.dir': os.path.join(gingerBasePaths.ui_dir,
- dirname),
- 'tools.wokauth.on': False,
- 'tools.nocache.on': False}
- if dirname != 'images':
- custom_config['/' + dirname].update({
- 'tools.expires.on': True,
- 'tools.expires.secs': CACHEEXPIRES})
-
self.update(custom_config)
diff --git a/tests/test_config.py.in b/tests/test_config.py.in
index 8f09975..73e98cf 100644
--- a/tests/test_config.py.in
+++ b/tests/test_config.py.in
@@ -123,6 +123,7 @@ class ConfigTests(unittest.TestCase):
'tools.wokauth.on': False,
'tools.nocache.on': False,
'tools.staticdir.dir': '%s/ui/images' % pluginPrefix,
+ 'tools.staticdir.content_types': {'svg': 'image/svg+xml'},
'tools.staticdir.on': True
},
'/ui/config/tab-ext.xml': {
--
2.9.3
Aline Manera
Apr 3, 2017, 6:59:22 PM4/3/17
to Ginger Devel
ui/images/Makefile.am | 2 +-
ui/images/icon-vm.png | Bin 2976 -> 0 bytes
2 files changed, 1 insertion(+), 1 deletion(-)
ui/images/icon-vm.png | Bin 2976 -> 0 bytes
delete mode 100644 ui/images/icon-vm.png
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
index 2b8e788..38e0adb 100644
--- a/ui/images/Makefile.am
+++ b/ui/images/Makefile.am
@@ -17,4 +17,4 @@
imagedir = $(datadir)/wok/plugins/gingerbase/ui/images
-dist_image_DATA = *.png *.ico *.svg
+dist_image_DATA = *.ico *.svg
diff --git a/ui/images/icon-vm.png b/ui/images/icon-vm.png
deleted file mode 100644
index 50dac50c5a0ee59f4e79170434f53bb3b94390e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2976
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
--
2.9.3
Aline Manera
Apr 3, 2017, 7:01:04 PM4/3/17
to Ginger Devel
Depends on Wok patch:
- [PATCH] [Wok] Bug fix #1109: Specify Content-Type for SVG files
---
- [PATCH] [Wok] Bug fix #1109: Specify Content-Type for SVG files
ginger.py | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/ginger.py b/ginger.py
index 2ed6470..5acd77a 100644
--- a/ginger.py
+++ b/ginger.py
@@ -23,7 +23,7 @@ import os
from i18n import messages
from model import GingerModel
from wok import config
-from wok.config import PluginPaths
+from wok.config import PluginConfig, PluginPaths
from wok.plugins.ginger.control import sub_nodes
from wok.root import WokRoot
@@ -49,21 +49,14 @@ class Ginger(WokRoot):
self.paths = PluginPaths('ginger')
def get_custom_conf(self):
- custom_config = {
+ custom_config = PluginConfig('ginger')
+ custom_config.update({
'/help': {
'tools.staticdir.on': True,
'tools.nocache.on': True,
'tools.staticdir.dir': os.path.join(self.paths.ui_dir,
'pages/help')
}
- }
-
- for dirname in ('css', 'js', 'images'):
- custom_config['/' + dirname] = {
- 'tools.staticdir.on': True,
- 'tools.staticdir.dir': os.path.join(self.paths.ui_dir,
- custom_config['/' + dirname] = {
- 'tools.staticdir.on': True,
- dirname),
- 'tools.wokauth.on': False,
- 'tools.nocache.on': False}
+ })
- 'tools.wokauth.on': False,
- 'tools.nocache.on': False}
return custom_config
--
2.9.3
Aline Manera
Apr 4, 2017, 10:22:31 AM4/4/17
to Ginger Devel
ui/images/Makefile.am | 4 ++--
--- a/ui/images/Makefile.am
+++ b/ui/images/Makefile.am
@@ -1,7 +1,7 @@
#
# Ginger Base
#
-# 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.
ui/images/icon-vm.png | Bin 2976 -> 0 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 ui/images/icon-vm.png
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
index 2b8e788..417ec75 100644
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
--- a/ui/images/Makefile.am
+++ b/ui/images/Makefile.am
@@ -1,7 +1,7 @@
#
# Ginger Base
#
-# 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.
Daniel Henrique Barboza
Apr 4, 2017, 3:21:54 PM4/4/17
to ginger-...@googlegroups.com
Applied. Thanks!
Reply all
Reply to author
Forward
0 new messages