Cleaned up shortcode attributes list and included missing options.

diff --git a/css/admin.css b/css/admin.css
index 6f06b8b..42bd503 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -407,3 +407,15 @@ input[type=submit], input[type=file] {
     color: #888;
     font-weight: 400;
 }
+
+
+.shortcode-option-list span 
+{
+    display: inline-block;
+    width: 200px;
+}
+.shortcode-option-list-title
+{
+    font-weight: bold;
+}
+

diff --git a/setup/rolesAndCapabilities.php b/setup/rolesAndCapabilities.php
index 1189b42..1889047 100644 (file)
--- a/setup/rolesAndCapabilities.php
+++ b/setup/rolesAndCapabilities.php
@@ -66,7 +66,7 @@ $this->addRoleCapability('glm_members_settings',
         'administrator' => true,
         'author' => false,
         'contributor' => false,
-        'editor' => false,
+        'editor' => true,
         'subscriber' => false
     )
 );
@@ -77,7 +77,7 @@ $this->addRoleCapability('glm_members_management',
         'administrator' => true,
         'author' => false,
         'contributor' => false,
-        'editor' => true,
+        'editor' => false,
         'subscriber' => false
     )
 );

diff --git a/setup/shortcodes.php b/setup/shortcodes.php
index d6da5fa..51501db 100644 (file)
--- a/setup/shortcodes.php
+++ b/setup/shortcodes.php
@@ -322,30 +322,65 @@ $glmMembersShortcodesDescription = '
             show regardless of any settings, although there is a setting to show this as a
             link or not as a link.
             </p>
-            <p>
-                <table width="100%">
-                    <tr><th colspan=3">Global Options</th></tr>
-                    <tr><td>all</td><td>none</td></tr>
-                    <tr><th colspan=3">Map Options</th></tr>
-                    <tr><td>map</td><td>map-name-link</td><td>map-logo</td></tr>
-                    <tr><td>map-opened</td><td>map-description</td><td>map-short-description</td></tr>
-                    <tr><td>map-street</td><td>map-city-state-zip</td><td>map-address</td></tr>
-                    <tr><td>map-region</td><td>map-phone</td><td>map-country</td></tr>
-                    <tr><td>map-url</td><td>map-url-new-target</td><td>map-toll-free</td></tr>
-                    <tr><td>map-categories</td><td>map-credit-cards</td><td>map-email</td></tr>
-                    <tr><td>map-amenities</td></tr>
-                    <tr><th colspan=3">Search Form Options</th></tr>
-                    <tr><td>search</td><td>search-text</td><td>search-categories</td></tr>
-                    <tr><td>search-amenities</td><td>search-alpha</td></tr>
-                    <tr><th colspan=3">Member List Options</th></tr>
-                    <tr><td>list</td><td>name-link</td><td>logo</td></tr>
-                    <tr><td>address</td><td>street</td><td>city-state-zip</td></tr>
-                    <tr><td>country</td><td>region</td><td>description</td></tr>
-                    <tr><td>short-description</td><td>phone</td><td>toll-free</td></tr>
-                    <tr><td>url</td><td>url-new-target</td><td>email</td></tr>
-                    <tr><td>categories</td><td>credit-cards</td><td>amenities</td></tr>
-                </table>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Global Options</span><br>
+                    <span>all</span>
+                    <span>none</span>
             </p>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Map Options</span><br>
+                    <span>map</span>
+                    <span>map-name-link</span>
+                    <span>map-logo</span>
+                    <span>map-opened</span>
+                    <span>map-description</span>
+                    <span>map-short-description</span>
+                    <span>map-street</span>
+                    <span>map-city-state-zip</span>
+                    <span>map-address</span>
+                    <span>map-region</span>
+                    <span>map-phone</span>
+                    <span>map-country</span>
+                    <span>map-url</span>
+                    <span>map-url-new-target</span>
+                    <span>map-toll-free</span>
+                    <span>map-categories</span>
+                    <span>map-credit-cards</span>
+                    <span>map-email</span>
+            </p>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Search Form Options</span><br>
+                    <span>search</span>
+                    <span>search-text</span>
+                    <span>search-categories</span>
+                    <span>search-amenities</span>
+                    <span>search-alpha</span>
+                    <span>search-filters-opened</span>
+                    <span>logo-filler</span>
+        </p>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Member List Options</span><br>
+                    <span>list</span>
+                    <span>name-link</span>
+                    <span>logo</span>
+                    <span>address</span>
+                    <span>street</span>
+                    <span>city-state-zip</span>
+                    <span>country</span>
+                    <span>region</span>
+                    <span>description</span>
+                    <span>short-description</span>
+                    <span>phone</span>
+                    <span>toll-free</span>
+                    <span>url</span>
+                    <span>url-new-target</span>
+                    <span>email</span>
+                    <span>categories</span>
+                    <span>credit-cards</span>
+                    <span>amenities</span>
+                    <span>packages</span>
+                    <span>packages-link</span>
+        </p>
         </td>
     </tr>
     <tr>
@@ -414,26 +449,53 @@ $glmMembersShortcodesDescription = '
             show regardless of any settings, although there is a setting to show this as a
             link or not as a link.
             </p>
-            <p>
-                <table width="100%">
-                    <tr><th colspan=3">Global Options</th></tr>
-                    <tr><td>all</td><td>none</td></tr>
-                    <tr><th colspan=3">Map Options</th></tr>
-                    <tr><td>map</td><td>map-logo</td><td>map-description</td></tr>
-                    <tr><td>map-short-description</td><td>map-address</td><td>map-street</td></tr>
-                    <tr><td>map-city-state-zip</td><td>map-country</td><td>map-region</td></tr>
-                    <tr><td>map-phone</td><td>map-toll-free</td><td>map-url</td></tr>
-                    <tr><td>map-url-new-target</td><td>map-email</td><td>map-categories</td></tr>
-                    <tr><td>map-credit-cards</td><td>map-amenities</td></tr>
-                    <tr><th colspan=3">Directions Options</th></tr>
-                    <tr><td>directions</td></tr>
-                    <tr><th colspan=3">Member Detail Options</th></tr>
-                    <tr><td>logo</td><td>address</td><td>street</td></tr>
-                    <tr><td>city-state-zip</td><td>country</td><td>region</td></tr>
-                    <tr><td>description</td><td>short-description</td><td>phone</td></tr>
-                    <tr><td>toll-free</td><td>url</td><td>url-new-target</td></tr>
-                    <tr><td>email</td><td>categories</td><td>credit-cards</td></tr>
-                    <tr><td>amenities</td></tr>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Global Options</span><br>
+                    <span>all</span>
+                    <span>none</span>
+            </p>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Map Options</span><br>
+                    <span>map</span>
+                    <span>map-logo</span>
+                    <span>map-description</span>
+                    <span>map-short-description</span>
+                    <span>map-address</span>
+                    <span>map-street</span>
+                    <span>map-city-state-zip</span>
+                    <span>map-country</span>
+                    <span>map-region</span>
+                    <span>map-phone</span>
+                    <span>map-toll-free</span>
+                    <span>map-url</span>
+                    <span>map-url-new-target</span>
+                    <span>map-email</span>
+                    <span>map-categories</span>
+                    <span>map-credit-cards</span>
+                    <span>map-amenities</span>
+            </p>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Directions Options</span><br>
+                    <span>directions</span>
+            </p>
+            <p class="shortcode-option-list">
+                <span class="shortcode-option-list-title">Member Detail Options</span><br>
+                    <span>logo</span>
+                    <span>address</span>
+                    <span>street</span>
+                    <span>city-state-zip</span>
+                    <span>country</span>
+                    <span>region</span>
+                    <span>description</span>
+                    <span>short-description</span>
+                    <span>phone</span>
+                    <span>toll-free</span>
+                    <span>url</span>
+                    <span>url-new-target</span>
+                    <span>email</span>
+                    <span>categories</span>
+                    <span>credit-cards</span>
+                    <span>amenities</span>
                 </table>
             </p>
         </td>