Changeset 34:8427930c5f88 in AnnotationManagerN4J for src/main/webapp


Ignore:
Timestamp:
Sep 25, 2012, 8:20:17 PM (13 years ago)
Author:
casties
Branch:
default
Parents:
33:86bb29132ba6 (diff), 31:9f653697437e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with 8ad8596a570af38aacfaecdb68b7e06145624181

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/main/webapp/index.html

    r31 r34  
    1111
    1212<body>
    13         <h1>Annotation Server</h1>
     13  <h1>Annotation Server</h1>
     14  <h2>View</h2>
     15  <ul>
     16    <li><a href="tags">View tags</a></li>
     17    <li><a href="annotationBrowser">All Annotations</a></li>
     18  </ul>
     19  <h2>Admin</h2>
    1420        <ul>
    15                 <li><a href="groups">View and edit groups</a></li>
    16                 <li><a href="tags">Browse by Tags</a></li>
    17                 <li><a href="annotationBrowser">All Annotations</a></li>
    18                
     21                <li><a href="annotations/groups">View and edit groups</a></li>
     22    <li><a href="annotations/persons">View and edit persons</a></li>
    1923        </ul>
    2024</body>

  • src/main/webapp/index.html

    r32 r34  
    1111
    1212<body>
    13         <h1>Annotation Server</h1>
    14         <h2>View</h2>
     13  <h1>Annotation Server</h1>
     14  <h2>View</h2>
    1515  <ul>
    1616    <li><a href="tags">View tags</a></li>
     17    <li><a href="annotationBrowser">All Annotations</a></li>
    1718  </ul>
    1819  <h2>Admin</h2>
Note: See TracChangeset for help on using the changeset viewer.