[Erp5-report] r9471 - /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Aug 25 18:51:11 CEST 2006


Author: kevin
Date: Fri Aug 25 18:51:10 2006
New Revision: 9471

URL: http://svn.erp5.org?rev=9471&view=rev
Log:
Use generic Planning Box stuff.
Delete &nbsp; in dummy <p> tags used to clear.
Code layout modification.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml?rev=9471&r1=9470&r2=9471&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml Fri Aug 25 18:51:10 2006
@@ -81,44 +81,26 @@
 <tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/>\n
 \n
 <?xml version="1.0" encoding="UTF-8"?>\n
-<!DOCTYPE html\n
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n
-<html xmlns="http://www.w3.org/1999/xhtml"\n
-      xml:lang="en"\n
-      lang="en">\n
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n
+\n
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n
   <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
-    <base tal:attributes="href python: \'%s/\' % (url, )" />\n
+    <base tal:attributes="href python: \'%s/\' % (url, )"/>\n
     <meta name="generator" content="ERP5"/>\n
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
-    <title tal:content="template/title_or_id"\n
-           i18n:translate="" i18n:domain="ui"></title>\n
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n
     <tal:block tal:repeat="css css_list">\n
-      <link tal:attributes="href css"\n
-            type="text/css"\n
-            rel="stylesheet" />\n
+      <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n
     </tal:block>\n
 \n
-    <tal:block tal:condition="form/pt | nothing">\n
-      <tal:block tal:define="planning_box python: here.ERP5XhtmlStyle_getPlanningBox(form)">\n
-        <tal:block tal:condition="python: planning_box">\n
-\n
-          <style tal:content="structure python: planning_box.render_css(None,REQUEST=request)"\n
-                 tal:attributes="type python:\'text/css\'">\n
-          </style>\n
-\n
-          <tal:block tal:condition="python: planning_box.get_value(\'js_enabled\')">\n
-            <tal:block tal:define="dummy python:js_list.append(\'%s/wz_dragdrop.js\' % (here.portal_url.getPortalPath(), ));" />\n
-          </tal:block>\n
-        </tal:block>\n
-      </tal:block>\n
+    <tal:block metal:use-macro="here/global_definitions/macros/planning_box_definitions"/>\n
+\n
+    <tal:block tal:repeat="js js_list">\n
+      <script tal:attributes="src js" type="text/javascript"></script>\n
     </tal:block>\n
 \n
-    <tal:block tal:repeat="js js_list">\n
-      <script tal:attributes="src js"\n
-              type="text/javascript"></script>\n
-    </tal:block>\n
   </head>\n
+\n
   <body onload="fixLeftRightHeight()">\n
 <!--     <tal:block tal:replace="structure request"/> -->\n
     <form id="main_form"\n
@@ -132,7 +114,6 @@
                id="hidden_button" type="submit" value="dummy"\n
                tal:attributes="name python: \'%s:method\' % (form_action, )" />\n
 \n
-        <!-- Generic way of specifying http parameters -->\n
         <tal:block metal:use-macro="here/global_definitions/macros/http_definitions"/>\n
 \n
         <div id="main_bar">\n
@@ -180,12 +161,11 @@
               <select name="select_module"\n
                       tal:define="module_list here/ERP5XhtmlStyle_getModuleItemList;"\n
                       tal:attributes="onChange string:submitAction(this.form,\'${url}/ERP5XhtmlStyle_doModule\')">\n
-                <option selected="selected" value=""\n
-                        i18n:translate="" i18n:domain="ui">ERP5 Modules</option>\n
+                <option selected="selected" value="" i18n:translate="" i18n:domain="ui">ERP5 Modules</option>\n
                 <tal:block tal:repeat="module module_list">\n
                   <option value="something"\n
                           tal:attributes="value python: module[1]"\n
-                          tal:content="python: module[0]" />\n
+                          tal:content="python: module[0]"/>\n
                 </tal:block>\n
               </select>\n
               <button type="submit" name="ERP5XhtmlStyle_doModule:method" title="Select Module"\n
@@ -226,23 +206,20 @@
               </button>\n
             </span>\n
           </span>\n
-          <p class="clear">&nbsp;</p>\n
+          <p class="clear"></p>\n
         </div>\n
         <div id="context_bar">\n
-          <tal:block metal:define-slot="context_bar" />\n
+          <tal:block metal:define-slot="context_bar"/>\n
         </div>\n
       </div>\n
       <div id="status">\n
         <div id="breadcrumb">\n
           <tal:block tal:repeat="item here/breadcrumbs">\n
             <tal:block tal:condition="python: repeat[\'item\'].index < 2">\n
-              <a tal:attributes="href item/url"\n
-                tal:content="item/title"\n
-                i18n:translate="" i18n:domain="ui"></a>\n
+              <a tal:attributes="href item/url" tal:content="item/title" i18n:translate="" i18n:domain="ui"/>\n
             </tal:block>\n
             <tal:block tal:condition="python: repeat[\'item\'].index >= 2">\n
-              <a tal:attributes="href item/url"\n
-                tal:content="item/title"></a>\n
+              <a tal:attributes="href item/url" tal:content="item/title"/>\n
             </tal:block>\n
             /\n
           </tal:block>\n
@@ -250,15 +227,14 @@
         <div id="logged_in_as">\n
           <tal:block tal:condition="not: here/portal_membership/isAnonymousUser">\n
             <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>\n
-            <tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getUserName()" />\n
+            <tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getUserName()"/>\n
           </tal:block>\n
         </div>\n
         <p class="clear" style="height: 10px"></p>\n
-        <div tal:content="structure here/REQUEST/portal_status_message | nothing"\n
-             id="transition_message"></div>\n
+        <div tal:content="structure here/REQUEST/portal_status_message | nothing" id="transition_message"/>\n
       </div>\n
       <div id="master">\n
-        <tal:block metal:define-slot="main" />\n
+        <tal:block metal:define-slot="main"/>\n
       </div>\n
     </form>\n
   </body>\n




More information about the Erp5-report mailing list