12:08 p.m.
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V4 -> V5:
let autoconf generate sample.conf
V3 -> V4:
rebase
V2 -> V3:
change "enable-plugins" to "enable-sample"
remove nls
improve the Portuguese translation.
V1 -> V2:
The improvement concept here is to directly generate JSON on the server
and assign it to the i18n variable, rather than inserting nodes into the DOM.
Plugins would use a plugin1.i18n= structure to keep plugin strings from
colliding with each other, or with the kimchi variables.
ShaoHe Feng (6):
Update root.py to make Cheetah render the JSON template.
Update the i18n tmpl to produce JSON
Add JS API for fetching i18n JSON
Issue #342: load i18n.html of the plugin
add an optional to toggle the sample plugin
generate the translation files for plugins/sample
Zhou Zheng Sheng (1):
Add Minimal UI Page for the Sample Plugin
configure.ac | 18 ++++
plugins/sample/Makefile.am | 11 +-
plugins/sample/__init__.py | 3 +-
plugins/sample/config.status | 1 +
plugins/sample/po/LINGUAS | 1 +
plugins/sample/po/Makefile.in.in | 1 +
plugins/sample/po/Makevars | 1 +
plugins/sample/po/POTFILES.in | 2 +
plugins/sample/po/en_US.po | 21 ++++
plugins/sample/po/gen-pot | 1 +
plugins/sample/po/pt_BR.po | 24 +++++
plugins/sample/po/zh_CN.po | 24 +++++
plugins/sample/sample.conf | 7 --
plugins/sample/sample.conf.in | 12 +++
plugins/sample/ui/config/tab-ext.xml | 8 +-
plugins/sample/ui/pages/i18n.json.tmpl | 9 ++
plugins/sample/ui/pages/tab.html.tmpl | 6 ++
src/kimchi/root.py | 5 +
src/kimchi/template.py | 34 ++++---
ui/js/src/kimchi.api.js | 18 +++-
ui/js/src/kimchi.main.js | 24 ++++-
ui/pages/i18n.html.tmpl | 178 ---------------------------------
ui/pages/i18n.json.tmpl | 165 ++++++++++++++++++++++++++++++
23 files changed, 361 insertions(+), 213 deletions(-)
create mode 120000 plugins/sample/config.status
create mode 120000 plugins/sample/po/LINGUAS
create mode 120000 plugins/sample/po/Makefile.in.in
create mode 120000 plugins/sample/po/Makevars
create mode 100644 plugins/sample/po/POTFILES.in
create mode 100644 plugins/sample/po/en_US.po
create mode 120000 plugins/sample/po/gen-pot
create mode 100644 plugins/sample/po/pt_BR.po
create mode 100644 plugins/sample/po/zh_CN.po
delete mode 100644 plugins/sample/sample.conf
create mode 100644 plugins/sample/sample.conf.in
create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
delete mode 100644 ui/pages/i18n.html.tmpl
create mode 100644 ui/pages/i18n.json.tmpl
--
1.9.3
12:08 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Add minimal UI just enough to re-produce issue 342.
https://github.com/kimchi-project/kimchi/issues/342
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
plugins/sample/__init__.py | 3 ++-
plugins/sample/sample.conf | 5 +++++
plugins/sample/ui/config/tab-ext.xml | 8 ++++----
plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
5 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 3183898..2101aed 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -26,6 +26,7 @@
from kimchi.config import PluginPaths
from kimchi.control.base import Collection, Resource
+from kimchi.root import Root
from plugins.sample.i18n import messages
from plugins.sample.model import Model
@@ -33,7 +34,7 @@
model = Model()
-class Drawings(Resource):
+class Drawings(Root):
def __init__(self):
Resource.__init__(self, model)
self.description = Description(model)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
index c4e80f7..78a9f4e 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf
@@ -5,3 +5,8 @@ uri = "/plugins/sample"
[/]
tools.trailing_slash.on = False
+tools.sessions.on = True
+tools.sessions.name = 'kimchi'
+tools.sessions.httponly = True
+tools.sessions.locking = 'explicit'
+tools.sessions.storage_type = 'ram'
diff --git a/plugins/sample/ui/config/tab-ext.xml b/plugins/sample/ui/config/tab-ext.xml
index 948fa07..8e0b3d3 100644
--- a/plugins/sample/ui/config/tab-ext.xml
+++ b/plugins/sample/ui/config/tab-ext.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--<tabs-ext>
+<tabs-ext>
<tab>
- <title>Test</title>
- <filePath>plugins/sample/ui/tab.html</filePath>
+ <title>SampleTab</title>
+ <path>plugins/sample/tab.html</path>
</tab>
-</tabs-ext>-->
\ No newline at end of file
+</tabs-ext>
diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
b/plugins/sample/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..a153e2d
--- /dev/null
+++ b/plugins/sample/ui/pages/i18n.json.tmpl
@@ -0,0 +1,9 @@
+#unicode UTF-8
+#import gettext
+#from kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+ "SampleTab": "$_("SampleTab")"
+}
diff --git a/plugins/sample/ui/pages/tab.html.tmpl
b/plugins/sample/ui/pages/tab.html.tmpl
new file mode 100644
index 0000000..49fc4ec
--- /dev/null
+++ b/plugins/sample/ui/pages/tab.html.tmpl
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+Hello, world
+</body>
+</html>
--
1.9.3
12:09 p.m.
New subject: [PATCH V5 2/7] Update root.py to make Cheetah render the JSON template.
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
when the request are json files, set the Content-Type as
application/json.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
src/kimchi/root.py | 5 +++++
src/kimchi/template.py | 34 +++++++++++++++++++---------------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/kimchi/root.py b/src/kimchi/root.py
index 8b1d09b..1cebfd1 100644
--- a/src/kimchi/root.py
+++ b/src/kimchi/root.py
@@ -82,6 +82,11 @@ def get(self):
def default(self, page, **kwargs):
if page.endswith('.html'):
return template.render(page, None)
+ if page.endswith('.json'):
+ cherrypy.response.headers['Content-Type'] = \
+ 'application/json;charset=utf-8'
+ context = template.render_cheetah_file(page, None)
+ return context.encode("utf-8")
raise cherrypy.HTTPError(404)
@cherrypy.expose
diff --git a/src/kimchi/template.py b/src/kimchi/template.py
index 60cd818..146e735 100644
--- a/src/kimchi/template.py
+++ b/src/kimchi/template.py
@@ -82,26 +82,30 @@ def can_accept_html():
can_accept('*/*')
+def render_cheetah_file(resource, data):
+ paths = cherrypy.request.app.root.paths
+ filename = paths.get_template_path(resource)
+ try:
+ params = {'data': data}
+ lang = validate_language(get_lang())
+ gettext_conf = {'domain': 'kimchi',
+ 'localedir': paths.mo_dir,
+ 'lang': [lang]}
+ params['lang'] = gettext_conf
+ return Template(file=filename, searchList=params).respond()
+ except OSError, e:
+ if e.errno == errno.ENOENT:
+ raise cherrypy.HTTPError(404)
+ else:
+ raise
+
+
def render(resource, data):
if can_accept('application/json'):
cherrypy.response.headers['Content-Type'] = \
'application/json;charset=utf-8'
return json.dumps(data, indent=2, separators=(',', ':'))
elif can_accept_html():
- paths = cherrypy.request.app.root.paths
- filename = paths.get_template_path(resource)
- try:
- params = {'data': data}
- lang = validate_language(get_lang())
- gettext_conf = {'domain': 'kimchi',
- 'localedir': paths.mo_dir,
- 'lang': [lang]}
- params['lang'] = gettext_conf
- return Template(file=filename, searchList=params).respond()
- except OSError, e:
- if e.errno == errno.ENOENT:
- raise cherrypy.HTTPError(404)
- else:
- raise
+ return render_cheetah_file(resource, data)
else:
raise cherrypy.HTTPError(406)
--
1.9.3
12:09 p.m.
New subject: [PATCH V5 3/7] Update the i18n tmpl to produce JSON
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Remove html tags from i18n as they are not valid
Correct object definition from acceptable JS to valid JSON replacing
' with " in attribute names.
Update root.py to make Cheetah render the JSON template.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/pages/i18n.html.tmpl | 178 ------------------------------------------------
ui/pages/i18n.json.tmpl | 165 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 165 insertions(+), 178 deletions(-)
delete mode 100644 ui/pages/i18n.html.tmpl
create mode 100644 ui/pages/i18n.json.tmpl
diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
deleted file mode 100644
index 25b81c2..0000000
--- a/ui/pages/i18n.html.tmpl
+++ /dev/null
@@ -1,178 +0,0 @@
-#*
- * Project Kimchi
- *
- * Copyright IBM, Corp. 2013
- *
- * 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 kimchi.cachebust import href
-#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
-#silent _ = t.gettext
-#silent _t = t.gettext
-
-<!DOCTYPE html>
-<html class="no-js" lang=$lang.lang[0]>
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible"
content="IE=edge,chrome=1">
- <title>language</title>
-</head>
-<body>
-<script>
-var i18n = {
- 'KCHAUTH6001E': "$_("The username or password you entered is
incorrect. Please try again.")",
- 'KCHAUTH6002E': "$_("This field is required.")",
-
- 'KCHAUTH6001M': "$_("Log in")",
- 'KCHAUTH6002M': "$_("Logging in...")",
-
- 'Host': "$_("Host")",
- 'Guests': "$_("Guests")",
- 'Templates': "$_("Templates")",
- 'Storage': "$_("Storage")",
- 'Network': "$_("Network")",
-
- 'KCHAPI6001E': "$_("Invalid URL. Redireced to home
page.")",
- 'KCHAPI6002E': "$_("Failed to get application
configuration")",
- 'KCHAPI6003E': "$_("This is not a valid Linux path")",
- 'KCHAPI6004E': "$_("This is not a valid URL.")",
- 'KCHAPI6005E': "$_("No such data available.")",
- 'KCHAPI6006E': "$_("options needed.")",
- 'KCHAPI6007E': "$_("Can not contact the host system. Verify the
host system is up and that you have network connectivity to it. HTTP request response %1.
")",
-
- 'KCHAPI6001M': "$_("Delete Confirmation")",
- 'KCHAPI6002M': "$_("OK")",
- 'KCHAPI6003M': "$_("Cancel")",
- 'KCHAPI6004M': "$_("Confirm")",
- 'KCHAPI6005M': "$_("Create")",
- 'KCHAPI6006M': "$_("Warning")",
- 'KCHAPI6007M': "$_("Save")",
-
- 'KCHGRD6001M': "$_("Loading...")",
- 'KCHGRD6002M': "$_("An error occurs while checking for packages
update.")",
- 'KCHGRD6003M': "$_("Retry")",
- 'KCHGRD6004M': "$_("Detailed message:")",
-
- 'KCHTMPL6001W': "$_("No iso found")",
-
- 'KCHTMPL6002E': "$_("This is not a valid ISO file.")",
-
- 'KCHTMPL6002M': "$_("It will take long time. Do you want to
continue?")",
- 'KCHTMPL6003M': "$_("This will permanently delete the template.
Would you like to continue?")",
-
- 'KCHHOST6001E': "$_("Unable to shut down system as there are some
virtual machines running!")",
-
- 'KCHHOST6001M': "$_("Max:")",
- 'KCHHOST6002M': "$_("Utilization")",
- 'KCHHOST6003M': "$_("Available")",
- 'KCHHOST6004M': "$_("Read Rate")",
- 'KCHHOST6005M': "$_("Write Rate")",
- 'KCHHOST6006M': "$_("Received")",
- 'KCHHOST6007M': "$_("Sent")",
- 'KCHHOST6008M': "$_("Shutting down or restarting host will cause
unsaved work lost. Continue to shut down/restarting?")",
-
-
- 'KCHREPO6001M': "$_("Confirm")",
- 'KCHREPO6002M': "$_("Repository will be removed permanently and
can't be recovered. Do you want to continue?")",
- 'KCHREPO6003M': "$_("Repositories")",
- 'KCHREPO6004M': "$_("ID")",
- 'KCHREPO6005M': "$_("Name")",
- 'KCHREPO6006M': "$_("Base URL")",
- 'KCHREPO6007M': "$_("Is Mirror")",
- 'KCHREPO6008M': "$_("URL Args")",
- 'KCHREPO6009M': "$_("Enabled")",
- 'KCHREPO6010M': "$_("GPG Check")",
- 'KCHREPO6011M': "$_("GPG Key")",
- 'KCHREPO6012M': "$_("Add")",
- 'KCHREPO6013M': "$_("Edit")",
- 'KCHREPO6014M': "$_("Remove")",
- 'KCHREPO6015M': "$_("Failed.")",
- 'KCHREPO6016M': "$_("Enable")",
- 'KCHREPO6017M': "$_("Disable")",
-
-
- 'KCHUPD6001M': "$_("Software Updates")",
- 'KCHUPD6002M': "$_("Package Name")",
- 'KCHUPD6003M': "$_("Version")",
- 'KCHUPD6004M': "$_("Architecture")",
- 'KCHUPD6005M': "$_("Repository")",
- 'KCHUPD6006M': "$_("Update All")",
- 'KCHUPD6007M': "$_("Updating...")",
- 'KCHUPD6008M': "$_("Failed to retrieve updates.")",
- 'KCHUPD6009M': "$_("Failed to update package(s).")",
-
-
- 'KCHDR6001M': "$_("Debug report will be removed permanently and
can't be recovered. Do you want to continue?")",
- 'KCHDR6002M': "$_("Debug Reports")",
- 'KCHDR6003M': "$_("Name")",
- 'KCHDR6005M': "$_("Generated Time")",
- 'KCHDR6006M': "$_("Generate")",
- 'KCHDR6007M': "$_("Generating...")",
- 'KCHDR6008M': "$_("Rename")",
- 'KCHDR6009M': "$_("Remove")",
- 'KCHDR6010M': "$_("Download")",
- 'KCHDR6011M': "$_("Report name should contain only letters, digits
and/or hyphen ('-').")",
-
- 'KCHVM6001M': "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
- 'KCHVM6002M': "$_("Power off Confirmation")",
- 'KCHVM6003M': "$_("This action may produce undesirable results,
"
- "for example unflushed disk cache in the guest. "
- "Would you like to continue?")",
- 'KCHVM6004M': "$_("Reset Confirmation")",
- 'KCHVM6005M': "$_("There is a risk of data loss caused by reset
without"
- " the guest OS shutdown. Would you like to
continue?")",
- 'KCHVM6006M': "$_("Shut Down Confirmation")",
- 'KCHVM6007M': "$_("Note the guest OS may ignore this request. Would
you like to continue?")",
- 'KCHVM6008M': "$_("VM Delete Confirmation")",
-
- 'KCHVMCD6001M': "$_("This CDROM will be detached permanently and
you can re-attach it. Continue to detach it?")",
- 'KCHVMCD6002M': "$_("Attach")",
- 'KCHVMCD6003M': "$_("Attaching...")",
- 'KCHVMCD6004M': "$_("Replace")",
- 'KCHVMCD6005M': "$_("Replacing...")",
- 'KCHVMCD6006M': "$_("Successfully attached!")",
- 'KCHVMCD6007M': "$_("Successfully replaced!")",
- 'KCHVMCD6008M': "$_("Successfully detached!")",
-
-
- 'KCHNET6001E': "$_("The VLAN id must be between 1 and
4094.")",
-
- 'KCHNET6001M': "$_("unavailable")",
- 'KCHNET6002M': "$_("This action will interrupt network connectivity
for any virtual machine that depend on this network.")",
- 'KCHNET6003M': "$_("Create a network")",
- 'KCHNET6004M': "$_("This network is not persistent. Instead of
stop, this action will permanently delete it. Would you like to continue?")",
-
- 'KCHPOOL6001M': "$_("This will permanently delete the storage pool.
Would you like to continue?")",
- 'KCHPOOL6002M': "$_("This storage pool is empty.")",
- 'KCHPOOL6003M': "$_("It will format your disk and you will loose
any data in there, are you sure to continue? ")",
- 'KCHPOOL6004M': "$_("SCSI Fibre Channel")",
- 'KCHPOOL6005M': "$_("No SCSI adapters found.")",
-
- 'KCHPOOL6001E': "$_("The storage pool name can not be
blank.")",
- 'KCHPOOL6002E': "$_("The storage pool path can not be
blank.")",
- 'KCHPOOL6003E': "$_("NFS server mount path can not be
blank.")",
- 'KCHPOOL6004E': "$_("Invalid storage pool name. It should not
contain '/'.")",
- 'KCHPOOL6005E': "$_("Invalid NFS mount path.")",
- 'KCHPOOL6006E': "$_("No logical device selected.")",
- 'KCHPOOL6007E': "$_("The iSCSI target can not be
blank.")",
- 'KCHPOOL6008E': "$_("Server name can not be blank.")",
- 'KCHPOOL6009E': "$_("This is not a valid Server Name or IP. please,
modify it.")",
- 'KCHPOOL6010M': "$_("Looking for available partitions
...")",
- 'KCHPOOL6011M': "$_("No available partitions found.")",
- 'KCHPOOL6012M': "$_("This storage pool is not persistent. Instead
of deactivate, this action will permanently delete it. Would you like to
continue?")"
-};
-</script>
-</body>
-</html>
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..3ef488f
--- /dev/null
+++ b/ui/pages/i18n.json.tmpl
@@ -0,0 +1,165 @@
+#*
+ * Project Kimchi
+ *
+ * Copyright IBM, Corp. 2013
+ *
+ * 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 kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+ "KCHAUTH6001E": "$_("The username or password you entered is
incorrect. Please try again.")",
+ "KCHAUTH6002E": "$_("This field is required.")",
+
+ "KCHAUTH6001M": "$_("Log in")",
+ "KCHAUTH6002M": "$_("Logging in...")",
+
+ "Host": "$_("Host")",
+ "Guests": "$_("Guests")",
+ "Templates": "$_("Templates")",
+ "Storage": "$_("Storage")",
+ "Network": "$_("Network")",
+
+ "KCHAPI6001E": "$_("Invalid URL. Redireced to home
page.")",
+ "KCHAPI6002E": "$_("Failed to get application
configuration")",
+ "KCHAPI6003E": "$_("This is not a valid Linux path")",
+ "KCHAPI6004E": "$_("This is not a valid URL.")",
+ "KCHAPI6005E": "$_("No such data available.")",
+ "KCHAPI6006E": "$_("options needed.")",
+ "KCHAPI6007E": "$_("Can not contact the host system. Verify the
host system is up and that you have network connectivity to it. HTTP request response %1.
")",
+
+ "KCHAPI6001M": "$_("Delete Confirmation")",
+ "KCHAPI6002M": "$_("OK")",
+ "KCHAPI6003M": "$_("Cancel")",
+ "KCHAPI6004M": "$_("Confirm")",
+ "KCHAPI6005M": "$_("Create")",
+ "KCHAPI6006M": "$_("Warning")",
+ "KCHAPI6007M": "$_("Save")",
+
+ "KCHGRD6001M": "$_("Loading...")",
+ "KCHGRD6002M": "$_("An error occurs while checking for packages
update.")",
+ "KCHGRD6003M": "$_("Retry")",
+ "KCHGRD6004M": "$_("Detailed message:")",
+
+ "KCHTMPL6001W": "$_("No iso found")",
+
+ "KCHTMPL6002E": "$_("This is not a valid ISO file.")",
+
+ "KCHTMPL6002M": "$_("It will take long time. Do you want to
continue?")",
+ "KCHTMPL6003M": "$_("This will permanently delete the template.
Would you like to continue?")",
+
+ "KCHHOST6001E": "$_("Unable to shut down system as there are some
virtual machines running!")",
+
+ "KCHHOST6001M": "$_("Max:")",
+ "KCHHOST6002M": "$_("Utilization")",
+ "KCHHOST6003M": "$_("Available")",
+ "KCHHOST6004M": "$_("Read Rate")",
+ "KCHHOST6005M": "$_("Write Rate")",
+ "KCHHOST6006M": "$_("Received")",
+ "KCHHOST6007M": "$_("Sent")",
+ "KCHHOST6008M": "$_("Shutting down or restarting host will cause
unsaved work lost. Continue to shut down/restarting?")",
+
+
+ "KCHREPO6001M": "$_("Confirm")",
+ "KCHREPO6002M": "$_("Repository will be removed permanently and
can't be recovered. Do you want to continue?")",
+ "KCHREPO6003M": "$_("Repositories")",
+ "KCHREPO6004M": "$_("ID")",
+ "KCHREPO6005M": "$_("Name")",
+ "KCHREPO6006M": "$_("Base URL")",
+ "KCHREPO6007M": "$_("Is Mirror")",
+ "KCHREPO6008M": "$_("URL Args")",
+ "KCHREPO6009M": "$_("Enabled")",
+ "KCHREPO6010M": "$_("GPG Check")",
+ "KCHREPO6011M": "$_("GPG Key")",
+ "KCHREPO6012M": "$_("Add")",
+ "KCHREPO6013M": "$_("Edit")",
+ "KCHREPO6014M": "$_("Remove")",
+ "KCHREPO6015M": "$_("Failed.")",
+ "KCHREPO6016M": "$_("Enable")",
+ "KCHREPO6017M": "$_("Disable")",
+
+
+ "KCHUPD6001M": "$_("Software Updates")",
+ "KCHUPD6002M": "$_("Package Name")",
+ "KCHUPD6003M": "$_("Version")",
+ "KCHUPD6004M": "$_("Architecture")",
+ "KCHUPD6005M": "$_("Repository")",
+ "KCHUPD6006M": "$_("Update All")",
+ "KCHUPD6007M": "$_("Updating...")",
+ "KCHUPD6008M": "$_("Failed to retrieve updates.")",
+ "KCHUPD6009M": "$_("Failed to update package(s).")",
+
+
+ "KCHDR6001M": "$_("Debug report will be removed permanently and
can't be recovered. Do you want to continue?")",
+ "KCHDR6002M": "$_("Debug Reports")",
+ "KCHDR6003M": "$_("Name")",
+ "KCHDR6005M": "$_("Generated Time")",
+ "KCHDR6006M": "$_("Generate")",
+ "KCHDR6007M": "$_("Generating...")",
+ "KCHDR6008M": "$_("Rename")",
+ "KCHDR6009M": "$_("Remove")",
+ "KCHDR6010M": "$_("Download")",
+ "KCHDR6011M": "$_("Report name should contain only letters,
digits and/or hyphen ('-').")",
+
+ "KCHVM6001M": "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
+ "KCHVM6002M": "$_("Power off Confirmation")",
+ "KCHVM6003M": "$_("This action may produce undesirable results,
"
+ "for example unflushed disk cache in the guest. "
+ "Would you like to continue?")",
+ "KCHVM6004M": "$_("Reset Confirmation")",
+ "KCHVM6005M": "$_("There is a risk of data loss caused by reset
without"
+ " the guest OS shutdown. Would you like to
continue?")",
+ "KCHVM6006M": "$_("Shut Down Confirmation")",
+ "KCHVM6007M": "$_("Note the guest OS may ignore this request.
Would you like to continue?")",
+ "KCHVM6008M": "$_("VM Delete Confirmation")",
+
+ "KCHVMCD6001M": "$_("This CDROM will be detached permanently and
you can re-attach it. Continue to detach it?")",
+ "KCHVMCD6002M": "$_("Attach")",
+ "KCHVMCD6003M": "$_("Attaching...")",
+ "KCHVMCD6004M": "$_("Replace")",
+ "KCHVMCD6005M": "$_("Replacing...")",
+ "KCHVMCD6006M": "$_("Successfully attached!")",
+ "KCHVMCD6007M": "$_("Successfully replaced!")",
+ "KCHVMCD6008M": "$_("Successfully detached!")",
+
+
+ "KCHNET6001E": "$_("The VLAN id must be between 1 and
4094.")",
+
+ "KCHNET6001M": "$_("unavailable")",
+ "KCHNET6002M": "$_("This action will interrupt network
connectivity for any virtual machine that depend on this network.")",
+ "KCHNET6003M": "$_("Create a network")",
+ "KCHNET6004M": "$_("This network is not persistent. Instead of
stop, this action will permanently delete it. Would you like to continue?")",
+
+ "KCHPOOL6001M": "$_("This will permanently delete the storage
pool. Would you like to continue?")",
+ "KCHPOOL6002M": "$_("This storage pool is empty.")",
+ "KCHPOOL6003M": "$_("It will format your disk and you will loose
any data in there, are you sure to continue? ")",
+ "KCHPOOL6004M": "$_("SCSI Fibre Channel")",
+ "KCHPOOL6005M": "$_("No SCSI adapters found.")",
+
+ "KCHPOOL6001E": "$_("The storage pool name can not be
blank.")",
+ "KCHPOOL6002E": "$_("The storage pool path can not be
blank.")",
+ "KCHPOOL6003E": "$_("NFS server mount path can not be
blank.")",
+ "KCHPOOL6004E": "$_("Invalid storage pool name. It should not
contain '/'.")",
+ "KCHPOOL6005E": "$_("Invalid NFS mount path.")",
+ "KCHPOOL6006E": "$_("No logical device selected.")",
+ "KCHPOOL6007E": "$_("The iSCSI target can not be
blank.")",
+ "KCHPOOL6008E": "$_("Server name can not be blank.")",
+ "KCHPOOL6009E": "$_("This is not a valid Server Name or IP.
please, modify it.")",
+ "KCHPOOL6010M": "$_("Looking for available partitions
...")",
+ "KCHPOOL6011M": "$_("No available partitions
found.")",
+ "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead
of deactivate, this action will permanently delete it. Would you like to
continue?")"
+}
\ No newline at end of file
--
1.9.3
12:09 p.m.
New subject: [PATCH V5 4/7] Add JS API for fetching i18n JSON
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Create an API for fetching the i18n JSON.
Use the API to load the kimchi UI strings.
API will need to be simplified after convincing CherryPy to respond to the reque
st for JSON.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.api.js | 14 ++++++++++++++
ui/js/src/kimchi.main.js | 11 ++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js
index 072d127..ad89880 100644
--- a/ui/js/src/kimchi.api.js
+++ b/ui/js/src/kimchi.api.js
@@ -63,6 +63,20 @@ var kimchi = {
},
/**
+ * Get the i18 strings.
+ */
+ getI18n: function(suc, err, url, sync) {
+ kimchi.requestJSON({
+ url : url ? url : kimchi.url + 'i18n.json',
+ type : 'GET',
+ resend: true,
+ dataType : 'json',
+ success : suc,
+ error: err
+ });
+ },
+
+ /**
* Get the host static information.
*/
getHost: function(suc, err) {
diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
index 184029d..1e6602c 100644
--- a/ui/js/src/kimchi.main.js
+++ b/ui/js/src/kimchi.main.js
@@ -247,9 +247,14 @@ kimchi.main = function() {
};
// Load i18n translation strings first and then render the page.
- $('#main').load('i18n.html', function() {
- buildTabs(initUI);
- });
+ kimchi.getI18n(
+ function(i18nStrings){ //success
+ i18n = i18nStrings;
+ buildTabs(initUI);
+ },
+ function(data){ //error
+ kimchi.message.error(data.responseJSON.reason);
+ });
};
kimchi.getHelp = function(e) {
--
1.9.3
12:09 p.m.
New subject: [PATCH V5 5/7] Issue #342: load i18n.html of the plugin
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Apparently, in plugin code there is no way to insert new entries into
Kimchi ./ui/pages/i18n.json.tmpl, so every plugin should provide its own
i18n.json.tmpl.
each plugin provides a "plugins/plugin-name/ui/pages/i18n.json.tmpl",
and maps it to the URI "plugins/plugin-name/json.html". This is already
supported by the kimchi back-end. What we have to do is just to load
"plugins/plugin-name/i18n.json" in the front-end code.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.api.js | 4 +++-
ui/js/src/kimchi.main.js | 13 +++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js
index ad89880..0d96d07 100644
--- a/ui/js/src/kimchi.api.js
+++ b/ui/js/src/kimchi.api.js
@@ -71,6 +71,7 @@ var kimchi = {
type : 'GET',
resend: true,
dataType : 'json',
+ async : !sync,
success : suc,
error: err
});
@@ -560,13 +561,14 @@ var kimchi = {
});
},
- listPlugins : function(suc, err) {
+ listPlugins : function(suc, err, sync) {
kimchi.requestJSON({
url : kimchi.url + 'plugins',
type : 'GET',
contentType : 'application/json',
dataType : 'json',
resend: true,
+ async : !sync,
success : suc,
error : err
});
diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
index 1e6602c..eb4575a 100644
--- a/ui/js/src/kimchi.main.js
+++ b/ui/js/src/kimchi.main.js
@@ -39,7 +39,7 @@ kimchi.main = function() {
$(xmlData).find('tab').each(function() {
var $tab = $(this);
var titleKey = $tab.find('title').text();
- var title = i18n[titleKey];
+ var title = i18n[titleKey] ? i18n[titleKey] : titleKey;
var path = $tab.find('path').text();
tabs.push({
title: title,
@@ -64,6 +64,7 @@ kimchi.main = function() {
var tabConfigUrl = '/config/ui/tabs.xml';
var pluginConfigUrl = '/plugins/{plugin}/ui/config/tab-ext.xml';
+ var pluginI18nUrl = 'plugins/{plugin}/i18n.json';
var DEFAULT_HASH;
var buildTabs = function(callback) {
var tabs = retrieveTabs(tabConfigUrl);
@@ -72,6 +73,12 @@ kimchi.main = function() {
var url = kimchi.substitute(pluginConfigUrl, {
plugin: p
});
+ var i18nUrl = kimchi.substitute(pluginI18nUrl, {
+ plugin: p
+ });
+ kimchi.getI18n(function(i18nObj){ $.extend(i18n, i18nObj)},
+ function(i18nObj){ //i18n is not define by plugin
+ }, i18nUrl, true);
tabs.push.apply(tabs, retrieveTabs(url));
});
@@ -85,7 +92,9 @@ kimchi.main = function() {
$('#nav-menu').append(genTabs(tabs));
callback && callback();
- });
+ }, function(data) {
+ kimchi.message.error(data.responseJSON.reason);
+ }, true);
};
var onLanguageChanged = function(lang) {
--
1.9.3
12:09 p.m.
New subject: [PATCH V5 6/7] add an optional to toggle the sample plugin
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
sample plugin is used to test as a plugin demo.
we disable it by default.
use this command to enable sample plugin
$ ./autogen.sh --enable-plugins
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
configure.ac | 17 +++++++++++++++++
plugins/sample/Makefile.am | 2 +-
plugins/sample/{sample.conf => sample.conf.in} | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
rename plugins/sample/{sample.conf => sample.conf.in} (91%)
diff --git a/configure.ac b/configure.ac
index cc971e8..2594829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,22 @@ if test "x$PYFLAKES" = "x"; then
AC_MSG_WARN([pyflakes not found])
fi
+AC_ARG_ENABLE(
+ [sample],
+ [AS_HELP_STRING(
+ [--enable-sample],
+ [build sample plugin package @<:@default=no@:>@]
+ )],
+ ,
+ [enable_sample="no"]
+)
+
+# AM_CONDITIONAL([SAMPLE], [test "${enable_sample}" = "yes"])
+if test "${enable_sample}" = "yes"; then
+AC_SUBST([ENABLE_SAMPLE], [True])
+else
+AC_SUBST([ENABLE_SAMPLE], [False])
+fi
AC_CONFIG_FILES([
po/Makefile.in
@@ -62,6 +78,7 @@ AC_CONFIG_FILES([
src/kimchi/model/Makefile
plugins/Makefile
plugins/sample/Makefile
+ plugins/sample/sample.conf
plugins/sample/ui/Makefile
plugins/sample/ui/config/Makefile
ui/Makefile
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index e03a4c0..a229244 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -19,4 +19,4 @@
SUBDIRS = ui
-EXTRA_DIST = API.json sample.conf $(wildcard *.py)
+EXTRA_DIST = API.json sample.conf.in $(wildcard *.py)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf.in
similarity index 91%
rename from plugins/sample/sample.conf
rename to plugins/sample/sample.conf.in
index 78a9f4e..f890983 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf.in
@@ -1,5 +1,5 @@
[kimchi]
-enable = True
+enable = @ENABLE_SAMPLE@
plugin_class = "Drawings"
uri = "/plugins/sample"
--
1.9.3
12:09 p.m.
New subject: [PATCH V5 7/7] generate the translation files for plugins/sample
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
please use this command to generate the translation files for
plugins/sample
$ make -C plugins/sample/po/ update-po
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
configure.ac | 1 +
plugins/sample/Makefile.am | 9 ++++++++-
plugins/sample/config.status | 1 +
plugins/sample/po/LINGUAS | 1 +
plugins/sample/po/Makefile.in.in | 1 +
plugins/sample/po/Makevars | 1 +
plugins/sample/po/POTFILES.in | 2 ++
plugins/sample/po/en_US.po | 21 +++++++++++++++++++++
plugins/sample/po/gen-pot | 1 +
plugins/sample/po/pt_BR.po | 24 ++++++++++++++++++++++++
plugins/sample/po/zh_CN.po | 24 ++++++++++++++++++++++++
11 files changed, 85 insertions(+), 1 deletion(-)
create mode 120000 plugins/sample/config.status
create mode 120000 plugins/sample/po/LINGUAS
create mode 120000 plugins/sample/po/Makefile.in.in
create mode 120000 plugins/sample/po/Makevars
create mode 100644 plugins/sample/po/POTFILES.in
create mode 100644 plugins/sample/po/en_US.po
create mode 120000 plugins/sample/po/gen-pot
create mode 100644 plugins/sample/po/pt_BR.po
create mode 100644 plugins/sample/po/zh_CN.po
diff --git a/configure.ac b/configure.ac
index 2594829..add7b1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,7 @@ AC_CONFIG_FILES([
src/kimchi/model/Makefile
plugins/Makefile
plugins/sample/Makefile
+ plugins/sample/po/Makefile.in
plugins/sample/sample.conf
plugins/sample/ui/Makefile
plugins/sample/ui/config/Makefile
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index a229244..1627cc6 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -17,6 +17,13 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-SUBDIRS = ui
+SUBDIRS = ui po
EXTRA_DIST = API.json sample.conf.in $(wildcard *.py)
+
+all-local:
+ while read L && test -n "$$L"; do \
+ dir=mo/$$L/LC_MESSAGES ; \
+ $(MKDIR_P) $$dir ; \
+ ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ; \
+ done < po/LINGUAS
diff --git a/plugins/sample/config.status b/plugins/sample/config.status
new file mode 120000
index 0000000..6cd6b4f
--- /dev/null
+++ b/plugins/sample/config.status
@@ -0,0 +1 @@
+../../config.status
\ No newline at end of file
diff --git a/plugins/sample/po/LINGUAS b/plugins/sample/po/LINGUAS
new file mode 120000
index 0000000..4fb83a5
--- /dev/null
+++ b/plugins/sample/po/LINGUAS
@@ -0,0 +1 @@
+../../../po/LINGUAS
\ No newline at end of file
diff --git a/plugins/sample/po/Makefile.in.in b/plugins/sample/po/Makefile.in.in
new file mode 120000
index 0000000..44028c0
--- /dev/null
+++ b/plugins/sample/po/Makefile.in.in
@@ -0,0 +1 @@
+../../../po/Makefile.in.in
\ No newline at end of file
diff --git a/plugins/sample/po/Makevars b/plugins/sample/po/Makevars
new file mode 120000
index 0000000..3b6b02f
--- /dev/null
+++ b/plugins/sample/po/Makevars
@@ -0,0 +1 @@
+../../../po/Makevars
\ No newline at end of file
diff --git a/plugins/sample/po/POTFILES.in b/plugins/sample/po/POTFILES.in
new file mode 100644
index 0000000..f1b069f
--- /dev/null
+++ b/plugins/sample/po/POTFILES.in
@@ -0,0 +1,2 @@
+# List of source files which contain translatable strings.
+ui/pages/*.tmpl
diff --git a/plugins/sample/po/en_US.po b/plugins/sample/po/en_US.po
new file mode 100644
index 0000000..1889845
--- /dev/null
+++ b/plugins/sample/po/en_US.po
@@ -0,0 +1,21 @@
+# English translations for kimchi package.
+# Copyright (C) 2014 THE kimchi'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kimchi package.
+# shhfeng <shaohef(a)linux.vnet.ibm.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 1.2.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-17 02:13+0800\n"
+"PO-Revision-Date: 2014-05-17 02:08+0800\n"
+"Last-Translator: shhfeng <shaohef(a)linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+msgid "SampleTab"
+msgstr "SampleTab"
diff --git a/plugins/sample/po/gen-pot b/plugins/sample/po/gen-pot
new file mode 120000
index 0000000..b449d56
--- /dev/null
+++ b/plugins/sample/po/gen-pot
@@ -0,0 +1 @@
+../../../po/gen-pot
\ No newline at end of file
diff --git a/plugins/sample/po/pt_BR.po b/plugins/sample/po/pt_BR.po
new file mode 100644
index 0000000..0ff1d43
--- /dev/null
+++ b/plugins/sample/po/pt_BR.po
@@ -0,0 +1,24 @@
+# Portuguese translations for kimchi package
+# Copyright (C) 2014 THE kimchi'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kimchi package.
+# shhfeng <shaohef(a)linux.vnet.ibm.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 1.2.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-17 02:13+0800\n"
+"PO-Revision-Date: 2014-05-17 02:09+0800\n"
+"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
+"Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"X-Poedit-Country: Brazil\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "SampleTab"
+msgstr "Tab de exemplo"
diff --git a/plugins/sample/po/zh_CN.po b/plugins/sample/po/zh_CN.po
new file mode 100644
index 0000000..bba53c3
--- /dev/null
+++ b/plugins/sample/po/zh_CN.po
@@ -0,0 +1,24 @@
+# Chinese translations for kimchi package
+# Copyright (C) 2014 THE kimchi'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kimchi package.
+# shhfeng <shaohef(a)linux.vnet.ibm.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 1.2.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-17 02:13+0800\n"
+"PO-Revision-Date: 2014-05-17 02:10+0800\n"
+"Last-Translator: shhfeng <shaohef(a)linux.vnet.ibm.com>\n"
+"Language-Team: Chinese (simplified)\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "SampleTab"
+msgstr "示例标签"
--
1.9.3
1:16 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
Reviewed-by: Daniel Barboza <danielhb(a)linux.vnet.ibm.com>
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Add minimal UI just enough to re-produce issue 342.
https://github.com/kimchi-project/kimchi/issues/342
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
plugins/sample/__init__.py | 3 ++-
plugins/sample/sample.conf | 5 +++++
plugins/sample/ui/config/tab-ext.xml | 8 ++++----
plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
5 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 3183898..2101aed 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -26,6 +26,7 @@
from kimchi.config import PluginPaths
from kimchi.control.base import Collection, Resource
+from kimchi.root import Root
from plugins.sample.i18n import messages
from plugins.sample.model import Model
@@ -33,7 +34,7 @@
model = Model()
-class Drawings(Resource):
+class Drawings(Root):
def __init__(self):
Resource.__init__(self, model)
self.description = Description(model)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
index c4e80f7..78a9f4e 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf
@@ -5,3 +5,8 @@ uri = "/plugins/sample"
[/]
tools.trailing_slash.on = False
+tools.sessions.on = True
+tools.sessions.name = 'kimchi'
+tools.sessions.httponly = True
+tools.sessions.locking = 'explicit'
+tools.sessions.storage_type = 'ram'
diff --git a/plugins/sample/ui/config/tab-ext.xml b/plugins/sample/ui/config/tab-ext.xml
index 948fa07..8e0b3d3 100644
--- a/plugins/sample/ui/config/tab-ext.xml
+++ b/plugins/sample/ui/config/tab-ext.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--<tabs-ext>
+<tabs-ext>
<tab>
- <title>Test</title>
- <filePath>plugins/sample/ui/tab.html</filePath>
+ <title>SampleTab</title>
+ <path>plugins/sample/tab.html</path>
</tab>
-</tabs-ext>-->
\ No newline at end of file
+</tabs-ext>
diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
b/plugins/sample/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..a153e2d
--- /dev/null
+++ b/plugins/sample/ui/pages/i18n.json.tmpl
@@ -0,0 +1,9 @@
+#unicode UTF-8
+#import gettext
+#from kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+ "SampleTab": "$_("SampleTab")"
+}
diff --git a/plugins/sample/ui/pages/tab.html.tmpl
b/plugins/sample/ui/pages/tab.html.tmpl
new file mode 100644
index 0000000..49fc4ec
--- /dev/null
+++ b/plugins/sample/ui/pages/tab.html.tmpl
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+Hello, world
+</body>
+</html>
1:18 p.m.
New subject: [PATCH V5 2/7] Update root.py to make Cheetah render the JSON template.
Reviewed-by: Daniel Barboza <danielhb(a)linux.vnet.ibm.com>
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
when the request are json files, set the Content-Type as
application/json.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
src/kimchi/root.py | 5 +++++
src/kimchi/template.py | 34 +++++++++++++++++++---------------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/kimchi/root.py b/src/kimchi/root.py
index 8b1d09b..1cebfd1 100644
--- a/src/kimchi/root.py
+++ b/src/kimchi/root.py
@@ -82,6 +82,11 @@ def get(self):
def default(self, page, **kwargs):
if page.endswith('.html'):
return template.render(page, None)
+ if page.endswith('.json'):
+ cherrypy.response.headers['Content-Type'] = \
+ 'application/json;charset=utf-8'
+ context = template.render_cheetah_file(page, None)
+ return context.encode("utf-8")
raise cherrypy.HTTPError(404)
@cherrypy.expose
diff --git a/src/kimchi/template.py b/src/kimchi/template.py
index 60cd818..146e735 100644
--- a/src/kimchi/template.py
+++ b/src/kimchi/template.py
@@ -82,26 +82,30 @@ def can_accept_html():
can_accept('*/*')
+def render_cheetah_file(resource, data):
+ paths = cherrypy.request.app.root.paths
+ filename = paths.get_template_path(resource)
+ try:
+ params = {'data': data}
+ lang = validate_language(get_lang())
+ gettext_conf = {'domain': 'kimchi',
+ 'localedir': paths.mo_dir,
+ 'lang': [lang]}
+ params['lang'] = gettext_conf
+ return Template(file=filename, searchList=params).respond()
+ except OSError, e:
+ if e.errno == errno.ENOENT:
+ raise cherrypy.HTTPError(404)
+ else:
+ raise
+
+
def render(resource, data):
if can_accept('application/json'):
cherrypy.response.headers['Content-Type'] = \
'application/json;charset=utf-8'
return json.dumps(data, indent=2, separators=(',', ':'))
elif can_accept_html():
- paths = cherrypy.request.app.root.paths
- filename = paths.get_template_path(resource)
- try:
- params = {'data': data}
- lang = validate_language(get_lang())
- gettext_conf = {'domain': 'kimchi',
- 'localedir': paths.mo_dir,
- 'lang': [lang]}
- params['lang'] = gettext_conf
- return Template(file=filename, searchList=params).respond()
- except OSError, e:
- if e.errno == errno.ENOENT:
- raise cherrypy.HTTPError(404)
- else:
- raise
+ return render_cheetah_file(resource, data)
else:
raise cherrypy.HTTPError(406)
1:18 p.m.
New subject: [PATCH V5 3/7] Update the i18n tmpl to produce JSON
Reviewed-by: Daniel Barboza <danielhb(a)linux.vnet.ibm.com>
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Remove html tags from i18n as they are not valid
Correct object definition from acceptable JS to valid JSON replacing
' with " in attribute names.
Update root.py to make Cheetah render the JSON template.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/pages/i18n.html.tmpl | 178 ------------------------------------------------
ui/pages/i18n.json.tmpl | 165 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 165 insertions(+), 178 deletions(-)
delete mode 100644 ui/pages/i18n.html.tmpl
create mode 100644 ui/pages/i18n.json.tmpl
diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
deleted file mode 100644
index 25b81c2..0000000
--- a/ui/pages/i18n.html.tmpl
+++ /dev/null
@@ -1,178 +0,0 @@
-#*
- * Project Kimchi
- *
- * Copyright IBM, Corp. 2013
- *
- * 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 kimchi.cachebust import href
-#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
-#silent _ = t.gettext
-#silent _t = t.gettext
-
-<!DOCTYPE html>
-<html class="no-js" lang=$lang.lang[0]>
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible"
content="IE=edge,chrome=1">
- <title>language</title>
-</head>
-<body>
-<script>
-var i18n = {
- 'KCHAUTH6001E': "$_("The username or password you entered is
incorrect. Please try again.")",
- 'KCHAUTH6002E': "$_("This field is required.")",
-
- 'KCHAUTH6001M': "$_("Log in")",
- 'KCHAUTH6002M': "$_("Logging in...")",
-
- 'Host': "$_("Host")",
- 'Guests': "$_("Guests")",
- 'Templates': "$_("Templates")",
- 'Storage': "$_("Storage")",
- 'Network': "$_("Network")",
-
- 'KCHAPI6001E': "$_("Invalid URL. Redireced to home
page.")",
- 'KCHAPI6002E': "$_("Failed to get application
configuration")",
- 'KCHAPI6003E': "$_("This is not a valid Linux path")",
- 'KCHAPI6004E': "$_("This is not a valid URL.")",
- 'KCHAPI6005E': "$_("No such data available.")",
- 'KCHAPI6006E': "$_("options needed.")",
- 'KCHAPI6007E': "$_("Can not contact the host system. Verify the
host system is up and that you have network connectivity to it. HTTP request response %1.
")",
-
- 'KCHAPI6001M': "$_("Delete Confirmation")",
- 'KCHAPI6002M': "$_("OK")",
- 'KCHAPI6003M': "$_("Cancel")",
- 'KCHAPI6004M': "$_("Confirm")",
- 'KCHAPI6005M': "$_("Create")",
- 'KCHAPI6006M': "$_("Warning")",
- 'KCHAPI6007M': "$_("Save")",
-
- 'KCHGRD6001M': "$_("Loading...")",
- 'KCHGRD6002M': "$_("An error occurs while checking for packages
update.")",
- 'KCHGRD6003M': "$_("Retry")",
- 'KCHGRD6004M': "$_("Detailed message:")",
-
- 'KCHTMPL6001W': "$_("No iso found")",
-
- 'KCHTMPL6002E': "$_("This is not a valid ISO file.")",
-
- 'KCHTMPL6002M': "$_("It will take long time. Do you want to
continue?")",
- 'KCHTMPL6003M': "$_("This will permanently delete the template.
Would you like to continue?")",
-
- 'KCHHOST6001E': "$_("Unable to shut down system as there are some
virtual machines running!")",
-
- 'KCHHOST6001M': "$_("Max:")",
- 'KCHHOST6002M': "$_("Utilization")",
- 'KCHHOST6003M': "$_("Available")",
- 'KCHHOST6004M': "$_("Read Rate")",
- 'KCHHOST6005M': "$_("Write Rate")",
- 'KCHHOST6006M': "$_("Received")",
- 'KCHHOST6007M': "$_("Sent")",
- 'KCHHOST6008M': "$_("Shutting down or restarting host will cause
unsaved work lost. Continue to shut down/restarting?")",
-
-
- 'KCHREPO6001M': "$_("Confirm")",
- 'KCHREPO6002M': "$_("Repository will be removed permanently and
can't be recovered. Do you want to continue?")",
- 'KCHREPO6003M': "$_("Repositories")",
- 'KCHREPO6004M': "$_("ID")",
- 'KCHREPO6005M': "$_("Name")",
- 'KCHREPO6006M': "$_("Base URL")",
- 'KCHREPO6007M': "$_("Is Mirror")",
- 'KCHREPO6008M': "$_("URL Args")",
- 'KCHREPO6009M': "$_("Enabled")",
- 'KCHREPO6010M': "$_("GPG Check")",
- 'KCHREPO6011M': "$_("GPG Key")",
- 'KCHREPO6012M': "$_("Add")",
- 'KCHREPO6013M': "$_("Edit")",
- 'KCHREPO6014M': "$_("Remove")",
- 'KCHREPO6015M': "$_("Failed.")",
- 'KCHREPO6016M': "$_("Enable")",
- 'KCHREPO6017M': "$_("Disable")",
-
-
- 'KCHUPD6001M': "$_("Software Updates")",
- 'KCHUPD6002M': "$_("Package Name")",
- 'KCHUPD6003M': "$_("Version")",
- 'KCHUPD6004M': "$_("Architecture")",
- 'KCHUPD6005M': "$_("Repository")",
- 'KCHUPD6006M': "$_("Update All")",
- 'KCHUPD6007M': "$_("Updating...")",
- 'KCHUPD6008M': "$_("Failed to retrieve updates.")",
- 'KCHUPD6009M': "$_("Failed to update package(s).")",
-
-
- 'KCHDR6001M': "$_("Debug report will be removed permanently and
can't be recovered. Do you want to continue?")",
- 'KCHDR6002M': "$_("Debug Reports")",
- 'KCHDR6003M': "$_("Name")",
- 'KCHDR6005M': "$_("Generated Time")",
- 'KCHDR6006M': "$_("Generate")",
- 'KCHDR6007M': "$_("Generating...")",
- 'KCHDR6008M': "$_("Rename")",
- 'KCHDR6009M': "$_("Remove")",
- 'KCHDR6010M': "$_("Download")",
- 'KCHDR6011M': "$_("Report name should contain only letters, digits
and/or hyphen ('-').")",
-
- 'KCHVM6001M': "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
- 'KCHVM6002M': "$_("Power off Confirmation")",
- 'KCHVM6003M': "$_("This action may produce undesirable results,
"
- "for example unflushed disk cache in the guest. "
- "Would you like to continue?")",
- 'KCHVM6004M': "$_("Reset Confirmation")",
- 'KCHVM6005M': "$_("There is a risk of data loss caused by reset
without"
- " the guest OS shutdown. Would you like to
continue?")",
- 'KCHVM6006M': "$_("Shut Down Confirmation")",
- 'KCHVM6007M': "$_("Note the guest OS may ignore this request.
Would you like to continue?")",
- 'KCHVM6008M': "$_("VM Delete Confirmation")",
-
- 'KCHVMCD6001M': "$_("This CDROM will be detached permanently and
you can re-attach it. Continue to detach it?")",
- 'KCHVMCD6002M': "$_("Attach")",
- 'KCHVMCD6003M': "$_("Attaching...")",
- 'KCHVMCD6004M': "$_("Replace")",
- 'KCHVMCD6005M': "$_("Replacing...")",
- 'KCHVMCD6006M': "$_("Successfully attached!")",
- 'KCHVMCD6007M': "$_("Successfully replaced!")",
- 'KCHVMCD6008M': "$_("Successfully detached!")",
-
-
- 'KCHNET6001E': "$_("The VLAN id must be between 1 and
4094.")",
-
- 'KCHNET6001M': "$_("unavailable")",
- 'KCHNET6002M': "$_("This action will interrupt network
connectivity for any virtual machine that depend on this network.")",
- 'KCHNET6003M': "$_("Create a network")",
- 'KCHNET6004M': "$_("This network is not persistent. Instead of
stop, this action will permanently delete it. Would you like to continue?")",
-
- 'KCHPOOL6001M': "$_("This will permanently delete the storage
pool. Would you like to continue?")",
- 'KCHPOOL6002M': "$_("This storage pool is empty.")",
- 'KCHPOOL6003M': "$_("It will format your disk and you will loose
any data in there, are you sure to continue? ")",
- 'KCHPOOL6004M': "$_("SCSI Fibre Channel")",
- 'KCHPOOL6005M': "$_("No SCSI adapters found.")",
-
- 'KCHPOOL6001E': "$_("The storage pool name can not be
blank.")",
- 'KCHPOOL6002E': "$_("The storage pool path can not be
blank.")",
- 'KCHPOOL6003E': "$_("NFS server mount path can not be
blank.")",
- 'KCHPOOL6004E': "$_("Invalid storage pool name. It should not
contain '/'.")",
- 'KCHPOOL6005E': "$_("Invalid NFS mount path.")",
- 'KCHPOOL6006E': "$_("No logical device selected.")",
- 'KCHPOOL6007E': "$_("The iSCSI target can not be
blank.")",
- 'KCHPOOL6008E': "$_("Server name can not be blank.")",
- 'KCHPOOL6009E': "$_("This is not a valid Server Name or IP.
please, modify it.")",
- 'KCHPOOL6010M': "$_("Looking for available partitions
...")",
- 'KCHPOOL6011M': "$_("No available partitions found.")",
- 'KCHPOOL6012M': "$_("This storage pool is not persistent. Instead
of deactivate, this action will permanently delete it. Would you like to
continue?")"
-};
-</script>
-</body>
-</html>
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..3ef488f
--- /dev/null
+++ b/ui/pages/i18n.json.tmpl
@@ -0,0 +1,165 @@
+#*
+ * Project Kimchi
+ *
+ * Copyright IBM, Corp. 2013
+ *
+ * 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 kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+ "KCHAUTH6001E": "$_("The username or password you entered is
incorrect. Please try again.")",
+ "KCHAUTH6002E": "$_("This field is required.")",
+
+ "KCHAUTH6001M": "$_("Log in")",
+ "KCHAUTH6002M": "$_("Logging in...")",
+
+ "Host": "$_("Host")",
+ "Guests": "$_("Guests")",
+ "Templates": "$_("Templates")",
+ "Storage": "$_("Storage")",
+ "Network": "$_("Network")",
+
+ "KCHAPI6001E": "$_("Invalid URL. Redireced to home
page.")",
+ "KCHAPI6002E": "$_("Failed to get application
configuration")",
+ "KCHAPI6003E": "$_("This is not a valid Linux
path")",
+ "KCHAPI6004E": "$_("This is not a valid URL.")",
+ "KCHAPI6005E": "$_("No such data available.")",
+ "KCHAPI6006E": "$_("options needed.")",
+ "KCHAPI6007E": "$_("Can not contact the host system. Verify the
host system is up and that you have network connectivity to it. HTTP request response %1.
")",
+
+ "KCHAPI6001M": "$_("Delete Confirmation")",
+ "KCHAPI6002M": "$_("OK")",
+ "KCHAPI6003M": "$_("Cancel")",
+ "KCHAPI6004M": "$_("Confirm")",
+ "KCHAPI6005M": "$_("Create")",
+ "KCHAPI6006M": "$_("Warning")",
+ "KCHAPI6007M": "$_("Save")",
+
+ "KCHGRD6001M": "$_("Loading...")",
+ "KCHGRD6002M": "$_("An error occurs while checking for packages
update.")",
+ "KCHGRD6003M": "$_("Retry")",
+ "KCHGRD6004M": "$_("Detailed message:")",
+
+ "KCHTMPL6001W": "$_("No iso found")",
+
+ "KCHTMPL6002E": "$_("This is not a valid ISO
file.")",
+
+ "KCHTMPL6002M": "$_("It will take long time. Do you want to
continue?")",
+ "KCHTMPL6003M": "$_("This will permanently delete the template.
Would you like to continue?")",
+
+ "KCHHOST6001E": "$_("Unable to shut down system as there are
some virtual machines running!")",
+
+ "KCHHOST6001M": "$_("Max:")",
+ "KCHHOST6002M": "$_("Utilization")",
+ "KCHHOST6003M": "$_("Available")",
+ "KCHHOST6004M": "$_("Read Rate")",
+ "KCHHOST6005M": "$_("Write Rate")",
+ "KCHHOST6006M": "$_("Received")",
+ "KCHHOST6007M": "$_("Sent")",
+ "KCHHOST6008M": "$_("Shutting down or restarting host will cause
unsaved work lost. Continue to shut down/restarting?")",
+
+
+ "KCHREPO6001M": "$_("Confirm")",
+ "KCHREPO6002M": "$_("Repository will be removed permanently and
can't be recovered. Do you want to continue?")",
+ "KCHREPO6003M": "$_("Repositories")",
+ "KCHREPO6004M": "$_("ID")",
+ "KCHREPO6005M": "$_("Name")",
+ "KCHREPO6006M": "$_("Base URL")",
+ "KCHREPO6007M": "$_("Is Mirror")",
+ "KCHREPO6008M": "$_("URL Args")",
+ "KCHREPO6009M": "$_("Enabled")",
+ "KCHREPO6010M": "$_("GPG Check")",
+ "KCHREPO6011M": "$_("GPG Key")",
+ "KCHREPO6012M": "$_("Add")",
+ "KCHREPO6013M": "$_("Edit")",
+ "KCHREPO6014M": "$_("Remove")",
+ "KCHREPO6015M": "$_("Failed.")",
+ "KCHREPO6016M": "$_("Enable")",
+ "KCHREPO6017M": "$_("Disable")",
+
+
+ "KCHUPD6001M": "$_("Software Updates")",
+ "KCHUPD6002M": "$_("Package Name")",
+ "KCHUPD6003M": "$_("Version")",
+ "KCHUPD6004M": "$_("Architecture")",
+ "KCHUPD6005M": "$_("Repository")",
+ "KCHUPD6006M": "$_("Update All")",
+ "KCHUPD6007M": "$_("Updating...")",
+ "KCHUPD6008M": "$_("Failed to retrieve updates.")",
+ "KCHUPD6009M": "$_("Failed to update package(s).")",
+
+
+ "KCHDR6001M": "$_("Debug report will be removed permanently and
can't be recovered. Do you want to continue?")",
+ "KCHDR6002M": "$_("Debug Reports")",
+ "KCHDR6003M": "$_("Name")",
+ "KCHDR6005M": "$_("Generated Time")",
+ "KCHDR6006M": "$_("Generate")",
+ "KCHDR6007M": "$_("Generating...")",
+ "KCHDR6008M": "$_("Rename")",
+ "KCHDR6009M": "$_("Remove")",
+ "KCHDR6010M": "$_("Download")",
+ "KCHDR6011M": "$_("Report name should contain only letters,
digits and/or hyphen ('-').")",
+
+ "KCHVM6001M": "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
+ "KCHVM6002M": "$_("Power off Confirmation")",
+ "KCHVM6003M": "$_("This action may produce undesirable results,
"
+ "for example unflushed disk cache in the guest. "
+ "Would you like to continue?")",
+ "KCHVM6004M": "$_("Reset Confirmation")",
+ "KCHVM6005M": "$_("There is a risk of data loss caused by reset
without"
+ " the guest OS shutdown. Would you like to
continue?")",
+ "KCHVM6006M": "$_("Shut Down Confirmation")",
+ "KCHVM6007M": "$_("Note the guest OS may ignore this request.
Would you like to continue?")",
+ "KCHVM6008M": "$_("VM Delete Confirmation")",
+
+ "KCHVMCD6001M": "$_("This CDROM will be detached permanently and
you can re-attach it. Continue to detach it?")",
+ "KCHVMCD6002M": "$_("Attach")",
+ "KCHVMCD6003M": "$_("Attaching...")",
+ "KCHVMCD6004M": "$_("Replace")",
+ "KCHVMCD6005M": "$_("Replacing...")",
+ "KCHVMCD6006M": "$_("Successfully attached!")",
+ "KCHVMCD6007M": "$_("Successfully replaced!")",
+ "KCHVMCD6008M": "$_("Successfully detached!")",
+
+
+ "KCHNET6001E": "$_("The VLAN id must be between 1 and
4094.")",
+
+ "KCHNET6001M": "$_("unavailable")",
+ "KCHNET6002M": "$_("This action will interrupt network
connectivity for any virtual machine that depend on this network.")",
+ "KCHNET6003M": "$_("Create a network")",
+ "KCHNET6004M": "$_("This network is not persistent. Instead of
stop, this action will permanently delete it. Would you like to continue?")",
+
+ "KCHPOOL6001M": "$_("This will permanently delete the storage
pool. Would you like to continue?")",
+ "KCHPOOL6002M": "$_("This storage pool is empty.")",
+ "KCHPOOL6003M": "$_("It will format your disk and you will loose
any data in there, are you sure to continue? ")",
+ "KCHPOOL6004M": "$_("SCSI Fibre Channel")",
+ "KCHPOOL6005M": "$_("No SCSI adapters found.")",
+
+ "KCHPOOL6001E": "$_("The storage pool name can not be
blank.")",
+ "KCHPOOL6002E": "$_("The storage pool path can not be
blank.")",
+ "KCHPOOL6003E": "$_("NFS server mount path can not be
blank.")",
+ "KCHPOOL6004E": "$_("Invalid storage pool name. It should not
contain '/'.")",
+ "KCHPOOL6005E": "$_("Invalid NFS mount path.")",
+ "KCHPOOL6006E": "$_("No logical device selected.")",
+ "KCHPOOL6007E": "$_("The iSCSI target can not be
blank.")",
+ "KCHPOOL6008E": "$_("Server name can not be
blank.")",
+ "KCHPOOL6009E": "$_("This is not a valid Server Name or IP.
please, modify it.")",
+ "KCHPOOL6010M": "$_("Looking for available partitions
...")",
+ "KCHPOOL6011M": "$_("No available partitions
found.")",
+ "KCHPOOL6012M": "$_("This storage pool is not persistent.
Instead of deactivate, this action will permanently delete it. Would you like to
continue?")"
+}
\ No newline at end of file
1:18 p.m.
New subject: [PATCH V5 4/7] Add JS API for fetching i18n JSON
Reviewed-by: Daniel Barboza <danielhb(a)linux.vnet.ibm.com>
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Create an API for fetching the i18n JSON.
Use the API to load the kimchi UI strings.
API will need to be simplified after convincing CherryPy to respond to the reque
st for JSON.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.api.js | 14 ++++++++++++++
ui/js/src/kimchi.main.js | 11 ++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js
index 072d127..ad89880 100644
--- a/ui/js/src/kimchi.api.js
+++ b/ui/js/src/kimchi.api.js
@@ -63,6 +63,20 @@ var kimchi = {
},
/**
+ * Get the i18 strings.
+ */
+ getI18n: function(suc, err, url, sync) {
+ kimchi.requestJSON({
+ url : url ? url : kimchi.url + 'i18n.json',
+ type : 'GET',
+ resend: true,
+ dataType : 'json',
+ success : suc,
+ error: err
+ });
+ },
+
+ /**
* Get the host static information.
*/
getHost: function(suc, err) {
diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
index 184029d..1e6602c 100644
--- a/ui/js/src/kimchi.main.js
+++ b/ui/js/src/kimchi.main.js
@@ -247,9 +247,14 @@ kimchi.main = function() {
};
// Load i18n translation strings first and then render the page.
- $('#main').load('i18n.html', function() {
- buildTabs(initUI);
- });
+ kimchi.getI18n(
+ function(i18nStrings){ //success
+ i18n = i18nStrings;
+ buildTabs(initUI);
+ },
+ function(data){ //error
+ kimchi.message.error(data.responseJSON.reason);
+ });
};
kimchi.getHelp = function(e) {
1:18 p.m.
New subject: [PATCH V5 5/7] Issue #342: load i18n.html of the plugin
Reviewed-by: Daniel Barboza <danielhb(a)linux.vnet.ibm.com>
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Apparently, in plugin code there is no way to insert new entries into
Kimchi ./ui/pages/i18n.json.tmpl, so every plugin should provide its own
i18n.json.tmpl.
each plugin provides a "plugins/plugin-name/ui/pages/i18n.json.tmpl",
and maps it to the URI "plugins/plugin-name/json.html". This is already
supported by the kimchi back-end. What we have to do is just to load
"plugins/plugin-name/i18n.json" in the front-end code.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.api.js | 4 +++-
ui/js/src/kimchi.main.js | 13 +++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js
index ad89880..0d96d07 100644
--- a/ui/js/src/kimchi.api.js
+++ b/ui/js/src/kimchi.api.js
@@ -71,6 +71,7 @@ var kimchi = {
type : 'GET',
resend: true,
dataType : 'json',
+ async : !sync,
success : suc,
error: err
});
@@ -560,13 +561,14 @@ var kimchi = {
});
},
- listPlugins : function(suc, err) {
+ listPlugins : function(suc, err, sync) {
kimchi.requestJSON({
url : kimchi.url + 'plugins',
type : 'GET',
contentType : 'application/json',
dataType : 'json',
resend: true,
+ async : !sync,
success : suc,
error : err
});
diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
index 1e6602c..eb4575a 100644
--- a/ui/js/src/kimchi.main.js
+++ b/ui/js/src/kimchi.main.js
@@ -39,7 +39,7 @@ kimchi.main = function() {
$(xmlData).find('tab').each(function() {
var $tab = $(this);
var titleKey = $tab.find('title').text();
- var title = i18n[titleKey];
+ var title = i18n[titleKey] ? i18n[titleKey] : titleKey;
var path = $tab.find('path').text();
tabs.push({
title: title,
@@ -64,6 +64,7 @@ kimchi.main = function() {
var tabConfigUrl = '/config/ui/tabs.xml';
var pluginConfigUrl = '/plugins/{plugin}/ui/config/tab-ext.xml';
+ var pluginI18nUrl = 'plugins/{plugin}/i18n.json';
var DEFAULT_HASH;
var buildTabs = function(callback) {
var tabs = retrieveTabs(tabConfigUrl);
@@ -72,6 +73,12 @@ kimchi.main = function() {
var url = kimchi.substitute(pluginConfigUrl, {
plugin: p
});
+ var i18nUrl = kimchi.substitute(pluginI18nUrl, {
+ plugin: p
+ });
+ kimchi.getI18n(function(i18nObj){ $.extend(i18n, i18nObj)},
+ function(i18nObj){ //i18n is not define by plugin
+ }, i18nUrl, true);
tabs.push.apply(tabs, retrieveTabs(url));
});
@@ -85,7 +92,9 @@ kimchi.main = function() {
$('#nav-menu').append(genTabs(tabs));
callback && callback();
- });
+ }, function(data) {
+ kimchi.message.error(data.responseJSON.reason);
+ }, true);
};
var onLanguageChanged = function(lang) {
1:18 p.m.
New subject: [PATCH V5 6/7] add an optional to toggle the sample plugin
Reviewed-by: Daniel Barboza <danielhb(a)linux.vnet.ibm.com>
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
sample plugin is used to test as a plugin demo.
we disable it by default.
use this command to enable sample plugin
$ ./autogen.sh --enable-plugins
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
configure.ac | 17 +++++++++++++++++
plugins/sample/Makefile.am | 2 +-
plugins/sample/{sample.conf => sample.conf.in} | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
rename plugins/sample/{sample.conf => sample.conf.in} (91%)
diff --git a/configure.ac b/configure.ac
index cc971e8..2594829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,22 @@ if test "x$PYFLAKES" = "x"; then
AC_MSG_WARN([pyflakes not found])
fi
+AC_ARG_ENABLE(
+ [sample],
+ [AS_HELP_STRING(
+ [--enable-sample],
+ [build sample plugin package @<:@default=no@:>@]
+ )],
+ ,
+ [enable_sample="no"]
+)
+
+# AM_CONDITIONAL([SAMPLE], [test "${enable_sample}" = "yes"])
+if test "${enable_sample}" = "yes"; then
+AC_SUBST([ENABLE_SAMPLE], [True])
+else
+AC_SUBST([ENABLE_SAMPLE], [False])
+fi
AC_CONFIG_FILES([
po/Makefile.in
@@ -62,6 +78,7 @@ AC_CONFIG_FILES([
src/kimchi/model/Makefile
plugins/Makefile
plugins/sample/Makefile
+ plugins/sample/sample.conf
plugins/sample/ui/Makefile
plugins/sample/ui/config/Makefile
ui/Makefile
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index e03a4c0..a229244 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -19,4 +19,4 @@
SUBDIRS = ui
-EXTRA_DIST = API.json sample.conf $(wildcard *.py)
+EXTRA_DIST = API.json sample.conf.in $(wildcard *.py)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf.in
similarity index 91%
rename from plugins/sample/sample.conf
rename to plugins/sample/sample.conf.in
index 78a9f4e..f890983 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf.in
@@ -1,5 +1,5 @@
[kimchi]
-enable = True
+enable = @ENABLE_SAMPLE@
plugin_class = "Drawings"
uri = "/plugins/sample"
1:19 p.m.
New subject: [PATCH V5 7/7] generate the translation files for plugins/sample
Reviewed-by: Daniel Barboza <danielhb(a)linux.vnet.ibm.com>
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
please use this command to generate the translation files for
plugins/sample
$ make -C plugins/sample/po/ update-po
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
configure.ac | 1 +
plugins/sample/Makefile.am | 9 ++++++++-
plugins/sample/config.status | 1 +
plugins/sample/po/LINGUAS | 1 +
plugins/sample/po/Makefile.in.in | 1 +
plugins/sample/po/Makevars | 1 +
plugins/sample/po/POTFILES.in | 2 ++
plugins/sample/po/en_US.po | 21 +++++++++++++++++++++
plugins/sample/po/gen-pot | 1 +
plugins/sample/po/pt_BR.po | 24 ++++++++++++++++++++++++
plugins/sample/po/zh_CN.po | 24 ++++++++++++++++++++++++
11 files changed, 85 insertions(+), 1 deletion(-)
create mode 120000 plugins/sample/config.status
create mode 120000 plugins/sample/po/LINGUAS
create mode 120000 plugins/sample/po/Makefile.in.in
create mode 120000 plugins/sample/po/Makevars
create mode 100644 plugins/sample/po/POTFILES.in
create mode 100644 plugins/sample/po/en_US.po
create mode 120000 plugins/sample/po/gen-pot
create mode 100644 plugins/sample/po/pt_BR.po
create mode 100644 plugins/sample/po/zh_CN.po
diff --git a/configure.ac b/configure.ac
index 2594829..add7b1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,7 @@ AC_CONFIG_FILES([
src/kimchi/model/Makefile
plugins/Makefile
plugins/sample/Makefile
+ plugins/sample/po/Makefile.in
plugins/sample/sample.conf
plugins/sample/ui/Makefile
plugins/sample/ui/config/Makefile
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index a229244..1627cc6 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -17,6 +17,13 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-SUBDIRS = ui
+SUBDIRS = ui po
EXTRA_DIST = API.json sample.conf.in $(wildcard *.py)
+
+all-local:
+ while read L && test -n "$$L"; do \
+ dir=mo/$$L/LC_MESSAGES ; \
+ $(MKDIR_P) $$dir ; \
+ ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ; \
+ done < po/LINGUAS
diff --git a/plugins/sample/config.status b/plugins/sample/config.status
new file mode 120000
index 0000000..6cd6b4f
--- /dev/null
+++ b/plugins/sample/config.status
@@ -0,0 +1 @@
+../../config.status
\ No newline at end of file
diff --git a/plugins/sample/po/LINGUAS b/plugins/sample/po/LINGUAS
new file mode 120000
index 0000000..4fb83a5
--- /dev/null
+++ b/plugins/sample/po/LINGUAS
@@ -0,0 +1 @@
+../../../po/LINGUAS
\ No newline at end of file
diff --git a/plugins/sample/po/Makefile.in.in b/plugins/sample/po/Makefile.in.in
new file mode 120000
index 0000000..44028c0
--- /dev/null
+++ b/plugins/sample/po/Makefile.in.in
@@ -0,0 +1 @@
+../../../po/Makefile.in.in
\ No newline at end of file
diff --git a/plugins/sample/po/Makevars b/plugins/sample/po/Makevars
new file mode 120000
index 0000000..3b6b02f
--- /dev/null
+++ b/plugins/sample/po/Makevars
@@ -0,0 +1 @@
+../../../po/Makevars
\ No newline at end of file
diff --git a/plugins/sample/po/POTFILES.in b/plugins/sample/po/POTFILES.in
new file mode 100644
index 0000000..f1b069f
--- /dev/null
+++ b/plugins/sample/po/POTFILES.in
@@ -0,0 +1,2 @@
+# List of source files which contain translatable strings.
+ui/pages/*.tmpl
diff --git a/plugins/sample/po/en_US.po b/plugins/sample/po/en_US.po
new file mode 100644
index 0000000..1889845
--- /dev/null
+++ b/plugins/sample/po/en_US.po
@@ -0,0 +1,21 @@
+# English translations for kimchi package.
+# Copyright (C) 2014 THE kimchi'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kimchi package.
+# shhfeng <shaohef(a)linux.vnet.ibm.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 1.2.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-17 02:13+0800\n"
+"PO-Revision-Date: 2014-05-17 02:08+0800\n"
+"Last-Translator: shhfeng <shaohef(a)linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+msgid "SampleTab"
+msgstr "SampleTab"
diff --git a/plugins/sample/po/gen-pot b/plugins/sample/po/gen-pot
new file mode 120000
index 0000000..b449d56
--- /dev/null
+++ b/plugins/sample/po/gen-pot
@@ -0,0 +1 @@
+../../../po/gen-pot
\ No newline at end of file
diff --git a/plugins/sample/po/pt_BR.po b/plugins/sample/po/pt_BR.po
new file mode 100644
index 0000000..0ff1d43
--- /dev/null
+++ b/plugins/sample/po/pt_BR.po
@@ -0,0 +1,24 @@
+# Portuguese translations for kimchi package
+# Copyright (C) 2014 THE kimchi'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kimchi package.
+# shhfeng <shaohef(a)linux.vnet.ibm.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 1.2.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-17 02:13+0800\n"
+"PO-Revision-Date: 2014-05-17 02:09+0800\n"
+"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
+"Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"X-Poedit-Country: Brazil\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "SampleTab"
+msgstr "Tab de exemplo"
diff --git a/plugins/sample/po/zh_CN.po b/plugins/sample/po/zh_CN.po
new file mode 100644
index 0000000..bba53c3
--- /dev/null
+++ b/plugins/sample/po/zh_CN.po
@@ -0,0 +1,24 @@
+# Chinese translations for kimchi package
+# Copyright (C) 2014 THE kimchi'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kimchi package.
+# shhfeng <shaohef(a)linux.vnet.ibm.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 1.2.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-17 02:13+0800\n"
+"PO-Revision-Date: 2014-05-17 02:10+0800\n"
+"Last-Translator: shhfeng <shaohef(a)linux.vnet.ibm.com>\n"
+"Language-Team: Chinese (simplified)\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "SampleTab"
+msgstr "示例标签"
9:09 p.m.
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V4 -> V5:
let autoconf generate sample.conf
V3 -> V4:
rebase
V2 -> V3:
change "enable-plugins" to "enable-sample"
remove nls
improve the Portuguese translation.
V1 -> V2:
The improvement concept here is to directly generate JSON on the server
and assign it to the i18n variable, rather than inserting nodes into the DOM.
Plugins would use a plugin1.i18n= structure to keep plugin strings from
colliding with each other, or with the kimchi variables.
ShaoHe Feng (6):
Update root.py to make Cheetah render the JSON template.
Update the i18n tmpl to produce JSON
Add JS API for fetching i18n JSON
Issue #342: load i18n.html of the plugin
add an optional to toggle the sample plugin
generate the translation files for plugins/sample
Zhou Zheng Sheng (1):
Add Minimal UI Page for the Sample Plugin
configure.ac | 18 ++++
plugins/sample/Makefile.am | 11 +-
plugins/sample/__init__.py | 3 +-
plugins/sample/config.status | 1 +
plugins/sample/po/LINGUAS | 1 +
plugins/sample/po/Makefile.in.in | 1 +
plugins/sample/po/Makevars | 1 +
plugins/sample/po/POTFILES.in | 2 +
plugins/sample/po/en_US.po | 21 ++++
plugins/sample/po/gen-pot | 1 +
plugins/sample/po/pt_BR.po | 24 +++++
plugins/sample/po/zh_CN.po | 24 +++++
plugins/sample/sample.conf | 7 --
plugins/sample/sample.conf.in | 12 +++
plugins/sample/ui/config/tab-ext.xml | 8 +-
plugins/sample/ui/pages/i18n.json.tmpl | 9 ++
plugins/sample/ui/pages/tab.html.tmpl | 6 ++
src/kimchi/root.py | 5 +
src/kimchi/template.py | 34 ++++---
ui/js/src/kimchi.api.js | 18 +++-
ui/js/src/kimchi.main.js | 24 ++++-
ui/pages/i18n.html.tmpl | 178 ---------------------------------
ui/pages/i18n.json.tmpl | 165 ++++++++++++++++++++++++++++++
23 files changed, 361 insertions(+), 213 deletions(-)
create mode 120000 plugins/sample/config.status
create mode 120000 plugins/sample/po/LINGUAS
create mode 120000 plugins/sample/po/Makefile.in.in
create mode 120000 plugins/sample/po/Makevars
create mode 100644 plugins/sample/po/POTFILES.in
create mode 100644 plugins/sample/po/en_US.po
create mode 120000 plugins/sample/po/gen-pot
create mode 100644 plugins/sample/po/pt_BR.po
create mode 100644 plugins/sample/po/zh_CN.po
delete mode 100644 plugins/sample/sample.conf
create mode 100644 plugins/sample/sample.conf.in
create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
delete mode 100644 ui/pages/i18n.html.tmpl
create mode 100644 ui/pages/i18n.json.tmpl
The tests are failing:
======================================================================
FAIL: test_bad_params (test_plugin.PluginTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/alinefm/kimchi/tests/test_plugin.py", line 114, in
test_bad_params
self.assertEquals(400, resp.status)
AssertionError: 400 != 404
======================================================================
FAIL: test_rectangles (test_plugin.PluginTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/alinefm/kimchi/tests/test_plugin.py", line 87, in
test_rectangles
self._create_rectangle_and_assert('small', 10, 8)
File "/home/alinefm/kimchi/tests/test_plugin.py", line 72, in
_create_rectangle_and_assert
self.assertEquals(201, resp.status)
AssertionError: 201 != 404
----------------------------------------------------------------------
Ran 159 tests in 181.016s
FAILED (failures=2)
[09/Jun/2014:16:05:11] ENGINE Waiting for child threads to terminate...
make[3]: *** [check-local] Error 1
make[3]: Leaving directory `/home/alinefm/kimchi/tests'
make[2]: *** [check-am] Error 2
make[2]: Leaving directory `/home/alinefm/kimchi/tests'
make[1]: *** [check] Error 2
make[1]: Leaving directory `/home/alinefm/kimchi/tests'
make: *** [check-recursive] Error 1
9:21 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Add minimal UI just enough to re-produce issue 342.
https://github.com/kimchi-project/kimchi/issues/342
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
plugins/sample/__init__.py | 3 ++-
plugins/sample/sample.conf | 5 +++++
plugins/sample/ui/config/tab-ext.xml | 8 ++++----
plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
5 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 3183898..2101aed 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -26,6 +26,7 @@
from kimchi.config import PluginPaths
from kimchi.control.base import Collection, Resource
+from kimchi.root import Root
from plugins.sample.i18n import messages
from plugins.sample.model import Model
@@ -33,7 +34,7 @@
model = Model()
-class Drawings(Resource):
+class Drawings(Root):
def __init__(self):
Resource.__init__(self, model)
self.description = Description(model)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
index c4e80f7..78a9f4e 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf
@@ -5,3 +5,8 @@ uri = "/plugins/sample"
[/]
tools.trailing_slash.on = False
+tools.sessions.on = True
+tools.sessions.name = 'kimchi'
+tools.sessions.httponly = True
+tools.sessions.locking = 'explicit'
+tools.sessions.storage_type = 'ram'
diff --git a/plugins/sample/ui/config/tab-ext.xml b/plugins/sample/ui/config/tab-ext.xml
index 948fa07..8e0b3d3 100644
--- a/plugins/sample/ui/config/tab-ext.xml
+++ b/plugins/sample/ui/config/tab-ext.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--<tabs-ext>
+<tabs-ext>
<tab>
- <title>Test</title>
- <filePath>plugins/sample/ui/tab.html</filePath>
+ <title>SampleTab</title>
+ <path>plugins/sample/tab.html</path>
The UI files should be in a dedicated dir, as we have for kimchi
And we could remove tab.html (which does not have any meaning) to
sampleplugin.html or something like that
</tab>
-</tabs-ext>-->
\ No newline at end of file
+</tabs-ext>
diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
b/plugins/sample/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..a153e2d
--- /dev/null
+++ b/plugins/sample/ui/pages/i18n.json.tmpl
@@ -0,0 +1,9 @@
+#unicode UTF-8
+#import gettext
+#from kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+ "SampleTab": "$_("SampleTab")"
+}
diff --git a/plugins/sample/ui/pages/tab.html.tmpl
b/plugins/sample/ui/pages/tab.html.tmpl
new file mode 100644
index 0000000..49fc4ec
--- /dev/null
+++ b/plugins/sample/ui/pages/tab.html.tmpl
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+Hello, world
+</body>
+</html>
9:22 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Add minimal UI just enough to re-produce issue 342.
https://github.com/kimchi-project/kimchi/issues/342
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
plugins/sample/__init__.py | 3 ++-
plugins/sample/sample.conf | 5 +++++
plugins/sample/ui/config/tab-ext.xml | 8 ++++----
plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
5 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 3183898..2101aed 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -26,6 +26,7 @@
from kimchi.config import PluginPaths
from kimchi.control.base import Collection, Resource
+from kimchi.root import Root
from plugins.sample.i18n import messages
from plugins.sample.model import Model
@@ -33,7 +34,7 @@
model = Model()
-class Drawings(Resource):
+class Drawings(Root):
def __init__(self):
Resource.__init__(self, model)
self.description = Description(model)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
index c4e80f7..78a9f4e 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf
@@ -5,3 +5,8 @@ uri = "/plugins/sample"
[/]
tools.trailing_slash.on = False
+tools.sessions.on = True
+tools.sessions.name = 'kimchi'
+tools.sessions.httponly = True
+tools.sessions.locking = 'explicit'
+tools.sessions.storage_type = 'ram'
diff --git a/plugins/sample/ui/config/tab-ext.xml b/plugins/sample/ui/config/tab-ext.xml
index 948fa07..8e0b3d3 100644
--- a/plugins/sample/ui/config/tab-ext.xml
+++ b/plugins/sample/ui/config/tab-ext.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--<tabs-ext>
+<tabs-ext>
<tab>
- <title>Test</title>
- <filePath>plugins/sample/ui/tab.html</filePath>
+ <title>SampleTab</title>
+ <path>plugins/sample/tab.html</path>
</tab>
-</tabs-ext>-->
\ No newline at end of file
+</tabs-ext>
diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
b/plugins/sample/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..a153e2d
--- /dev/null
+++ b/plugins/sample/ui/pages/i18n.json.tmpl
@@ -0,0 +1,9 @@
+#unicode UTF-8
+#import gettext
+#from kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+ "SampleTab": "$_("SampleTab")"
+}
What is it for?
Will it be base for all the plugin templates?
diff --git a/plugins/sample/ui/pages/tab.html.tmpl
b/plugins/sample/ui/pages/tab.html.tmpl
new file mode 100644
index 0000000..49fc4ec
--- /dev/null
+++ b/plugins/sample/ui/pages/tab.html.tmpl
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+Hello, world
+</body>
+</html>
9:23 p.m.
New subject: [PATCH V5 2/7] Update root.py to make Cheetah render the JSON template.
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
when the request are json files, set the Content-Type as
application/json.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
src/kimchi/root.py | 5 +++++
src/kimchi/template.py | 34 +++++++++++++++++++---------------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/kimchi/root.py b/src/kimchi/root.py
index 8b1d09b..1cebfd1 100644
--- a/src/kimchi/root.py
+++ b/src/kimchi/root.py
@@ -82,6 +82,11 @@ def get(self):
def default(self, page, **kwargs):
if page.endswith('.html'):
return template.render(page, None)
+ if page.endswith('.json'):
+ cherrypy.response.headers['Content-Type'] = \
+ 'application/json;charset=utf-8'
+ context = template.render_cheetah_file(page, None)
+ return context.encode("utf-8")
raise cherrypy.HTTPError(404)
Why is it needed for the plugins as kimchi does not make use of it?
@cherrypy.expose
diff --git a/src/kimchi/template.py b/src/kimchi/template.py
index 60cd818..146e735 100644
--- a/src/kimchi/template.py
+++ b/src/kimchi/template.py
@@ -82,26 +82,30 @@ def can_accept_html():
can_accept('*/*')
+def render_cheetah_file(resource, data):
+ paths = cherrypy.request.app.root.paths
+ filename = paths.get_template_path(resource)
+ try:
+ params = {'data': data}
+ lang = validate_language(get_lang())
+ gettext_conf = {'domain': 'kimchi',
+ 'localedir': paths.mo_dir,
+ 'lang': [lang]}
+ params['lang'] = gettext_conf
+ return Template(file=filename, searchList=params).respond()
+ except OSError, e:
+ if e.errno == errno.ENOENT:
+ raise cherrypy.HTTPError(404)
+ else:
+ raise
+
+
def render(resource, data):
if can_accept('application/json'):
cherrypy.response.headers['Content-Type'] = \
'application/json;charset=utf-8'
return json.dumps(data, indent=2, separators=(',', ':'))
elif can_accept_html():
- paths = cherrypy.request.app.root.paths
- filename = paths.get_template_path(resource)
- try:
- params = {'data': data}
- lang = validate_language(get_lang())
- gettext_conf = {'domain': 'kimchi',
- 'localedir': paths.mo_dir,
- 'lang': [lang]}
- params['lang'] = gettext_conf
- return Template(file=filename, searchList=params).respond()
- except OSError, e:
- if e.errno == errno.ENOENT:
- raise cherrypy.HTTPError(404)
- else:
- raise
+ return render_cheetah_file(resource, data)
else:
raise cherrypy.HTTPError(406)
9:25 p.m.
New subject: [PATCH V5 3/7] Update the i18n tmpl to produce JSON
Oh.. now my questions about the JSON are answered! =)
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Remove html tags from i18n as they are not valid
Correct object definition from acceptable JS to valid JSON replacing
' with " in attribute names.
Update root.py to make Cheetah render the JSON template.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/pages/i18n.html.tmpl | 178 ------------------------------------------------
ui/pages/i18n.json.tmpl | 165 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 165 insertions(+), 178 deletions(-)
delete mode 100644 ui/pages/i18n.html.tmpl
create mode 100644 ui/pages/i18n.json.tmpl
diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
deleted file mode 100644
index 25b81c2..0000000
--- a/ui/pages/i18n.html.tmpl
+++ /dev/null
@@ -1,178 +0,0 @@
-#*
- * Project Kimchi
- *
- * Copyright IBM, Corp. 2013
- *
- * 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 kimchi.cachebust import href
-#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
-#silent _ = t.gettext
-#silent _t = t.gettext
-
-<!DOCTYPE html>
-<html class="no-js" lang=$lang.lang[0]>
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible"
content="IE=edge,chrome=1">
- <title>language</title>
-</head>
-<body>
-<script>
-var i18n = {
- 'KCHAUTH6001E': "$_("The username or password you entered is
incorrect. Please try again.")",
- 'KCHAUTH6002E': "$_("This field is required.")",
-
- 'KCHAUTH6001M': "$_("Log in")",
- 'KCHAUTH6002M': "$_("Logging in...")",
-
- 'Host': "$_("Host")",
- 'Guests': "$_("Guests")",
- 'Templates': "$_("Templates")",
- 'Storage': "$_("Storage")",
- 'Network': "$_("Network")",
-
- 'KCHAPI6001E': "$_("Invalid URL. Redireced to home
page.")",
- 'KCHAPI6002E': "$_("Failed to get application
configuration")",
- 'KCHAPI6003E': "$_("This is not a valid Linux path")",
- 'KCHAPI6004E': "$_("This is not a valid URL.")",
- 'KCHAPI6005E': "$_("No such data available.")",
- 'KCHAPI6006E': "$_("options needed.")",
- 'KCHAPI6007E': "$_("Can not contact the host system. Verify the
host system is up and that you have network connectivity to it. HTTP request response %1.
")",
-
- 'KCHAPI6001M': "$_("Delete Confirmation")",
- 'KCHAPI6002M': "$_("OK")",
- 'KCHAPI6003M': "$_("Cancel")",
- 'KCHAPI6004M': "$_("Confirm")",
- 'KCHAPI6005M': "$_("Create")",
- 'KCHAPI6006M': "$_("Warning")",
- 'KCHAPI6007M': "$_("Save")",
-
- 'KCHGRD6001M': "$_("Loading...")",
- 'KCHGRD6002M': "$_("An error occurs while checking for packages
update.")",
- 'KCHGRD6003M': "$_("Retry")",
- 'KCHGRD6004M': "$_("Detailed message:")",
-
- 'KCHTMPL6001W': "$_("No iso found")",
-
- 'KCHTMPL6002E': "$_("This is not a valid ISO file.")",
-
- 'KCHTMPL6002M': "$_("It will take long time. Do you want to
continue?")",
- 'KCHTMPL6003M': "$_("This will permanently delete the template.
Would you like to continue?")",
-
- 'KCHHOST6001E': "$_("Unable to shut down system as there are some
virtual machines running!")",
-
- 'KCHHOST6001M': "$_("Max:")",
- 'KCHHOST6002M': "$_("Utilization")",
- 'KCHHOST6003M': "$_("Available")",
- 'KCHHOST6004M': "$_("Read Rate")",
- 'KCHHOST6005M': "$_("Write Rate")",
- 'KCHHOST6006M': "$_("Received")",
- 'KCHHOST6007M': "$_("Sent")",
- 'KCHHOST6008M': "$_("Shutting down or restarting host will cause
unsaved work lost. Continue to shut down/restarting?")",
-
-
- 'KCHREPO6001M': "$_("Confirm")",
- 'KCHREPO6002M': "$_("Repository will be removed permanently and
can't be recovered. Do you want to continue?")",
- 'KCHREPO6003M': "$_("Repositories")",
- 'KCHREPO6004M': "$_("ID")",
- 'KCHREPO6005M': "$_("Name")",
- 'KCHREPO6006M': "$_("Base URL")",
- 'KCHREPO6007M': "$_("Is Mirror")",
- 'KCHREPO6008M': "$_("URL Args")",
- 'KCHREPO6009M': "$_("Enabled")",
- 'KCHREPO6010M': "$_("GPG Check")",
- 'KCHREPO6011M': "$_("GPG Key")",
- 'KCHREPO6012M': "$_("Add")",
- 'KCHREPO6013M': "$_("Edit")",
- 'KCHREPO6014M': "$_("Remove")",
- 'KCHREPO6015M': "$_("Failed.")",
- 'KCHREPO6016M': "$_("Enable")",
- 'KCHREPO6017M': "$_("Disable")",
-
-
- 'KCHUPD6001M': "$_("Software Updates")",
- 'KCHUPD6002M': "$_("Package Name")",
- 'KCHUPD6003M': "$_("Version")",
- 'KCHUPD6004M': "$_("Architecture")",
- 'KCHUPD6005M': "$_("Repository")",
- 'KCHUPD6006M': "$_("Update All")",
- 'KCHUPD6007M': "$_("Updating...")",
- 'KCHUPD6008M': "$_("Failed to retrieve updates.")",
- 'KCHUPD6009M': "$_("Failed to update package(s).")",
-
-
- 'KCHDR6001M': "$_("Debug report will be removed permanently and
can't be recovered. Do you want to continue?")",
- 'KCHDR6002M': "$_("Debug Reports")",
- 'KCHDR6003M': "$_("Name")",
- 'KCHDR6005M': "$_("Generated Time")",
- 'KCHDR6006M': "$_("Generate")",
- 'KCHDR6007M': "$_("Generating...")",
- 'KCHDR6008M': "$_("Rename")",
- 'KCHDR6009M': "$_("Remove")",
- 'KCHDR6010M': "$_("Download")",
- 'KCHDR6011M': "$_("Report name should contain only letters, digits
and/or hyphen ('-').")",
-
- 'KCHVM6001M': "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
- 'KCHVM6002M': "$_("Power off Confirmation")",
- 'KCHVM6003M': "$_("This action may produce undesirable results,
"
- "for example unflushed disk cache in the guest. "
- "Would you like to continue?")",
- 'KCHVM6004M': "$_("Reset Confirmation")",
- 'KCHVM6005M': "$_("There is a risk of data loss caused by reset
without"
- " the guest OS shutdown. Would you like to
continue?")",
- 'KCHVM6006M': "$_("Shut Down Confirmation")",
- 'KCHVM6007M': "$_("Note the guest OS may ignore this request.
Would you like to continue?")",
- 'KCHVM6008M': "$_("VM Delete Confirmation")",
-
- 'KCHVMCD6001M': "$_("This CDROM will be detached permanently and
you can re-attach it. Continue to detach it?")",
- 'KCHVMCD6002M': "$_("Attach")",
- 'KCHVMCD6003M': "$_("Attaching...")",
- 'KCHVMCD6004M': "$_("Replace")",
- 'KCHVMCD6005M': "$_("Replacing...")",
- 'KCHVMCD6006M': "$_("Successfully attached!")",
- 'KCHVMCD6007M': "$_("Successfully replaced!")",
- 'KCHVMCD6008M': "$_("Successfully detached!")",
-
-
- 'KCHNET6001E': "$_("The VLAN id must be between 1 and
4094.")",
-
- 'KCHNET6001M': "$_("unavailable")",
- 'KCHNET6002M': "$_("This action will interrupt network
connectivity for any virtual machine that depend on this network.")",
- 'KCHNET6003M': "$_("Create a network")",
- 'KCHNET6004M': "$_("This network is not persistent. Instead of
stop, this action will permanently delete it. Would you like to continue?")",
-
- 'KCHPOOL6001M': "$_("This will permanently delete the storage
pool. Would you like to continue?")",
- 'KCHPOOL6002M': "$_("This storage pool is empty.")",
- 'KCHPOOL6003M': "$_("It will format your disk and you will loose
any data in there, are you sure to continue? ")",
- 'KCHPOOL6004M': "$_("SCSI Fibre Channel")",
- 'KCHPOOL6005M': "$_("No SCSI adapters found.")",
-
- 'KCHPOOL6001E': "$_("The storage pool name can not be
blank.")",
- 'KCHPOOL6002E': "$_("The storage pool path can not be
blank.")",
- 'KCHPOOL6003E': "$_("NFS server mount path can not be
blank.")",
- 'KCHPOOL6004E': "$_("Invalid storage pool name. It should not
contain '/'.")",
- 'KCHPOOL6005E': "$_("Invalid NFS mount path.")",
- 'KCHPOOL6006E': "$_("No logical device selected.")",
- 'KCHPOOL6007E': "$_("The iSCSI target can not be
blank.")",
- 'KCHPOOL6008E': "$_("Server name can not be blank.")",
- 'KCHPOOL6009E': "$_("This is not a valid Server Name or IP.
please, modify it.")",
- 'KCHPOOL6010M': "$_("Looking for available partitions
...")",
- 'KCHPOOL6011M': "$_("No available partitions found.")",
- 'KCHPOOL6012M': "$_("This storage pool is not persistent. Instead
of deactivate, this action will permanently delete it. Would you like to
continue?")"
-};
-</script>
-</body>
-</html>
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..3ef488f
--- /dev/null
+++ b/ui/pages/i18n.json.tmpl
@@ -0,0 +1,165 @@
+#*
+ * Project Kimchi
+ *
+ * Copyright IBM, Corp. 2013
+ *
+ * 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 kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+ "KCHAUTH6001E": "$_("The username or password you entered is
incorrect. Please try again.")",
+ "KCHAUTH6002E": "$_("This field is required.")",
+
+ "KCHAUTH6001M": "$_("Log in")",
+ "KCHAUTH6002M": "$_("Logging in...")",
+
+ "Host": "$_("Host")",
+ "Guests": "$_("Guests")",
+ "Templates": "$_("Templates")",
+ "Storage": "$_("Storage")",
+ "Network": "$_("Network")",
+
+ "KCHAPI6001E": "$_("Invalid URL. Redireced to home
page.")",
+ "KCHAPI6002E": "$_("Failed to get application
configuration")",
+ "KCHAPI6003E": "$_("This is not a valid Linux
path")",
+ "KCHAPI6004E": "$_("This is not a valid URL.")",
+ "KCHAPI6005E": "$_("No such data available.")",
+ "KCHAPI6006E": "$_("options needed.")",
+ "KCHAPI6007E": "$_("Can not contact the host system. Verify the
host system is up and that you have network connectivity to it. HTTP request response %1.
")",
+
+ "KCHAPI6001M": "$_("Delete Confirmation")",
+ "KCHAPI6002M": "$_("OK")",
+ "KCHAPI6003M": "$_("Cancel")",
+ "KCHAPI6004M": "$_("Confirm")",
+ "KCHAPI6005M": "$_("Create")",
+ "KCHAPI6006M": "$_("Warning")",
+ "KCHAPI6007M": "$_("Save")",
+
+ "KCHGRD6001M": "$_("Loading...")",
+ "KCHGRD6002M": "$_("An error occurs while checking for packages
update.")",
+ "KCHGRD6003M": "$_("Retry")",
+ "KCHGRD6004M": "$_("Detailed message:")",
+
+ "KCHTMPL6001W": "$_("No iso found")",
+
+ "KCHTMPL6002E": "$_("This is not a valid ISO
file.")",
+
+ "KCHTMPL6002M": "$_("It will take long time. Do you want to
continue?")",
+ "KCHTMPL6003M": "$_("This will permanently delete the template.
Would you like to continue?")",
+
+ "KCHHOST6001E": "$_("Unable to shut down system as there are
some virtual machines running!")",
+
+ "KCHHOST6001M": "$_("Max:")",
+ "KCHHOST6002M": "$_("Utilization")",
+ "KCHHOST6003M": "$_("Available")",
+ "KCHHOST6004M": "$_("Read Rate")",
+ "KCHHOST6005M": "$_("Write Rate")",
+ "KCHHOST6006M": "$_("Received")",
+ "KCHHOST6007M": "$_("Sent")",
+ "KCHHOST6008M": "$_("Shutting down or restarting host will cause
unsaved work lost. Continue to shut down/restarting?")",
+
+
+ "KCHREPO6001M": "$_("Confirm")",
+ "KCHREPO6002M": "$_("Repository will be removed permanently and
can't be recovered. Do you want to continue?")",
+ "KCHREPO6003M": "$_("Repositories")",
+ "KCHREPO6004M": "$_("ID")",
+ "KCHREPO6005M": "$_("Name")",
+ "KCHREPO6006M": "$_("Base URL")",
+ "KCHREPO6007M": "$_("Is Mirror")",
+ "KCHREPO6008M": "$_("URL Args")",
+ "KCHREPO6009M": "$_("Enabled")",
+ "KCHREPO6010M": "$_("GPG Check")",
+ "KCHREPO6011M": "$_("GPG Key")",
+ "KCHREPO6012M": "$_("Add")",
+ "KCHREPO6013M": "$_("Edit")",
+ "KCHREPO6014M": "$_("Remove")",
+ "KCHREPO6015M": "$_("Failed.")",
+ "KCHREPO6016M": "$_("Enable")",
+ "KCHREPO6017M": "$_("Disable")",
+
+
+ "KCHUPD6001M": "$_("Software Updates")",
+ "KCHUPD6002M": "$_("Package Name")",
+ "KCHUPD6003M": "$_("Version")",
+ "KCHUPD6004M": "$_("Architecture")",
+ "KCHUPD6005M": "$_("Repository")",
+ "KCHUPD6006M": "$_("Update All")",
+ "KCHUPD6007M": "$_("Updating...")",
+ "KCHUPD6008M": "$_("Failed to retrieve updates.")",
+ "KCHUPD6009M": "$_("Failed to update package(s).")",
+
+
+ "KCHDR6001M": "$_("Debug report will be removed permanently and
can't be recovered. Do you want to continue?")",
+ "KCHDR6002M": "$_("Debug Reports")",
+ "KCHDR6003M": "$_("Name")",
+ "KCHDR6005M": "$_("Generated Time")",
+ "KCHDR6006M": "$_("Generate")",
+ "KCHDR6007M": "$_("Generating...")",
+ "KCHDR6008M": "$_("Rename")",
+ "KCHDR6009M": "$_("Remove")",
+ "KCHDR6010M": "$_("Download")",
+ "KCHDR6011M": "$_("Report name should contain only letters,
digits and/or hyphen ('-').")",
+
+ "KCHVM6001M": "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
+ "KCHVM6002M": "$_("Power off Confirmation")",
+ "KCHVM6003M": "$_("This action may produce undesirable results,
"
+ "for example unflushed disk cache in the guest. "
+ "Would you like to continue?")",
+ "KCHVM6004M": "$_("Reset Confirmation")",
+ "KCHVM6005M": "$_("There is a risk of data loss caused by reset
without"
+ " the guest OS shutdown. Would you like to
continue?")",
+ "KCHVM6006M": "$_("Shut Down Confirmation")",
+ "KCHVM6007M": "$_("Note the guest OS may ignore this request.
Would you like to continue?")",
+ "KCHVM6008M": "$_("VM Delete Confirmation")",
+
+ "KCHVMCD6001M": "$_("This CDROM will be detached permanently and
you can re-attach it. Continue to detach it?")",
+ "KCHVMCD6002M": "$_("Attach")",
+ "KCHVMCD6003M": "$_("Attaching...")",
+ "KCHVMCD6004M": "$_("Replace")",
+ "KCHVMCD6005M": "$_("Replacing...")",
+ "KCHVMCD6006M": "$_("Successfully attached!")",
+ "KCHVMCD6007M": "$_("Successfully replaced!")",
+ "KCHVMCD6008M": "$_("Successfully detached!")",
+
+
+ "KCHNET6001E": "$_("The VLAN id must be between 1 and
4094.")",
+
+ "KCHNET6001M": "$_("unavailable")",
+ "KCHNET6002M": "$_("This action will interrupt network
connectivity for any virtual machine that depend on this network.")",
+ "KCHNET6003M": "$_("Create a network")",
+ "KCHNET6004M": "$_("This network is not persistent. Instead of
stop, this action will permanently delete it. Would you like to continue?")",
+
+ "KCHPOOL6001M": "$_("This will permanently delete the storage
pool. Would you like to continue?")",
+ "KCHPOOL6002M": "$_("This storage pool is empty.")",
+ "KCHPOOL6003M": "$_("It will format your disk and you will loose
any data in there, are you sure to continue? ")",
+ "KCHPOOL6004M": "$_("SCSI Fibre Channel")",
+ "KCHPOOL6005M": "$_("No SCSI adapters found.")",
+
+ "KCHPOOL6001E": "$_("The storage pool name can not be
blank.")",
+ "KCHPOOL6002E": "$_("The storage pool path can not be
blank.")",
+ "KCHPOOL6003E": "$_("NFS server mount path can not be
blank.")",
+ "KCHPOOL6004E": "$_("Invalid storage pool name. It should not
contain '/'.")",
+ "KCHPOOL6005E": "$_("Invalid NFS mount path.")",
+ "KCHPOOL6006E": "$_("No logical device selected.")",
+ "KCHPOOL6007E": "$_("The iSCSI target can not be
blank.")",
+ "KCHPOOL6008E": "$_("Server name can not be
blank.")",
+ "KCHPOOL6009E": "$_("This is not a valid Server Name or IP.
please, modify it.")",
+ "KCHPOOL6010M": "$_("Looking for available partitions
...")",
+ "KCHPOOL6011M": "$_("No available partitions
found.")",
+ "KCHPOOL6012M": "$_("This storage pool is not persistent.
Instead of deactivate, this action will permanently delete it. Would you like to
continue?")"
+}
\ No newline at end of file
9:35 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
On 06/09/2014 04:21 PM, Aline Manera wrote:
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
> From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>
> Add minimal UI just enough to re-produce issue 342.
>
> https://github.com/kimchi-project/kimchi/issues/342
>
> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
> ---
> plugins/sample/__init__.py | 3 ++-
> plugins/sample/sample.conf | 5 +++++
> plugins/sample/ui/config/tab-ext.xml | 8 ++++----
> plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
> plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
> 5 files changed, 26 insertions(+), 5 deletions(-)
> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
>
> diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
> index 3183898..2101aed 100644
> --- a/plugins/sample/__init__.py
> +++ b/plugins/sample/__init__.py
> @@ -26,6 +26,7 @@
>
> from kimchi.config import PluginPaths
> from kimchi.control.base import Collection, Resource
> +from kimchi.root import Root
> from plugins.sample.i18n import messages
> from plugins.sample.model import Model
>
> @@ -33,7 +34,7 @@
> model = Model()
>
>
> -class Drawings(Resource):
> +class Drawings(Root):
> def __init__(self):
> Resource.__init__(self, model)
> self.description = Description(model)
> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
> index c4e80f7..78a9f4e 100644
> --- a/plugins/sample/sample.conf
> +++ b/plugins/sample/sample.conf
> @@ -5,3 +5,8 @@ uri = "/plugins/sample"
>
> [/]
> tools.trailing_slash.on = False
> +tools.sessions.on = True
> +tools.sessions.name = 'kimchi'
> +tools.sessions.httponly = True
> +tools.sessions.locking = 'explicit'
> +tools.sessions.storage_type = 'ram'
> diff --git a/plugins/sample/ui/config/tab-ext.xml
> b/plugins/sample/ui/config/tab-ext.xml
> index 948fa07..8e0b3d3 100644
> --- a/plugins/sample/ui/config/tab-ext.xml
> +++ b/plugins/sample/ui/config/tab-ext.xml
> @@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="utf-8"?>
> -<!--<tabs-ext>
> +<tabs-ext>
> <tab>
> - <title>Test</title>
> - <filePath>plugins/sample/ui/tab.html</filePath>
> + <title>SampleTab</title>
> + <path>plugins/sample/tab.html</path>
The UI files should be in a dedicated dir, as we have for kimchi
And we could remove tab.html (which does not have any meaning) to
sampleplugin.html or something like that
And you use plugins/sample/tab.html but add a file in
plugins/sample/ui/pages/tab.html.tmpl
Where is the clue between them?
> </tab>
> -</tabs-ext>-->
> \ No newline at end of file
> +</tabs-ext>
> diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
> b/plugins/sample/ui/pages/i18n.json.tmpl
> new file mode 100644
> index 0000000..a153e2d
> --- /dev/null
> +++ b/plugins/sample/ui/pages/i18n.json.tmpl
> @@ -0,0 +1,9 @@
> +#unicode UTF-8
> +#import gettext
> +#from kimchi.cachebust import href
> +#silent t = gettext.translation($lang.domain, $lang.localedir,
> languages=$lang.lang)
> +#silent _ = t.gettext
> +#silent _t = t.gettext
> +{
> + "SampleTab": "$_("SampleTab")"
> +}
> diff --git a/plugins/sample/ui/pages/tab.html.tmpl
> b/plugins/sample/ui/pages/tab.html.tmpl
> new file mode 100644
> index 0000000..49fc4ec
> --- /dev/null
> +++ b/plugins/sample/ui/pages/tab.html.tmpl
> @@ -0,0 +1,6 @@
> +<!DOCTYPE html>
> +<html>
> +<body>
> +Hello, world
> +</body>
> +</html>
_______________________________________________
Kimchi-devel mailing list
Kimchi-devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
9:39 p.m.
New subject: [PATCH V5 6/7] add an optional to toggle the sample plugin
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
sample plugin is used to test as a plugin demo.
we disable it by default.
use this command to enable sample plugin
$ ./autogen.sh --enable-plugins
It failed for me: configure: WARNING: unrecognized options: --enable-plugins
Maybe it should be --enable-sample ?
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
configure.ac | 17 +++++++++++++++++
plugins/sample/Makefile.am | 2 +-
plugins/sample/{sample.conf => sample.conf.in} | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
rename plugins/sample/{sample.conf => sample.conf.in} (91%)
diff --git a/configure.ac b/configure.ac
index cc971e8..2594829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,22 @@ if test "x$PYFLAKES" = "x"; then
AC_MSG_WARN([pyflakes not found])
fi
+AC_ARG_ENABLE(
+ [sample],
+ [AS_HELP_STRING(
+ [--enable-sample],
+ [build sample plugin package @<:@default=no@:>@]
+ )],
+ ,
+ [enable_sample="no"]
+)
+
+# AM_CONDITIONAL([SAMPLE], [test "${enable_sample}" = "yes"])
+if test "${enable_sample}" = "yes"; then
+AC_SUBST([ENABLE_SAMPLE], [True])
+else
+AC_SUBST([ENABLE_SAMPLE], [False])
+fi
AC_CONFIG_FILES([
po/Makefile.in
@@ -62,6 +78,7 @@ AC_CONFIG_FILES([
src/kimchi/model/Makefile
plugins/Makefile
plugins/sample/Makefile
+ plugins/sample/sample.conf
plugins/sample/ui/Makefile
plugins/sample/ui/config/Makefile
ui/Makefile
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index e03a4c0..a229244 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -19,4 +19,4 @@
SUBDIRS = ui
-EXTRA_DIST = API.json sample.conf $(wildcard *.py)
+EXTRA_DIST = API.json sample.conf.in $(wildcard *.py)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf.in
similarity index 91%
rename from plugins/sample/sample.conf
rename to plugins/sample/sample.conf.in
index 78a9f4e..f890983 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf.in
@@ -1,5 +1,5 @@
[kimchi]
-enable = True
+enable = @ENABLE_SAMPLE@
plugin_class = "Drawings"
uri = "/plugins/sample"
9:45 p.m.
New subject: [PATCH V5 5/7] Issue #342: load i18n.html of the plugin
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Apparently, in plugin code there is no way to insert new entries into
Kimchi ./ui/pages/i18n.json.tmpl, so every plugin should provide its own
i18n.json.tmpl.
each plugin provides a "plugins/plugin-name/ui/pages/i18n.json.tmpl",
and maps it to the URI "plugins/plugin-name/json.html".
How did you do this map for the sample plugin?
This is already
supported by the kimchi back-end. What we have to do is just to load
"plugins/plugin-name/i18n.json" in the front-end code.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.api.js | 4 +++-
ui/js/src/kimchi.main.js | 13 +++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js
index ad89880..0d96d07 100644
--- a/ui/js/src/kimchi.api.js
+++ b/ui/js/src/kimchi.api.js
@@ -71,6 +71,7 @@ var kimchi = {
type : 'GET',
resend: true,
dataType : 'json',
+ async : !sync,
success : suc,
error: err
});
@@ -560,13 +561,14 @@ var kimchi = {
});
},
- listPlugins : function(suc, err) {
+ listPlugins : function(suc, err, sync) {
kimchi.requestJSON({
url : kimchi.url + 'plugins',
type : 'GET',
contentType : 'application/json',
dataType : 'json',
resend: true,
+ async : !sync,
success : suc,
error : err
});
diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
index 1e6602c..eb4575a 100644
--- a/ui/js/src/kimchi.main.js
+++ b/ui/js/src/kimchi.main.js
@@ -39,7 +39,7 @@ kimchi.main = function() {
$(xmlData).find('tab').each(function() {
var $tab = $(this);
var titleKey = $tab.find('title').text();
- var title = i18n[titleKey];
+ var title = i18n[titleKey] ? i18n[titleKey] : titleKey;
var path = $tab.find('path').text();
tabs.push({
title: title,
@@ -64,6 +64,7 @@ kimchi.main = function() {
var tabConfigUrl = '/config/ui/tabs.xml';
var pluginConfigUrl = '/plugins/{plugin}/ui/config/tab-ext.xml';
+ var pluginI18nUrl = 'plugins/{plugin}/i18n.json';
var DEFAULT_HASH;
var buildTabs = function(callback) {
var tabs = retrieveTabs(tabConfigUrl);
@@ -72,6 +73,12 @@ kimchi.main = function() {
var url = kimchi.substitute(pluginConfigUrl, {
plugin: p
});
+ var i18nUrl = kimchi.substitute(pluginI18nUrl, {
+ plugin: p
+ });
+ kimchi.getI18n(function(i18nObj){ $.extend(i18n, i18nObj)},
+ function(i18nObj){ //i18n is not define by plugin
+ }, i18nUrl, true);
tabs.push.apply(tabs, retrieveTabs(url));
});
@@ -85,7 +92,9 @@ kimchi.main = function() {
$('#nav-menu').append(genTabs(tabs));
callback && callback();
- });
+ }, function(data) {
+ kimchi.message.error(data.responseJSON.reason);
+ }, true);
};
var onLanguageChanged = function(lang) {
4:13 a.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
on 2014/06/10 03:22, Aline Manera wrote:
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
> From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>
> Add minimal UI just enough to re-produce issue 342.
>
> https://github.com/kimchi-project/kimchi/issues/342
>
> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
> ---
> plugins/sample/__init__.py | 3 ++-
> plugins/sample/sample.conf | 5 +++++
> plugins/sample/ui/config/tab-ext.xml | 8 ++++----
> plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
> plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
> 5 files changed, 26 insertions(+), 5 deletions(-)
> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
>
> diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
> index 3183898..2101aed 100644
> --- a/plugins/sample/__init__.py
> +++ b/plugins/sample/__init__.py
> @@ -26,6 +26,7 @@
>
> from kimchi.config import PluginPaths
> from kimchi.control.base import Collection, Resource
> +from kimchi.root import Root
> from plugins.sample.i18n import messages
> from plugins.sample.model import Model
>
> @@ -33,7 +34,7 @@
> model = Model()
>
>
> -class Drawings(Resource):
> +class Drawings(Root):
> def __init__(self):
> Resource.__init__(self, model)
> self.description = Description(model)
> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
> index c4e80f7..78a9f4e 100644
> --- a/plugins/sample/sample.conf
> +++ b/plugins/sample/sample.conf
> @@ -5,3 +5,8 @@ uri = "/plugins/sample"
>
> [/]
> tools.trailing_slash.on = False
> +tools.sessions.on = True
> +tools.sessions.name = 'kimchi'
> +tools.sessions.httponly = True
> +tools.sessions.locking = 'explicit'
> +tools.sessions.storage_type = 'ram'
> diff --git a/plugins/sample/ui/config/tab-ext.xml
> b/plugins/sample/ui/config/tab-ext.xml
> index 948fa07..8e0b3d3 100644
> --- a/plugins/sample/ui/config/tab-ext.xml
> +++ b/plugins/sample/ui/config/tab-ext.xml
> @@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="utf-8"?>
> -<!--<tabs-ext>
> +<tabs-ext>
> <tab>
> - <title>Test</title>
> - <filePath>plugins/sample/ui/tab.html</filePath>
> + <title>SampleTab</title>
> + <path>plugins/sample/tab.html</path>
> </tab>
> -</tabs-ext>-->
> \ No newline at end of file
> +</tabs-ext>
> diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
> b/plugins/sample/ui/pages/i18n.json.tmpl
> new file mode 100644
> index 0000000..a153e2d
> --- /dev/null
> +++ b/plugins/sample/ui/pages/i18n.json.tmpl
> @@ -0,0 +1,9 @@
> +#unicode UTF-8
> +#import gettext
> +#from kimchi.cachebust import href
> +#silent t = gettext.translation($lang.domain, $lang.localedir,
> languages=$lang.lang)
> +#silent _ = t.gettext
> +#silent _t = t.gettext
> +{
> + "SampleTab": "$_("SampleTab")"
> +}
What is it for?
Will it be base for all the plugin templates?
This patch series is to solve issue 342. The front-end doesn't correctly
load the i18n.html of the plugin. After discussion we determine change
i18n.html into i18n.json so the front-end can easily load it without
extra parsing. In all, this is a demonstration on how to do i18n in
plugins for the front-end.
> diff --git a/plugins/sample/ui/pages/tab.html.tmpl
> b/plugins/sample/ui/pages/tab.html.tmpl
> new file mode 100644
> index 0000000..49fc4ec
> --- /dev/null
> +++ b/plugins/sample/ui/pages/tab.html.tmpl
> @@ -0,0 +1,6 @@
> +<!DOCTYPE html>
> +<html>
> +<body>
> +Hello, world
> +</body>
> +</html>
4:20 a.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
on 2014/06/10 03:21, Aline Manera wrote:
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
> From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>
> Add minimal UI just enough to re-produce issue 342.
>
> https://github.com/kimchi-project/kimchi/issues/342
>
> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
> ---
> plugins/sample/__init__.py | 3 ++-
> plugins/sample/sample.conf | 5 +++++
> plugins/sample/ui/config/tab-ext.xml | 8 ++++----
> plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
> plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
> 5 files changed, 26 insertions(+), 5 deletions(-)
> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
>
> diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
> index 3183898..2101aed 100644
> --- a/plugins/sample/__init__.py
> +++ b/plugins/sample/__init__.py
> @@ -26,6 +26,7 @@
>
> from kimchi.config import PluginPaths
> from kimchi.control.base import Collection, Resource
> +from kimchi.root import Root
> from plugins.sample.i18n import messages
> from plugins.sample.model import Model
>
> @@ -33,7 +34,7 @@
> model = Model()
>
>
> -class Drawings(Resource):
> +class Drawings(Root):
> def __init__(self):
> Resource.__init__(self, model)
> self.description = Description(model)
> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
> index c4e80f7..78a9f4e 100644
> --- a/plugins/sample/sample.conf
> +++ b/plugins/sample/sample.conf
> @@ -5,3 +5,8 @@ uri = "/plugins/sample"
>
> [/]
> tools.trailing_slash.on = False
> +tools.sessions.on = True
> +tools.sessions.name = 'kimchi'
> +tools.sessions.httponly = True
> +tools.sessions.locking = 'explicit'
> +tools.sessions.storage_type = 'ram'
> diff --git a/plugins/sample/ui/config/tab-ext.xml
> b/plugins/sample/ui/config/tab-ext.xml
> index 948fa07..8e0b3d3 100644
> --- a/plugins/sample/ui/config/tab-ext.xml
> +++ b/plugins/sample/ui/config/tab-ext.xml
> @@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="utf-8"?>
> -<!--<tabs-ext>
> +<tabs-ext>
> <tab>
> - <title>Test</title>
> - <filePath>plugins/sample/ui/tab.html</filePath>
> + <title>SampleTab</title>
> + <path>plugins/sample/tab.html</path>
The UI files should be in a dedicated dir, as we have for kimchi
And we could remove tab.html (which does not have any meaning) to
sampleplugin.html or something like that
Hi, this file is not handle by back-end. It's just served by back-end,
and the front-end parses this file to get the clue on where the html
file of the plugin is. So "plugins/sample/ui/tab.html" here is a virtual
URI, which is mapped to pages/tab.html under the specific ui dir of this
plugin.
It's ok that we change it to sampleplugin.html, but since it's under the
plugin specific ui dir already, a tab.html is also ok I think.
> </tab>
> -</tabs-ext>-->
> \ No newline at end of file
> +</tabs-ext>
> diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
> b/plugins/sample/ui/pages/i18n.json.tmpl
> new file mode 100644
> index 0000000..a153e2d
> --- /dev/null
> +++ b/plugins/sample/ui/pages/i18n.json.tmpl
> @@ -0,0 +1,9 @@
> +#unicode UTF-8
> +#import gettext
> +#from kimchi.cachebust import href
> +#silent t = gettext.translation($lang.domain, $lang.localedir,
> languages=$lang.lang)
> +#silent _ = t.gettext
> +#silent _t = t.gettext
> +{
> + "SampleTab": "$_("SampleTab")"
> +}
> diff --git a/plugins/sample/ui/pages/tab.html.tmpl
> b/plugins/sample/ui/pages/tab.html.tmpl
> new file mode 100644
> index 0000000..49fc4ec
> --- /dev/null
> +++ b/plugins/sample/ui/pages/tab.html.tmpl
> @@ -0,0 +1,6 @@
> +<!DOCTYPE html>
> +<html>
> +<body>
> +Hello, world
> +</body>
> +</html>
_______________________________________________
Kimchi-devel mailing list
Kimchi-devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
--
Zhou Zheng Sheng / 周征晟
E-mail: zhshzhou(a)linux.vnet.ibm.com
Telephone: 86-10-82454397
4:28 a.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
on 2014/06/10 03:35, Aline Manera wrote:
On 06/09/2014 04:21 PM, Aline Manera wrote:
> On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
>> From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>>
>> Add minimal UI just enough to re-produce issue 342.
>>
>> https://github.com/kimchi-project/kimchi/issues/342
>>
>> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
>> ---
>> plugins/sample/__init__.py | 3 ++-
>> plugins/sample/sample.conf | 5 +++++
>> plugins/sample/ui/config/tab-ext.xml | 8 ++++----
>> plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
>> plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
>> 5 files changed, 26 insertions(+), 5 deletions(-)
>> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
>> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
>>
>> diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
>> index 3183898..2101aed 100644
>> --- a/plugins/sample/__init__.py
>> +++ b/plugins/sample/__init__.py
>> @@ -26,6 +26,7 @@
>>
>> from kimchi.config import PluginPaths
>> from kimchi.control.base import Collection, Resource
>> +from kimchi.root import Root
>> from plugins.sample.i18n import messages
>> from plugins.sample.model import Model
>>
>> @@ -33,7 +34,7 @@
>> model = Model()
>>
>>
>> -class Drawings(Resource):
>> +class Drawings(Root):
>> def __init__(self):
>> Resource.__init__(self, model)
>> self.description = Description(model)
>> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
>> index c4e80f7..78a9f4e 100644
>> --- a/plugins/sample/sample.conf
>> +++ b/plugins/sample/sample.conf
>> @@ -5,3 +5,8 @@ uri = "/plugins/sample"
>>
>> [/]
>> tools.trailing_slash.on = False
>> +tools.sessions.on = True
>> +tools.sessions.name = 'kimchi'
>> +tools.sessions.httponly = True
>> +tools.sessions.locking = 'explicit'
>> +tools.sessions.storage_type = 'ram'
>> diff --git a/plugins/sample/ui/config/tab-ext.xml
>> b/plugins/sample/ui/config/tab-ext.xml
>> index 948fa07..8e0b3d3 100644
>> --- a/plugins/sample/ui/config/tab-ext.xml
>> +++ b/plugins/sample/ui/config/tab-ext.xml
>> @@ -1,7 +1,7 @@
>> <?xml version="1.0" encoding="utf-8"?>
>> -<!--<tabs-ext>
>> +<tabs-ext>
>> <tab>
>> - <title>Test</title>
>> - <filePath>plugins/sample/ui/tab.html</filePath>
>> + <title>SampleTab</title>
>> + <path>plugins/sample/tab.html</path>
>
> The UI files should be in a dedicated dir, as we have for kimchi
> And we could remove tab.html (which does not have any meaning) to
> sampleplugin.html or something like that
And you use plugins/sample/tab.html but add a file in
plugins/sample/ui/pages/tab.html.tmpl
Where is the clue between them?
It's in "src/kimchi/config.py.in", "class PluginPaths(Paths)". It
sets
self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui'))
and in "plugins/sample/__init__.py", it sets
self.paths = PluginPaths('sample')
This is the established design of the plugin ui framework. It's not
changed in this patch series, so there is no code about it.
>
>> </tab>
>> -</tabs-ext>-->
>> \ No newline at end of file
>> +</tabs-ext>
>> diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
>> b/plugins/sample/ui/pages/i18n.json.tmpl
>> new file mode 100644
>> index 0000000..a153e2d
>> --- /dev/null
>> +++ b/plugins/sample/ui/pages/i18n.json.tmpl
>> @@ -0,0 +1,9 @@
>> +#unicode UTF-8
>> +#import gettext
>> +#from kimchi.cachebust import href
>> +#silent t = gettext.translation($lang.domain, $lang.localedir,
>> languages=$lang.lang)
>> +#silent _ = t.gettext
>> +#silent _t = t.gettext
>> +{
>> + "SampleTab": "$_("SampleTab")"
>> +}
>> diff --git a/plugins/sample/ui/pages/tab.html.tmpl
>> b/plugins/sample/ui/pages/tab.html.tmpl
>> new file mode 100644
>> index 0000000..49fc4ec
>> --- /dev/null
>> +++ b/plugins/sample/ui/pages/tab.html.tmpl
>> @@ -0,0 +1,6 @@
>> +<!DOCTYPE html>
>> +<html>
>> +<body>
>> +Hello, world
>> +</body>
>> +</html>
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel(a)ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
_______________________________________________
Kimchi-devel mailing list
Kimchi-devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
--
Zhou Zheng Sheng / 周征晟
E-mail: zhshzhou(a)linux.vnet.ibm.com
Telephone: 86-10-82454397
5:11 a.m.
New subject: [PATCH V5 6/7] add an optional to toggle the sample plugin
On 06/10/2014 03:39 AM, Aline Manera wrote:
On 06/09/2014 07:09 AM, shaohef(a)linux.vnet.ibm.com wrote:
> From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
>
> sample plugin is used to test as a plugin demo.
>
> we disable it by default.
>
> use this command to enable sample plugin
> $ ./autogen.sh --enable-plugins
It failed for me: configure: WARNING: unrecognized options:
--enable-plugins
Maybe it should be --enable-sample ?
yes, --enable-sample.
so sorry, I have changed the opition in code, but not change the commit
message.
>
> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
> ---
> configure.ac | 17 +++++++++++++++++
> plugins/sample/Makefile.am | 2 +-
> plugins/sample/{sample.conf => sample.conf.in} | 2 +-
> 3 files changed, 19 insertions(+), 2 deletions(-)
> rename plugins/sample/{sample.conf => sample.conf.in} (91%)
>
> diff --git a/configure.ac b/configure.ac
> index cc971e8..2594829 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -48,6 +48,22 @@ if test "x$PYFLAKES" = "x"; then
> AC_MSG_WARN([pyflakes not found])
> fi
>
> +AC_ARG_ENABLE(
> + [sample],
> + [AS_HELP_STRING(
> + [--enable-sample],
> + [build sample plugin package @<:@default=no@:>@]
> + )],
> + ,
> + [enable_sample="no"]
> +)
> +
> +# AM_CONDITIONAL([SAMPLE], [test "${enable_sample}" = "yes"])
> +if test "${enable_sample}" = "yes"; then
> +AC_SUBST([ENABLE_SAMPLE], [True])
> +else
> +AC_SUBST([ENABLE_SAMPLE], [False])
> +fi
>
> AC_CONFIG_FILES([
> po/Makefile.in
> @@ -62,6 +78,7 @@ AC_CONFIG_FILES([
> src/kimchi/model/Makefile
> plugins/Makefile
> plugins/sample/Makefile
> + plugins/sample/sample.conf
> plugins/sample/ui/Makefile
> plugins/sample/ui/config/Makefile
> ui/Makefile
> diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
> index e03a4c0..a229244 100644
> --- a/plugins/sample/Makefile.am
> +++ b/plugins/sample/Makefile.am
> @@ -19,4 +19,4 @@
>
> SUBDIRS = ui
>
> -EXTRA_DIST = API.json sample.conf $(wildcard *.py)
> +EXTRA_DIST = API.json sample.conf.in $(wildcard *.py)
> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf.in
> similarity index 91%
> rename from plugins/sample/sample.conf
> rename to plugins/sample/sample.conf.in
> index 78a9f4e..f890983 100644
> --- a/plugins/sample/sample.conf
> +++ b/plugins/sample/sample.conf.in
> @@ -1,5 +1,5 @@
> [kimchi]
> -enable = True
> +enable = @ENABLE_SAMPLE@
> plugin_class = "Drawings"
> uri = "/plugins/sample"
>
--
Thanks and best regards!
Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com>
IBM Linux Technology Center
7:11 a.m.
New subject: [PATCH V5 6/7] add an optional to toggle the sample plugin
on 2014/06/09 18:09, shaohef(a)linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
sample plugin is used to test as a plugin demo.
we disable it by default.
use this command to enable sample plugin
$ ./autogen.sh --enable-plugins
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
configure.ac | 17 +++++++++++++++++
plugins/sample/Makefile.am | 2 +-
plugins/sample/{sample.conf => sample.conf.in} | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
rename plugins/sample/{sample.conf => sample.conf.in} (91%)
diff --git a/configure.ac b/configure.ac
index cc971e8..2594829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,22 @@ if test "x$PYFLAKES" = "x"; then
AC_MSG_WARN([pyflakes not found])
fi
+AC_ARG_ENABLE(
+ [sample],
+ [AS_HELP_STRING(
+ [--enable-sample],
+ [build sample plugin package @<:@default=no@:>@]
+ )],
+ ,
+ [enable_sample="no"]
+)
+
+# AM_CONDITIONAL([SAMPLE], [test "${enable_sample}" = "yes"])
Is this AM_CONDITIONAL useless? Maybe you can delete it in next patch set.
+if test "${enable_sample}" = "yes"; then
+AC_SUBST([ENABLE_SAMPLE], [True])
+else
+AC_SUBST([ENABLE_SAMPLE], [False])
+fi
AC_CONFIG_FILES([
po/Makefile.in
@@ -62,6 +78,7 @@ AC_CONFIG_FILES([
src/kimchi/model/Makefile
plugins/Makefile
plugins/sample/Makefile
+ plugins/sample/sample.conf
plugins/sample/ui/Makefile
plugins/sample/ui/config/Makefile
ui/Makefile
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index e03a4c0..a229244 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -19,4 +19,4 @@
SUBDIRS = ui
-EXTRA_DIST = API.json sample.conf $(wildcard *.py)
+EXTRA_DIST = API.json sample.conf.in $(wildcard *.py)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf.in
similarity index 91%
rename from plugins/sample/sample.conf
rename to plugins/sample/sample.conf.in
index 78a9f4e..f890983 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf.in
@@ -1,5 +1,5 @@
[kimchi]
-enable = True
+enable = @ENABLE_SAMPLE@
plugin_class = "Drawings"
uri = "/plugins/sample"
11:31 a.m.
On 06/10/2014 03:09 AM, Aline Manera wrote:
On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
> From: ShaoHe Feng<shaohef(a)linux.vnet.ibm.com>
>
> V4 -> V5:
> let autoconf generate sample.conf
>
> V3 -> V4:
> rebase
>
> V2 -> V3:
> change "enable-plugins" to "enable-sample"
> remove nls
> improve the Portuguese translation.
>
> V1 -> V2:
> The improvement concept here is to directly generate JSON on the server
> and assign it to the i18n variable, rather than inserting nodes into the DOM.
> Plugins would use a plugin1.i18n= structure to keep plugin strings from
> colliding with each other, or with the kimchi variables.
>
>
> ShaoHe Feng (6):
> Update root.py to make Cheetah render the JSON template.
> Update the i18n tmpl to produce JSON
> Add JS API for fetching i18n JSON
> Issue #342: load i18n.html of the plugin
> add an optional to toggle the sample plugin
> generate the translation files for plugins/sample
>
> Zhou Zheng Sheng (1):
> Add Minimal UI Page for the Sample Plugin
>
> configure.ac | 18 ++++
> plugins/sample/Makefile.am | 11 +-
> plugins/sample/__init__.py | 3 +-
> plugins/sample/config.status | 1 +
> plugins/sample/po/LINGUAS | 1 +
> plugins/sample/po/Makefile.in.in | 1 +
> plugins/sample/po/Makevars | 1 +
> plugins/sample/po/POTFILES.in | 2 +
> plugins/sample/po/en_US.po | 21 ++++
> plugins/sample/po/gen-pot | 1 +
> plugins/sample/po/pt_BR.po | 24 +++++
> plugins/sample/po/zh_CN.po | 24 +++++
> plugins/sample/sample.conf | 7 --
> plugins/sample/sample.conf.in | 12 +++
> plugins/sample/ui/config/tab-ext.xml | 8 +-
> plugins/sample/ui/pages/i18n.json.tmpl | 9 ++
> plugins/sample/ui/pages/tab.html.tmpl | 6 ++
> src/kimchi/root.py | 5 +
> src/kimchi/template.py | 34 ++++---
> ui/js/src/kimchi.api.js | 18 +++-
> ui/js/src/kimchi.main.js | 24 ++++-
> ui/pages/i18n.html.tmpl | 178 ---------------------------------
> ui/pages/i18n.json.tmpl | 165 ++++++++++++++++++++++++++++++
> 23 files changed, 361 insertions(+), 213 deletions(-)
> create mode 120000 plugins/sample/config.status
> create mode 120000 plugins/sample/po/LINGUAS
> create mode 120000 plugins/sample/po/Makefile.in.in
> create mode 120000 plugins/sample/po/Makevars
> create mode 100644 plugins/sample/po/POTFILES.in
> create mode 100644 plugins/sample/po/en_US.po
> create mode 120000 plugins/sample/po/gen-pot
> create mode 100644 plugins/sample/po/pt_BR.po
> create mode 100644 plugins/sample/po/zh_CN.po
> delete mode 100644 plugins/sample/sample.conf
> create mode 100644 plugins/sample/sample.conf.in
> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
> delete mode 100644 ui/pages/i18n.html.tmpl
> create mode 100644 ui/pages/i18n.json.tmpl
>
The tests are failing:
======================================================================
FAIL: test_bad_params (test_plugin.PluginTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/alinefm/kimchi/tests/test_plugin.py", line 114, in
test_bad_params
self.assertEquals(400, resp.status)
AssertionError: 400 != 404
======================================================================
FAIL: test_rectangles (test_plugin.PluginTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/alinefm/kimchi/tests/test_plugin.py", line 87, in
test_rectangles
self._create_rectangle_and_assert('small', 10, 8)
File "/home/alinefm/kimchi/tests/test_plugin.py", line 72, in
_create_rectangle_and_assert
self.assertEquals(201, resp.status)
AssertionError: 201 != 404
----------------------------------------------------------------------
Ran 159 tests in 181.016s
FAILED (failures=2)
[09/Jun/2014:16:05:11] ENGINE Waiting for child threads to terminate...
make[3]: *** [check-local] Error 1
make[3]: Leaving directory `/home/alinefm/kimchi/tests'
make[2]: *** [check-am] Error 2
make[2]: Leaving directory `/home/alinefm/kimchi/tests'
make[1]: *** [check] Error 2
make[1]: Leaving directory `/home/alinefm/kimchi/tests'
make: *** [check-recursive] Error 1
when disable sample plugin, should skip this test. patch will send later.
--
Thanks and best regards!
Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com>
IBM Linux Technology Center
3:21 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
On 06/09/2014 11:28 PM, Zhou Zheng Sheng wrote:
on 2014/06/10 03:35, Aline Manera wrote:
> On 06/09/2014 04:21 PM, Aline Manera wrote:
>> On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
>>> From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>>>
>>> Add minimal UI just enough to re-produce issue 342.
>>>
>>> https://github.com/kimchi-project/kimchi/issues/342
>>>
>>> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>>> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
>>> ---
>>> plugins/sample/__init__.py | 3 ++-
>>> plugins/sample/sample.conf | 5 +++++
>>> plugins/sample/ui/config/tab-ext.xml | 8 ++++----
>>> plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
>>> plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
>>> 5 files changed, 26 insertions(+), 5 deletions(-)
>>> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
>>> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
>>>
>>> diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
>>> index 3183898..2101aed 100644
>>> --- a/plugins/sample/__init__.py
>>> +++ b/plugins/sample/__init__.py
>>> @@ -26,6 +26,7 @@
>>>
>>> from kimchi.config import PluginPaths
>>> from kimchi.control.base import Collection, Resource
>>> +from kimchi.root import Root
>>> from plugins.sample.i18n import messages
>>> from plugins.sample.model import Model
>>>
>>> @@ -33,7 +34,7 @@
>>> model = Model()
>>>
>>>
>>> -class Drawings(Resource):
>>> +class Drawings(Root):
>>> def __init__(self):
>>> Resource.__init__(self, model)
>>> self.description = Description(model)
>>> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
>>> index c4e80f7..78a9f4e 100644
>>> --- a/plugins/sample/sample.conf
>>> +++ b/plugins/sample/sample.conf
>>> @@ -5,3 +5,8 @@ uri = "/plugins/sample"
>>>
>>> [/]
>>> tools.trailing_slash.on = False
>>> +tools.sessions.on = True
>>> +tools.sessions.name = 'kimchi'
>>> +tools.sessions.httponly = True
>>> +tools.sessions.locking = 'explicit'
>>> +tools.sessions.storage_type = 'ram'
>>> diff --git a/plugins/sample/ui/config/tab-ext.xml
>>> b/plugins/sample/ui/config/tab-ext.xml
>>> index 948fa07..8e0b3d3 100644
>>> --- a/plugins/sample/ui/config/tab-ext.xml
>>> +++ b/plugins/sample/ui/config/tab-ext.xml
>>> @@ -1,7 +1,7 @@
>>> <?xml version="1.0" encoding="utf-8"?>
>>> -<!--<tabs-ext>
>>> +<tabs-ext>
>>> <tab>
>>> - <title>Test</title>
>>> - <filePath>plugins/sample/ui/tab.html</filePath>
>>> + <title>SampleTab</title>
>>> + <path>plugins/sample/tab.html</path>
>> The UI files should be in a dedicated dir, as we have for kimchi
>> And we could remove tab.html (which does not have any meaning) to
>> sampleplugin.html or something like that
> And you use plugins/sample/tab.html but add a file in
> plugins/sample/ui/pages/tab.html.tmpl
> Where is the clue between them?
>
It's in "src/kimchi/config.py.in", "class PluginPaths(Paths)". It
sets
self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui'))
and in "plugins/sample/__init__.py", it sets
self.paths = PluginPaths('sample')
But from that code:
self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui'))
the plugin UI dir, should be *<plugin-dir>/ui*
And in this patch set, the xml points to plugins/sample/tab.html, which
correspond only to <plugin-dir>
This is the established design of the plugin ui framework. It's not
changed in this patch series, so there is no code about it.
>>> </tab>
>>> -</tabs-ext>-->
>>> \ No newline at end of file
>>> +</tabs-ext>
>>> diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
>>> b/plugins/sample/ui/pages/i18n.json.tmpl
>>> new file mode 100644
>>> index 0000000..a153e2d
>>> --- /dev/null
>>> +++ b/plugins/sample/ui/pages/i18n.json.tmpl
>>> @@ -0,0 +1,9 @@
>>> +#unicode UTF-8
>>> +#import gettext
>>> +#from kimchi.cachebust import href
>>> +#silent t = gettext.translation($lang.domain, $lang.localedir,
>>> languages=$lang.lang)
>>> +#silent _ = t.gettext
>>> +#silent _t = t.gettext
>>> +{
>>> + "SampleTab": "$_("SampleTab")"
>>> +}
>>> diff --git a/plugins/sample/ui/pages/tab.html.tmpl
>>> b/plugins/sample/ui/pages/tab.html.tmpl
>>> new file mode 100644
>>> index 0000000..49fc4ec
>>> --- /dev/null
>>> +++ b/plugins/sample/ui/pages/tab.html.tmpl
>>> @@ -0,0 +1,6 @@
>>> +<!DOCTYPE html>
>>> +<html>
>>> +<body>
>>> +Hello, world
>>> +</body>
>>> +</html>
>> _______________________________________________
>> Kimchi-devel mailing list
>> Kimchi-devel(a)ovirt.org
>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel(a)ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
3:24 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
On 06/09/2014 11:20 PM, Zhou Zheng Sheng wrote:
on 2014/06/10 03:21, Aline Manera wrote:
> On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
>> From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>>
>> Add minimal UI just enough to re-produce issue 342.
>>
>> https://github.com/kimchi-project/kimchi/issues/342
>>
>> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
>> ---
>> plugins/sample/__init__.py | 3 ++-
>> plugins/sample/sample.conf | 5 +++++
>> plugins/sample/ui/config/tab-ext.xml | 8 ++++----
>> plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
>> plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
>> 5 files changed, 26 insertions(+), 5 deletions(-)
>> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
>> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
>>
>> diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
>> index 3183898..2101aed 100644
>> --- a/plugins/sample/__init__.py
>> +++ b/plugins/sample/__init__.py
>> @@ -26,6 +26,7 @@
>>
>> from kimchi.config import PluginPaths
>> from kimchi.control.base import Collection, Resource
>> +from kimchi.root import Root
>> from plugins.sample.i18n import messages
>> from plugins.sample.model import Model
>>
>> @@ -33,7 +34,7 @@
>> model = Model()
>>
>>
>> -class Drawings(Resource):
>> +class Drawings(Root):
>> def __init__(self):
>> Resource.__init__(self, model)
>> self.description = Description(model)
>> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
>> index c4e80f7..78a9f4e 100644
>> --- a/plugins/sample/sample.conf
>> +++ b/plugins/sample/sample.conf
>> @@ -5,3 +5,8 @@ uri = "/plugins/sample"
>>
>> [/]
>> tools.trailing_slash.on = False
>> +tools.sessions.on = True
>> +tools.sessions.name = 'kimchi'
>> +tools.sessions.httponly = True
>> +tools.sessions.locking = 'explicit'
>> +tools.sessions.storage_type = 'ram'
>> diff --git a/plugins/sample/ui/config/tab-ext.xml
>> b/plugins/sample/ui/config/tab-ext.xml
>> index 948fa07..8e0b3d3 100644
>> --- a/plugins/sample/ui/config/tab-ext.xml
>> +++ b/plugins/sample/ui/config/tab-ext.xml
>> @@ -1,7 +1,7 @@
>> <?xml version="1.0" encoding="utf-8"?>
>> -<!--<tabs-ext>
>> +<tabs-ext>
>> <tab>
>> - <title>Test</title>
>> - <filePath>plugins/sample/ui/tab.html</filePath>
>> + <title>SampleTab</title>
>> + <path>plugins/sample/tab.html</path>
> The UI files should be in a dedicated dir, as we have for kimchi
> And we could remove tab.html (which does not have any meaning) to
> sampleplugin.html or something like that
>
Hi, this file is not handle by back-end. It's just served by back-end,
and the front-end parses this file to get the clue on where the html
file of the plugin is.
So "plugins/sample/ui/tab.html" here is a virtual
URI, which is mapped to pages/tab.html under the specific ui dir of this
plugin.
1. This patch set uses plugins/sample/tab/html instead of
plugins/sample/ui/tab.html
2. Where is the map to pages/tab.html?
It's ok that we change it to sampleplugin.html, but since it's under the
plugin specific ui dir already, a tab.html is also ok I think.
>> </tab>
>> -</tabs-ext>-->
>> \ No newline at end of file
>> +</tabs-ext>
>> diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
>> b/plugins/sample/ui/pages/i18n.json.tmpl
>> new file mode 100644
>> index 0000000..a153e2d
>> --- /dev/null
>> +++ b/plugins/sample/ui/pages/i18n.json.tmpl
>> @@ -0,0 +1,9 @@
>> +#unicode UTF-8
>> +#import gettext
>> +#from kimchi.cachebust import href
>> +#silent t = gettext.translation($lang.domain, $lang.localedir,
>> languages=$lang.lang)
>> +#silent _ = t.gettext
>> +#silent _t = t.gettext
>> +{
>> + "SampleTab": "$_("SampleTab")"
>> +}
>> diff --git a/plugins/sample/ui/pages/tab.html.tmpl
>> b/plugins/sample/ui/pages/tab.html.tmpl
>> new file mode 100644
>> index 0000000..49fc4ec
>> --- /dev/null
>> +++ b/plugins/sample/ui/pages/tab.html.tmpl
>> @@ -0,0 +1,6 @@
>> +<!DOCTYPE html>
>> +<html>
>> +<body>
>> +Hello, world
>> +</body>
>> +</html>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel(a)ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
4:19 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
on 2014/06/10 21:24, Aline Manera wrote:
On 06/09/2014 11:20 PM, Zhou Zheng Sheng wrote:
> on 2014/06/10 03:21, Aline Manera wrote:
>> On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
>>> From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>>>
>>> Add minimal UI just enough to re-produce issue 342.
>>>
>>> https://github.com/kimchi-project/kimchi/issues/342
>>>
>>> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
>>> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
>>> ---
>>> plugins/sample/__init__.py | 3 ++-
>>> plugins/sample/sample.conf | 5 +++++
>>> plugins/sample/ui/config/tab-ext.xml | 8 ++++----
>>> plugins/sample/ui/pages/i18n.json.tmpl | 9 +++++++++
>>> plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
>>> 5 files changed, 26 insertions(+), 5 deletions(-)
>>> create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl
>>> create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
>>>
>>> diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
>>> index 3183898..2101aed 100644
>>> --- a/plugins/sample/__init__.py
>>> +++ b/plugins/sample/__init__.py
>>> @@ -26,6 +26,7 @@
>>>
>>> from kimchi.config import PluginPaths
>>> from kimchi.control.base import Collection, Resource
>>> +from kimchi.root import Root
>>> from plugins.sample.i18n import messages
>>> from plugins.sample.model import Model
>>>
>>> @@ -33,7 +34,7 @@
>>> model = Model()
>>>
>>>
>>> -class Drawings(Resource):
>>> +class Drawings(Root):
>>> def __init__(self):
>>> Resource.__init__(self, model)
>>> self.description = Description(model)
>>> diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
>>> index c4e80f7..78a9f4e 100644
>>> --- a/plugins/sample/sample.conf
>>> +++ b/plugins/sample/sample.conf
>>> @@ -5,3 +5,8 @@ uri = "/plugins/sample"
>>>
>>> [/]
>>> tools.trailing_slash.on = False
>>> +tools.sessions.on = True
>>> +tools.sessions.name = 'kimchi'
>>> +tools.sessions.httponly = True
>>> +tools.sessions.locking = 'explicit'
>>> +tools.sessions.storage_type = 'ram'
>>> diff --git a/plugins/sample/ui/config/tab-ext.xml
>>> b/plugins/sample/ui/config/tab-ext.xml
>>> index 948fa07..8e0b3d3 100644
>>> --- a/plugins/sample/ui/config/tab-ext.xml
>>> +++ b/plugins/sample/ui/config/tab-ext.xml
>>> @@ -1,7 +1,7 @@
>>> <?xml version="1.0" encoding="utf-8"?>
>>> -<!--<tabs-ext>
>>> +<tabs-ext>
>>> <tab>
>>> - <title>Test</title>
>>> - <filePath>plugins/sample/ui/tab.html</filePath>
>>> + <title>SampleTab</title>
>>> + <path>plugins/sample/tab.html</path>
>> The UI files should be in a dedicated dir, as we have for kimchi
>> And we could remove tab.html (which does not have any meaning) to
>> sampleplugin.html or something like that
>>
> Hi, this file is not handle by back-end. It's just served by back-end,
> and the front-end parses this file to get the clue on where the html
> file of the plugin is.
> So "plugins/sample/ui/tab.html" here is a virtual
> URI, which is mapped to pages/tab.html under the specific ui dir of this
> plugin.
1. This patch set uses plugins/sample/tab/html instead of
plugins/sample/ui/tab.html
Sorry! I wanted to say "plugins/sample/tab.html is virtual URI", and
"plugins/sample/ui/tab.htmls" is the real file. Sorry for the misleading.
2. Where is the map to pages/tab.html?
It works like this:
1. plugins.sample.Drawings inherits Root, and it is mounted on URI
"/plugins/sample". It also sets "self.paths =
PluginPaths('sample')"
2. GET plugins/sample/tab.html -> Drawings(Root).default("tab.html") ->
template.render("tab.html").
3. When the template needs to get the actual template file name, it calls
paths = cherrypy.request.app.root.paths
filename = paths.get_template_path(resource)
So here paths is actually "PluginPaths('sample')", and calling
paths.get_template_path()
returns the result of
os.path.join(self.ui_dir, 'pages/%s.tmpl' % resource)
So actually the filename is
self.ui_dir + 'pages/tab.html'
and PluginPaths.__init__ sets
self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui'))
so at last the filename is
'plugins/sample/ui' + 'pages/tab.html'
Let me add Mark Wu to the cc list. He is the designer of the plugin
framework.
>
> It's ok that we change it to sampleplugin.html, but since it's under the
> plugin specific ui dir already, a tab.html is also ok I think.
>
>>> </tab>
>>> -</tabs-ext>-->
>>> \ No newline at end of file
>>> +</tabs-ext>
>>> diff --git a/plugins/sample/ui/pages/i18n.json.tmpl
>>> b/plugins/sample/ui/pages/i18n.json.tmpl
>>> new file mode 100644
>>> index 0000000..a153e2d
>>> --- /dev/null
>>> +++ b/plugins/sample/ui/pages/i18n.json.tmpl
>>> @@ -0,0 +1,9 @@
>>> +#unicode UTF-8
>>> +#import gettext
>>> +#from kimchi.cachebust import href
>>> +#silent t = gettext.translation($lang.domain, $lang.localedir,
>>> languages=$lang.lang)
>>> +#silent _ = t.gettext
>>> +#silent _t = t.gettext
>>> +{
>>> + "SampleTab": "$_("SampleTab")"
>>> +}
>>> diff --git a/plugins/sample/ui/pages/tab.html.tmpl
>>> b/plugins/sample/ui/pages/tab.html.tmpl
>>> new file mode 100644
>>> index 0000000..49fc4ec
>>> --- /dev/null
>>> +++ b/plugins/sample/ui/pages/tab.html.tmpl
>>> @@ -0,0 +1,6 @@
>>> +<!DOCTYPE html>
>>> +<html>
>>> +<body>
>>> +Hello, world
>>> +</body>
>>> +</html>
>> _______________________________________________
>> Kimchi-devel mailing list
>> Kimchi-devel(a)ovirt.org
>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>>
>
--
Zhou Zheng Sheng / 周征晟
E-mail: zhshzhou(a)linux.vnet.ibm.com
Telephone: 86-10-82454397
4:24 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
on 2014/06/10 22:19, Zhou Zheng Sheng wrote:
on 2014/06/10 21:24, Aline Manera wrote:
> On 06/09/2014 11:20 PM, Zhou Zheng Sheng wrote:
>> on 2014/06/10 03:21, Aline Manera wrote:
>>> On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
>>>> diff --git a/plugins/sample/ui/config/tab-ext.xml
>>>> b/plugins/sample/ui/config/tab-ext.xml
>>>> index 948fa07..8e0b3d3 100644
>>>> --- a/plugins/sample/ui/config/tab-ext.xml
>>>> +++ b/plugins/sample/ui/config/tab-ext.xml
>>>> @@ -1,7 +1,7 @@
>>>> <?xml version="1.0" encoding="utf-8"?>
>>>> -<!--<tabs-ext>
>>>> +<tabs-ext>
>>>> <tab>
>>>> - <title>Test</title>
>>>> - <filePath>plugins/sample/ui/tab.html</filePath>
>>>> + <title>SampleTab</title>
>>>> + <path>plugins/sample/tab.html</path>
>>> The UI files should be in a dedicated dir, as we have for kimchi
>>> And we could remove tab.html (which does not have any meaning) to
>>> sampleplugin.html or something like that
>>>
>> Hi, this file is not handle by back-end. It's just served by back-end,
>> and the front-end parses this file to get the clue on where the html
>> file of the plugin is.
>
>> So "plugins/sample/ui/tab.html" here is a virtual
>> URI, which is mapped to pages/tab.html under the specific ui dir of this
>> plugin.
>
> 1. This patch set uses plugins/sample/tab/html instead of
> plugins/sample/ui/tab.html
>
Sorry! I wanted to say "plugins/sample/tab.html is virtual URI", and
"plugins/sample/ui/tab.htmls" is the real file. Sorry for the misleading.
> 2. Where is the map to pages/tab.html?
>
It works like this:
1. plugins.sample.Drawings inherits Root, and it is mounted on URI
"/plugins/sample". It also sets "self.paths =
PluginPaths('sample')"
2. GET plugins/sample/tab.html -> Drawings(Root).default("tab.html") ->
template.render("tab.html").
3. When the template needs to get the actual template file name, it calls
paths = cherrypy.request.app.root.paths
filename = paths.get_template_path(resource)
So here paths is actually "PluginPaths('sample')", and calling
paths.get_template_path()
returns the result of
os.path.join(self.ui_dir, 'pages/%s.tmpl' % resource)
So actually the filename is
self.ui_dir + 'pages/tab.html'
should be self.ui_dir + 'pages/tab.html.tmpl'
and PluginPaths.__init__ sets
self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui'))
so at last the filename is
'plugins/sample/ui' + 'pages/tab.html'
should be 'plugins/sample/ui' + 'pages/tab.html.tmpl'
Let me add Mark Wu to the cc list. He is the designer of the plugin
framework.
4:34 p.m.
New subject: [PATCH V5 1/7] Add Minimal UI Page for the Sample Plugin
On 06/10/2014 11:24 AM, Zhou Zheng Sheng wrote:
on 2014/06/10 22:19, Zhou Zheng Sheng wrote:
> on 2014/06/10 21:24, Aline Manera wrote:
>> On 06/09/2014 11:20 PM, Zhou Zheng Sheng wrote:
>>> on 2014/06/10 03:21, Aline Manera wrote:
>>>> On 06/09/2014 07:08 AM, shaohef(a)linux.vnet.ibm.com wrote:
>>>>> diff --git a/plugins/sample/ui/config/tab-ext.xml
>>>>> b/plugins/sample/ui/config/tab-ext.xml
>>>>> index 948fa07..8e0b3d3 100644
>>>>> --- a/plugins/sample/ui/config/tab-ext.xml
>>>>> +++ b/plugins/sample/ui/config/tab-ext.xml
>>>>> @@ -1,7 +1,7 @@
>>>>> <?xml version="1.0" encoding="utf-8"?>
>>>>> -<!--<tabs-ext>
>>>>> +<tabs-ext>
>>>>> <tab>
>>>>> - <title>Test</title>
>>>>> - <filePath>plugins/sample/ui/tab.html</filePath>
>>>>> + <title>SampleTab</title>
>>>>> + <path>plugins/sample/tab.html</path>
>>>> The UI files should be in a dedicated dir, as we have for kimchi
>>>> And we could remove tab.html (which does not have any meaning) to
>>>> sampleplugin.html or something like that
>>>>
>>> Hi, this file is not handle by back-end. It's just served by back-end,
>>> and the front-end parses this file to get the clue on where the html
>>> file of the plugin is.
>>> So "plugins/sample/ui/tab.html" here is a virtual
>>> URI, which is mapped to pages/tab.html under the specific ui dir of this
>>> plugin.
>> 1. This patch set uses plugins/sample/tab/html instead of
>> plugins/sample/ui/tab.html
>>
> Sorry! I wanted to say "plugins/sample/tab.html is virtual URI", and
> "plugins/sample/ui/tab.htmls" is the real file. Sorry for the misleading.
>
>> 2. Where is the map to pages/tab.html?
>>
> It works like this:
>
> 1. plugins.sample.Drawings inherits Root, and it is mounted on URI
> "/plugins/sample". It also sets "self.paths =
PluginPaths('sample')"
>
> 2. GET plugins/sample/tab.html -> Drawings(Root).default("tab.html")
->
> template.render("tab.html").
>
> 3. When the template needs to get the actual template file name, it calls
> paths = cherrypy.request.app.root.paths
> filename = paths.get_template_path(resource)
>
> So here paths is actually "PluginPaths('sample')", and calling
> paths.get_template_path()
> returns the result of
> os.path.join(self.ui_dir, 'pages/%s.tmpl' % resource)
>
> So actually the filename is
> self.ui_dir + 'pages/tab.html'
should be self.ui_dir + 'pages/tab.html.tmpl'
> and PluginPaths.__init__ sets
> self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui'))
>
> so at last the filename is
> 'plugins/sample/ui' + 'pages/tab.html'
should be 'plugins/sample/ui' + 'pages/tab.html.tmpl'
> Let me add Mark Wu to the cc list. He is the designer of the plugin
> framework.
Thanks a lot for the explanation, Zhou Zheng! =)
Got the flow now!
Sorry about too many question. I was just trying to understand that
3600
days inactive
3601
days old
33 comments
5 participants
participants (5)
-
Aline Manera -
Daniel H Barboza -
shaohef＠linux.vnet.ibm.com -
Sheldon
-
Zhou Zheng Sheng