Update for admin list view and edit add forms. (amenity)

For the edit add amenity forms commenting out the description and short
description fields.
For the list view commenting out description and short description.
For the list view adding the groups column to show which groups the
amenity is in.

diff --git a/views/admin/settings/amenities.html b/views/admin/settings/amenities.html
index 397e09c..729531e 100644 (file)
--- a/views/admin/settings/amenities.html
+++ b/views/admin/settings/amenities.html
@@ -24,6 +24,7 @@
                             <input type="text" name="name" class="glm-form-text-input">
                         </td>
                     </tr>
+                    <!--
                     <tr>
                         <th>Description:</th>
                         <td>
@@ -36,6 +37,7 @@
                             <input type="text" name="short_descr" class="glm-form-text-input">
                         </td>
                     </tr>
+                    -->
                     <tr>
                         <td colspan="2">
                             <table style="width: 100%;">
@@ -101,6 +103,7 @@
                             <input id="editAmenityName" type="text" name="name" class="glm-form-text-input">
                         </td>
                     </tr>
+                    <!--
                     <tr>
                         <th>Description:</th>
                         <td>
@@ -113,6 +116,7 @@
                             <input id="editAmenityShortDescr" type="text" name="short_descr" class="glm-form-text-input">
                         </td>
                     </tr>
+                    -->
                     <tr>
                         <td colspan="2">
                             <table style="width: 100%;">
@@ -160,8 +164,11 @@
                 <tr>
                     <th>Amenity</th>
                     <th>Used With</th>
+                    <th>Groups</th>
+                    <!--
                     <th>Description</th>
                     <th>Short Description</th>
+                    -->
                     <th>&nbsp;</th>
                 </tr>
             </thead>
@@ -180,12 +187,19 @@
                             <td id="editAmenityRefType_{$t.id}">
                                 {$t.ref_type.name}
                             </td>
+                            <td id="editAmenityGroups">
+                                {foreach $t.groups as $group}
+                                {$groups[$group.group_id].name}
+                                {/foreach}
+                            </td>
+                            <!--
                             <td id="editAmenityDescr_{$t.id}">
                                 {$t.descr}
                             </td>
                             <td id="editAmenityShortDescr_{$t.id}">
                                 {$t.short_descr}
                             </td>
+                            -->
                             <td>
                                 <div class="deleteAmenityButton button button-secondary glm-button-small glm-right" data-amenityID="{$t.id}">Delete</div>
                             </td>
@@ -232,8 +246,8 @@
             $('#editAmenityName').val(amenityName.trim());
             $('#editAmenityRef').val(amenityRefTypeID);
             $('#editAmenityUsesValue').prop('checked', amenityUsesValue);
-            $('#editAmenityDescr').val(amenityDescr.trim());
-            $('#editAmenityShortDescr').val(amenityShortDescr.trim());
+            //$('#editAmenityDescr').val(amenityDescr.trim());
+            //$('#editAmenityShortDescr').val(amenityShortDescr.trim());
             $('.amenityGroup').each(function(){
                 $(this).prop('checked', false);
             });