Changeset 510:4fb35343d2e7 in documentViewer

Timestamp:

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

Author:

casties

Branch:

elementtree

Message:

more search. nicer css.

Files:

• MpdlXmlTextServer.py (modified) (4 diffs)
• css/docuviewer.css (modified) (2 diffs)
• zpt/viewer_images.zpt (modified) (2 diffs)
• zpt/viewer_text.zpt (modified) (4 diffs)

MpdlXmlTextServer.py

@@ -307 +307 @@
                 docinfo['resultSize_%s_%s'%(mode,query)] = getInt(div.text)
 
-        if pagediv:
+        if pagediv is not None:
             # store XML in docinfo
             docinfo['resultXML_%s_%s'%(mode,query)] = ET.tostring(pagediv, 'UTF-8')
 
-        logging.debug("getSearchResults: pagediv=%s"%pagediv)
         return docinfo
     
@@ -336 +335 @@
         fullresult = ET.fromstring(resultxml)
         
-        if fullresult:
+        if fullresult is not None:
             # paginate
             first = start
@@ -409 +408 @@
                 docinfo['tocSize_%s'%mode] = getInt(div.text)
 
-        if pagediv:
+        if pagediv is not None:
             # store XML in docinfo
             docinfo['tocXML_%s'%mode] = ET.tostring(pagediv, 'UTF-8')
@@ -440 +439 @@
         fulltoc = ET.fromstring(tocxml)
         
-        if fulltoc:
+        if fulltoc is not None:
             # paginate
             first = (start - 1) * 2

css/docuviewer.css

@@ -3 +3 @@
     display: table-row;
 }
-div.col-left {
-    display: table-cell;
-    vertical-align: top;
-}
-div.col-main {
-    display: table-cell;
-    vertical-align: top;
-}
-div.col-right {
+div.page-body div.col {
     display: table-cell;
     vertical-align: top;
@@ -20 +12 @@
 }
 
-div.col-left .thumb {
+div.toc-text .toc, div.toc-figures .toc {
+    float:left;
+    clear:right; 
+}
+div.toc-text .toc.float.right, div.toc-figures .toc.float.right  {
+    float:right;
+}
+
+div.toc-thumbs .thumb {
     padding: 3px;
 }
-div.col-left .thumbsel {
+div.toc-thumbs .thumbsel {
     padding: 2px;
     border: 1px solid blue;
 }
-div.col-left .thumbcap {
+div.toc-thumbs .thumbcap {
     color: black;
 }
-
-div.col-left .toc {
-    float:left;
-    clear:right; 
-}
-div.col-left .toc.float.right {
-    float:right;
-}

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 -->