Various updates including fixes to the use of "Member" submenu and packaging support.
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:14:22 +0000 (15:14 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:14:22 +0000 (15:14 -0500)
29 files changed:
classes/data/dataMembers.php
classes/glmPluginSupport.php
controllers/admin.php
controllers/front.php
css/admin.css
glm-member-db.php
models/admin/member/index.php
setup/adminHooks.php [new file with mode: 0644]
setup/frontHooks.php [new file with mode: 0644]
views/admin/configure/accommodationTypes.html
views/admin/configure/amenities.html
views/admin/configure/categories.html
views/admin/configure/cities.html
views/admin/configure/header.html
views/admin/configure/index.html
views/admin/configure/regions.html
views/admin/management/development.html
views/admin/management/header.html
views/admin/management/import.html
views/admin/management/import/readDatabase.html
views/admin/management/index.html
views/admin/management/terms.html
views/admin/member/header.html
views/admin/member/index.html
views/admin/member/memberInfo.html
views/admin/members/header.html
views/admin/members/index.html
views/admin/members/list.html
views/front/members/list.html

index 601b64a..3b779c2 100644 (file)
@@ -162,7 +162,7 @@ class GlmDataMembers extends GlmDataAbstract {
             'member_slug' => array(
                 'field' => 'member_slug',
                 'type' => 'text',
-                'use' => 'gl'
+                'use' => 'gle'
             ),
 
             // Date created
@@ -245,7 +245,7 @@ class GlmDataMembers extends GlmDataAbstract {
 
         return $slug;
 
-}
+    }
 
     /*
      * Get a simple members list - Name and ID only
index 0fcb27d..b8039ae 100644 (file)
@@ -318,9 +318,8 @@ class GlmPluginSupport
 
                             // Check for PHP script to update database
                             $phpScript = $a['database']['dbScriptPath'].'/update_database_V'.$ver.'.php';
-
                             if (is_file($phpScript)) {
-                                include ($phpScript);
+                                require_once ($phpScript);
                             }
 
                             // If there were no errors
index 451d3b4..905423a 100644 (file)
@@ -186,6 +186,29 @@ class glmMembersAdmin extends GlmPluginSupport
         // Create hook for add-ons to create menus
         do_action('glm-member-db-add-menu');
 
+        /*
+         * Include any misc add-on hooks and filters in add-on setup folder adminMisc.php file.
+         *
+         * Note that filter and hook callback functions must be included in-line as shown below...
+         *
+         *  add_filter( 'filter_title', function( $parameter ) {
+         *     // Function code
+         *  });
+         *
+         *  Also note that parameters will be in the context of this class.
+         *
+         */
+        foreach ($this->config['addOns'] as $a) {
+
+            // If setup/frontMisc.php exists include that now - Can be used for additional filters and hooks
+            $miscFile = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminHooks.php';
+            if (is_file($miscFile)) {
+                require_once($miscFile);
+            }
+
+        }
+
+
     }
 
     /**
@@ -339,7 +362,7 @@ class glmMembersAdmin extends GlmPluginSupport
     public function configureMenus ()
     {
 
-        // Add a new main menu item for management and display of Members
+        // If user can manage all members, then show "Members" menu item
         if (apply_filters('glm_members_menu_members', true)) {
 
             $mainMenuSlug = 'glm-members-admin-menu-members';
@@ -366,6 +389,7 @@ class glmMembersAdmin extends GlmPluginSupport
                 );
             }
 
+        // Otherwise just display "Member" menu item
         } else {
 
             $mainMenuSlug = 'glm-members-admin-menu-member';
@@ -504,8 +528,8 @@ class glmMembersAdmin extends GlmPluginSupport
      *
      * Controller parameters
      *
-     * @param string $menuItem
-     *            Name of the menu item that is being processed
+     * @param string $menuItem Name of the menu item that is being processed
+     * @param string $action Specified Action to take or false
      *
      * @return void
      * @access public
@@ -788,6 +812,7 @@ class glmMembersAdmin extends GlmPluginSupport
         $smarty->templateAssign ( 'thisPage', (isset($_REQUEST['page']) ? $_REQUEST['page']: '') );
         $smarty->templateAssign ( 'glmPluginName', GLM_MEMBERS_PLUGIN_NAME );
         $smarty->templateAssign ( 'glmPluginMediaURL', GLM_MEMBERS_PLUGIN_MEDIA_URL );
+        $smarty->templateAssign ( 'glmWordpresBasePluginPath', GLM_MEMBERS_WORDPRESS_PLUGIN_PATH );
         $smarty->templateAssign ( 'thisYear', date ( 'Y' ) );
         $smarty->templateAssign ( 'ref_type_numb', $this->config['ref_type_numb']);
         $smarty->templateAssign ( 'settings', $this->config['settings']);
index 5c8986a..0f6daed 100644 (file)
@@ -57,26 +57,6 @@ class glmMembersFront extends GlmPluginSupport
             die('Database check failure');
         }
 
-        // Setup rewrite for member detail pages
-        add_filter( 'rewrite_rules_array',
-            array(
-                $this,
-                'glm_members_insert_rewrite_rules'
-            )
-        );
-        add_filter('query_vars',
-            array(
-                $this,
-                'glm_members_RewriteQueryVars'
-            )
-        );
-        add_filter( 'init',
-            array(
-                $this,
-                'glm_members_flush_rules'
-            )
-        );
-
         // Add front-end scripts and css
         add_action('wp_enqueue_scripts',
             array(
@@ -97,33 +77,30 @@ class glmMembersFront extends GlmPluginSupport
 
         }
 
-    }
+        /*
+         * Include any misc add-on hooks and filters in add-on setup folder frontMisc.php file.
+         *
+         * Note that filter and hook callback functions must be included in-line as shown below...
+         *
+         *  add_filter( 'filter_title', function( $parameter ) {
+         *     // Function code
+         *  });
+         *
+         *  Also note that parameters will be in the context of this class.
+         *
+         */
+        foreach ($this->config['addOns'] as $a) {
 
-    // Flush rules if the member detail rewrite hasn't been included
-    function glm_members_flush_rules(){
-        $rules = get_option( 'rewrite_rules' );
-        if ( ! isset( $rules['('.$this->config['settings']['canonical_member_page'].')/([^/]*)$'] ) ) {
-            global $wp_rewrite;
-            $wp_rewrite->flush_rules();
-        }
-    }
+            // If setup/frontMisc.php exists include that now - Can be used for additional filters and hooks
+            $miscFile = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/frontHooks.php';
+            if (is_file($miscFile)) {
+                require_once($miscFile);
+            }
 
-    // Add the rewrite rule for the member detail page
-    function glm_members_insert_rewrite_rules( $rules )
-    {
-        $newrules = array();
-        $newrules['('.$this->config['settings']['canonical_member_page'].')/([^/]*)$'] = 'index.php?pagename=$matches[1]&memberslug=$matches[2]';
-        return $newrules + $rules;
-    }
+        }
 
-    // Have WP store memberid value so we can read it after rewrites
-    function glm_members_RewriteQueryVars($vars)
-    {
-        array_push($vars, 'memberslug');
-        return $vars;
     }
 
-
     /**
      * Setup inclusion of front-end scripts and css
      *
@@ -144,7 +121,6 @@ class glmMembersFront extends GlmPluginSupport
         wp_enqueue_style("wp-jquery-ui-dialog");
 
         // Register any front.js files in the js directory of any glm members plugin
-        reset($this->config['addOns']);
         foreach ($this->config['addOns'] as $a) {
             $jsFile = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/js/front.js';
             if (is_file($jsFile)) {
index bc96525..d6c690f 100644 (file)
     margin-left: 4px !important;
     margin-right: 4px !important;   
 }
+.glm-button-small {
+    font-size: 0.9em !important;
+    padding: .0em .3em 0em .3em !important;
+    margin-right: 2px !important;
+    line-height: 1.8em !important;
+    height: 1.8em !important; 
+}
 
 /* Admin Area - General */
 #glm-admin-content-container {
+    margin-top: 1em;
     border: 1px #ccc solid;
     padding: 1em;
     background-color: #fff;
 }
 
 /* Admin Tabs */
-.nav-tab-wrapper {
-    white-space: nowrap;
-    height: 1.5em;
-}
-.nav-tab {
-    font-size: 1.1vw !important;
-    font-weight: bold;
-    padding: 0px 8px 4px 8px !important;
-}
-.nav-tab-active {
-    font-weight: bold;
-    font-size: 1.1vw !important;
-    text-decoration: none;
-    border: 2px #ccc solid;
-    border-bottom: 0px;
-    padding: 8px 8px 10px 8px !important;
-    margin-bottom: 10px;
-    background-color: #f8f8f8;
-}
 .disabled {
     pointer-events: none;
     cursor: default;
index ab533a2..5837e72 100644 (file)
@@ -217,6 +217,7 @@ add_option('glmMembersDatabaseDbVersion', false);
  *      'name' => {text name for add-on},
  *      'short_name' => {an abreviated name for the add-on},
  *      'slug' => {slug for add-on},
+ *      'config' => {optional array of config data to be merged into $config},
  *      'actions' => array(
  *          'adminActions => array(
  *              '{menu name}' => array(
@@ -232,6 +233,16 @@ add_option('glmMembersDatabaseDbVersion', false);
  *              ... additional pages ...
  *          )
  *      ),
+ *      'shortcodes' => array(
+ *          '{shortcode} => array(
+ *              'plugin' => {plugin slug},
+ *              'menu' => '{menu},
+ *              'action' => '{action}',
+ *              'table' => {table name where default values for 'attributes' are stored},
+ *              'adttributes' => array({array of attributes that might be in the shortcode})
+ *          ),
+ *          ... additional shortcodes ...
+ *      ),
  *          // if the add-on is adding database tables use this, otherwise FALSE
  *      'database' => array(
  *          'dbPrefix' => '{database prefix to use}',
@@ -295,7 +306,12 @@ if (count($config['addOns']) > 0) {
             $config['shortcodes'] = array_merge_recursive($config['shortcodes'], $a['shortcodes']);
         }
 
-        // If the add-on has additional config parameters
+        // If the add-on has supplied additional config parameters when registering
+        if (isset($a['config'])) {
+            $config = array_merge_recursive($config, $a['config']);
+        }
+
+        // If the add-on has additional config parameters in a plugin.ini file
         $iniFile = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.'/'.$a['slug'].'/config/plugin.ini';
         if (isset($iniFile)) {
 
index 9521948..70486a8 100644 (file)
@@ -101,6 +101,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
 
         $success = true;
         $haveMember = false;
+        $addingMember = false;
         $memberData = false;
         $memberName = false;
         $memberID = 0;
@@ -117,20 +118,32 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
         // Check if there's a logged in user who is locked to their own entity
         $lockedToMember = apply_filters('glm_members_locked_to_member_id', false);
         if ($lockedToMember) {
+            $memberID = $lockedToMember;
 
-                $memberID = $lockedToMember;
+        // Otherwise Check for other member selection options
+        } else {
+
+            if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'add') {
+
+               delete_option('glmMembersDatabaseMemberID');
+               $memberID = 0;
 
-        // Check if a redirecting model supplied the member ID
-        } elseif (isset($actionData['memberID'])) {
+            // Check if a redirecting model supplied the member ID
+            } elseif (isset($actionData['memberID'])) {
 
-            $memberID = $actionData['memberID'];
+                $memberID = $actionData['memberID'];
 
-        // Otherwise check if one was supplied by the user or passed from somewhere else
-        } elseif (isset($_REQUEST['member'])) {
+            // Otherwise check if one was supplied by the user or passed from somewhere else
+            } elseif (isset($_REQUEST['member'])) {
 
-            // Make sure it's a number
-            $memberID = $_REQUEST['member']-0;
+                // Make sure it's a number
+                $memberID = $_REQUEST['member']-0;
+
+            } else {
 
+                $memberID = get_option('glmMembersDatabaseMemberID');
+
+            }
         }
 
         /*
@@ -138,7 +151,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
          * Setup to add a new member
          *
          */
-        if ($memberID <= 0) {
+        if ($memberID <= 0 && isset($_REQUEST['option']) && ($_REQUEST['option'] == 'add' || $_REQUEST['option'] == 'addNew')) {
 
             // If this is a new member submission
             if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'addNew') {
@@ -146,8 +159,8 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
                 // Attempt to add the new member
                 $memberData = $this->insertEntry();
                 if($memberData['status']) {
+
                     $memberID = $memberData['fieldData']['id'];
-                    $haveMember = true;
 
                     // Update the member slug then get member data again
                     $this->updateSlug($memberID);
@@ -155,6 +168,8 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
                     // Now get the updated entry with the slug
                     $memberData = $this->editEntry($memberID);
 
+                    $haveMember = true;
+
                 }
 
                 if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
@@ -171,6 +186,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
 
                 // Setup to add a new member
                 $memberData = $this->newEntry();
+                $addingMember = true;
 
             }
 
@@ -212,7 +228,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
          *  Get existing base member data
          *
          */
-        } else {
+        } elseif ($memberID > 0) {
 
             if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
                 glmMembersAdmin::addNotice("<b>&nbsp;&nbsp;Member ID specified:</b> $memberID", 'Process');
@@ -220,7 +236,9 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
 
             // Try to get existing member data
             $memberData = $this->editEntry($memberID);
-            $haveMember = true;
+            if ($memberData) {
+                $haveMember = true;
+            }
 
         }
 
@@ -233,7 +251,6 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
          * Other actions that may be required
          *
          */
-
         // Check if there's a request to delete a specific member information record
         if (isset($_REQUEST['deleteID']) && $_REQUEST['deleteID'] != '') {
 
@@ -334,13 +351,15 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
                 $noActive = true;
             }
 
-        }
-
+            // Also save the mmeber ID in a WordPress "option" in case someone clicks the "Member" sub-menu
+            update_option('glmMembersDatabaseMemberID', $memberID);
 
+        }
         // Compile template data
         $templateData = array(
             'haveMemberTypes' => $haveMemberTypes,
             'haveMember' => $haveMember,
+            'addingMember' => $addingMember,
             'memberID' => $memberID,
             'member' => $memberData,
             'memberName' => $memberName,
diff --git a/setup/adminHooks.php b/setup/adminHooks.php
new file mode 100644 (file)
index 0000000..1c00507
--- /dev/null
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Gaslight Media Members Database
+ * GLM Members Misc Admin Hooks and Filters
+ *
+ * PHP version 5.5
+ *
+ * @category glmWordPressPlugin
+ * @package  glmMembersDatabase
+ * @author   Chuck Scott <cscott@gaslightmedia.com>
+ * @license  http://www.gaslightmedia.com Gaslightmedia
+ * @release  adminHooks.php,v 1.0 2014/10/31 19:31:47 cscott Exp $
+ * @link     http://dev.gaslightmedia.com/
+ */
+
+/*
+ * Place Misc Hooks and Filters here. If this file exists, it will be included
+ * by the add-on main plugin script.
+ *
+ * Note that filter and hook callback functions must be included in-line as shown below...
+ *
+ *  add_filter( 'filter_title', function( $parameter ) {
+ *     // Function code
+ *  });
+ *
+ *  Also note that parameters will be in the context of the main admin controller constructor.
+  */
+
+?>
\ No newline at end of file
diff --git a/setup/frontHooks.php b/setup/frontHooks.php
new file mode 100644 (file)
index 0000000..f93f124
--- /dev/null
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Gaslight Media Members Database
+ * GLM Members Misc Front Hooks and Filters
+ *
+ * PHP version 5.5
+ *
+ * @category glmWordPressPlugin
+ * @package  glmMembersDatabase
+ * @author   Chuck Scott <cscott@gaslightmedia.com>
+ * @license  http://www.gaslightmedia.com Gaslightmedia
+ * @release  frontHooks.php,v 1.0 2014/10/31 19:31:47 cscott Exp $
+ * @link     http://dev.gaslightmedia.com/
+ */
+
+/*
+ * Place Misc Hooks and Filters here. If this file exists, it will be included
+ * by the add-on main plugin script.
+ *
+ * Note that filter and hook callback functions must be included in-line as shown below...
+ *
+ *  add_filter( 'filter_title', function( $parameter ) {
+ *     // Function code
+ *  });
+ *
+ *  Also note that parameters will be in the context of the main front controller constructor.
+  */
+
+// Setup rewrite for member detail pages
+add_filter('rewrite_rules_array', function($rules) {
+    $newrules = array();
+    $newrules['('.$this->config['settings']['canonical_member_page'].')/([^/]*)$'] = 'index.php?pagename=$matches[1]&memberslug=$matches[2]';
+    return $newrules + $rules;
+});
+
+// Add memberslug query var
+add_filter('query_vars', function($vars) {
+    array_push($vars, 'memberslug');
+    return $vars;
+});
+
+// On init, check if we need to flush the rewrite rules to pickup the new ones
+add_filter('init', function() {
+    $rules = get_option( 'rewrite_rules' );
+    if ( ! isset( $rules['('.$this->config['settings']['canonical_member_page'].')/([^/]*)$'] ) ) {
+        global $wp_rewrite;
+        $wp_rewrite->flush_rules();
+    }
+});
+
+?>
\ No newline at end of file
index 0f1839d..a57c7e6 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/configure/header.html'}
 
     <!-- Add Accommodation Type Button and Dialog Box -->
-    <div id="newAccommodationTypeButton" class="button-primary glm-right">Add a Accommodation Type</div>
+    <div id="newAccommodationTypeButton" class="button button-primary glm-right">Add a Accommodation Type</div>
     <div id="newAccommodationTypeDialog" class="glm-dialog-box" title="Enter a New Accommodation Type">
         <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="accommodationTypes">
@@ -27,8 +27,8 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="newAccommodationTypeCancel" class="button-primary glm-right">Cancel</a>
-            <input type="submit" value="Add new Accommodation Type" class="button-primary">
+            <a id="newAccommodationTypeCancel" class="button button-primary glm-right">Cancel</a>
+            <input type="submit" value="Add new Accommodation Type" class="button button-primary">
         </form>
     </div>
 
@@ -36,8 +36,8 @@
     <div id="deleteAccommodationTypeDialog" class="glm-dialog-box" title="Delete Accommodation Type">
         <center>
             <p>Are you sure you want to delete this accommodation type?</p>
-            <p><div id="deleteAccommodationTypeConfirm" class="button-primary">Yes, delete this accommodation type</div></p>
-            <p><div id="deleteAccommodationTypeCancel" class="button-primary">Cancel</div></p>
+            <p><div id="deleteAccommodationTypeConfirm" class="button button-primary">Yes, delete this accommodation type</div></p>
+            <p><div id="deleteAccommodationTypeCancel" class="button button-primary">Cancel</div></p>
         </center>
     </div>
 
@@ -68,7 +68,7 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="editAccommodationTypeCancel" class="button-primary glm-right">Cancel</a>
+            <a id="editAccommodationTypeCancel" class="button button-primary glm-right">Cancel</a>
             <input type="submit" value="Update this Accommodation Type">
         </form>
     </div>
                     {$t.short_descr}
                 </td>
                 <td>
-                    <div class="deleteAccommodationTypeButton button-primary glm-right" data-accommodationTypeID="{$t.id}">Delete</div>
+                    <div class="deleteAccommodationTypeButton button button-secondary glm-button-small glm-right" data-accommodationTypeID="{$t.id}">Delete</div>
                 </td>
             </tr>
     {/foreach}
index b1b9a68..7115bef 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/configure/header.html'}
 
     <!-- Add Amenities Button and Dialog Box -->
-    <div id="newAmenityButton" class="button-primary glm-right">Add an Amenity</div>
+    <div id="newAmenityButton" class="button button-primary glm-right">Add an Amenity</div>
     <div id="newAmenityDialog" class="glm-dialog-box" title="Enter a New Amenity">
         <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="amenities">
@@ -42,8 +42,8 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="newAmenityCancel" class="button-primary glm-right">Cancel</a>
-            <input type="submit" value="Add new Amenity" class="button-primary">
+            <a id="newAmenityCancel" class="button button-primary glm-right">Cancel</a>
+            <input type="submit" value="Add new Amenity" class="button button-primary">
             
         </form>
     </div>
@@ -52,8 +52,8 @@
     <div id="deleteAmenityDialog" class="glm-dialog-box" title="Delete Amenity">
         <center>
             <p>Are you sure you want to delete this accommodation type?</p>
-            <p><div id="deleteAmenityConfirm" class="button-primary">Yes, delete this accommodation type</div></p>
-            <p><div id="deleteAmenityCancel" class="button-primary">Cancel</div></p>
+            <p><div id="deleteAmenityConfirm" class="button button-primary">Yes, delete this accommodation type</div></p>
+            <p><div id="deleteAmenityCancel" class="button button-primary">Cancel</div></p>
         </center>
     </div>
 
@@ -99,7 +99,7 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="editAmenityCancel" class="button-primary glm-right">Cancel</a>
+            <a id="editAmenityCancel" class="button button-primary glm-right">Cancel</a>
             <input type="submit" value="Update this Amenity">
             
         </form>
                     {$t.short_descr}
                 </td>
                 <td>
-                    <div class="deleteAmenityButton button-primary glm-right" data-amenityID="{$t.id}">Delete</div>
+                    <div class="deleteAmenityButton button button-secondary glm-button-small glm-right" data-amenityID="{$t.id}">Delete</div>
                 </td>
             </tr>
     {/foreach}
index 7ede7f0..42a7bfd 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/configure/header.html'}
 
     <!-- Add Categories Button and Dialog Box -->
-    <div id="newCategoryButton" class="button-primary glm-right">Add a Category</div>
+    <div id="newCategoryButton" class="button button-primary glm-right">Add a Category</div>
     <div id="newCategoryDialog" class="glm-dialog-box" title="Enter a New Category">
         <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="categories">
@@ -43,8 +43,8 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="newCategoryCancel" class="button-primary glm-right">Cancel</a>
-            <input type="submit" value="Add new Category" class="button-primary">
+            <a id="newCategoryCancel" class="button button-primary glm-right">Cancel</a>
+            <input type="submit" value="Add new Category" class="button button-primary">
         </form>
     </div>
     
@@ -52,8 +52,8 @@
     <div id="deleteCategoryDialog" class="glm-dialog-box" title="Delete Category">
         <center>
             <p>Are you sure you want to delete this category?</p>
-            <p><div id="deleteCategoryConfirm" class="button-primary">Yes, delete this category</div></p>
-            <p><div id="deleteCategoryCancel" class="button-primary">Cancel</div></p>
+            <p><div id="deleteCategoryConfirm" class="button button-primary">Yes, delete this category</div></p>
+            <p><div id="deleteCategoryCancel" class="button button-primary">Cancel</div></p>
         </center>
     </div>
 
@@ -99,7 +99,7 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="editCategoryCancel" class="button-primary glm-right">Cancel</a>
+            <a id="editCategoryCancel" class="button button-primary glm-right">Cancel</a>
             <input type="submit" value="Update this Category">
         </form>
     </div>
                     {$t.short_descr}
                 </td>
                 <td>
-                    <div class="deleteCategoryButton button-primary glm-right" data-categoryID="{$t.id}">Delete</div>
+                    <div class="deleteCategoryButton button button-secondary glm-button-small glm-right" data-categoryID="{$t.id}">Delete</div>
                 </td>
             </tr>
     {/foreach}
index 892fca5..8615f06 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/configure/header.html'}
 
     <!-- Add City Button and Dialog Box -->
-    <div id="newCityButton" class="button-primary glm-right">Add a City</div>
+    <div id="newCityButton" class="button button-primary glm-right">Add a City</div>
     <div id="newCityDialog" class="glm-dialog-box" title="Enter a New City">
         <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="cities">
@@ -15,7 +15,7 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="newCityCancel" class="button-primary glm-right">Cancel</a>
+            <a id="newCityCancel" class="button button-primary glm-right">Cancel</a>
             <input type="submit" value="Add new City">
         </form>
     </div>
@@ -24,8 +24,8 @@
     <div id="deleteCityDialog" class="glm-dialog-box" title="Delete City">
         <center>
             <p>Are you sure you want to delete this city?</p>
-            <p><div id="deleteCityConfirm" class="button-primary">Yes, delete this city</div></p>
-            <p><div id="deleteCityCancel" class="button-primary">Cancel</div></p>
+            <p><div id="deleteCityConfirm" class="button button-primary">Yes, delete this city</div></p>
+            <p><div id="deleteCityCancel" class="button button-primary">Cancel</div></p>
         </center>
     </div>
 
@@ -44,8 +44,8 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="newCityCancel" class="button-primary glm-right">Cancel</a>
-            <input type="submit" value="Update this City" class="button-primary">
+            <a id="newCityCancel" class="button button-primary glm-right">Cancel</a>
+            <input type="submit" value="Update this City" class="button button-primary">
         </form>
     </div>
     
@@ -71,7 +71,7 @@
                     <a class="editCity" data-cityID="{$t.id}">{$t.name}</a>
                 </td>
                 <td>
-                    <div class="deleteCityButton button-primary glm-right" data-cityID="{$t.id}">Delete</div>
+                    <div class="deleteCityButton button button-secondary glm-button-small glm-right" data-cityID="{$t.id}">Delete</div>
                 </td>
             </tr>
     {/foreach}
index cd9ee47..cb224ee 100644 (file)
@@ -3,14 +3,14 @@
     <h2>{$glmPluginName} Configuration</h2>
        
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index}-active{/if}">Member Types</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories}-active{/if}">Member Categories</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=accommodationTypes" class="nav-tab{if $thisAction==accommodationTypes}-active{/if}">Accommodation Types</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities}-active{/if}">Amenities</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities}-active{/if}">Cities</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions}-active{/if}">Regions</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Member Types</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Member Categories</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=accommodationTypes" class="nav-tab{if $thisAction==accommodationTypes} nav-tab-active{/if}">Accommodation Types</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
 {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action}-active{/if}">{$a.text}</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 {/foreach}        
     </h2>
     <div id="glm-admin-content-container">
index b188b6d..46369ab 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/configure/header.html'}
 
     <!-- Add Member Type Button and Dialog Box -->
-    <div id="newMemberTypeButton" class="button-primary glm-right">Add a Member Type</div>    
+    <div id="newMemberTypeButton" class="button button-primary glm-right">Add a Member Type</div>    
     <div id="newMemberTypeDialog" class="glm-dialog-box" title="Enter New Member Type">
         <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="index">
@@ -22,8 +22,8 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="newMemberTypeCancel" class="button-primary glm-right">Cancel</a>
-            <input type="submit" value="Add new member type" class="button-primary">
+            <a id="newMemberTypeCancel" class="button button-primary glm-right">Cancel</a>
+            <input type="submit" value="Add new member type" class="button button-primary">
         </form>
     </div>
 
@@ -31,8 +31,8 @@
     <div id="deleteMemberTypeDialog" class="glm-dialog-box" title="Delete Member Type">
         <center>
             <p>Are you sure you want to delete this member type?</p>
-            <p><div id="deleteMemberTypeConfirm" class="button-primary">Yes, delete this member type</div></p>
-            <p><div id="deleteMemberTypeCancel" class="button-primary">Cancel</div></p>
+            <p><div id="deleteMemberTypeConfirm" class="button button-primary">Yes, delete this member type</div></p>
+            <p><div id="deleteMemberTypeCancel" class="button button-primary">Cancel</div></p>
         </center>
     </div>
                     
@@ -57,7 +57,7 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="editMemberTypeCancel" class="button-primary glm-right">Cancel</a>
+            <a id="editMemberTypeCancel" class="button button-primary glm-right">Cancel</a>
             <input type="submit" value="Update this member type">
         </form>
     </div>
@@ -88,7 +88,7 @@
                     {$t.descr}
                 </td>
                 <td>
-                    <div class="deleteMemberTypeButton button-primary glm-right" data-memberTypeID="{$t.id}">Delete</div>
+                    <div class="deleteMemberTypeButton button button-secondary glm-button-small glm-right" data-memberTypeID="{$t.id}">Delete</div>
                 </td>
             </tr>
     {/foreach}
index 0475d07..cacbfb4 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/configure/header.html'}
 
     <!-- Add Regions Button and Dialog Box -->
-    <div id="newRegionButton" class="button-primary glm-right">Add a Region</div>
+    <div id="newRegionButton" class="button button-primary glm-right">Add a Region</div>
     <div id="newRegionDialog" class="glm-dialog-box" title="Enter a New Region">
         <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="regions">
@@ -27,8 +27,8 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="newRegionCancel" class="button-primary glm-right">Cancel</a>
-            <input type="submit" value="Add new Region" class="button-primary">
+            <a id="newRegionCancel" class="button button-primary glm-right">Cancel</a>
+            <input type="submit" value="Add new Region" class="button button-primary">
         </form>
     </div>
 
@@ -36,8 +36,8 @@
     <div id="deleteRegionDialog" class="glm-dialog-box" title="Delete Region">
         <center>
             <p>Are you sure you want to delete this region?</p>
-            <p><div id="deleteRegionConfirm" class="button-primary">Yes, delete this region</div></p>
-            <p><div id="deleteRegionCancel" class="button-primary">Cancel</div></p>
+            <p><div id="deleteRegionConfirm" class="button button-primary">Yes, delete this region</div></p>
+            <p><div id="deleteRegionCancel" class="button button-primary">Cancel</div></p>
         </center>
     </div>
 
@@ -68,7 +68,7 @@
                 </tr>
             </table>
             <p><span class="glm-required">*</span> Required</p>
-            <a id="editRegionCancel" class="button-primary glm-right">Cancel</a>
+            <a id="editRegionCancel" class="button button-primary glm-right">Cancel</a>
             <input type="submit" value="Update this Region">
         </form>
     </div>
                     {$t.short_descr}
                 </td>
                 <td>
-                    <div class="deleteRegionButton button-primary glm-right" data-regionID="{$t.id}">Delete</div>
+                    <div class="deleteRegionButton button button-secondary glm-button-small glm-right" data-regionID="{$t.id}">Delete</div>
                 </td>
             </tr>
     {/foreach}
index 7d2ad62..b69636b 100644 (file)
@@ -33,8 +33,8 @@
                         </div>
                         <p>
                             <input class="glm-right" type="submit" value="Click here to import all members not marked as Skip">
-                            <span id="skipAll" class="button-primary">Skip All</span>&nbsp;&nbsp;
-                            <span id="skipNone" class="button-primary">Import All</span>
+                            <span id="skipAll" class="button button-primary">Skip All</span>&nbsp;&nbsp;
+                            <span id="skipNone" class="button button-primary">Import All</span>
                         </p>
                         <div class="glm-nitice glm-indent">
                             <ul class="glm-required glm-indent">
index e375175..b539c74 100644 (file)
@@ -3,14 +3,14 @@
     <h2>{$glmPluginName} Configuration</h2>
        
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index}-active{/if}">General Settings</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=terms" class="nav-tab{if $thisAction==terms}-active{/if}">Terms and Phrases</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=development" class="nav-tab{if $thisAction==development}-active{/if}">Development</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=import" class="nav-tab{if $thisAction==import}-active{/if}">Data Import</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=addons" class="nav-tab{if $thisAction==addons}-active{/if}">Add-Ons</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=hooks" class="nav-tab{if $thisAction==hooks}-active{/if}">Hooks</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">General Settings</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=terms" class="nav-tab{if $thisAction==terms} nav-tab-active{/if}">Terms and Phrases</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=development" class="nav-tab{if $thisAction==development} nav-tab-active{/if}">Development</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=import" class="nav-tab{if $thisAction==import} nav-tab-active{/if}">Data Import</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=addons" class="nav-tab{if $thisAction==addons} nav-tab-active{/if}">Add-Ons</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=hooks" class="nav-tab{if $thisAction==hooks} nav-tab-active{/if}">Hooks</a>
 {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action}-active{/if}">{$a.text}</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 {/foreach}        
     </h2>
     <div id="glm-admin-content-container">
index 84ef641..d65a243 100644 (file)
@@ -85,7 +85,7 @@
             </tr>
         </table>
         
-        <input type="submit" value="Continue" class="button-primary">
+        <input type="submit" value="Continue" class="button button-primary">
         
     </form>
             
index 59dc475..bce2721 100644 (file)
@@ -35,7 +35,7 @@
         <input type="hidden" name="glm_action" value="import">
         <input type="hidden" name="option" value="importImages">
         <p><span class="glm-notice">WARNING:</span> This process may take a very long time!<br>Do not interrupt or re-submit this page.</p>
-        <input type="submit" value="Continue" class="button-primary">
+        <input type="submit" value="Continue" class="button button-primary">
     </form>
             
     
index b6a9064..fe2f520 100644 (file)
                 </td>
             </tr>
         </table>
-        <input type="submit" value="Update Settings" class="button-primary">
+        <input type="submit" value="Update Settings" class="button button-primary">
     </form>
     
     <script type="text/javascript">
index ffea0f8..f594b6c 100644 (file)
                 </td>
             </tr>
         </table>
-        <input type="submit" value="Update Settings" class="button-primary">
+        <input type="submit" value="Update Settings" class="button button-primary">
     </form>
 {include file='admin/footer.html'}
index 4d8c2dc..86e938b 100644 (file)
     </h2>
 
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&id={$memberInfoID}" class="nav-tab{if $thisAction==index}-active{/if}">Member Dashboard</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&id={$memberInfoID}" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Member Dashboard</a>
 {if $memberID}
   {if $memberInfoID}
-        <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$memberInfoID}" class="nav-tab{if $thisAction==memberInfo}-active{/if} {if !$memberID || !$memberInfoID}disabled{/if}">Member Info</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$memberInfoID}" class="nav-tab{if $thisAction==memberInfo} nav-tab-active{/if} {if !$memberID || !$memberInfoID}disabled{/if}">Member Info</a>
   {/if}
   {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}&member={$memberID}" class="nav-tab{if $thisAction==$a.action}-active{/if}">{$a.text}</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}&member={$memberID}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
   {/foreach}        
 {/if}
 
 {* Not needed yet 
-        <a href="{$thisURL}?page={$thisPage}&glm_action=locations&member={$memberID}" class="nav-tab{if $thisAction==locations}-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Locations</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=facilities&member={$memberID}" class="nav-tab{if $thisAction==facilities}-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Facilities</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=attractions&member={$memberID}" class="nav-tab{if $thisAction==attractions}-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Attractions</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=contacts&member={$memberID}" class="nav-tab{if $thisAction==contacts}-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Contacts</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=locations&member={$memberID}" class="nav-tab{if $thisAction==locations} nav-tab-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Locations</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=facilities&member={$memberID}" class="nav-tab{if $thisAction==facilities} nav-tab-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Facilities</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=attractions&member={$memberID}" class="nav-tab{if $thisAction==attractions} nav-tab-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Attractions</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=contacts&member={$memberID}" class="nav-tab{if $thisAction==contacts} nav-tab-active{/if} {if !$memberID || !$memberInfo}disabled{/if}">Contacts</a>
 *}
         
     </h2>
index aaf96ab..e6a8b71 100644 (file)
@@ -1,15 +1,17 @@
 {include file='admin/member/header.html'}
 
-{if $haveMemberTypes}
+{if $haveMember || $addingMember}
+ {if $haveMemberTypes}
 
 
     <h2>
-  {if $haveMember}
-        General Member Information
-  {else}
+  {if $addingMember}
         Add New Member
+  {else}
+        General Member Information
   {/if}
     </h2>
+
   {if $memberUpdated}
     <h2 class="glm-notice glm-flash-updated">Member Updated</h2>
   {/if}
   {if apply_filters('glm_members_permit_admin_member_index_edit_member', true)}
     <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="index">
-      {if $haveMember}
+      {if $addingMember}
+        <input type="hidden" name="option" value="addNew">
+        <input type="hidden" name="created" value="today">
+      {else}
         <input type="hidden" name="option" value="submit">
         <input type="hidden" name="member" value="{$member.fieldData.id}">
         <input type="hidden" name="created" value="{$member.fieldData.created.date}">
-      {else}
-        <input type="hidden" name="option" value="addNew">
-        <input type="hidden" name="created" value="today">
       {/if}
         
         <table class="glm-admin-table">
@@ -35,7 +37,7 @@
                 </td>
             </tr>
             
-      {if $haveMember}
+      {if !$addingMember}
             <tr>
                 <th>Name for URLs:</th>
                 <td>
                     {if $member.fieldFail.member_type}<p>{$member.fieldFail.member_type}</p>{/if}
                 </td>
             </tr>            
-        {if $haveMember}
+        {if !$addingMember}
             <tr><th>Date created:</th><td>{$member.fieldData.created.date}</td></tr>
         {/if}
             
         </table>
         <p><span class="glm-required">*</span> Required</p>
-    {if $haveMember}
-        <input type="submit" value="Update member">
-    {else}
+    {if $addingMember}
         <input type="submit" value="Add new member">
+    {else}
+        <input type="submit" value="Update member">
     {/if}
     </form>
   {else}
 
   {if apply_filters('glm_members_permit_admin_member_index_view_member_info_version', true)}
     {if apply_filters('glm_members_permit_admin_member_index_add_member_info_version', true)}
-    <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}" class="button-primary glm-button glm-right">Add New Member Information Version</a>
+    <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}" class="button button-primary glm-button glm-right">Add New Member Information Version</a>
     {/if}   
     <br clear="all">
     <p>
                 <td>{$m.modify_time.datetime}</td>
                 <td>
           {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)}       
-                    <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}&option=clone" class="button-primary glm-right">Clone</a>&nbsp;
-                    {if $m.status.name != 'Active'}<a href="{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&activateID={$m.id}" class="button-primary glm-button glm-right">Activate</a>{/if}
+                    <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}&option=clone" class="button button-secondary glm-button-small glm-right">Clone</a>&nbsp;
+                    {if $m.status.name != 'Active'}<a href="{$thisURL}?page={$thisPage}&glm_action=index&member={$memberID}&activateID={$m.id}" class="button button-secondary glm-button-small glm-right">Activate</a>{/if}
           {/if}
                 </td>
             </tr>
          {/if}
         {/foreach}
       {else} <!-- haveInfoRecords -->
-            <tr><td colspan="5"><a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here too start entering information for this member.</a></td></tr>
+            <tr><td colspan="5"><a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here to start entering information for this member.</a></td></tr>
       {/if}
         </tbody>
     </table>
    {/if} <!-- apply_filters -->
- {/if}
 {/if}
 
-{else}        
+ {else}        
     <h3 class="glm-error">You do not have any Member Types setup.</h3>
     <p>You must have at least one Member Type to add a new member.</p>
     <td><a href="{$thisURL}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add Member Types.</a></td>
+ {/if}
+{else}
+    <h3 class="glm-error">No current member.</h3>
 {/if}
 
+
     <script type="text/javascript">
         jQuery(document).ready(function($) {
                
index f073fc5..b256e28 100644 (file)
     
     {if $memberInfoID && $memberInfo}
         <!--  Delete Member Information dialog -->
-        <div id="deleteMemberInfoButton" class="button-primary glm-right">Delete this Member Information Version</div>
+        <div id="deleteMemberInfoButton" class="button button-primary glm-right">Delete this Member Information Version</div>
         <div id="deleteMemberInfoDialog" class="glm-dialog-box" title="Delete Member Information">
       {if $memberInfo.fieldData.status.value == 10}
-            <p><center><a id="deleteMemberInfoCancel" class="button-primary">Cancel</a></center></p>
+            <p><center><a id="deleteMemberInfoCancel" class="button button-primary">Cancel</a></center></p>
             <p>
                 <span class="glm-notice">NOTE:</span> This member information is the <b>currently active</b> version! You may not delete an active version. 
                 To delete this version, please select another version to be active or change the "Member Info Status" on this page to something
@@ -32,7 +32,7 @@
             </p>
       {else}
             <center>
-                <p><a id="deleteMemberInfoCancel" class="button-primary">Cancel</a></p>
+                <p><a id="deleteMemberInfoCancel" class="button button-primary">Cancel</a></p>
                 <p><input id="deleteMemberInfoSubmit" type="submit" value="Delete this Member Information Version"></p>
             </center>
             <div class="glm-item-container">
                 <th>City</th>
                 <td class="glm-item-container">
                     <!--  Add new city dialog -->
-                    <div id="newCityButton" class="button-primary glm-right">Add a new City</div>
+                    <div id="newCityButton" class="button button-secondary glm-right">Add a new City</div>
                     <div id="newCityDialog" class="glm-dialog-box" title="Enter a New City">
                         <table class="glm-admin-table">
                             <tr>
                             </tr>
                         </table>
                         <p><span class="glm-required">*</span> Required</p>
-                        <a id="newCityCancel" class="button-primary glm-right">Cancel</a>
+                        <a id="newCityCancel" class="button button-primary glm-right">Cancel</a>
                         <input id="newCitySubmit" type="submit" value="Add new City">
                     </div>
                     <!-- City Selection -->
                 <th>Categories</th>
                 <td class="glm-item-container">
                     <!--  Add new category dialog -->
-                    <div id="newCategoryButton" class="button-primary glm-right">Add a new Category</div>
+                    <div id="newCategoryButton" class="button button-secondary glm-right">Add a new Category</div>
                     <div id="newCategoryDialog" class="glm-dialog-box" title="Enter a New Category">
                             <table class="glm-admin-table">
                                 <tr>
                                 </tr>
                             </table>
                             <p><span class="glm-required">*</span> Required</p>
-                            <a id="newCategoryCancel" class="button-primary glm-right">Cancel</a>
+                            <a id="newCategoryCancel" class="button button-primary glm-right">Cancel</a>
                             <input id="newCategorySubmit" type="submit" value="Add new Category">
                     </div>
                     <!-- Category Selection -->
                 <th {if $memberInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL):</th>
                 <td {if $memberInfo.fieldFail.url}class="glm-form-bad-input"{/if}>
         {if $memberInfo.fieldData.url}
-                    <a class="button-primary glm-right" href="{$memberInfo.fieldData.url}" target="urlTarget">Test Link</a>
+                    <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.url}" target="urlTarget">Test Link</a>
         {/if}
                     <input type="text" name="url" value="{$memberInfo.fieldData.url}" class="glm-form-text-input-medium" placeholder="ex: http://www.gaslightmedia.com">
                     {if $memberInfo.fieldFail.url}<p>{$memberInfo.fieldFail.url}</p>{/if}
                                         </td>
                                     </tr>
                                     <tr>
-                                        </b><div style="float: right; margin: .2em .2em 0 0;" id="imageUploadCancel" class="button-primary glm-right">Cancel Upload</div>
+                                        </b><div style="float: right; margin: .2em .2em 0 0;" id="imageUploadCancel" class="button button-primary glm-right">Cancel Upload</div>
                                         <td class="glm-statusPrompt">Name: </td><td class="glm-statusValue">{ fileName }</td>
                                     </tr>
                                     <tr><td class="glm-statusPrompt">Type: </td><td class="glm-statusValue">{ fileType }</td></tr>
index 4891eeb..650c3cf 100644 (file)
@@ -1,10 +1,10 @@
 <div class="wrap">
-    <h2>Your Members</h2>
+    <h2>All Members</h2>
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index}-active{/if}">Dashboard</a>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=list" class="nav-tab{if $thisAction==list}-active{/if}">Members List</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=list" class="nav-tab{if $thisAction==list} nav-tab-active{/if}">Members List</a>
 {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action}-active{/if}">{$a.text}</a>
+        <a href="{$thisURL}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 {/foreach}        
     </h2>
     <div id="glm-admin-content-container">
index 91f0e91..f96354f 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/members/header.html'}
     
 {if apply_filters('glm_members_permit_admin_members_index_add_member', true)}
-    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=index&" class="button-primary glm-button glm-right">Add A New Member</a>
+    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=index&option=add" class="button button-primary glm-button glm-right">Add A New Member</a>
 {/if}
     <h2 class="glm-left">Main Dashboard</h2>
     
@@ -95,7 +95,7 @@
                     {$p.reference_name}
                 </td>
                 <td>
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&id={$p.id}}" class="button-primary glm-right">Manage</a>
+                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&id={$p.id}}" class="button button-secondary glm-button-small glm-right">Manage</a>
                 </td>
             </tr>
     {/foreach}
index 79a1cad..bfa4ced 100644 (file)
@@ -59,7 +59,7 @@
                     {if $m.pending > 0}<span class="glm-notice">{$m.pending} Pending</span>{/if}
                 </td>
                 <td>
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$m.id}&memberInfo={$m.active_id}" class="button-primary glm-right" style="margin: 0 .2em 0 .2em;">Active Info</a>
+                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$m.id}&memberInfo={$m.active_id}" class="button button-secondary glm-button-small glm-right" style="margin: 0 .2em 0 .2em;">Active Info</a>
                 </td>
             </tr>
     {/foreach}
index 8e935ae..51fa518 100644 (file)
@@ -1,6 +1,5 @@
 {include file='front/members/header.html'}
 
-
         <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
 
 {if $settings.list_show_map}