Changeset 498:3146b4e7b6a5 in documentViewer


Ignore:
Timestamp:
Feb 10, 2012, 6:05:45 PM (12 years ago)
Author:
casties
Branch:
elementtree
Message:

more clean up.
works with new jquery digilib.

Files:
7 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • documentViewer.py

    r491 r498  
    150150       
    151151        templateFolder = Folder('template')
    152         #self['template'] = templateFolder # Zope-2.12 style
    153         self._setObject('template',templateFolder) # old style
     152        self['template'] = templateFolder # Zope-2.12 style
     153        #self._setObject('template',templateFolder) # old style
    154154        try:
    155155            import MpdlXmlTextServer
    156156            textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName)
    157             #templateFolder['fulltextclient'] = xmlRpcClient
    158             templateFolder._setObject('fulltextclient',textServer)
     157            templateFolder['fulltextclient'] = textServer
     158            #templateFolder._setObject('fulltextclient',textServer)
    159159        except Exception, e:
    160160            logging.error("Unable to create MpdlXmlTextServer for fulltextclient: "+str(e))
    … …  
    163163            from Products.zogiLib.zogiLib import zogiLib
    164164            zogilib = zogiLib(id="zogilib", title="zogilib for docuviewer", dlServerURL=imageScalerUrl, layout="book")
    165             #templateFolder['zogilib'] = zogilib
    166             templateFolder._setObject('zogilib',zogilib)
     165            templateFolder['zogilib'] = zogilib
     166            #templateFolder._setObject('zogilib',zogilib)
    167167        except Exception, e:
    168168            logging.error("Unable to create zogiLib for zogilib: "+str(e))
    … …  
    180180    # proxy text server methods to fulltextclient
    181181    def getTextPage(self, **args):
    182         """get page"""
     182        """returns full text content of page"""
    183183        return self.template.fulltextclient.getTextPage(**args)
    184184
    185     def getOrigPages(self, **args):
    186         """get page"""
    187         return self.template.fulltextclient.getOrigPages(**args)
    188    
    189     def getOrigPagesNorm(self, **args):
    190         """get page"""
    191         return self.template.fulltextclient.getOrigPagesNorm(**args)
    192 
     185    #WTF?
    193186    def getQuery(self, **args):
    194187        """get query in search"""
    195188        return self.template.fulltextclient.getQuery(**args)
    196189     
     190    #WTF?
    197191    def getSearch(self, **args):
    198192        """get search"""
    199193        return self.template.fulltextclient.getSearch(**args)
    200194   
     195    #WTF?
    201196    def getGisPlaces(self, **args):
    202197        """get gis places"""
    203198        return self.template.fulltextclient.getGisPlaces(**args)
    204199 
     200    #WTF?
    205201    def getAllGisPlaces(self, **args):
    206202        """get all gis places """
    207203        return self.template.fulltextclient.getAllGisPlaces(**args)
    208204       
     205    #WTF?
    209206    def getWordInfo(self, **args):
    210207        """get translate"""
    211208        return self.template.fulltextclient.getWordInfo(**args)
    212209
     210    #WTF?
    213211    def getLemma(self, **args):
    214212        """get lemma"""
    215213        return self.template.fulltextclient.getLemma(**args)
    216214
     215    #WTF?
    217216    def getLemmaQuery(self, **args):
    218217        """get query"""
    219218        return self.template.fulltextclient.getLemmaQuery(**args)
    220219
     220    #WTF?
    221221    def getLex(self, **args):
    222222        """get lex"""
    … …  
    224224
    225225    def getToc(self, **args):
    226         """get toc"""
     226        """returns the full table of contents (in internal format)"""
    227227        return self.template.fulltextclient.getToc(**args)
    228228
    229229    def getTocPage(self, **args):
    230         """get tocpage"""
     230        """returns one page of the table of contents"""
    231231        return self.template.fulltextclient.getTocPage(**args)
    232232

  • version.txt

    r453 r498  
    1 DocumentViewer 0.7.0
     1DocumentViewer 2.0a

  • zpt/viewer_images.zpt

    r493 r498  
    1313  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.js"></script>
    1414  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.geometry.js"></script>
    15   <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.birdseye.js"></script>
    16   <!-- <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.regions.js"></script> -->
     15  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.arrows.js"></script>
     16  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.marks.js"></script>
    1717  <link rel="stylesheet" type="text/css" tal:attributes="href string:$dlBaseUrl/jquery/jquery.digilib.css" />
    1818
    … …  
    2525            'pn' : '${pageinfo/pn}',
    2626            'suppressParamNames' : ['fn'],
    27             'showRegionNumbers' : true,
    28             'visibleButtonSets' : 0
     27            'scalerInsets' : {'x' : 140, 'y' : 100}
    2928        };"></script>
    3029
    3130<script type="text/javascript">
    32     //<!--
     31// <!--
    3332    $(document).ready(function() {
    3433        // autosubmit forms
    … …  
    3837        $('form.autosubmit input[type="submit"]').hide();
    3938        // get digilib div
    40         $digilib = $('div.scaler');
     39        $digilib = $('div#scaler');
    4140        // configure digilib
    4241        $digilib.digilib(dlOpts);
    4342    });
    44 //-->
     43// -->
    4544</script>
    4645</head>
    … …  
    8887        </ul>
    8988        <div class="content">
    90           <div class="dl-buttons">
    91             <span><a href="javascript:$digilib.digilib('zoomArea')">zoom</a></span>
    92           </div>
    93           <div class="scaler">
     89          <div id="scaler">
    9490            <img tal:attributes="src string:${docinfo/imageURL}&pn=${pageinfo/pn}&dw=500&dh=500" />
    9591          </div>
    … …  
    9793      </div> <!-- col-main -->
    9894      <div class="col-right">
    99         BUTTONS
     95          <div class="digilib-buttons">
     96            <div><a href="javascript:$digilib.digilib('zoomBy', 1.4)">zoom in</a></div>
     97            <div><a href="javascript:$digilib.digilib('zoomBy', 0.7)">zoom out</a></div>
     98            <div><a href="javascript:$digilib.digilib('zoomArea')">zoom area</a></div>
     99            <div><a href="javascript:$digilib.digilib('zoomFull')">full page</a></div>
     100            <div><a href="javascript:$digilib.digilib('zoomFull', 'width')">page width</a></div>
     101            <div><a href="javascript:$digilib.digilib('setMark')">set mark</a></div>
     102            <div><a href="javascript:$digilib.digilib('removeMark')">remove mark</a></div>
     103            <div><a href="javascript:$digilib.digilib('reference')">get reference</a></div>
     104            <div><a tal:attributes="href string:$dlBaseUrl/jquery/digilib.html?fn=${docinfo/imagePath}&pn=${pageinfo/pn}" target="_blank">digilib</a></div>
     105          </div>
    100106      </div>
    101107    </div> <!-- page-body -->
Note: See TracChangeset for help on using the changeset viewer.