[Erp5-report] r35513 ivan - in /erp5/trunk/bt5/erp5_km: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri May 21 10:54:04 CEST 2010
Author: ivan
Date: Fri May 21 10:53:59 2010
New Revision: 35513
URL: http://svn.erp5.org?rev=35513&view=rev
Log:
Rather than copy and paste ZPT libraries from generic knowledge pad bt5 and adjust HTML improve generic bt5 to make it possible to reuse it with only CSS styles.
Added:
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/Base_viewKnowledgePadMacroLibrary.xml
Modified:
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml
erp5/trunk/bt5/erp5_km/bt/revision
Added: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/Base_viewKnowledgePadMacroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/Base_viewKnowledgePadMacroLibrary.xml?rev=35513&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/Base_viewKnowledgePadMacroLibrary.xml (added)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/Base_viewKnowledgePadMacroLibrary.xml [utf8] Fri May 21 10:53:59 2010
@@ -1,0 +1,314 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<tal:block metal:define-macro="disable_server_integration">\n
+\n
+ <tal:block tal:condition="isKnowledgePadTemplateUsed">\n
+ <script type="text/javascript" \n
+ tal:content="structure python: here.Base_generateOverrideJavaScript(\n
+ mode = mode,\n
+ default_pad_group = default_pad_group,\n
+ cancel_url = cancel_url)">\n
+ </script>\n
+ </tal:block>\n
+\n
+</tal:block>\n
+\n
+<tal:block metal:define-macro="knowledge_pad_security_check">\n
+\n
+ <div tal:condition="python: not isUserAllowedToCreateKnowledgePads and not isAnon">\n
+ <div class="wait_block">\n
+ <p i18n:translate="" i18n:domain="ui"> \n
+ You are not allowed to use knowledge pad system due to security restrictions.\n
+ </p>\n
+ </div>\n
+ </div>\n
+\n
+</tal:block> \n
+\n
+<tal:block metal:define-macro="add_new_gadget">\n
+ <a href="Base_viewGadgetListDialog"\n
+ tal:condition="not: isKnowledgePadTemplateUsed"\n
+ tal:define="current_web_site python:request.get(\'current_web_site\', here);\n
+ portal_path python:request.get(\'current_web_site_url\', current_web_site.absolute_url())"\n
+ tal:attributes="href python:\n
+ \'Base_viewGadgetListDialog?reset=1&cancel_url=%s&active_pad_relative_url=%s&mode=%s&editable_mode:int=%d\'\n
+ %(cancel_url, active_knowledge_pad.getRelativeUrl(), mode, editable_mode);"\n
+ title="Add gadgets"\n
+ id="add-gadgets"\n
+ class="bt-small"> \n
+ <span i18n:translate="" i18n:domain="ui">\n
+ <img alt="+" src="km_img/icon-add.png"\n
+ tal:attributes="src string:${portal_path}/km_img/icon-add.png"/>\n
+ <tal:block i18n:translate="" i18n:domain="ui">Add gadgets</tal:block>\n
+ </span>\n
+ </a>\n
+</tal:block>\n
+\n
+<tal:block metal:define-macro="stick">\n
+ <tal:block\n
+ tal:condition="not: isKnowledgePadTemplateUsed"\n
+ tal:define="is_customized_pad python:\n
+ active_knowledge_pad.getPublicationSectionValue()==context and\n
+ active_knowledge_pad.getGroup()==default_pad_group;\n
+ current_web_site python:request.get(\'current_web_site\', here);\n
+ portal_path python:request.get(\'current_web_site_url\', current_web_site.absolute_url())">\n
+\n
+ <a tal:condition="not: is_customized_pad"\n
+ tal:attributes="href python:\n
+ \'WebSection_stickKnowledgePad?knowledge_pad_url=%s&cancel_url=%s&editable_mode:int=%d\'\n
+ %(active_knowledge_pad.getRelativeUrl(), cancel_url, editable_mode)"\n
+ class="bt-small">\n
+ <span i18n:translate="" i18n:domain="ui">\n
+ <img alt="" src="km_img/icon-stick.png"\n
+ tal:attributes="src string:${portal_path}/km_img/icon-stick.png"/>\n
+ <tal:block i18n:translate="" i18n:domain="ui">Stick it</tal:block>\n
+ </span>\n
+ </a>\n
+\n
+ <a tal:condition="is_customized_pad"\n
+ tal:attributes="href python:\n
+ \'WebSection_unStickKnowledgePad?knowledge_pad_url=%s&cancel_url=%s&editable_mode:int=%d\'\n
+ %(active_knowledge_pad.getRelativeUrl(), cancel_url, editable_mode)"\n
+ class="bt-small">\n
+ <span i18n:translate="" i18n:domain="ui">\n
+ <img alt="" src="km_img/icon-stick.png"/>\n
+ tal:attributes="src string:${portal_path}/km_img/icon-stick.png"/>\n
+ <tal:block i18n:translate="" i18n:domain="ui">Unstick it</tal:block>\n
+ </span>\n
+ </a>\n
+ </tal:block>\n
+</tal:block>\n
+\n
+\n
+\n
+<tal:block metal:define-macro="hidden_dialogs">\n
+\n
+ <div id="add_new_tab_dialog"\n
+ class="toggable_dialog">\n
+ <h3 i18n:translate="" i18n:domain="ui"> Add new tab </h3>\n
+ <span i18n:translate="" i18n:domain="ui">Tab name</span>: \n
+ <input type="text" value="" name="pad_title" id="new_pad_title"/><br/><br/>\n
+ <button type="button"\n
+ onclick="toggleElement(\'add_new_tab_dialog\');"\n
+ i18n:translate="" \n
+ i18n:domain="ui">Cancel</button>\n
+ <button type="button"\n
+ tal:condition="python: mode==\'erp5_front\'"\n
+ tal:attributes="onclick python: \n
+ \'\'\'addPadOnServer(\'ERP5Site_addNewKnowledgePad\', \n
+ \'/%s\', \'%s\',\n
+ \'view\')\'\'\'\n
+ %(context.getPortalObject().getId(),\n
+ mode)" \n
+ i18n:translate="" \n
+ i18n:domain="ui">Add</button>\n
+ <button type="button"\n
+ tal:condition="python: mode==\'web_front\'"\n
+ tal:attributes="onclick python: \n
+ \'\'\'addPadOnServer(\'ERP5Site_addNewKnowledgePad\', \n
+ \'/%s/%s\', \'%s\', \n
+ \'view\')\'\'\'\n
+ %(context.getPortalObject().getId(), \n
+ context.getRelativeUrl(),\n
+ mode)" \n
+ i18n:translate="" \n
+ i18n:domain="ui">Add</button>\n
+ </div>\n
+\n
+ <div id="rename_tab_dialog" \n
+ tal:condition="active_knowledge_pad"\n
+ class="toggable_dialog">\n
+ <h3 i18n:translate="" i18n:domain="ui"> Rename tab </h3>\n
+ <form action="">\n
+ <div>\n
+ <span i18n:translate="" i18n:domain="ui">Tab name</span>:\n
+ <input type="text"\n
+ id="new_knowledge_pad_title"\n
+ name="knowledge_pad_title"\n
+ tal:attributes="value active_knowledge_pad/getTitle"/><br/><br/>\n
+ <button type="button"\n
+ i18n:translate="" \n
+ i18n:domain="ui"\n
+ onclick="toggleElement(\'rename_tab_dialog\');">Cancel</button>\n
+ <button type="button"\n
+ i18n:translate="" \n
+ i18n:domain="ui"\n
+ tal:attributes="onclick python: \'renameKnowledgePadToServer(\n
+ \\\'rename_tab_dialog\\\',\n
+ \\\'active_knowledge_pad_title\\\',\n
+ \\\'new_knowledge_pad_title\\\',\n
+ \\\'%s\\\')\' %active_knowledge_pad.getRelativeUrl()">\n
+ Rename \n
+ </button>\n
+ </div>\n
+ </form>\n
+ </div>\n
+</tal:block>\n
+\n
+\n
+<tal:block metal:define-macro="navigation"\n
+ tal:define="is_tabs_visible \n
+ python: int(here.REQUEST.get(\'is_tabs_visible\', 1));\n
+ editable_mode python: context.REQUEST.get(\'editable_mode\', False);">\n
+\n
+ <table id="navigation_table">\n
+ <tr>\n
+ <td tal:attributes="class python: test(is_tabs_visible,\n
+ \'border_bottom1px\',\n
+ \'border_bottom0px\');">\n
+ <div class="border_bottom0px" id="tabs_switcher">\n
+ <span i18n:translate="" i18n:domain="ui"\n
+ tal:condition="not: is_tabs_visible">Show tabs</span>\n
+ <span i18n:translate="" i18n:domain="ui" \n
+ tal:condition="is_tabs_visible">Hide tabs</span>\n
+ </div>\n
+ </td>\n
+ <td tal:attributes="class python: test(is_tabs_visible,\n
+ \'tab_visible\',\n
+ \'tab_hidden\');">\n
+ <div id="tabs"\n
+ tal:attributes="style python:\n
+ \'display: %s\' %test(is_tabs_visible, \'block\', \'none\')">\n
+ <ul>\n
+ <tal:block tal:repeat="knowledge_pad knowledge_pads">\n
+\n
+ <tal:block\n
+ tal:define="is_active python:\n
+ knowledge_pad.getRelativeUrl()==active_knowledge_pad.getRelativeUrl()">\n
+\n
+ <li tal:condition="is_active"\n
+ tal:define="global active_knowledge_pad knowledge_pad"\n
+ class="tab active">\n
+ <span>\n
+ <a class="active" id="active_knowledge_pad_title" href="#" tal:content="knowledge_pad/getTitle">Tab title</a>\n
+ <a class="icon edit" title="Settings" i18n:attributes="title" i18n:domain="ui"\n
+ href="#" onclick="toggleElement(\'rename_tab_dialog\');">Rename</a>\n
+ <a class="icon close" title="Remove" i18n:attributes="title" i18n:domain="ui"\n
+ tal:condition="python: mode==\'erp5_front\'" href="#"\n
+ tal:attributes="onclick python: \'removeKnowledgePadFromServer(\n
+ \\\'%s\\\', \\\'%s\\\',\\\'/%s\\\')\'\n
+ %(active_knowledge_pad.getRelativeUrl(),\n
+ mode,\n
+ context.getId())">Remove</a>\n
+ <a class="icon close" title="Remove" i18n:attributes="title" i18n:domain="ui"\n
+ tal:condition="python: mode!=\'erp5_front\'" href="#"\n
+ tal:attributes="onclick python: \'removeKnowledgePadFromServer(\n
+ \\\'%s\\\', \\\'%s\\\',\\\'/%s/%s\\\')\'\n
+ %(active_knowledge_pad.getRelativeUrl(),\n
+ mode,\n
+ context.getPortalObject().getId(),\n
+ context.getRelativeUrl())">Remove</a>\n
+ </span>\n
+ </li>\n
+\n
+ <li tal:condition="not: is_active"\n
+ class="tab">\n
+ <span>\n
+ <a href="#" tal:content="knowledge_pad/getTitle" tal:attributes="href python:\n
+ \'ERP5Site_toggleActiveKnowledgePad?knowledge_pad_url=%s&mode=%s\'\n
+ %(knowledge_pad.getRelativeUrl(), mode)">Tab tile</a>\n
+ <a class="icon edit" tal:attributes="href python:\n
+ \'ERP5Site_toggleActiveKnowledgePad?knowledge_pad_url=%s&mode=%s\'\n
+ %(knowledge_pad.getRelativeUrl(), mode)">Tab tile</a>\n
+ <a class="icon close" tal:attributes="href python:\n
+ \'ERP5Site_toggleActiveKnowledgePad?knowledge_pad_url=%s&mode=%s\'\n
+ %(knowledge_pad.getRelativeUrl(), mode)">Tab tile</a>\n
+ </span>\n
+ </li>\n
+ </tal:block>\n
+ </tal:block>\n
+ <li class="last">\n
+ <a class="tabs-add"\n
+ tal:condition="not: isKnowledgePadTemplateUsed"\n
+ onclick="toggleElement(\'add_new_tab_dialog\');"\n
+ i18n:translate="" i18n:domain="ui"\n
+ id="add_new_tab_dialog_link">Add tab</a>\n
+ <a class="tabs-add"\n
+ tal:condition="isKnowledgePadTemplateUsed"\n
+ onclick="showCreateDefaultKnowledgePadWarningMessage();"\n
+ i18n:translate="" i18n:domain="ui"\n
+ id="add_new_tab_dialog_link">\n
+ <img src="images/configure.png" \n
+ style="width:15px;"\n
+ alt="images/configure.png"/>\n
+ </a>\n
+ </li>\n
+ </ul>\n
+ </div>\n
+ </td>\n
+ <td>\n
+ <div id="add_new_gadget_link"\n
+ tal:attributes="class python: test(is_tabs_visible,\n
+ \'border_bottom1px\',\n
+ \'border_bottom0px\');">\n
+ <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget"> Add Gadgets</span>\n
+ </div>\n
+ </td>\n
+\n
+ </tr>\n
+ </table>\n
+\n
+</tal:block>\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>content_type</string> </key>
+ <value> <string>text/html</string> </value>
+ </item>
+ <item>
+ <key> <string>expand</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Base_viewKnowledgePadMacroLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml?rev=35513&r1=35512&r2=35513&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml [utf8] Fri May 21 10:53:59 2010
@@ -279,32 +279,32 @@
\n
}\n
\n
-#tabs ul li.active, #tabs ul li:hover {\n
+#tabs ul li.tab_selected, #tabs ul li:hover {\n
\n
\tbackground-position: 0 0;\n
\n
}\n
\n
-#tabs ul li.active span, #tabs ul li:hover span {\n
+#tabs ul li.tab_selected span, #tabs ul li:hover span {\n
\n
\tbackground-position: 100% 0;\n
\n
}\n
-\n
-#tabs ul li.active:hover {\n
+ \n
+#tabs ul li.tab_selected:hover {\n
\n
\tbackground-position: 0 -22px;\n
\tcolor:#fff;\n
\n
}\n
\n
-#tabs ul li.active:hover span {\n
+#tabs ul li.tab_selected:hover span {\n
\n
\tbackground-position: 100% -22px;\n
\n
}\n
\n
-#tabs ul li.active:hover span a { color:#fafafa; }\n
+#tabs ul li.tab_selected:hover span a { color:#fafafa; }\n
\n
#tabs ul li span a { color: #e2e0d2; }\n
\n
@@ -312,6 +312,28 @@
\n
\tbackground: none;\n
\n
+}\n
+\n
+/* Rename & Remove pad buttons */\n
+#tabs li span.rename_tab_dialog_image{\n
+ background: none;\n
+ margin-left: -40px;\n
+}\n
+\n
+#tabs li span.remove_tab_dialog_image{\n
+ background: none;\n
+ margin-left: -25px;\n
+}\n
+\n
+/* Add new tab link */\n
+#add_new_tab_dialog_link{\n
+ background: url("km_img/bullet.png") no-repeat 0 7px!important;\n
+ color: #9D968D!important;\n
+ padding-top: 4px!important;\n
+ margin-left: 10px!important;\n
+ padding-left:13px !important;\n
+ font-size: 8pt;\n
+ font-weight: normal;\n
}\n
\n
#navigation_table a, #navigation_table #tabs_switcher{\n
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml?rev=35513&r1=35512&r2=35513&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml [utf8] Fri May 21 10:53:59 2010
@@ -15,7 +15,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts74084052.19</string> </value>
+ <value> <string>ts74431602.59</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -89,17 +89,45 @@
overflow: auto;\n
}\n
\n
-\n
-#add_new_tab_dialog_link{\n
- /*line-height: 22px;*/\n
- padding-left: 10px;\n
-}\n
-\n
+/* Add gadgets link */\n
#add_new_gadget_link{\n
- padding-top:15px;\n
+ margin-top:13px;\n
+ padding:0; \n
+}\n
+\n
+#add-gadgets{\n
border-bottom: none;\n
float:right;\n
- width:auto;\n
+ background: url("km_img/bt-add.png") no-repeat 0 0px;\n
+ margin-top:0px;\n
+ padding:0;\n
+ width:72px;\n
+ height:18px;\n
+ cursor: pointer;\n
+}\n
+\n
+#add-gadgets span{\n
+ display: none;\n
+}\n
+\n
+/* Stick gadget */\n
+#stick-gadgets{\n
+ border-bottom: none;\n
+ float:right;\n
+ background: url("km_img/bt-stick.png") no-repeat 0 0px;\n
+ margin-top:0px;\n
+ padding:0;\n
+ width:55px;\n
+ height:18px;\n
+ cursor: pointer;\n
+}\n
+#stick-gadgets a{\n
+ height:17px;\n
+ width:72px;\n
+}\n
+\n
+#stick-gadgets span{\n
+ display: none;\n
}\n
\n
\n
@@ -249,10 +277,6 @@
}\n
\n
\n
-#add_new_gadget_link {\n
- border-bottom: none;\n
-}\n
-\n
#page_wrapper .content{\n
border: none;\n
}\n
@@ -326,7 +350,7 @@
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>4944</int> </value>
+ <value> <int>5335</int> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_km/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/bt/revision?rev=35513&r1=35512&r2=35513&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/bt/revision [utf8] Fri May 21 10:53:59 2010
@@ -1,1 +1,1 @@
-1409
+1410
More information about the Erp5-report
mailing list