[Erp5-report] r39502 gabriel - in /experimental/bt5/erp5_web_ung_theme: SkinTemplateItem/po...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Oct 25 16:34:17 CEST 2010


Author: gabriel
Date: Mon Oct 25 16:34:15 2010
New Revision: 39502

URL: http://svn.erp5.org?rev=39502&view=rev
Log:
2010-10-25 gabriel
* added SearchableText feature and change 'Refresh' button to reset the query

Added:
    experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchResultList.xml
Modified:
    experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchBar.xml
    experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
    experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
    experimental/bt5/erp5_web_ung_theme/bt/change_log
    experimental/bt5/erp5_web_ung_theme/bt/revision

Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchBar.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchBar.xml?rev=39502&r1=39501&r2=39502&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchBar.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchBar.xml [utf8] Mon Oct 25 16:34:15 2010
@@ -42,8 +42,10 @@
                        portal_path python:website.absolute_url();\n
                        has_editor python: here.absolute_url() != portal_path;">\n
 <tal:block tal:condition="python: not has_editor">\n
-  <input name="field_your_search_text" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \'./ERP5Site_viewQuickSearchResultList\');" />\n
-  <input type="submit" name="./ERP5Site_viewQuickSearchResultList:method" class="button" value="Search Docs" />\n
+  <form>\n
+  <input type="text" name="field_your_search_text" class="field"/>\n
+  <input type="submit" value="Search Docs" name="WebSection_viewSearchResultList:method"/>\n
+  </form> \n
 </tal:block>\n
 <tal:block tal:condition="python: has_editor">\n
 <a name="document_title" tal:content="here/getTitle"/>\n

Added: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchResultList.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchResultList.xml?rev=39502&view=auto
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchResultList.xml (added)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewSearchResultList.xml [utf8] Mon Oct 25 16:34:15 2010
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>request = context.REQUEST\n
+field_your_search_text = request.get("field_your_search_text")\n
+portal_type_list = ["Web Page", "Web Illustration", "Web Table"]\n
+\n
+keep_items = dict(SearchableText=field_your_search_text,\n
+          portal_type=portal_type_list)\n
+\n
+return context.Base_redirect("WebSection_viewDocumentList", keep_items=keep_items)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>request</string>
+                            <string>field_your_search_text</string>
+                            <string>portal_type_list</string>
+                            <string>dict</string>
+                            <string>keep_items</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSection_viewSearchResultList</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml?rev=39502&r1=39501&r2=39502&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] Mon Oct 25 16:34:15 2010
@@ -80,11 +80,11 @@
       <div class="main">\n
         <div class="main-status">\n
           Starred\n
-          <tal:block tal:condition="python: not has_editor">\n
-            <a tal:attributes="href request/URL">Refresh</a>\n
+          <tal:block tal:define="current_url request/URL" tal:condition="python: not has_editor">\n
+            <a tal:attributes="href python: current_url + \'?reset:int=1\'">Refresh</a>\n
           </tal:block>\n
           <tal:block tal:condition="python: has_editor">\n
-            <a tal:attributes="href python: request.get(\'URL\') + \'?editable_mode:int=1\'">Refresh</a>\n
+            <a tal:attributes="href python: current_url + \'?editable_mode:int=1\'">Refresh</a>\n
           </tal:block>\n
         </div>\n
         <div class="main-content">\n
@@ -93,8 +93,7 @@
               <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
             </tal:block>\n
           </tal:block>\n
-         <tal:block metal:define-slot="main">\n
-         </tal:block>\n
+         <tal:block metal:define-slot="main"/>\n
         </div>\n
       </div>\n
     </div>\n

Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml?rev=39502&r1=39501&r2=39502&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] Mon Oct 25 16:34:15 2010
@@ -204,7 +204,7 @@ div.document div.content {\n
   padding:0px;\n
 }\n
 \n
-div.document div.content fieldset.bottom {\n
+fieldset.bottom {\n
   position: relative;\n
   border:0px;\n
   padding:0px;\n
@@ -229,7 +229,7 @@ tr.DataA:hover, tr.DataB:hover {\n
   background-color: #DAE6F6;\n
 }\n
 \n
-div.document div.content a img {\n
+div.document div.content a img, div.main-content a img{\n
   border:0px;\n
 }\n
 div.main div.main-status a {\n
@@ -271,10 +271,6 @@ thead {\n
   width:0.5%;\n
 }\n
 \n
-input[type="text"] { \n
-  float:left;\n
-}\n
-\n
 .listbox-table-header-cell {\n
   text-align:left;\n
 }\n
@@ -363,7 +359,7 @@ div.header-bottom {\n
 \n
 div.header-right {\n
   float: right;\n
-  margin-top: -33px;\n
+  margin-top: -24px;\n
   height: 18px;\n
   width: 30%;\n
 }\n
@@ -374,6 +370,10 @@ div.bottom_actions button {\n
 \n
 div.gadget-column, div.main {\n
   margin-top: 1%;\n
+}\n
+\n
+button.delete {\n
+  margin-top: 3px;\n
 }
 
 ]]></string> </value>

Modified: experimental/bt5/erp5_web_ung_theme/bt/change_log
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/bt/change_log?rev=39502&r1=39501&r2=39502&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/bt/change_log [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/bt/change_log [utf8] Mon Oct 25 16:34:15 2010
@@ -1,3 +1,6 @@
+2010-10-25 gabriel
+* added SearchableText feature and change 'Refresh' button to reset the query
+
 2010-10-21 gabriel
 * Added action to create new Web documents
 

Modified: experimental/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/bt/revision?rev=39502&r1=39501&r2=39502&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Oct 25 16:34:15 2010
@@ -1 +1 @@
-23
\ No newline at end of file
+24
\ No newline at end of file




More information about the Erp5-report mailing list