Merge branch 'main' into stable

dainst · Jul 9, 2024 · 7b2d4be · 7b2d4be
2 parents 26df3d8 + b759650
commit 7b2d4be
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/frontend/app/users/contact.controller.js b/frontend/app/users/contact.controller.js
@@ -1,6 +1,7 @@
-export default function($scope, contactService, transl8, messages) {
+export default function ($scope, contactService, transl8, messages) {
 
     $scope.formChange = false;
+    $scope.submitButtonDisabled = false;
 
     $scope.dataChanged = function () {
         $scope.formChange = true;
@@ -36,6 +37,7 @@ export default function($scope, contactService, transl8, messages) {
 
     $scope.submit = function () {
         if (areCheckboxesChecked()) {
+            $scope.submitButtonDisabled = true;
             contactService.sendContact($scope.usrData,
                 function (data) {
                     $scope.error = "";

diff --git a/frontend/app/users/contact.html b/frontend/app/users/contact.html
@@ -10,44 +10,43 @@ <h2>{{"navbar_contact"|transl8}}</h2>
     </div>
 
     <div class="col-md-6 col-md-offset-3 col-xs-12 alert alert-info">
-      <div class="alert-message" role="alert">
-          {{'ui_forgot_password_alert_pre'|transl8}}
-          <a href="pwdreset" class="alert-link">{{'ui_forgot_password_alert'|transl8}}</a>
-          {{'ui_forgot_password_alert_post'|transl8}}
+        <div class="alert-message" role="alert">
+            {{'ui_forgot_password_alert_pre'|transl8}}
+            <a href="pwdreset" class="alert-link">{{'ui_forgot_password_alert'|transl8}}</a>
+            {{'ui_forgot_password_alert_post'|transl8}}
 
-      </div>
+        </div>
     </div>
 
     <div class="col-md-6 col-md-offset-3 col-xs-12 well" ng-hide="success">
-        <form novalidate show-validation class="form-horizontal register-form"
-              role="form" name="contactForm"
-              ng-keyup="dataChanged()">
+        <form novalidate show-validation class="form-horizontal register-form" role="form" name="contactForm"
+            ng-keyup="dataChanged()">
 
             <div class="form-group" style="padding-top: 10px;">
                 <label class="col-sm-4 control-label">Name </label>
                 <div class="col-sm-8">
                     <input type="text" ng-model="usrData.name" class="form-control"
-                           placeholder="{{'contact_first_surname'|transl8}}" required/>
+                        placeholder="{{'contact_first_surname'|transl8}}" required />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-4 control-label">eMail </label>
                 <div class="col-sm-8">
-                    <input type="email" ng-model="usrData.email" placeholder="eMail" class="form-control" required/>
+                    <input type="email" ng-model="usrData.email" placeholder="eMail" class="form-control" required />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-4 control-label">{{"ui_subject"|transl8}} </label>
                 <div class="col-sm-8">
                     <input type="text" name="subject" ng-model="usrData.subject" class="form-control"
-                           placeholder="{{'ui_subject'|transl8}}" required/>
+                        placeholder="{{'ui_subject'|transl8}}" required />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-4 control-label">{{"ui_message"|transl8}} </label>
                 <div class="col-sm-8">
                     <textarea name="message" ng-model="usrData.message" rows="4" class="form-control"
-                              placeholder="{{'ui_message'|transl8}}" required></textarea>
+                        placeholder="{{'ui_message'|transl8}}" required></textarea>
                 </div>
             </div>
             <div class="form-group">
@@ -74,9 +73,10 @@ <h2>{{"navbar_contact"|transl8}}</h2>
             </div>
             <div class="form-group">
                 <div class="col-sm-offset-4 col-sm-8">
-                    <button type="submit" ng-click="submit()" class="btn btn-primary">{{"ui_send"|transl8}}</button>
+                    <button type="submit" ng-disabled="submitButtonDisabled" ng-click="submit()"
+                        class="btn btn-primary">{{"ui_send"|transl8}}</button>
                 </div>
             </div>
         </form>
     </div>
-</div>
+</div>
diff --git a/frontend/con10t/en/palatinGIS.html b/frontend/con10t/en/palatinGIS.html
@@ -20,7 +20,7 @@
 		<!-- Haupttitel des Projektes: Überschrift der Größe <h1> oder Logo / Bild -->
         <div class="con10t-title">
 			<h1 align="center">PalatinGIS.<br> 
-				An analysis tool for the project "From the hand drawing to the digital model.<br>
+				An analysis tool for the project "From hand drawing to digital model.<br> 
 				The Palatine in Rome as a case study for knowledge generation in archaeology"
 			</h1>
 			<h2 align="center">Head: Dr. Barbara Sielhorst (Ruhr-Universität Bochum)</h2>

diff --git a/frontend/con10t/it/palatinGIS.html b/frontend/con10t/it/palatinGIS.html
@@ -21,7 +21,7 @@
         <div class="con10t-title">
 			<h1 align="center">PalatinGIS.<br> 
 				Uno strumento di analisi per il progetto "Dal disegno a mano al modello digitale.<br>
-				Il Palatino di Roma come caso di studio per la generazione di conoscenza in archeologia".
+				Il Palatino di Roma come caso di studio per la generazione di conoscenza in archeologia"
 			</h1>
 			<h2 align="center">Responsabile: Dott.ssa Barbara Sielhorst (Università della Ruhr di Bochum)</h2>
 		</div>