Merge remote-tracking branch 'calcms/master'

edit-event.html: hide unused user excerpt
edit-event: register page leave handler later
jquery.min.js: upgrade 3.7.1

website/agenda/planung/js/edit-event.js

@@ -287,7 +287,7 @@ function checkFields(){
 
 function copyEventToClipboard(){
     var text = $('textarea[name="excerpt"]').val()+"\n";
-    text += $('textarea[name="user_excerpt"]').val()+"\n";
+    if ($('textarea[name="user_excerpt"]').val()) text += $('textarea[name="user_excerpt"]').val()+"\n";
     text += $('textarea[name="topic"]').val()+"\n\n";
     text += $('textarea[name="content"]').val()+"\n";
 
@@ -319,8 +319,6 @@ $(document).ready(
         }
         onDateModified();
 
-        pageLeaveHandler();
-
         checkFields();
 
         $('textarea').autosize();
@@ -335,11 +333,10 @@ $(document).ready(
             }
         )
 
-        jQuery.getJSON("help-texts.cgi?project_id="+getProjectId()+"&studio_id="+getStudioId()+"&action=get", 
-        function(data){
+        jQuery.getJSON("help-texts.cgi?project_id="+getProjectId()+"&studio_id="+getStudioId()+"&action=get")
+        .done( function(data) {
             for (col in data){
                 let value = data[col];
-                console.log(col+" "+value)
                 $(`input[name="${col}"]`).hover(function() {
                     $(this).attr("title",value)
                 });
@@ -347,6 +344,10 @@ $(document).ready(
                     $(this).attr("title",value)
                 });
             }
+        })
+        .always( function() {
+            console.log("register page leave handler");
+            pageLeaveHandler();
         });
 
         console.log("done")

website/agenda/planung/templates/edit-event.html

@@ -437,8 +437,13 @@
             </td>
         </tr>
 
-        <tr id="user_excerpt"> 
-            <td class="label"><TMPL_VAR .loc.label_excerpt_extension></td>
+        <tr id="user_excerpt">
+            <td class="label">
+                <TMPL_IF .allow.update_event_field_excerpt_extension><TMPL_VAR .loc.label_excerpt_extension>
+                <TMPL_ELSE>
+                    <TMPL_IF user_excerpt><TMPL_VAR .loc.label_excerpt_extension></TMPL_IF>
+                </TMPL_IF>
+            </td>
             <td>
                 <div id="excerpt_extension_too_long" class="error" style="display:none"><TMPL_VAR .loc.label_excerpt_extension_too_long></div>
                 <TMPL_IF .allow.update_event_field_excerpt_extension>