Clean up mentions of external ID on submission page.

Author: meisterT

webapp/templates/jury/submission.html.twig

@@ -197,15 +197,20 @@
                     </a>
                 </span>
 
-                {% if external_ccs_submission_url is not empty %}
-                    {% set externalSubmissionUrl = submission | externalCcsUrl %}
-                    {% if externalSubmissionUrl is not empty %}
-                        <span>
-                    <i class="fas fa-link" title="External link:"></i>
-                    <a href="{{ externalSubmissionUrl }}" target="_blank">
-                        View in external CCS
-                    </a>
-                </span>
+                {% if shadowMode() and submission.externalid %}
+                    {% if external_ccs_submission_url is empty %}
+                        External ID: {{- submission.externalid -}}
+                    {% else %}
+                        {% set externalSubmissionUrl = submission | externalCcsUrl %}
+                        {% if externalSubmissionUrl is not empty %}
+                            <span>
+                                <i class="fas fa-link" title="External link:"></i>
+                                <a href="{{ externalSubmissionUrl }}" target="_blank">
+                                    View in external CCS
+                                </a>
+                                (ID: {{- submission.externalid -}})
+                            </span>
+                        {% endif %}
                     {% endif %}
                 {% endif %}
             </div>
@@ -230,22 +235,6 @@
         </div>
     {% endif %}
 
-    {% if shadowMode() and submission.externalid %}
-        <div class="mb-2">
-            External ID:
-            {% if external_ccs_submission_url is empty %}
-                {{- submission.externalid -}}
-            {% else %}
-                <a href="{{ submission | externalCcsUrl }}" target="_blank">
-                    {{- submission.externalid -}}
-                </a>
-            {%- endif -%}
-            {%- if externalJudgement is not null -%}
-                , {{ externalJudgement.result | printValidJuryResult }}
-            {% endif %}
-        </div>
-    {% endif %}
-
     {% if externalJudgement is not null and externalJudgement.result is not empty and (
         (selectedJudging is not null and selectedJudging.result is not empty and externalJudgement.result != selectedJudging.result)
         or submission.importError) %}
@@ -558,11 +547,11 @@
                             </td>
                             <td>
                                 {% if externalSubmissionUrl is defined and externalSubmissionUrl is not empty %}
-                                <a href="{{ externalSubmissionUrl }}">
-                                    {% endif %}
-                                    external {{ externalJudgement.extjudgementid }}
-                                    {% if externalSubmissionUrl is defined and externalSubmissionUrl is not empty %}
-                                </a>
+                                    <a href="{{ externalSubmissionUrl }}">
+                                {% endif %}
+                                external
+                                {% if externalSubmissionUrl is defined and externalSubmissionUrl is not empty %}
+                                    </a>
                                 {% endif %}
                             </td>
                         </tr>