[Products.Silva][Sylvain Viollon] Update base class / cancel but...
[email protected] Thu, 31 Oct 2013 15:56:45 +0100
| Newsgroups | gmane.comp.web.zope.silva.cvs |
|---|---|
| Message-ID | <[email protected]> |
author: Sylvain Viollon
date: Thu Oct 31 15:56:42 2013 +0100
revision: 11873:75d8192ce7f8 in Products.Silva
branch: 2.4
details: https://hg.infrae.com/Products.Silva?cmd=changeset;node=75d8192ce7f8
modified: Products/Silva/ExtensionService.py Products/Silva/ExtensionService_templates/configureextensions.cpt
added:
removed:
log: Update base class / cancel button.
diffstat:
Products/Silva/ExtensionService.py | 4 +-
Products/Silva/ExtensionService_templates/configureextensions.cpt | 189 ++++-----
2 files changed, 92 insertions(+), 101 deletions(-)
diffs (238 lines):
diff -r bb3441ac7b08 -r 75d8192ce7f8 Products/Silva/ExtensionService.py
--- a/Products/Silva/ExtensionService.py Fri Oct 25 18:18:05 2013 +0200
+++ b/Products/Silva/ExtensionService.py Thu Oct 31 15:56:42 2013 +0100
@@ -450,7 +450,7 @@
grok.name('manage_extensions')
-class ConfigureExtensions(ManageExtensionsMixin, rest.PageWithTemplateREST):
+class ConfigureExtensions(ManageExtensionsMixin, rest.FormWithTemplateREST):
grok.adapts(rest.Screen, ExtensionService)
grok.name('admin')
grok.require('zope2.ViewManagementScreens')
@@ -462,4 +462,4 @@
super(ConfigureExtensions, self).update()
if self.status:
service = getUtility(IMessageService)
- service.send(self.status, self.request, namespace='feedbac')
+ service.send(self.status, self.request, namespace='feedback')
diff -r bb3441ac7b08 -r 75d8192ce7f8 Products/Silva/ExtensionService_templates/configureextensions.cpt
--- a/Products/Silva/ExtensionService_templates/configureextensions.cpt Fri Oct 25 18:18:05 2013 +0200
+++ b/Products/Silva/ExtensionService_templates/configureextensions.cpt Thu Oct 31 15:56:42 2013 +0100
@@ -1,27 +1,33 @@
<tal:configure tal:define="root context.get_root()"
i18n:domain="silva">
- <div class="form-head">
- <h3 i18n:translate="">
- Extensions management
- </h3>
- <p>
- Software version: <span tal:replace="root.get_silva_software_version()">.
- </p>
- <p>
- Site version: <span tal:replace="root.get_silva_content_version()">.
- </p>
- <p tal:condition="context.get_site_quota()"
- i18n:translate="">
- This site has a global quota of <span tal:replace="context.get_site_quota()" i18n:name="used" /> MB.
- </p>
- <p tal:condition="not context.get_site_quota()"
- i18n:translate="">
- This site has no global quota restrictions.
- </p>
- </div>
+ <div class="form-head">
+ <h3 i18n:translate="">
+ Extensions management
+ </h3>
+ <p>
+ Software version: <span tal:replace="root.get_silva_software_version()">.
+ </p>
+ <p>
+ Site version: <span tal:replace="root.get_silva_content_version()">.
+ </p>
+ <p tal:condition="context.get_site_quota()"
+ i18n:translate="">
+ This site has a global quota of <span tal:replace="context.get_site_quota()" i18n:name="used" /> MB.
+ </p>
+ <p tal:condition="not context.get_site_quota()"
+ i18n:translate="">
+ This site has no global quota restrictions.
+ </p>
+ </div>
- <form class="form-fields-container">
+ <form class="form-fields-container">
<div class="form-footer">
+ <a class="form-button open-screen" rel="admin" href="."
+ data-form-shortcut="ctrl+z" title="Go back to the site preferences"
+ i18n:attributes="title">
+ <ins class="ui-icon ui-icon-arrowreturnthick-1-w"></ins>
+ Cancel
+ </a>
<div class="form-controls">
<a class="form-control" name="refresh_all"
i18n:translate="">
@@ -32,10 +38,6 @@
i18n:translate="">
Install documentation
</a>
- <a class="form-control" name="refresh_catalog"
- i18n:translate="">
- Rebuild catalog
- </a>
<tal:quota tal:condition="not: context.get_site_quota()">
<!-- Site quota is not enabled, so you can enable or not the
feature. -->
@@ -50,87 +52,76 @@
Enable quota subsystem
</a>
</tal:quota>
- <a class="form-control" name="purge_old_versions"
- i18n:translate="">
- Purge old versions
- </a>
- <a class="form-control" name="upgrade_all" value=""
- data-confirmation="This will upgrade all Silva content, and may take a long time on a large site. This is, however, necessary to make old Silva content work with new versions."
- data-confirmation-title="Are you sure you want to continue?"
- i18n:attributes="data-confirmation-title data-confirmation"
- i18n:translate="">
- Upgrade content
- </a>
</div>
</div>
- </form>
+ </form>
- <div class="form-header">
- <h4 i18n:translate="">Available extensions</h4>
- </div>
+ <div class="form-header">
+ <h4 i18n:translate="">Available extensions</h4>
+ </div>
- <tal:extensions tal:repeat="extension rest.get_extensions()">
- <div tal:define="bg_color extension.is_installed and 'White' or 'LightGrey'"
- tal:attributes="style string:width:70%;; border:solid 1px;; padding:1ex;; margin:1ex;; background:${bg_color};;" >
- <h3 style="margin: 0 0 0.5ex;" tal:content="extension.info.title" />
+ <tal:extensions tal:repeat="extension rest.get_extensions()">
+ <div tal:define="bg_color extension.is_installed and 'White' or 'LightGrey'"
+ tal:attributes="style string:width:70%;; border:solid 1px;; padding:1ex;; margin:1ex;; background:${bg_color};;" >
+ <h3 style="margin: 0 0 0.5ex;" tal:content="extension.info.title" />
- <div style="float:right; width:40%; border: 1px solid black; margin: 0px 0px 15px 15px"
- tal:condition="extension.dependencies">
- <h5 class="form-title">Dependencies</h5>
- <ul style="padding-left: 0;list-style-position:inside;margin-top:0;">
- <li class="list-item"
- tal:repeat="dependency extension.dependencies">
- <span tal:content="dependency.title" />
+ <div style="float:right; width:40%; border: 1px solid black; margin: 0px 0px 15px 15px"
+ tal:condition="extension.dependencies">
+ <h5 class="form-title">Dependencies</h5>
+ <ul style="padding-left: 0;list-style-position:inside;margin-top:0;">
+ <li class="list-item"
+ tal:repeat="dependency extension.dependencies">
+ <span tal:content="dependency.title" />
+ </li>
+ </ul>
+ </div>
+
+ <p style="margin: 0 0 1ex;" tal:content="extension.info.version"/>
+ <p style="margin: 0 0 1ex;" tal:content="extension.info.description"/>
+
+ <form name="#"
+ tal:define="name extension.info.name"
+ tal:attributes="name name">
+ <input type="hidden" name="name"
+ tal:attributes="value name" />
+ <tal:regular tal:condition="name != 'Silva'">
+ <div class="form-footer">
+ <div class="form-controls">
+ <a class="form-control" name="install"
+ tal:condition="not extension.is_installed"
+ i18n:translate="">
+ Activate
+ </a>
+ <a class="form-control" name="uninstall"
+ tal:condition="extension.is_installed"
+ i18n:translate="">
+ Deactivate
+ </a>
+ <a class="form-control" name="refresh"
+ tal:condition="extension.is_installed"
+ i18n:translate="">
+ Refresh
+ </a>
+ </div>
+ </div>
+ </tal:regular>
+ <tal:systems tal:condition="name == 'Silva'">
+ <ul>
+ <li tal:repeat="extension_system rest.get_system_extensions()">
+ <span tal:replace="extension_system.name" />
+ (<span tal:replace="extension_system.version" />)
</li>
</ul>
- </div>
-
- <p style="margin: 0 0 1ex;" tal:content="extension.info.version"/>
- <p style="margin: 0 0 1ex;" tal:content="extension.info.description"/>
-
- <form name="#"
- tal:define="name extension.info.name"
- tal:attributes="name name">
- <input type="hidden" name="name"
- tal:attributes="value name" />
- <tal:regular tal:condition="name != 'Silva'">
- <div class="form-footer">
- <div class="form-controls">
- <a class="form-control" name="install"
- tal:condition="not extension.is_installed"
- i18n:translate="">
- Activate
- </a>
- <a class="form-control" name="uninstall"
- tal:condition="extension.is_installed"
- i18n:translate="">
- Deactivate
- </a>
- <a class="form-control" name="refresh"
- tal:condition="extension.is_installed"
- i18n:translate="">
- Refresh
- </a>
- </div>
+ <div class="form-footer">
+ <div class="form-controls">
+ <a class="form-control" name="refresh"
+ i18n:translate="">
+ Refresh
+ </a>
</div>
- </tal:regular>
- <tal:systems tal:condition="name == 'Silva'">
- <ul>
- <li tal:repeat="extension_system rest.get_system_extensions()">
- <span tal:replace="extension_system.name" />
- (<span tal:replace="extension_system.version" />)
- </li>
- </ul>
- <div class="form-footer">
- <div class="form-controls">
- <a class="form-control" name="refresh"
- i18n:translate="">
- Refresh
- </a>
- </div>
- </div>
- </tal:systems>
- </form>
- </div>
- </tal:extensions>
+ </div>
+ </tal:systems>
+ </form>
+ </div>
+ </tal:extensions>
</tal:configure>