[Erp5-report] r7245 - /erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/

nobody at svn.erp5.org nobody at svn.erp5.org
Fri May 12 14:40:15 CEST 2006


Author: chris
Date: Fri May 12 14:40:05 2006
New Revision: 7245

URL: http://svn.erp5.org?rev=7245&view=rev
Log:
- added show unmodified files feature

Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml?rev=7245&r1=7244&r2=7245&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml Fri May 12 14:40:05 2006
@@ -78,6 +78,7 @@
     var tree = null;\n
     var business_template;\n
     var is_expanded=false;\n
+    var is_showing_unmodified=false;\n
     var ie  = document.all\n
     var ns6 = document.getElementById&&!document.all\n
     var isMenu  = false ;\n
@@ -123,6 +124,19 @@
         tree.closeAllItems(0);\n
         is_expanded=false;\n
       }\n
+    }\n
+\n
+    function showNormalFiles(){\n
+      showObject();\n
+      is_expanded = false;\n
+      if(!is_showing_unmodified){\n
+        tree.loadXML(\'tree.xml?bt_id=%s&show_unmodified=True&do_extract=False\', hideObject);\n
+        is_showing_unmodified = true;\n
+      }else{\n
+        tree.loadXML(\'tree.xml?bt_id=%s&do_extract=False\', hideObject);\n
+        is_showing_unmodified = false;\n
+      }\n
+      tree.refreshItem(0);\n
     }\n
         \n
     function commit(popup, form){\n
@@ -371,7 +385,7 @@
       open(\'%s/BusinessTemplate_doSvnLs?file=\'+tree.getSelectedItemId(), \'_self\');\n
     }\n
   </script>\n
-\'\'\'% (context.getId(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url())\n
+\'\'\'% (context.getId(), context.getId(), context.getId(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url())\n
 \n
 return printed\n
 

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml?rev=7245&r1=7244&r2=7245&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml Fri May 12 14:40:05 2006
@@ -143,7 +143,8 @@
   <p><font color="green">Added files</font><br />\n
   <font color="orange">Modified files</font><br />\n
   <font color="red">Removed files</font><br />\n
-  <font color="grey">conflicted files</font><br />\n
+  <font color="grey">Conflicted files</font><br />\n
+  <font color=\'black\'>Unmodified files</font><br />\n
   </p>\n
   </div>\n
 </div>\n
@@ -154,7 +155,9 @@
     winList[\'captionWindow\'].open();\n
   }\n
 </script>\n
-\n
+</center>\n
+<input name="showUnmodified" value="showUnmodified" type="checkbox" onclick="showNormalFiles()"> <font color=\'black\'>Show unmodified files</font>\n
+<center>\n
 <script>\n
   // Menu Customization\n
   var MenuToolBar=new CreateToolBarMenu(\'#dae6e6\', \'#FFFFFF\', \'#B1BBBB\', \'#6699FF\', \'font-family:verdana;font-size:11px;color:black;font-weight:bold\', 16, 16)\n
@@ -177,6 +180,15 @@
           var splash = document.all.splashScreen;\n
         }\n
 \n
+        function showObject() {\n
+\t  if (ns4) {\n
+\t    splash.visibility = "visible";\n
+\t  }\n
+\t  if (ie4 || upLevel) {\n
+\t    splash.style.visibility = "visible";\n
+          }\n
+        }\n
+\n
         function hideObject() {\n
 \t  if (ns4) {\n
 \t    splash.visibility = "hide";\n

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml?rev=7245&r1=7244&r2=7245&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml Fri May 12 14:40:05 2006
@@ -68,11 +68,12 @@
             <key> <string>_body</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-context.getPortalObject().portal_subversion.extractBT(context)\n
+if do_extract==True:\n
+  context.getPortalObject().portal_subversion.extractBT(context)\n
 \n
 context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/xml;; charset=utf-8\')\n
 \n
-root = context.getPortalObject().portal_subversion.getModifiedTree(context)\n
+root = context.getPortalObject().portal_subversion.getModifiedTree(context, show_unmodified)\n
 if not root:\n
   return \'\'\'<?xml version=\'1.0\' encoding=\'iso-8859-1\'?>\n
 <tree id=\'0\'></tree>\'\'\'\n
@@ -94,7 +95,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>show_unmodified=False, do_extract=True</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -114,12 +115,15 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>0</int> </value>
+                        <value> <int>2</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>show_unmodified</string>
+                            <string>do_extract</string>
+                            <string>True</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>root</string>
@@ -134,7 +138,10 @@
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <int>0</int>
+                <int>1</int>
+              </tuple>
             </value>
         </item>
         <item>




More information about the Erp5-report mailing list