From 35b6942d91edd972091fcdda6ce3731d9efa6c80 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Wed, 7 Nov 2018 16:33:15 -0500 Subject: [PATCH] adding pages from a dropdown list to select a page to attach an area to from the settings menu --- css/admin.min.css | 1 + .../{mapSettings.php => mapSettingsAjax.php} | 6 +- models/admin/settings/mapSettings.php | 59 +++------------ sass/admin/_settings.scss | 24 +++++++ setup/validActions.php | 2 +- views/admin/settings/mapSettings.html | 72 ++++++------------- 6 files changed, 62 insertions(+), 102 deletions(-) rename models/admin/ajax/{mapSettings.php => mapSettingsAjax.php} (95%) diff --git a/css/admin.min.css b/css/admin.min.css index e69de29..e853d85 100644 --- a/css/admin.min.css +++ b/css/admin.min.css @@ -0,0 +1 @@ +#new-area-section{background-color:white}#new-area-section .input-container{margin-bottom:0;padding:0 10px 0 10px}#new-area-section .input-container input.area-name{margin:10px 10px 0 10px}#new-area-section .map-page-selection .select-wrapper .dropdown-content.select-dropdown li:not(:first-child){line-height:1;min-height:20px}#new-area-section .map-page-selection .select-wrapper .dropdown-content.select-dropdown li:not(:first-child) span,#new-area-section .map-page-selection .select-wrapper .dropdown-content.select-dropdown li:not(:first-child) a{line-height:1;padding:2px 10px} diff --git a/models/admin/ajax/mapSettings.php b/models/admin/ajax/mapSettingsAjax.php similarity index 95% rename from models/admin/ajax/mapSettings.php rename to models/admin/ajax/mapSettingsAjax.php index fd59af5..5aca237 100644 --- a/models/admin/ajax/mapSettings.php +++ b/models/admin/ajax/mapSettingsAjax.php @@ -18,7 +18,7 @@ require_once GLM_MEMBERS_COUNTY_MAP_PLUGIN_CLASS_PATH.'/data/dataMapSettings.php * This class exports the currently selected members list * to a printable HTML file, to a CSV file, or otherwise. */ -class GlmMembersAdmin_ajax_mapSettings extends GlmDataMapSettings +class GlmMembersAdmin_ajax_mapSettingsAjax extends GlmDataMapSettings { /** @@ -85,7 +85,7 @@ class GlmMembersAdmin_ajax_mapSettings extends GlmDataMapSettings $numbObits = 0; $namesList = false; $areas = false; - $test = "testa"; + $test = "start"; // Check if an ID is supplied $id = 0; if ( isset( $_REQUEST['id'] ) ) { @@ -123,7 +123,7 @@ class GlmMembersAdmin_ajax_mapSettings extends GlmDataMapSettings } } $data['list'] = $areas; - $data['test'] = $test; + $data['test'] = $this->wpdb->insert_id; // Get number of obits diff --git a/models/admin/settings/mapSettings.php b/models/admin/settings/mapSettings.php index e55ba6a..d2ca2f2 100644 --- a/models/admin/settings/mapSettings.php +++ b/models/admin/settings/mapSettings.php @@ -96,69 +96,32 @@ class GlmMembersAdmin_settings_mapSettings extends GlmDataMapSettings */ public function modelAction ($actionData = false) { - $success = true; - $areas = false; - + // Enqueue Materialize wp_register_script( 'materialize', GLM_MEMBERS_PLUGIN_URL . 'js/materialize/materialize.min.js', array( - 'jquery' + 'jquery' ), GLM_MEMBERS_PLUGIN_VERSION ); - + $args = array( + 'sort_order' => 'asc', + 'sort_column' => 'post_title', + 'hierarchical' => 0, + 'post_type' => 'page', + 'post_status' => 'publish' + ); + $pages = get_pages($args); wp_enqueue_script('materialize', false, array('jquery'), false, true); wp_enqueue_style('materialize-css', GLM_MEMBERS_PLUGIN_URL . 'css/materialize.min.css'); wp_enqueue_style('admin-css', GLM_MEMBERS_COUNTY_MAP_PLUGIN_URL . 'css/admin.min.css'); wp_enqueue_style('css-icons', "https://fonts.googleapis.com/icon?family=Material+Icons"); - - // Model Logic - $number_of_areas = 0; - $areaList = false; - - // Check if an ID is supplied - $id = 0; - if ( isset( $_REQUEST['id'] ) ) { - $id = $_REQUEST['id'] - 0; - } - // If there's an action option - if ( isset( $_REQUEST['option'] ) ) { - switch( $_REQUEST['option'] ) { - - case 'addNew': - $return = $this->insertEntry(); - $id = $return['fieldData']['id']; - break; - - case 'update': - if ( $id > 0 ) { - $this->updateEntry( $id ); - } - echo "no id"; - break; - - case 'delete': - if ( $id > 0 ) { - $this->deleteEntry( $id, true ); - } - break; - - default: - $option2 = false; - break; - - } - } - - $areas = $this->getList(); - - // Compile template data $templateData = array( - + 'pages' => $pages ); // Return status, suggested view, and data to controller diff --git a/sass/admin/_settings.scss b/sass/admin/_settings.scss index e69de29..6dd5206 100644 --- a/sass/admin/_settings.scss +++ b/sass/admin/_settings.scss @@ -0,0 +1,24 @@ +#new-area-section{ + background-color: white; + .input-container{ + margin-bottom: 0; + padding: 0 10px 0 10px; + input.area-name{ + margin: 10px 10px 0 10px; + } + } + .map-page-selection{ + .select-wrapper{ + .dropdown-content.select-dropdown{ + li:not(:first-child){ + line-height: 1; + min-height: 20px; + span,a{ + line-height: 1; + padding: 2px 10px; + } + } + } + } + } +} \ No newline at end of file diff --git a/setup/validActions.php b/setup/validActions.php index 4a485b7..1f129fb 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -60,7 +60,7 @@ $glmMembersCountyMapAddOnValidActions = array( 'adminActions' => array( 'ajax' => array( - 'mapSettings' => GLM_MEMBERS_COUNTY_MAP_PLUGIN_SLUG, + 'mapSettingsAjax' => GLM_MEMBERS_COUNTY_MAP_PLUGIN_SLUG, ), 'settings' => array( 'mapSettings' => GLM_MEMBERS_COUNTY_MAP_PLUGIN_SLUG, diff --git a/views/admin/settings/mapSettings.html b/views/admin/settings/mapSettings.html index f540865..aa291d0 100644 --- a/views/admin/settings/mapSettings.html +++ b/views/admin/settings/mapSettings.html @@ -1,15 +1,27 @@ -
- +
+
+ +
+
+
+ +
+
-
+
-