Fix interface links to direct to active pages

WildMeOrg · Sep 20, 2021 · c0650c8 · c0650c8
1 parent 114dbfc
commit c0650c8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/wbia/web/appfuncs.py b/wbia/web/appfuncs.py
@@ -23,8 +23,8 @@
 TARGET_HEIGHT = 800.0
 PAGE_SIZE = 500
 VALID_REVIEW_MODES = [
-    ('review_annotation', 'Annotation'),
-    ('review_viewpoint', 'Viewpoint'),
+    ('review_viewpoint2', 'Annotation'),
+    ('review_viewpoint3', 'Viewpoint'),
     ('review_quality', 'Quality'),
     ('review_demographics', 'Demographics'),
 ]

diff --git a/wbia/web/templates/group_review.html b/wbia/web/templates/group_review.html
@@ -16,8 +16,6 @@ <h2>Start Annot. Group Review</h2>
             {% for mode, mode_nice in mode_list %}
             <option value="{{ mode }}" default>{{ mode_nice }}</option>
             {% endfor %}
-            <!--<option value="review_viewpoint" default>Viewpoint</option>-->
-            <!--<option value="review_quality">Quality</option>-->
         </select>
     </form>
   </div>

diff --git a/wbia/web/templates/review/detection.html b/wbia/web/templates/review/detection.html
@@ -4,7 +4,7 @@
   <div class="alert alert-info text-center" role="alert">
     Congratulations, detection reviewing is completed.  Thank you!
     <br/>
-    <a href="{{ url_for('review_annotation') }}?imgsetid={{ imgsetid }}">Continue by reviewing annotation metadata</a>
+    <a href="{{ url_for('review_viewpoint2') }}?imgsetid={{ imgsetid }}">Continue by reviewing annotation metadata</a>
   </div>
   {% else %}
     <div class="row">

diff --git a/wbia/web/templates/view/annotations.html b/wbia/web/templates/view/annotations.html
@@ -96,9 +96,9 @@ <h3>|</h3>
               <td>{{ src }}</td>
               <td>{{ name }}</td>
               <td>{{ exemplar }}</td>
-              <td><a href="{{ url_for('review_annotation') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ species }}</a></td>
-              <td><a href="{{ url_for('review_annotation') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ viewpoint }}</a></td>
-              <td><a href="{{ url_for('review_annotation') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ quality }}</a></td>
+              <td><a href="{{ url_for('review_species') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ species }}</a></td>
+              <td><a href="{{ url_for('review_viewpoint3') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ viewpoint }}</a></td>
+              <td><a href="{{ url_for('review_quality') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ quality }}</a></td>
               <td><a href="{{ url_for('review_demographics') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ sex }} / {{ age }}</a></td>
               <td><a href="{{ url_for('view_images') }}?gid={{ gid }}">Go to</a></td>
               <td><a href="{{ url_for('view_images') }}?imgsetid={{ imgsetid_list_str_ }}">Go to</a></td>

diff --git a/wbia/web/templates/view/imagesets.html b/wbia/web/templates/view/imagesets.html
@@ -65,7 +65,7 @@
               <td>{{ start }}</td>
               <td><a href="{{ url_for('view_images') }}?imgsetid={{ imgsetid }}">Review</a></td>
               <td><a href="{{ url_for('view_annotations') }}?imgsetid={{ imgsetid }}">Review</a></td>
-              <td><a href="{{ url_for('review_cameratrap') }}?imgsetid={{ imgsetid }}">Cameratrap</a> | <a href="{{ url_for('review_detection') }}?imgsetid={{ imgsetid }}">Detections</a> | <a href="{{ url_for('review_annotation') }}?imgsetid={{ imgsetid }}">Annotations</a> | <a href="{{ url_for('review_demographics') }}?imgsetid={{ imgsetid }}">Demographics</a> | <a href="{{ url_for('review_identification_graph_refer') }}?imgsetid={{ imgsetid }}&backend=graph">GraphAlgorithm</a> | <a href="{{ url_for('review_identification_graph_refer') }}?imgsetid={{ imgsetid }}&backend=lca">LCA</a></td>
+              <td><a href="{{ url_for('review_cameratrap') }}?imgsetid={{ imgsetid }}">Cameratrap</a> | <a href="{{ url_for('review_detection') }}?imgsetid={{ imgsetid }}">Detections</a> | <a href="{{ url_for('review_viewpoint2') }}?imgsetid={{ imgsetid }}">Annotations</a> | <a href="{{ url_for('review_demographics') }}?imgsetid={{ imgsetid }}">Demographics</a> | <a href="{{ url_for('review_identification_graph_refer') }}?imgsetid={{ imgsetid }}&backend=graph">GraphAlgorithm</a> | <a href="{{ url_for('review_identification_graph_refer') }}?imgsetid={{ imgsetid }}&backend=lca">LCA</a></td>
             </tr>
             {% endfor %}
           {% endif %}

diff --git a/wbia/web/templates/view/names.html b/wbia/web/templates/view/names.html
@@ -117,8 +117,8 @@ <h3>|</h3>
                   <td>{{ src }}</td>
                   <td>{{ name }}</td>
                   <td>{{ exemplar }}</td>
-                  <td><a href="{{ url_for('review_viewpoint') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ species }}</a></td>
-                  <td><a href="{{ url_for('review_viewpoint') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ viewpoint }}</a></td>
+                  <td><a href="{{ url_for('review_species') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ species }}</a></td>
+                  <td><a href="{{ url_for('review_viewpoint3') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ viewpoint }}</a></td>
                   <td><a href="{{ url_for('review_quality') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ quality }}</a></td>
                   <td><a href="{{ url_for('review_demographics') }}?aid={{ aid }}&refer={{ REFER_SRC_ENCODED }}">{{ sex }} / {{ age }}</a></td>
                   <td><a href="{{ url_for('view_images') }}?gid={{ gid }}">Go to</a></td>