Changeset 546:2928037f9a75 in documentViewer for zpt


Ignore:
Timestamp:
Aug 28, 2012, 6:24:01 PM (12 years ago)
Author:
casties
Branch:
default
Message:

ASSIGNED - # 249: Annotations shared in groups
https://it-dev.mpiwg-berlin.mpg.de/tracs/mpdl-project-software/ticket/249

File:
1 edited

Legend:

Unmodified
Added
Removed
  • zpt/layer_text_annotator.zpt

    r531 r546  
    3434
    3535  <script type="text/javascript"
    36     tal:define="annUrl python:'%s?url=%s&pn=%s'%(rootUrl,docinfo['url'],pageinfo['pn']); annUser python:here.getAuthenticatedUser(anon='anonymous');"
    37     tal:content="structure string:var annotatorPageUrl='$annUrl'; var annotatorUser='$annUser';"></script>
     36    tal:define="annUrl python:'%s?url=%s&pn=%s'%(rootUrl,docinfo['url'],pageinfo['pn']);
     37      global annUser python:here.getAuthenticatedUser(anon='anonymous');
     38      global annGroup python:request.get('annotator_group', None);
     39      permUser python:test(annGroup, 'group:%s'%annGroup, annUser);"
     40    tal:content="structure string:var annotatorPageUrl='$annUrl'; var annotatorUser='$annUser'; var permissionUser='$permUser';"></script>
    3841
    3942  <script type="text/javascript">
     
    4649                    tokenUrl : 'template/token?user='+annotatorUser
    4750                }).addPlugin('Permissions', {
    48                     user : annotatorUser,
     51                    user : permissionUser,
    4952                    userString : function(user) {
    5053                        if (user && user.name) {
     
    6063                    }
    6164                }).addPlugin('Store', {
    62                     prefix: 'http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager/annotator',
     65                    //prefix: 'http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager/annotator',
     66                    prefix: 'http://r583-1.mpiwg-berlin.mpg.de:18080/AnnotationManager/annotator',
    6367                    annotationData : {
    6468                        'uri' : uri
     
    8993  <metal:block metal:define-macro="options_box" tal:condition="python:'annotator' in viewLayers">
    9094    <!-- BEGIN ANNOTATIONS -->
    91     <div class="options" tal:define="annUser python:here.getAuthenticatedUser(anon='anonymous')">
     95    <div class="options">
    9296      <h4>Annotations</h4>
    93       <div>You are user "<span tal:replace="annUser"/>"</div>
     97      <p>
     98        User "<span tal:replace="annUser" />"<span tal:condition="annGroup" tal:content="string: ($annGroup)"/>.
     99      </p>
     100      <!-- TODO: login button -->
     101      <form class="autosubmit" tal:attributes="action viewerUrl">
     102        <input type="hidden" tal:define="params python:here.getParams(params={'annotator_group':None});" tal:repeat="param params"
     103          tal:attributes="name param; value python:params[param]" />
     104        <p>
     105          In group
     106          <select class="autosubmit" name="annotator_group">
     107            <option value="" tal:attributes="selected not:annGroup;"> </option>
     108            <option
     109              tal:repeat="group python:here.getAnnotatorGroupsForUser(user=annUser,annotationServerUrl='http://localhost:18080/AnnotationManager')"
     110              tal:attributes="value group/id; selected python:group['id']==annGroup;" tal:content="group/name" />
     111          </select> <br />
     112          <input type="submit" value="Go!" />
     113        </p>
     114      </form>
    94115    </div>
    95116    <!-- END ANNOTATIONS -->
Note: See TracChangeset for help on using the changeset viewer.