Commit 596c0b18 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

* 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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27475 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4e4dfc00
...@@ -53,9 +53,10 @@ ...@@ -53,9 +53,10 @@
</tal:block>\n </tal:block>\n
\n \n
<tal:block tal:define="current_web_site python:request.get(\'current_web_site\', here);\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 menu_item_list python:current_web_site.WebSection_getSiteMapTree(depth=3);\n
<ul tal:repeat="menu_item menu_item_list">\n web_site_url python:current_web_site.absolute_url()">\n
<li tal:condition="python: menu_item is not None">\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="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 <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 <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 @@ ...@@ -71,6 +72,15 @@
<!--[if lte IE 6]></td></tr></table></a><![endif]-->\n <!--[if lte IE 6]></td></tr></table></a><![endif]-->\n
</tal:block>\n </tal:block>\n
</li>\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 </ul>\n
</tal:block>\n </tal:block>\n
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_Cacheable__manager_id</string> </key> <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>
<item> <item>
<key> <string>_bind_names</string> </key> <key> <string>_bind_names</string> </key>
...@@ -53,8 +53,9 @@ ...@@ -53,8 +53,9 @@
-->\n -->\n
</tal:block>\n </tal:block>\n
\n \n
<tal:block tal:define="web_site python:here.getWebSiteValue();\n <tal:block tal:define="current_web_section python:request.get(\'current_web_section\', here);\n
news_area_section_id python:here.getLayoutProperty(\'news_area_section_id\', \'\');\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 news_area_section python:web_site.restrictedTraverse(news_area_section_id)">\n
<ul>\n <ul>\n
<tal:block tal:repeat="item python:news_area_section.getDocumentValueList(limit=10, sort_on=[(\'modification_date\',\'descending\')])">\n <tal:block tal:repeat="item python:news_area_section.getDocumentValueList(limit=10, sort_on=[(\'modification_date\',\'descending\')])">\n
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<list> <list>
<string>default</string> <string>default</string>
<string>editable</string> <string>editable</string>
<string>enabled</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -109,6 +110,10 @@ ...@@ -109,6 +110,10 @@
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_editor_field</string> </value> <value> <string>my_editor_field</string> </value>
......
...@@ -456,6 +456,7 @@ div.adminToolbox.field label {\n ...@@ -456,6 +456,7 @@ div.adminToolbox.field label {\n
div.adminToolbox div.adminSection label {\n div.adminToolbox div.adminSection label {\n
display: block!important;\n display: block!important;\n
width: 6em!important;\n width: 6em!important;\n
float: left;\n
}\n }\n
\n \n
div.adminToolbox div.hiddenLabel label {\n div.adminToolbox div.hiddenLabel label {\n
...@@ -464,15 +465,14 @@ div.adminToolbox div.hiddenLabel label {\n ...@@ -464,15 +465,14 @@ div.adminToolbox div.hiddenLabel label {\n
\n \n
/* Sub section title */\n /* Sub section title */\n
div.adminToolbox h3 {\n div.adminToolbox h3 {\n
margin-left: 0em;\n font-size:120% !important /*Non-IE6*/; font-size:100% /*IE6*/;\n
/* font-size: inherit; */ /* Does not seem compatible with IE */\n margin:0;\n
font-size: 8pt;\n
}\n }\n
\n \n
/* Title */\n /* Title */\n
div.adminToolbox > div > h3 {\n div.adminToolbox > div > h3 {\n
background: #f77;\n background: #f77;\n
padding: .5em;\n padding: 0.5em 0;\n
margin: 0;\n margin: 0;\n
color: #fff;\n color: #fff;\n
cursor: pointer;\n cursor: pointer;\n
...@@ -480,16 +480,20 @@ div.adminToolbox > div > h3 {\n ...@@ -480,16 +480,20 @@ div.adminToolbox > div > h3 {\n
\n \n
div.adminToolbox > div > h3:hover {background: #f00}\n div.adminToolbox > div > h3:hover {background: #f00}\n
\n \n
div.adminToolbox > div.input > div.adminSection {\n div.adminToolbox div.input > div.adminSection {\n
border-bottom: 1px dotted #777;\n border-bottom: 1px solid #eee;\n
padding: .5em .5em .5em 0.5em;\n padding: 0.5em 0;\n
}\n }\n
\n \n
div.adminToolbox > div.input > div.adminSection:last-child {border-bottom: none}\n div.adminToolbox div.input > div.adminSection:last-child {border-bottom: none}\n
\n \n
div.adminToolbox ul {list-style: none}\n div.adminToolbox ul {list-style: none}\n
\n \n
div.adminToolbox li {margin: 0}\n div.adminToolbox li {\n
margin: 0;\n
padding: 0;\n
background: none;\n
}\n
\n \n
div.adminToolbox li > a {text-decoration: none}\n div.adminToolbox li > a {text-decoration: none}\n
\n \n
...@@ -554,10 +558,6 @@ div.adminToolbox button img {\n ...@@ -554,10 +558,6 @@ div.adminToolbox button img {\n
margin:0;\n margin:0;\n
}\n }\n
\n \n
div.adminToolbox h3 {\n
margin:0.5em 0 0.2em;\n
}\n
\n
div.adminToolbox ul {\n div.adminToolbox ul {\n
margin:0;\n margin:0;\n
}\n }\n
......
...@@ -325,6 +325,11 @@ div.subcontent-box.headbox1noicon h2.noicon {background:none;}\n ...@@ -325,6 +325,11 @@ div.subcontent-box.headbox1noicon h2.noicon {background:none;}\n
.navbuttonflag a:hover {text-decoration:none;}\n .navbuttonflag a:hover {text-decoration:none;}\n
.navbuttonflag a img {height:15px;}\n .navbuttonflag a img {height:15px;}\n
\n \n
/******************************************/\n
/* ERP5 Extensions */\n
/******************************************/\n
.navbar ul li.login {float:right}\n
\n
</tal:block> </tal:block>
]]></string> </value> ]]></string> </value>
......
102 103
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment