defined position for descriptive metadata box in process details

intranda · Oct 19, 2018 · 68750e1 · 68750e1
1 parent 6e3c084
commit 68750e1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 26 deletions.
diff --git a/Goobi/src/messages/messages_de.properties b/Goobi/src/messages/messages_de.properties
@@ -412,6 +412,7 @@ dennochEinloggen=Dennoch einloggen
 description=Beschreibung
 descriptionData=Angaben zu den Quellen
 descriptiontitle=Titel
+descriptiveMetadata=Deskriptive Metdaten
 details=Details
 detailsDerVorlage=Details der physischen Vorlage
 detailsDesArbeitsschritts=Details der Aufgabe
@@ -1538,7 +1539,6 @@ plugin_admin_rwanda_assign_case_files_helpOcr=Activate this field, when the docu
 plugin_admin_rwanda_assign_case_files_helpProfession=The profession 1994.
 plugin_admin_rwanda_assign_case_files_helpSentence=The sentence of the trial.
 plugin_admin_rwanda_assign_case_files_helpSex=The gender of the person.
-plugin_admin_rwanda_assign_case_files_trialCategory=Enter the trial category.
 plugin_admin_rwanda_assign_case_files_helpTrialdate=The date of trial.
 plugin_admin_rwanda_assign_case_files_id=ID
 plugin_admin_rwanda_assign_case_files_incompleteDocument=Incomplete document

diff --git a/Goobi/src/messages/messages_en.properties b/Goobi/src/messages/messages_en.properties
@@ -412,6 +412,7 @@ dennochEinloggen=Log in anyway
 description=Description
 descriptionData=Information on the source
 descriptiontitle=Title
+descriptiveMetadata=Descriptive metadata
 details=Details
 detailsDerVorlage=Details of the physical template
 detailsDesArbeitsschritts=Details of the task
@@ -1538,7 +1539,6 @@ plugin_admin_rwanda_assign_case_files_helpOcr=Activate this field, when the docu
 plugin_admin_rwanda_assign_case_files_helpProfession=The profession 1994.
 plugin_admin_rwanda_assign_case_files_helpSentence=The sentence of the trial.
 plugin_admin_rwanda_assign_case_files_helpSex=The gender of the person.
-plugin_admin_rwanda_assign_case_files_trialCategory=Enter the trial category.
 plugin_admin_rwanda_assign_case_files_helpTrialdate=The date of trial.
 plugin_admin_rwanda_assign_case_files_id=ID
 plugin_admin_rwanda_assign_case_files_incompleteDocument=Incomplete document

diff --git a/Goobi/src/messages/messages_es.properties b/Goobi/src/messages/messages_es.properties
@@ -412,6 +412,7 @@ dennochEinloggen=Conectarse de todos modos
 description=Descripci\u00F3n
 descriptionData=Informaci\u00F3n sobre la fuente
 descriptiontitle=T\u00EDtulo
+descriptiveMetadata=Deskriptive Metdaten zzz
 details=Detalles
 detailsDerVorlage=Detalles de la plantilla f\u00EDsica
 detailsDesArbeitsschritts=Detalles de la tarea
@@ -1538,7 +1539,6 @@ plugin_admin_rwanda_assign_case_files_helpOcr=Activate this field, when the docu
 plugin_admin_rwanda_assign_case_files_helpProfession=The profession 1994.
 plugin_admin_rwanda_assign_case_files_helpSentence=The sentence of the trial.
 plugin_admin_rwanda_assign_case_files_helpSex=The gender of the person.
-plugin_admin_rwanda_assign_case_files_trialCategory=Enter the trial category.
 plugin_admin_rwanda_assign_case_files_helpTrialdate=The date of trial.
 plugin_admin_rwanda_assign_case_files_id=ID
 plugin_admin_rwanda_assign_case_files_incompleteDocument=Incomplete document

diff --git a/Goobi/src/messages/messages_nl.properties b/Goobi/src/messages/messages_nl.properties
@@ -412,6 +412,7 @@ dennochEinloggen=Log in anyway
 description=zzz
 descriptionData=Information on the source
 descriptiontitle=Title
+descriptiveMetadata=Descriptive metadata zzz
 details=Details
 detailsDerVorlage=Details of the physical template
 detailsDesArbeitsschritts=Details of the task
@@ -1538,7 +1539,6 @@ plugin_admin_rwanda_assign_case_files_helpOcr=Activate this field, when the docu
 plugin_admin_rwanda_assign_case_files_helpProfession=The profession 1994.
 plugin_admin_rwanda_assign_case_files_helpSentence=The sentence of the trial.
 plugin_admin_rwanda_assign_case_files_helpSex=The gender of the person.
-plugin_admin_rwanda_assign_case_files_trialCategory=Enter the trial category.
 plugin_admin_rwanda_assign_case_files_helpTrialdate=The date of trial.
 plugin_admin_rwanda_assign_case_files_id=ID
 plugin_admin_rwanda_assign_case_files_incompleteDocument=Incomplete document

diff --git a/Goobi/webapp/uii/includes/process/process_properties.xhtml b/Goobi/webapp/uii/includes/process/process_properties.xhtml
@@ -7,6 +7,31 @@
 
         <ui:include src="../calendarJavaScript.xhtml" />
 
+        <!-- ++++++++++++++++     Metadata listing as configured      ++++++++++++++++ -->
+
+	  <h:panelGroup styleClass="box thin-margin box-bordered " layout="block" rendered="#{ProzessverwaltungForm.sizeOfDisplayableMetadata != 0}">
+            <div class="box-title">
+            	<h3>
+                	<i class="fa fa-list"></i>
+                    <h:outputText value="#{msgs.descriptiveMetadata}" />
+           	    </h3>
+        	</div>
+            <div class="box-content nopadding">
+                <div class="dataTables_wrapper">
+                	<table class="table table-hover table-bordered">
+                        <c:forEach items="#{ProzessverwaltungForm.displayableMetadataMap}" var="metadata">
+                        	<tr>
+                               <td><h:outputText value="#{msgs[metadata.key]}"/> </td>
+                               <td><h:outputText value="#{msgs[metadata.value]}" rendered="#{metadata.key == 'DocStruct'}"/>
+                                   <h:outputText value="#{metadata.value}" rendered="#{metadata.key != 'DocStruct'}"/>
+                                </td>
+                            </tr>
+                        </c:forEach>
+              	     </table>
+                </div>
+            </div>
+        </h:panelGroup>
+
         <!-- ++++++++++++++++     Eigenschaftentabelle      ++++++++++++++++ -->
 
         <h:panelGroup rendered="#{ProzessverwaltungForm.modusBearbeiten!='eigenschaft'}">
@@ -135,31 +160,10 @@
 
                     </div>
                 </div>
+
             </h:form>
         </h:panelGroup>
 
-        <h:panelGroup styleClass="box thin-margin box-bordered" layout="block" rendered="#{ProzessverwaltungForm.sizeOfDisplayableMetadata != 0}">
-            <div class="box-title">
-            	<h3>
-                	<i class="fa fa-list"></i>
-                    <h:outputText value="#{msgs.metadata}" />
-           	    </h3>
-        	</div>
-            <div class="box-content nopadding">
-                <div class="dataTables_wrapper">
-                	<table class="table table-hover table-bordered">
-                        <c:forEach items="#{ProzessverwaltungForm.displayableMetadataMap}" var="metadata">
-                        	<tr>
-                               <td><h:outputText value="#{msgs[metadata.key]}"/> </td>
-                               <td><h:outputText value="#{msgs[metadata.value]}" rendered="#{metadata.key == 'DocStruct'}"/>
-                                   <h:outputText value="#{metadata.value}" rendered="#{metadata.key != 'DocStruct'}"/>
-                                </td>
-                            </tr>
-                        </c:forEach>
-              	     </table>
-                </div>
-            </div>
-        </h:panelGroup>