Changeset 535:510bae2b593b in documentViewer

Timestamp:

Jul 26, 2012, 5:32:31 PM (12 years ago)

Author:

casties

Branch:

default

Message:

more fixes, e.g. IE support. first version of index page.

Files:

• css/docuviewer.css (modified) (8 diffs)
• css/docuviewer_ie.css (added)
• documentViewer.py (modified) (1 diff)
• version.txt (modified) (1 diff)
• zpt/common_template.zpt (modified) (2 diffs)
• zpt/toc_concordance.zpt (modified) (1 diff)
• zpt/toc_figures.zpt (modified) (1 diff)
• zpt/toc_none.zpt (modified) (1 diff)
• zpt/viewer_index.zpt (modified) (1 diff)
• zpt/viewer_text.zpt (modified) (1 diff)

css/docuviewer.css

@@ -31 +31 @@
 div.page-head div.title {
     max-width: 50em;
-    border: 1px solid silver;
+    background-color: white;
+        font-family: Georgia,Times,serif;
+        font-size: 14px;
+        line-height: 1.3;
+        border: 1px solid silver;
     padding: 0.5em;  
-    background-color: white;
 }
 
@@ -70 +73 @@
 }
 
+div.toc-switcher-col {
+        display: table-cell;
+}
 div.toc-switcher {
-    display: table-cell;
+    display: block; /* moz only does relative with block */
+    position: relative;
     width: 26.5px; /* for moz and webkit -- don't ask me */
 }
 div.toc-switcher ul {
     position: absolute;
-    /* z-index: 20; */
     transform: rotate(270deg);
     transform-origin: top left;
@@ -85 +91 @@
     -o-transform: rotate(270deg);
     -o-transform-origin: top left;
-    left: 12px;
-    top: 486px;
+        left: 7px;
+    top: 32em;
+    width: 40em;
     padding: 0px;
 }
+
 div.toc-switcher li {
     list-style-type: none;
@@ -105 +113 @@
 
 div.tocbody {
-    /* z-index: 10; */
     display: table-cell;
     border: 1px solid silver;
@@ -138 +145 @@
 div.tocbody table.thumbs .thumbsel {
     padding: 2px;
-    border: 1px solid blue;
+    border: 1px solid #892B06;
 }
 div.tocbody table.thumbs .thumbcap {
@@ -164 +171 @@
 
 div.col.main div.content {
-    border: 1px solid silver;
-    padding: 1em;  
-    background-color: white;
+        min-width: 30em;
+    background-color: white;
+    font-family: Junicode,Gentium,Georgia,serif;
     font-size: 14px;
-    font-family: Junicode,Gentium,Georgia,serif;
+        line-height: 1.3;
+        border: 1px solid silver;
+    padding: 1em;
 }
 div.col.main div.content a:link,
@@ -183 +192 @@
  */
 div.col.buttons div.options {
-    border: 1px solid silver;
-    padding: 0.5em;  
-    background-color: white;    
+    background-color: white;
+        border: 1px solid silver;
+    border-radius: 5px;
+    padding: 0.5em;
+    margin-bottom: 5px;  
 }
 div.col.buttons h4 {
@@ -205 +216 @@
 }
 
+/*
+ * index page
+ */
+div.index-image {
+        float: left;
+        padding-left: 1em;
+        padding-right: 1em;
+        padding-bottom: 1em;
+}
+div.index-info td.type {
+        font-weight: bold;
+}

documentViewer.py

@@ -146 +146 @@
     # make docuviewer_css refreshable for development
     docuviewer_css.index_html = refreshingImageFileIndexHtml
+    docuviewer_ie_css = ImageFile('css/docuviewer_ie.css',globals())
+    # make docuviewer_ie_css refreshable for development
+    docuviewer_ie_css.index_html = refreshingImageFileIndexHtml
     jquery_js = ImageFile('js/jquery.js',globals())
     

version.txt

@@ -1 @@
-DocumentViewer 2.1.2a
+DocumentViewer 2.2.0

zpt/common_template.zpt

@@ -101 +101 @@
   <!-- toc type switcher -->
   <metal:block metal:define-macro="toc_switcher">
+  <div class="toc-switcher-col">
     <div class="toc-switcher">
       <ul>
@@ -118 +119 @@
       </ul>
     </div>
+    </div>
   </metal:block>
 

zpt/toc_concordance.zpt

@@ -13 +13 @@
                 pageNumbers docinfo/pageNumbers | nothing;
                 batch python:here.getBatch(start=start,size=grpsize,end=tocsize,data=pageNumbers);">
-      <div metal:use-macro="here/template/common_template/macros/toc_switcher" />
       <div class="ruler">
         <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />

zpt/toc_figures.zpt

@@ -12 +12 @@
       tal:define="start pageinfo/start; tocsize docinfo/numFigureEntries; grpsize pageinfo/tocPageSize;
                 batch python:here.getBatch(start=start,size=grpsize,end=tocsize);">
-      <div metal:use-macro="here/template/common_template/macros/toc_switcher" />
       <div class="ruler">
         <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />

zpt/toc_none.zpt

@@ -9 +9 @@
   <div class="toc-none" metal:define-macro="main">
     <div metal:use-macro="here/template/common_template/macros/toc_switcher"/>
-    <div class="content"></div>
+    <!--  <div class="tocbody none"></div> -->
   </div>
   <!-- toc -->

zpt/viewer_index.zpt

@@ -18 +18 @@
     <!-- image -->
     <a tal:define="tp docinfo/titlePage | nothing"
-      tal:attributes="href python:context.getLink('viewMode','auto')"><img
+      tal:attributes="href python:context.getLink(params={'viewMode':'auto','pn':tp})"><img
       tal:condition="tp" border="0"
       tal:attributes="src string:${docinfo/imageURL}&pn=$tp&dw=300&dh=500" /><img
-      tal:condition="not:tp" border="0" src="images/oldbook.png" /></a>
+      tal:condition="python:not tp and exists('here/template/book.png')" border="0" src="template/book.png" /></a>
   </div>
 

zpt/viewer_text.zpt

@@ -12 +12 @@
 <title tal:content="python:docinfo.get('creator',' ') + ' - ' + docinfo.get('title',' ')" />
 <link rel="stylesheet" href="template/docuviewer_css" type="text/css" />
+<!--[if IE]><link rel="stylesheet" href="template/docuviewer_ie_css" type="text/css" /><![endif]-->
 <script type="text/javascript" tal:attributes="src string:$rootUrl/template/jquery_js"></script>
 <script type="text/javascript">