[Erp5-report] r38124 fabien - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Sep  2 14:11:37 2010
New Revision: 38124

URL: http://svn.erp5.org?rev=38124&view=rev
Log:
Make PDF_renderHTMLPreviewNavigation page template not
PDF_viewHTMLPreviewAsImage form dependant. This permit to reuse it in other
forms.

"?" should not be part of the base_url

add a XXX comment : this part should be merge with OOo pagination, and should
be async

Reviewed by kazuhiko

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_renderHTMLPreviewNavigation.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_renderHTMLPreviewNavigation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_renderHTMLPreviewNavigation.xml?rev=38124&r1=38123&r2=38124&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_renderHTMLPreviewNavigation.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_renderHTMLPreviewNavigation.xml [utf8] Thu Sep  2 14:11:37 2010
@@ -39,6 +39,12 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
+<tal:block tal:replace="nothing">\n
+<!--\n
+XXX: PDF pagination should be similar to OOo one (using iframe). This part should also be async ideally\n
+-->\n
+</tal:block>\n
+\n
 <tal:block tal:define="current_thumbnail_index    \n
                  request/frame|\n
                    python:here.PDF_getPageNumberFromSelectionIndex(request.get(\'selection_index\', 0));\n
@@ -46,19 +52,19 @@
                  next_thunmbnail_index python: current_thumbnail_index + 1;\n
                  previous_thunmbnail_index python: current_thumbnail_index - 1;\n
                  parent_doc_url here/absolute_url;\n
-                 base_url string:${parent_doc_url}/PDF_viewHTMLPreviewAsImage?">\n
+                 base_url python: \'%s/%s\' % (parent_doc_url, request.get(\'current_form_id\', \'view\'))">\n
 \n
   <div class="pdf-preview-navigation">\n
     <tal:block tal:condition="python:current_thumbnail_index >= 1">\n
     <a href=""\n
-      tal:attributes="href string:${base_url}selection_index=0">\n
+      tal:attributes="href string:${base_url}?selection_index=0">\n
         <img src="images/2leftarrowb.png" \n
              i18n:attributes="alt"\n
              i18n:domain="ui"\n
              alt="First"/>\n
       </a>\n
     <a href=""\n
-      tal:attributes="href string:${base_url}selection_index=${previous_thunmbnail_index}">\n
+      tal:attributes="href string:${base_url}?selection_index=${previous_thunmbnail_index}">\n
         <img src="images/1leftarrowb.png" \n
              i18n:attributes="alt"\n
              i18n:domain="ui"\n
@@ -78,14 +84,14 @@
     <span tal:content="python:current_thumbnail_index+1"/> / <span tal:content="all_thunmbnails"/>\n
     <tal:block tal:condition="python:all_thunmbnails > next_thunmbnail_index">\n
     <a href=""\n
-      tal:attributes="href string:${base_url}selection_index=${next_thunmbnail_index}">\n
+      tal:attributes="href string:${base_url}?selection_index=${next_thunmbnail_index}">\n
         <img src="images/1rightarrowb.png" \n
              i18n:attributes="alt"\n
              i18n:domain="ui"\n
              alt="Next"/>\n
     </a>\n
     <a href=""\n
-      tal:attributes="href string:${base_url}selection_index=${all_thunmbnails}">\n
+      tal:attributes="href string:${base_url}?selection_index=${all_thunmbnails}">\n
         <img src="images/2rightarrowb.png" \n
              i18n:attributes="alt"\n
              i18n:domain="ui"\n
@@ -103,7 +109,8 @@
               alt="Last"/>\n
     </tal:block>\n
   </div>\n
-</tal:block>
+</tal:block>\n
+
 
 ]]></string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=38124&r1=38123&r2=38124&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Thu Sep  2 14:11:37 2010
@@ -1 +1 @@
-1166
\ No newline at end of file
+1167
\ No newline at end of file