From 010463d142eba44723c6f14b3aa1720116084a15 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 19 Aug 2014 09:32:42 -0400 Subject: [PATCH] Foundation for map/searchform. Form button. Map and searchform are now more responsive, submit has button class. --- Toolkit/Members/Map.php | 6 +++--- Toolkit/Members/css/member.css | 16 ++++++++++++++-- Toolkit/Members/templates/memberSearchForm.tpl | 4 ++-- templates/toolbox.html | 6 +++--- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Toolkit/Members/Map.php b/Toolkit/Members/Map.php index a2c92d5..64653ac 100644 --- a/Toolkit/Members/Map.php +++ b/Toolkit/Members/Map.php @@ -84,16 +84,16 @@ class Toolkit_Members_Map * * @return string */ - public function toHtml($id = "map-canvas", $w = "100%", $h = "300px") + public function toHtml($class="small-12 medium-6 large-6 columns", $id = "map-canvas", $h = "500px", $w = "100%") { $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'Toolkit/Members/libjs/google-map.js'; $GLOBALS['bottomScripts'][] = 'http://maps.google.com/maps/api/js?sensor=false'; - $format = '
'; + $format = '
'; - return sprintf($format, $id, $w, $h); + return sprintf($format, $class, $id, $h, $w); } // }}} diff --git a/Toolkit/Members/css/member.css b/Toolkit/Members/css/member.css index 6d99a8b..8024ddd 100755 --- a/Toolkit/Members/css/member.css +++ b/Toolkit/Members/css/member.css @@ -1,8 +1,9 @@ /* Member Search and display */ #category-search { - clear: both; - padding: 0; +/* clear: both;*/ + padding: 0px, 10px, 0px, 10px; margin-top: 22px; + } #category-search li { list-style-image:none; @@ -46,6 +47,17 @@ background-color: #ffffff; position: relative; width: 100px; } +#category-search fieldset ol:lastchild { + + text-align: center !important; +} +#category-search .button { + margin: auto !important; + background-color: orange; +} +#category-search .button:hover { + background-color: #f27225; +} #category-search label { width: 120px; /* float: left; diff --git a/Toolkit/Members/templates/memberSearchForm.tpl b/Toolkit/Members/templates/memberSearchForm.tpl index 81fb0b7..b710ec0 100644 --- a/Toolkit/Members/templates/memberSearchForm.tpl +++ b/Toolkit/Members/templates/memberSearchForm.tpl @@ -1,4 +1,4 @@ - {end:} - +
{if:toolboxContent.searchForm} {toolboxContent.searchForm:h} {end:} - +
{if:toolboxContent.searchResults} {toolboxContent.searchResults:h} {end:} @@ -127,4 +127,4 @@ {end:} - \ No newline at end of file + -- 2.17.1