Take into account permissions. Sort titles in projects.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16609 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributePropertyRenderer.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -82,7 +79,9 @@
     <select size="1" id="source_project" name="source_project"\n
                      tal:attributes="name string:${contribute_prefix}source_project">\n
       <option value="" value="" i18n:translate="" i18n:domain="ui">-- Select Programme --</option>\n
-      <option tal:repeat="item python:[(o.getTitle(),o.getRelativeUrl()) for o in here.project_module.searchFolder()]" tal:content="python:item[0]" tal:attributes="value python:item[1]">\n
+      <option tal:repeat="item python:[(o.getTitle(),o.getRelativeUrl()) for o in \n
+                                       here.project_module.searchFolder(sort_on=\'title\')]"\n
+              tal:content="python:item[0]" tal:attributes="value python:item[1]">\n
         Agricultural Development\n
       </option>\n
     </select>\n

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -60,6 +57,10 @@
     -->\n
 \n
 <tal:block metal:define-macro="main">\n
+<tal:block tal:define="global web_site_url web_site_url | nothing"/>\n
+<tal:block tal:condition="not:web_site_url">\n
+  <tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/>\n
+</tal:block>\n
 \n
 <div class="tabber" id="mytabber2">\n
   <div class="tabbertab">\n
@@ -108,7 +109,7 @@
   \n
   <div class="tabbertab">\n
     <h2>Link</h2>\n
-    <div class="fieldset">\n
+    <div class="fieldset tabbertabcont">\n
       <div>\n
         <label for="url" value="" i18n:translate="" i18n:domain="ui">Url</label>\n
         <input type="text" name="link_url" id="url" size="80" value="http://" />\n
@@ -155,7 +156,7 @@
               ),\n
 ]">\n
 \n
-      <div class="filebox" id="administration" tal:attributes="id file_group/id">\n
+      <div class="filebox" id="administration" class="tabbertabcont" tal:attributes="id file_group/id">\n
         <ul>\n
           <li class="listheader" value="" tal:content="file_group/title"\n
               i18n:translate="" i18n:domain="ui">Forms and Requests:</li>\n

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -139,7 +136,7 @@ Description:\n
           <li value="" i18n:translate=""\n
               i18n:domain="ui" tal:content="section/getTitle">Departments and Divisions:</li>\n
           <ul>\n
-            <li tal:repeat="root_section section/contentValues">\n
+            <li tal:repeat="root_section python:section.contentValues(checked_permission=\'View\')">\n
               <a    tal:content="root_section/getTitle"\n
                     tal:condition="python:not len(root_section.contentValues())"\n
                     tal:attributes="href root_section/absolute_url"/>\n

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/subsection_render.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -44,6 +41,12 @@
               </object>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
@@ -52,7 +55,8 @@
   This widget displays the list of Sections contained in the current context.\n
 --></tal:block>\n
 \n
-<ul><tal:block tal:repeat="section python:here.contentValues(portal_type=\'Web Section\')">\n
+<ul><tal:block tal:repeat="section python:here.contentValues(portal_type=\'Web Section\', \n
+                                                             checked_permission=\'View\')">\n
   <li>\n
     <a tal:attributes="href python: section.absolute_url_path()"\n
        tal:content="python: section.getProperty(\'translated_short_title\', None)\n