[Erp5-report] r27475 - in /erp5/trunk/bt5/erp5_web_multiflex5_theme: SkinTemplateItem/porta...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 9 16:22:49 CEST 2009
Author: kazuhiko
Date: Tue Jun 9 16:22:44 2009
New Revision: 27475
URL: http://svn.erp5.org?rev=27475&view=rev
Log:
* disable global_navigation_box for now.
* fix a bug in news widget.
* add a 'Login' link in the right of navigation bar.
* more CSS modifications for toolbox.
Added:
erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/template_local_role_list
erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/template_portal_type_role_list
Modified:
erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml
erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNewsWidget.xml
erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/global_navigation_box.xml
erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml
erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml
erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision
Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNavigationWidget.xml [utf8] Tue Jun 9 16:22:44 2009
@@ -53,9 +53,10 @@
</tal:block>\n
\n
<tal:block tal:define="current_web_site python:request.get(\'current_web_site\', here);\n
- menu_item_list python:current_web_site.WebSection_getSiteMapTree(depth=3)">\n
- <ul tal:repeat="menu_item menu_item_list">\n
- <li tal:condition="python: menu_item is not None">\n
+ menu_item_list python:current_web_site.WebSection_getSiteMapTree(depth=3);\n
+ web_site_url python:current_web_site.absolute_url()">\n
+ <ul>\n
+ <li tal:repeat="menu_item menu_item_list">\n
<tal:block tal:condition="not:nocall:menu_item/subsection"><a tal:attributes="href menu_item/url" tal:content="menu_item/translated_title">Menu</a></tal:block>\n
<tal:block tal:condition="nocall:menu_item/subsection">\n
<a tal:attributes="href menu_item/url"><tal:block tal:replace="menu_item/translated_title">Drop-down Menu</tal:block><!--[if IE 7]><!--></a><!--<![endif]-->\n
@@ -71,6 +72,15 @@
<!--[if lte IE 6]></td></tr></table></a><![endif]-->\n
</tal:block>\n
</li>\n
+ <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
+ <li class="login"><a href="#" i18n:translate="" i18n:domain="ui"\n
+ tal:attributes="href python:\'%s/login_form\' % web_site_url">Login</a></li>\n
+ </tal:block>\n
+ <tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n
+ <li class="login"><a tal:attributes="href python:\'%s/logout\' % web_site_url">\n
+ <tal:block i18n:translate="" i18n:domain="ui">Logout</tal:block>\n
+ (<tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getUserName()" />)</a></li>\n
+ </tal:block>\n
</ul>\n
</tal:block>\n
Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNewsWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNewsWidget.xml?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNewsWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewNewsWidget.xml [utf8] Tue Jun 9 16:22:44 2009
@@ -11,7 +11,7 @@
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
- <value> <string>web_section_ram_cache</string> </value>
+ <value> <string>web_site_user_ram_cache</string> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
@@ -53,8 +53,9 @@
-->\n
</tal:block>\n
\n
-<tal:block tal:define="web_site python:here.getWebSiteValue();\n
- news_area_section_id python:here.getLayoutProperty(\'news_area_section_id\', \'\');\n
+<tal:block tal:define="current_web_section python:request.get(\'current_web_section\', here);\n
+ web_site python:current_web_section.getWebSiteValue();\n
+ news_area_section_id python:current_web_section.getLayoutProperty(\'layout_news_area_section_id\', \'\');\n
news_area_section python:web_site.restrictedTraverse(news_area_section_id)">\n
<ul>\n
<tal:block tal:repeat="item python:news_area_section.getDocumentValueList(limit=10, sort_on=[(\'modification_date\',\'descending\')])">\n
Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/global_navigation_box.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/global_navigation_box.xml?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/global_navigation_box.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/global_navigation_box.xml [utf8] Tue Jun 9 16:22:44 2009
@@ -15,6 +15,7 @@
<list>
<string>default</string>
<string>editable</string>
+ <string>enabled</string>
<string>title</string>
</list>
</value>
@@ -110,6 +111,10 @@
<value> <int>0</int> </value>
</item>
<item>
+ <key> <string>enabled</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_editor_field</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml [utf8] Tue Jun 9 16:22:44 2009
@@ -337,7 +337,7 @@
/******************************************/\n
\n
/******************************************/\n
-/* ERP5 Extensions */\n
+/* ERP5 Extensions */\n
/******************************************/\n
\n
/* We will have to handle the different types in another way */\n
@@ -456,6 +456,7 @@
div.adminToolbox div.adminSection label {\n
display: block!important;\n
width: 6em!important;\n
+ float: left;\n
}\n
\n
div.adminToolbox div.hiddenLabel label {\n
@@ -464,15 +465,14 @@
\n
/* Sub section title */\n
div.adminToolbox h3 {\n
- margin-left: 0em;\n
- /* font-size: inherit; */ /* Does not seem compatible with IE */\n
- font-size: 8pt;\n
+ font-size:120% !important /*Non-IE6*/; font-size:100% /*IE6*/;\n
+ margin:0;\n
}\n
\n
/* Title */\n
div.adminToolbox > div > h3 {\n
background: #f77;\n
- padding: .5em;\n
+ padding: 0.5em 0;\n
margin: 0;\n
color: #fff;\n
cursor: pointer;\n
@@ -480,16 +480,20 @@
\n
div.adminToolbox > div > h3:hover {background: #f00}\n
\n
-div.adminToolbox > div.input > div.adminSection {\n
- border-bottom: 1px dotted #777;\n
- padding: .5em .5em .5em 0.5em;\n
-}\n
-\n
-div.adminToolbox > div.input > div.adminSection:last-child {border-bottom: none}\n
+div.adminToolbox div.input > div.adminSection {\n
+ border-bottom: 1px solid #eee;\n
+ padding: 0.5em 0;\n
+}\n
+\n
+div.adminToolbox div.input > div.adminSection:last-child {border-bottom: none}\n
\n
div.adminToolbox ul {list-style: none}\n
\n
-div.adminToolbox li {margin: 0}\n
+div.adminToolbox li {\n
+ margin: 0;\n
+ padding: 0;\n
+ background: none;\n
+}\n
\n
div.adminToolbox li > a {text-decoration: none}\n
\n
@@ -554,10 +558,6 @@
margin:0;\n
}\n
\n
-div.adminToolbox h3 {\n
- margin:0.5em 0 0.2em;\n
-}\n
-\n
div.adminToolbox ul {\n
margin:0;\n
}\n
Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml [utf8] Tue Jun 9 16:22:44 2009
@@ -325,6 +325,11 @@
.navbuttonflag a:hover {text-decoration:none;}\n
.navbuttonflag a img {height:15px;}\n
\n
+/******************************************/\n
+/* ERP5 Extensions */\n
+/******************************************/\n
+.navbar ul li.login {float:right}\n
+\n
</tal:block>
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/revision [utf8] Tue Jun 9 16:22:44 2009
@@ -1,1 +1,1 @@
-102
+103
Added: erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/template_local_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/template_local_role_list?rev=27475&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/template_portal_type_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_multiflex5_theme/bt/template_portal_type_role_list?rev=27475&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list