Merge branch 'customize_ui' into update_v6.3

src/main/java/propertyFiles/Bundle.properties

@@ -101,6 +101,7 @@ selectedFiles=Selected Files
 htmlAllowedTitle=Allowed HTML Tags
 htmlAllowedMsg=This field supports only certain <a class="popoverHTML" tabindex="0" role="button">HTML tags</a>.
 htmlAllowedTags=&lt;a&gt;, &lt;b&gt;, &lt;blockquote&gt;, &lt;br&gt;, &lt;code&gt;, &lt;del&gt;, &lt;dd&gt;, &lt;dl&gt;, &lt;dt&gt;, &lt;em&gt;, &lt;hr&gt;, &lt;h1&gt;-&lt;h3&gt;, &lt;i&gt;, &lt;img&gt;, &lt;kbd&gt;, &lt;li&gt;, &lt;ol&gt;, &lt;p&gt;, &lt;pre&gt;, &lt;s&gt;, &lt;sup&gt;, &lt;sub&gt;, &lt;strong&gt;, &lt;strike&gt;, &lt;u&gt;, &lt;ul&gt;
+vocabularyFaqMsg=More information about vocabularies, terms and URLs <a href="https://www.izus.uni-stuttgart.de/en/fokus/darus/#id-22d988a4-3" rel="help" target="_blank">here</a>.
 conditionalRequiredMsg=One or more of these fields may become required if you add to one or more of these optional fields.
 conditionalRequiredMsg.tooltip=This field will become required if you choose to enter values in one or more of these optional fields.
 toggleNavigation=Toggle navigation
@@ -1476,7 +1477,7 @@ dataset.publish.header=Publish Dataset
 dataset.rejectBtn=Return to Author
 dataset.submitBtn=Submit for Review
 dataset.disabledSubmittedBtn=Submitted for Review
-dataset.submitMessage=You will not be able to make changes to this dataset while it is in review.
+dataset.submitMessage=Please use the publication checklist for authors ( https://www.izus.uni-stuttgart.de/en/fokus/darus/publication/ ) to ensure publication readiness. You will not be able to make changes to this dataset while it is in review.
 dataset.submit.success=Your dataset has been submitted for review.
 dataset.inreview.infoMessage=The draft version of this dataset is currently under review prior to publication.
 dataset.submit.failure=Dataset Submission Failed - {0}
@@ -1530,7 +1531,7 @@ dataset.share.datasetShare=Share Dataset
 dataset.share.datasetShare.tip=Share this dataset on your favorite social media networks.
 dataset.share.datasetShare.shareText=View this dataset.
 dataset.locked.message=Dataset Locked
-dataset.locked.message.details=This dataset is locked until publication.
+dataset.locked.message.details=This dataset is reviewed prior to publication by the DaRUS-team. You will receive an email with further information in the next days.
 dataset.locked.inReview.message=Submitted for Review
 dataset.locked.ingest.message=The tabular data files uploaded are being processed and converted into the archival format
 dataset.unlocked.ingest.message=The tabular files have been ingested.

src/main/webapp/WEB-INF/web.xml

@@ -7,7 +7,7 @@
     <!-- Error page -->
     <error-page>
         <error-code>404</error-code>
-        <location>/404static.xhtml</location>
+        <location>/404.xhtml</location>
     </error-page>
     <error-page>
         <error-code>500</error-code>

src/main/webapp/metadataFragment.xhtml

@@ -356,6 +356,11 @@
                                                     <h:outputText value="#{bundle.conditionalRequiredMsg}"/>
                                                 </p>
                                             </ui:fragment>
+                                            <ui:fragment rendered="#{dsf.datasetFieldType.name == 'keyword'}">
+                                                <p class="help-block">
+                                                    <h:outputText value="#{bundle.vocabularyFaqMsg}" escape="false"/>
+                                                </p>
+                                            </ui:fragment>
                                             <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue" varStatus="valCount">
                                                 <div class="form-group form-col-container col-sm-9 edit-compound-field"  data-cvoc-parentfield="#{cvocConf.containsKey(dsf.datasetFieldType.id)?cvocConf.get(dsf.datasetFieldType.id).getString('field-name'):''}">
                                                     <!-- Sub Fields -->