From: Chuck Scott Date: Wed, 4 May 2016 19:17:26 +0000 (-0400) Subject: Final set of changes before initial deployment X-Git-Tag: v2.0.0^2~27 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9d20011b88bcdc40e44b4bb8d914eed244694b6b;p=WP-Plugins%2Fglm-member-db.git Final set of changes before initial deployment --- diff --git a/css/admin.css b/css/admin.css index 55837589..c6dee750 100644 --- a/css/admin.css +++ b/css/admin.css @@ -216,6 +216,7 @@ td.glm-nowrap { .glm-dynSelect-delete:hover { font-size: 1.1em; color: #000; + cursor: pointer; } /* Map Edit */ diff --git a/setup/adminMenus.php b/setup/adminMenus.php index 88bbf1fd..ca4eb761 100644 --- a/setup/adminMenus.php +++ b/setup/adminMenus.php @@ -75,19 +75,29 @@ if (current_user_can('glm_members_members')) { function() {$this->controller('member');} ); -// Otherwise just display "Member" menu item +// Otherwise just display menus for logged in member } else { $mainMenuSlug = 'glm-members-admin-menu-member'; add_menu_page( - $this->config['terms']['term_admin_menu_member'], - $this->config['terms']['term_admin_menu_member'], + $this->config['terms']['term_admin_menu_members'], + 'GLM Associate', 'glm_members_main_menu', 'glm-members-admin-menu-member', - function() {$this->controller('member');}, + function() {}, false, - '91.123' + '3.100' + ); + + // Add a submenu for the "Member" info page + add_submenu_page( + 'glm-members-admin-menu-member', + $this->config['terms']['term_admin_menu_member'], + 'My '.$this->config['terms']['term_admin_menu_member'], + 'glm_members_main_menu', + 'glm-members-admin-menu-member', + function() {$this->controller('member', 'index');} ); } diff --git a/views/admin/member/index.html b/views/admin/member/index.html index 1d356f9e..9427ccd9 100644 --- a/views/admin/member/index.html +++ b/views/admin/member/index.html @@ -34,7 +34,9 @@ +{if apply_filters('glm_members_menu_members', true)} Edit {$terms.term_member_cap} Name and Status +{/if} diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index a129a85a..3d839b85 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -258,8 +258,6 @@ {if $memberInfo.fieldRequired.lat}{else}{/if}Location: - -
Map Location Using Above Address

MAP USE: Drag the pointer to the desired location for this {$terms.term_member}. @@ -267,7 +265,12 @@ Click and drag anywhere else on the map to move to another area.

(map loads here)
- Selected Position: Lat {$memberInfo.fieldData.lat}, Lon {$memberInfo.fieldData.lon} +

+ Selected Position: +   Latitude +   Longitude +   Update pointer with new lat/lon postion. +

@@ -365,6 +368,8 @@ {/if}    Select a category to add to box below.
+{else} +

You do not have permission to change your {$terms.term_member} categories. Please call if you need changes made here. {/if}

@@ -417,6 +422,17 @@ + + + +
  +

+ Best image size to provide is between 800 and 1000 pixels wide and stored as a JPG or JPEG file. + Also try to supply images that have a reasonable "aspect ratio" (not too tall, not too wide). + Files provided like this should have a file size of 100 to 250 KB. Images will be automatically + resized for use in the Web site. Images that are too large will be rejected. +

+
Logo: @@ -689,6 +705,19 @@ initMap(); } + // Listen for changes in the lat/lon inputs + $('#latLonRecenter').on('click', function() { + + // Get lat and lon from the input fields + var glmLat = $('#glmLat').val(); + var glmLng = $('#glmLng').val(); + + location = new google.maps.LatLng(glmLat, glmLng); + initMap(); + return false; + + }); + }); /* @@ -976,14 +1005,12 @@ glmLat = this.position.lat(); glmLng = this.position.lng(); - // Assign it to the hidden fields for submission - $('#glmLat').val(glmLat); - $('#glmLng').val(glmLng); + // Assign it to the lat/lon fields for submission + $('#glmLat').val(glmLat.toFixed(6)); + $('#glmLng').val(glmLng.toFixed(6)); - // Also display it to the user - $('#mapPosition').html('Lat ' + glmLat.toFixed(4) + ', Lon ' + glmLng.toFixed(4)); }); - + // When estimate location button is clicked, geocode using address $('#glm-estimate-location').on('click', function() { @@ -1011,8 +1038,8 @@ // Assign the new position to the hidden fields for submission glmLat = results[0].geometry.location.lat(); glmLng = results[0].geometry.location.lng(); - $('#glmLat').val(glmLat); - $('#glmLng').val(glmLng); + $('#glmLat').val(glmLat.toFixed(6)); + $('#glmLng').val(glmLng.toFixed(6)); // Also display it to the user $('#mapPosition').html('Lat ' + glmLat.toFixed(4) + ', Lon ' + glmLng.toFixed(4)); @@ -1051,7 +1078,7 @@ map.setCenter(results[0].geometry.location); marker.setPosition( results[0].geometry.location ); - // Assign the new position to the hidden fields for submission + // Assign the new position to the lat/lon fields for submission glmLat = results[0].geometry.location.lat(); glmLng = results[0].geometry.location.lng(); $('#glmLat').val(glmLat); @@ -1066,7 +1093,7 @@ } }); } - + // Flash certain elements for a short time after display $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500); diff --git a/views/admin/members/list.html b/views/admin/members/list.html index 861fe670..755a18b3 100644 --- a/views/admin/members/list.html +++ b/views/admin/members/list.html @@ -24,6 +24,8 @@

List of {$terms.term_member_plur_cap}


+

Total found: {$memberCount}  

+ {if $paging} {if $prevStart}{/if} {if $nextStart}{/if} @@ -115,6 +117,7 @@ $( "#glmMembersSearch" ).autocomplete({ source: availableTags, html: true, + position: { my : "right top", at: "right bottom" }, select: function( event, ui ) { var memberID = ui.item.id; window.location.replace("{$adminUrl}?page=glm-members-admin-menu-member&glm_action=index&member=" + memberID );