Changeset 510:4fb35343d2e7 in documentViewer for zpt

Timestamp:

Feb 28, 2012, 9:39:21 AM (12 years ago)

Author:

casties

Branch:

elementtree

Message:

more search. nicer css.

Location:

zpt

Files:

• viewer_images.zpt (modified) (2 diffs)
• viewer_text.zpt (modified) (4 diffs)

zpt/viewer_images.zpt

@@ -61 +61 @@
     <div class="page-body" tal:condition="python:here.isAccessible(docinfo)">
       <!-- table of contents -->
-      <div class="col-left">
+      <div class="col toc">
         <metal:block
           metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)" />
       </div>
       <!-- col-main: text page -->
-      <div class="col-main">
+      <div class="col main">
         <div class="ruler">
           <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
@@ -86 +86 @@
       </div>
       <!-- /col-main -->
-      <div class="col-right">
+      <div class="col buttons">
         <div class="digilib-buttons">
           <div>

zpt/viewer_text.zpt

@@ -39 +39 @@
     <div class="page-body" tal:condition="python:here.isAccessible(docinfo)">
       <!--table of contents-->
-      <div class="col-left">
+      <div class="col toc">
         <metal:block
           metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)" />
@@ -45 +45 @@
 
       <!-- text page -->
-      <div class="col-main">
+      <div class="col main">
         <div class="ruler">
           <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
@@ -63 +63 @@
       <!-- end of col-main -->
 
+      <!-- right-side search results -->
+      <div class="col search" tal:condition="query">
+        <!--"BEGIN SEARCH RESULTS"  -->
+        <div class="options">
+          <h4>Search results</h4>
+          <div tal:content="structure python:here.getResultsPage(mode=queryType,query=query,pn=1,pageinfo=pageinfo,docinfo=docinfo)"/>
+        </div>
+      </div>
+
       <!-- right-side options -->
-      <div class="col-right">
+      <div class="col buttons">
         <!--"BEGIN TEXT DISPLAY"  -->
         <div class="options">
           <h4>Text display</h4>
-          <pre tal:content="python:repr(viewLayers)" />
-          <pre tal:content="python:repr(viewLayer)" />
           <form tal:attributes="action viewerUrl" class="autosubmit">
             <input type="hidden"
@@ -230 +237 @@
       <!-- /col-right -->
 
-      <!-- right-side options -->
-      <div class="col-veryright" tal:condition="query">
-        <!--"BEGIN SEARCH RESULTS"  -->
-        <div class="options">
-          <h4>Search results</h4>
-          <div tal:content="structure python:here.getResultsPage(mode=queryType,query=query,pn=1,pageinfo=pageinfo,docinfo=docinfo)"/>
-        </div>
-      </div>
-
     </div>
     <!-- /page-body -->