Resolved merge conflict

UCF · Oct 11, 2022 · 4329430 · 4329430
2 parents 3db08f2 + a741aed
commit 4329430
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/static_files/assets/js/script-manager.js b/static_files/assets/js/script-manager.js
@@ -464,7 +464,12 @@ const userSearchTypeahead = function () {
       delay: 250,
       minimumInputLength: 3
     },
-    placeholder: 'Search by first name, last name or NID...'
+    placeholder: 'Search by first name, last name or NID...',
+    language: {
+      noResults: function () {
+        return 'No users found. User must log into the events system at least once to be added to a calendar.';
+      }
+    }
   });
 };
 

diff --git a/static_files/static/js/script-manager.min.js b/static_files/static/js/script-manager.min.js
diff --git a/templates/esi/eventinstance/listing.html b/templates/esi/eventinstance/listing.html
@@ -35,7 +35,7 @@ <h3 class="h5 mb-2">
       </div>
 
       <p class="description">
-        {{ object.event.description|remove_html|truncatewords:60 }}
+        {{ object.event.description|remove_html|truncatewords:60|safe }}
       </p>
 
       {% if not calendar %}

diff --git a/templates/events/manager/calendar/update/update-users.html b/templates/events/manager/calendar/update/update-users.html
@@ -55,14 +55,14 @@ <h2 class="h3 font-weight-normal">Add New User</h2>
           <select id="id_username_d" name="username_d" class="form-control select2-select">
           </select>
         </div>
-        <div class="form-group col-8 col-lg-auto pr-3 mr-lg-0">
+        <div class="form-group col-12 col-lg-auto pr-lg-3 mr-lg-0 mb-3 mb-lg-0">
           <select id="id_role" class="form-control w-100" name="role">
             <option value="admin">Admin</option>
             <option value="editor" selected>Editor</option>
           </select>
         </div>
-        <div class="form-group col-4 col-lg-auto">
-          <button class="btn btn-primary" id="add-user-submit">Add User</button>
+        <div class="form-group col-lg-auto">
+          <button class="btn btn-primary w-100" id="add-user-submit">Add User to Calendar</button>
         </div>
       </form>