[Erp5-report] r35326 ivan - in /erp5/trunk/bt5/erp5_km: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri May 14 12:50:08 CEST 2010
Author: ivan
Date: Fri May 14 12:50:06 2010
New Revision: 35326
URL: http://svn.erp5.org?rev=35326&view=rev
Log:
Merge erp5_km_common.css but still keep a copy in obsolete folder.
Added:
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/erp5_km_common.css.xml
Modified:
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
erp5/trunk/bt5/erp5_km/bt/revision
Added: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/erp5_km_common.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/erp5_km_common.css.xml?rev=35326&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/erp5_km_common.css.xml (added)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/old/erp5_km_common.css.xml [utf8] Fri May 14 12:50:06 2010
@@ -1,0 +1,139 @@
+<?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>_Cacheable__manager_id</string> </key>
+ <value> <string>http_cache</string> </value>
+ </item>
+ <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[
+
+/****************************************************************/\n
+/* TODO: XXX-JPS */\n
+/* - missing docstring */\n
+/* - add dynamic properties */\n
+/****************************************************************/\n
+\n
+<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n
+\n
+\n
+/* Generic styles used in all ERP5 KM Styles */\n
+\n
+.doNotDisplay, /* for compatibility only */\n
+.do_not_display {\n
+ display: none\n
+}\n
+\n
+.hiddenLabel label, /* for compatibility only */\n
+.hidden_label label { \n
+ display: none !important\n
+}\n
+\n
+fieldset.hidden_fieldset {\n
+ display: none;\n
+}\n
+\n
+input#hidden_button {\n
+ width: 0;\n
+ height: 0;\n
+ display: inline;\n
+ border-width: 0;\n
+ float: left;\n
+}\n
+\n
+/* Save button styling */\n
+div.actions button {\n
+ float: right;\n
+ z-index: 300;\n
+ top: -.5em;\n
+ right: 0;\n
+}\n
+\n
+/* Search Popup window */\n
+div.search_popup {\n
+ background-color: #FFFFFF;\n
+ border: 1px solid black;\n
+ display: none;\n
+ left: 500px;\n
+ padding: 10px;\n
+ position: fixed;\n
+ top: 130px;\n
+ width: 150px;\n
+ z-index: 100;\n
+}\n
+\n
+/* Search Bar */\n
+div.searchBar{\n
+ margin-bottom: 2em;\n
+ text-align: center;\n
+}\n
+\n
+div.extendedSearchBar{\n
+ margin-top: 1em;\n
+ padding: 0.2em;\n
+ text-align: center;\n
+}\n
+\n
+div.searchBar input, div.extendedSearchBar input {\n
+ width: auto;\n
+}\n
+\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>erp5_km_common.css</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Common CSS Declarations - to refactor or merge</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml?rev=35326&r1=35325&r2=35326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml [utf8] Fri May 14 12:50:06 2010
@@ -1396,7 +1396,6 @@
}\n
\n
\n
-\n
/* Web Toolbar */\n
div.web-toolbar{\n
color: auto;\n
@@ -1426,6 +1425,66 @@
background:#E9E9E9;\n
}\n
\n
+\n
+/* Generic styles used in all ERP5 KM Styles */\n
+.doNotDisplay, \n
+.do_not_display {\n
+ display: none\n
+}\n
+\n
+.hiddenLabel label,\n
+.hidden_label label { \n
+ display: none !important\n
+}\n
+\n
+fieldset.hidden_fieldset {\n
+ display: none;\n
+}\n
+\n
+input#hidden_button {\n
+ width: 0;\n
+ height: 0;\n
+ display: inline;\n
+ border-width: 0;\n
+ float: left;\n
+}\n
+\n
+/* Save button styling */\n
+div.actions button {\n
+ float: right;\n
+ z-index: 300;\n
+ top: -.5em;\n
+ right: 0;\n
+}\n
+\n
+/* Search Popup window */\n
+div.search_popup {\n
+ background-color: #FFFFFF;\n
+ border: 1px solid black;\n
+ display: none;\n
+ left: 500px;\n
+ padding: 10px;\n
+ position: fixed;\n
+ top: 130px;\n
+ width: 150px;\n
+ z-index: 100;\n
+}\n
+\n
+/* Search Bar */\n
+div.searchBar{\n
+ margin-bottom: 2em;\n
+ text-align: center;\n
+}\n
+\n
+div.extendedSearchBar{\n
+ margin-top: 1em;\n
+ padding: 0.2em;\n
+ text-align: center;\n
+}\n
+\n
+div.searchBar input, div.extendedSearchBar input {\n
+ width: auto;\n
+}\n
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml?rev=35326&r1=35325&r2=35326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml [utf8] Fri May 14 12:50:06 2010
@@ -118,7 +118,6 @@
\'%s/km_css/color.css\' % portal_path,\n
\'%s/km_css/pulldown.css\' % portal_path,\n
\'%s/km_css/type.css\' % portal_path,\n
- \'%s/km_css/erp5_km_common.css\' % portal_path,\n
\'%s/km_css/gadget.css\' % portal_path,\n
\'%s/km_custom.css\' % portal_path,\n
];\n
Modified: erp5/trunk/bt5/erp5_km/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/bt/revision?rev=35326&r1=35325&r2=35326&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/bt/revision [utf8] Fri May 14 12:50:06 2010
@@ -1,1 +1,1 @@
-1390
+1391
More information about the Erp5-report
mailing list