Merge pull request #153 from lowercasename/rk/url-validation

Fix URL validation

4 files changed, 16 insertions, 12 deletions

diff --git a/views/event.handlebars b/views/event.handlebars
index cd1645a..1b1022e 100755
--- a/views/event.handlebars
+++ b/views/event.handlebars
@@ -11,7 +11,7 @@
   </div>
   <div class="col-lg-3 ml-2 edit-buttons">
     {{#if editingEnabled}}
-      <button type="button" id="editEvent" class="button button--primary" {{#if eventHasConcluded}}disabled{{/if}} data-event-id="{{eventData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> Edit event</button>
+      <button type="button" id="editEvent" class="button button--primary ml-auto d-block" {{#if eventHasConcluded}}disabled{{/if}} data-event-id="{{eventData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> Edit event</button>
     {{/if}}
   </div>
 </div>
diff --git a/views/eventgroup.handlebars b/views/eventgroup.handlebars
index 8fbedbc..9658b60 100755
--- a/views/eventgroup.handlebars
+++ b/views/eventgroup.handlebars
@@ -10,9 +10,7 @@
   </div>
   <div class="col-lg-2 ml-2 edit-buttons">
     {{#if editingEnabled}}
-      <button type="button" id="editGroup" class="button button--primary text-nowrap" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> Edit group</button>
-    {{else}}
-      <button type="button" id="editGroup" class="button button--primary text-nowrap" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editTokenModal"><i class="fas fa-edit"></i> Edit group</button>
+      <button type="button" id="editGroup" class="button button--primary text-nowrap ml-auto d-block" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> Edit group</button>
     {{/if}}
   </div>
 </div>
@@ -85,6 +83,10 @@
         <i class="fas fa-download"></i> Export as ICS
       </button>
     </div>
+
+    {{#unless editingEnabled}}
+        <button type="button" id="editGroup" class="button button--outline-secondary button--sm" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editTokenModal"><i class="fas fa-edit"></i> Switch to editing mode</button>
+    {{/unless}}
   </aside>
 </div>
 
@@ -103,12 +105,12 @@
         </tr>
       </table>
     </div>
-    
+
   </div>
 {{/if}}
 
 <div class="card mb-4" id="eventDescription">
-    <h5 class="card-header">About</h5>  
+    <h5 class="card-header">About</h5>
   <div class="card-body">
     {{{parsedDescription}}}
   </div>
@@ -268,7 +270,7 @@ window.groupData = {{{ json jsonData }}};
 
     if (urlParams.has('show_edit')) {
       $('#editModal').modal('show');
-      url.searchParams.delete('show_edit'); 
+      url.searchParams.delete('show_edit');
       history.replaceState(history.state, '', url.href);
     }
 
@@ -339,4 +341,4 @@ window.groupData = {{{ json jsonData }}};
 
   });
 </script>
-</main>
\ No newline at end of file
+</main>
diff --git a/views/partials/eventForm.handlebars b/views/partials/eventForm.handlebars
index 161f44b..6fbbbf0 100755
--- a/views/partials/eventForm.handlebars
+++ b/views/partials/eventForm.handlebars
@@ -39,7 +39,8 @@
 <div class="form-group">
   <label for="eventURL">Link</label>
   <div class="form-group ">
-    <input type="url" class="form-control" id="eventURL" name="eventURL" placeholder="For tickets or another event page (optional)." x-model="data.eventURL" >
+    <input type="url" class="form-control" id="eventURL" name="eventURL" placeholder="https://example.com" x-model="data.eventURL">
+    <small class="form-text">For tickets or another event page (optional).</small>
   </div>
 </div>
 <div class="form-group">
@@ -106,7 +107,7 @@
             <option></option>
             <template x-for="group in data.groups">
               <option :value="group.id" x-text="group.name"></option>
-            </template> 
+            </template>
           </select>
         </div>
         <button type="button" class="button button--outline-primary w-100 text-center" x-on:click="manualGroupInputVisible = !manualGroupInputVisible">
diff --git a/views/partials/eventGroupForm.handlebars b/views/partials/eventGroupForm.handlebars
index 284343f..5536e49 100644
--- a/views/partials/eventGroupForm.handlebars
+++ b/views/partials/eventGroupForm.handlebars
@@ -10,7 +10,8 @@
 </div>
 <div class="form-group">
     <label for="eventGroupURL">Link</label>
-    <input type="url" class="form-control" id="eventGroupURL" name="eventGroupURL" placeholder="For tickets or a page with more information (optional)." x-model="data.eventGroupURL">
+    <input type="url" class="form-control" id="eventGroupURL" name="eventGroupURL" placeholder="https://example.com" x-model="data.eventGroupURL">
+    <small class="form-text">For tickets or a page with more information (optional).</small>
 </div>
 <div class="form-group">
     <label for="hostName">Host or organisation name</label>
@@ -57,4 +58,4 @@
       </ul>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>