[Erp5-report] r41343 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Dec 10 16:39:17 CET 2010 

Author: gabriel
Date: Fri Dec 10 16:39:17 2010
New Revision: 41343

URL: http://svn.erp5.org?rev=41343&view=rev
Log:
2010-12-10 gabriel
* Refactored code to be possible make upload of Spreadsheet Documents.

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
    erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
    erp5/trunk/bt5/erp5_web_ung_theme/bt/comment
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml?rev=41343&r1=41342&r2=41343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml [utf8] Fri Dec 10 16:39:17 2010
@@ -50,9 +50,14 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>document = context.Base_contribute(file=file, \n
+            <value> <string>portal_type_dict = {"Web Page": "Text",\n
+                    "Web Table": "Spreadsheet",\n
+                    "Web Illustration": "Drawing"}\n
+\n
+portal_type = context.REQUEST.form.get("portal_type")\n
+document = context.Base_contribute(file=file, \n
                        url=None, \n
-                       portal_type="Text", \n
+                       portal_type=portal_type_dict.get(portal_type), \n
                        synchronous_metadata_discovery=None, \n
                        redirect_to_document=False, \n
                        attach_document_to_context=False, \n
@@ -65,7 +70,7 @@
                        follow_up_list=None, \n
 )\n
 \n
-return context.ERP5Site_createNewWebDocument(selection_action="Web Page",\n
+return context.ERP5Site_createNewWebDocument(selection_action=portal_type,\n
                                              document_path=document.getPath(),\n
                                              upload_document=1)\n
 </string> </value>
@@ -106,8 +111,10 @@ return context.ERP5Site_createNewWebDocu
                           <tuple>
                             <string>file</string>
                             <string>kw</string>
+                            <string>portal_type_dict</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>portal_type</string>
                             <string>None</string>
                             <string>False</string>
                             <string>document</string>

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml?rev=41343&r1=41342&r2=41343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewMenuWidget.xml [utf8] Fri Dec 10 16:39:17 2010
@@ -70,6 +70,12 @@
   <form action="WebSection_uploadDocument" method="post" enctype="multipart/form-data">\n
    <fieldset id="file_box">\n
      <input type="file" size="30" name="file">\n
+     <select name="portal_type">\n
+       <option value="Web Page">Web Page</option>\n
+       <option value="Web Illustration">Web Illustration</option>\n
+       <option value="Web Table">Web Table</option>\n
+     </select>\n
+     <br />\n
      <input type="submit" value="Submit" id="submit_document">\n
    </fieldset>\n
   </form> \n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml?rev=41343&r1=41342&r2=41343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] Fri Dec 10 16:39:17 2010
@@ -849,7 +849,7 @@ a.domain_selected {\n
 }\n
 \n
 div#upload_document {\n
-  height: 36px !important;\n
+  height: 58px !important;\n
   width: 390px !important;\n
   font-size: 12px;\n
 }\n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log?rev=41343&r1=41342&r2=41343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] Fri Dec 10 16:39:17 2010
@@ -1,4 +1,7 @@
 2010-12-10 gabriel
+* Refactored code to be possible make upload of Spreadsheet Documents.
+
+2010-12-10 gabriel
 * Added box and feature to make upload of Text documents.
 
 2010-12-07 gabriel

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/comment
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/comment?rev=41343&r1=41342&r2=41343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/comment [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/comment [utf8] Fri Dec 10 16:39:17 2010
@@ -1,4 +1,6 @@
 Experimental theme to provide an UNG experience as part of an ERP5 web site.
 
 TODO: 
-- define naming conventions for jquery 
\ No newline at end of file
+- Define naming conventions for jquery 
+- Clean up the javascript code
+- SpreadSheet Formula is ignored when the document is uploaded
\ No newline at end of file

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=41343&r1=41342&r2=41343&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Fri Dec 10 16:39:17 2010
@@ -1 +1 @@
-108
\ No newline at end of file
+110
\ No newline at end of file

More information about the Erp5-report mailing list