From c554c0ee9fbfd89ccfc5aba561f860c8648e1332 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Mon, 25 Jan 2016 14:01:36 -0500 Subject: [PATCH] Style changes based on meeting --- assets/blog.png | Bin 0 -> 663 bytes assets/blogger.png | Bin 0 -> 960 bytes assets/facebook.png | Bin 0 -> 636 bytes assets/flickr.png | Bin 0 -> 672 bytes assets/twitter.png | Bin 0 -> 775 bytes classes/data/settings/dataSettingsGeneral.php | 2 +- css/front.css | 206 +++++++++-- npm-debug.log | 17 + views/front/members/detail.html | 341 +++++++++++++----- views/front/members/list.html | 6 +- 10 files changed, 458 insertions(+), 114 deletions(-) create mode 100644 assets/blog.png create mode 100644 assets/blogger.png create mode 100644 assets/facebook.png create mode 100644 assets/flickr.png create mode 100644 assets/twitter.png create mode 100644 npm-debug.log diff --git a/assets/blog.png b/assets/blog.png new file mode 100644 index 0000000000000000000000000000000000000000..125638fa57d6d61879038fb8fa8e9efbcc81ee24 GIT binary patch literal 663 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 FV1fWXS{?uZ literal 0 HcmV?d00001 diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index 336c9532..a7f8866b 100644 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -176,7 +176,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'maps_default_zoom' => array( 'field' => 'maps_default_zoom', 'type' => 'integer', - 'default' => 10, + 'default' => 12, 'use' => 'a' ), diff --git a/css/front.css b/css/front.css index 2ce252d8..3b00ad89 100644 --- a/css/front.css +++ b/css/front.css @@ -66,6 +66,9 @@ .glm-member-list-info { clear: both; } +.glm-member-list-info { + font-size: 13px; +} .glm-member-list-items { margin-top: .5em; } @@ -78,24 +81,21 @@ } .glm-member-list-active-info { padding: 15px; - left: -20px; } - /* Member Detail */ -.glm-member-detail-container { - border: 1px #ccc solid; -/* padding: .4em 0px 0px 0px;*/ - background: #f8f8f8; - margin: .4em 0px .4em 0px; -} .glm-member-detail-image { margin-bottom: 1em; width: 100%; } .glm-member-detail-nameAddress { } -.glm-member-detail-info { - clear: both; +#glm-member-detail-info h2 { + color: #92a682; + font-size: 20px; + padding: 5px 10px; +} +#glm-member-detail-data > div { + padding: 10px 40px 10px 10px; } .glm-member-detail-items { margin-top: .5em; @@ -106,23 +106,16 @@ overflow: hidden; } .glm-member-detail-image-wrapper img { - float: none; + float: right; margin: 0 auto; } .glm-package-detail-image-wrapper img { float: right; } -@media (max-width: 640px) { - .glm-package-detail-image-wrapper img { - float: none; - margin: 0 auto; - } -} .glm-member-detail-button { padding: 10px 20px; border-radius: 6px; } -.glm-member-detail-container, .glm-member-entry-container, .glm-member-list-container { background-image: -moz-linear-gradient(top, #ffffff, #E9F0F7); @@ -132,13 +125,35 @@ margin-bottom: 5px; border-radius: 5px; } -.glm-member-detail-container #glm-locationMap-container { +#glm-member-detail-container { + background: #f5f5f5 none repeat scroll 0 0; + border: 1px solid #ccc; + border-radius: 5px; + margin: 20px 0 50px; +} +#page-wrapper .glm-member-container { + height: auto; +} +#glm-member-detail-sidemenu .glm-member-detail-table td { + cursor: pointer; +} +#glm-member-detail-sidemenu .glm-member-detail-table td.selected { + box-shadow: 1px 2px 5px 2px lightgrey inset; +} +#glm-member-detail-sidemenu .glm-member-detail-table td:hover { + box-shadow: 1px 1px 5px 3px lightgrey; + border-radius: 2px; +} +#glm-member-detail-sidemenu table { + width: 100%; +} +#glm-member-detail-container #glm-locationMap-container { padding: 0; } -#glm-member-detail-amenities-container table { +.glm-member-detail-table { width: 100%; } -#glm-member-detail-amenities-container table tbody tr th { +.glm-member-detail-table tbody tr th { background-color: #c4e2f0; } /* Alpha Lists */ @@ -174,12 +189,161 @@ max-width: none !important; } .glm-map-member-name { + font-size: 16px; width: 100%; font-weight: bold; border-bottom: 2px #ccc solid; } +.glm-member-list-info, +.glm-member-list-info p, +.glm-map-member-address { + font-size: 13px; + line-height: 1.2; + margin: 3px 0 0; +} + /* Specific Divs */ #glm-directions { padding: 1em; } +.glm-member-list-links { + display: inline; +} +.glm-member-list-links a { + color: black; + text-decoration: underline; + margin-right: 15px; +} +#glm-member-detail-social a { + margin-right: 5px; +} + +@media (max-width: 1024px) { + #glm-member-detail-data > div { + margin: 0 auto; + } + .glm-member-detail-image-wrapper img { + float: none; + margin: 0 auto; + } + #glm-member-detail-sidemenu, + .glm-member-detail-image-wrapper { + margin: 10px 0; + } + .glm-member-list-image-wrapper { + border-top-right-radius: 4px; + border-top-left-radius: 4px; + } +} +@media (min-width: 1024px) { + #page-wrapper .glm-member-detail-image-wrapper { + border-top-right-radius: 5px; + } + + .glm-member-list-image-wrapper { + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; + } +} + +@media (max-width: 640px) { + .glm-package-detail-image-wrapper img { + float: none; + margin: 0 auto; + } +} +/*#glm-locationMap-container { + margin-bottom: 0px; +} +#glm-locationMap { + margin: 0; +} +.glm-member-container { + line-height: 1.3; + font-size: 14px; + overflow: hidden; + position: relative; +} +.glm-member-container a:hover { + color: black; + cursor: pointer; +} + +.glm-member-container ul, +.glm-member-container ol, +.glm-member-container dl { + font-size: 14px; +} +.glm-member-container h2 { + padding: 0; + line-height: 1; + margin-bottom:3px; + font-size: 16px; + text-transform: uppercase; +} +.glm-member-container h2 a:hover { + color: black; +} +.glm-member-container p { + font-size: 14px; + margin-bottom: 10px; +} +.glm-member-container .glm-member-list-image-border { + border-right: 2px solid lightgrey; + overflow: hidden; + max-height: 200px; + max-width: 300px; +} +.glm-member-container .glm-member-list-description { + padding: 20px 20px 20px 0; +} +#glm-member-detail-container { + .glm-member-detail-info { + } + ul { + list-style: none; + } + .glm-member-detail-info { + padding: 15px; + } +} +#glm-member-detail-descr-row { + margin-top: 40px; +} +#glm-member-detail-amenities-container { + padding: 10px 40px 10px 10px; +} +#glm-member-detail-description-container { + padding: 10px; + padding-top: 10px; + padding-bottom: 10px; +} +.glm-member-detail-border { + border: 1px solid lightgrey; + padding: 10px; +} +#glm-member-detail-photos { + margin-top: 20px; + b, .clearing-assembled { + padding: 5px; + } +} +.glm-member-package-container .address a, +.glm-member-package-container .package-info > h3 a { + color: #34A9CD; +} +.glm-member-package-container .address a.email, +.glm-member-package-container .member > h2 a { + color: #92A682; +}*/ +div.member div.address a.email { + display: block; + float: left; + width: auto; + color: #73BF45; + height: 28px; + margin: 0 10px 3px 0; + padding: 4px 0 4px 32px; + background: url(../assets/email.png) 0 50% no-repeat; +} \ No newline at end of file diff --git a/npm-debug.log b/npm-debug.log new file mode 100644 index 00000000..36fb5ea0 --- /dev/null +++ b/npm-debug.log @@ -0,0 +1,17 @@ +0 info it worked if it ends with ok +1 verbose cli [ '/usr/bin/nodejs', '/usr/bin/npm', 'install' ] +2 info using npm@1.4.21 +3 info using node@v0.10.25 +4 error install Couldn't read dependencies +5 error package.json ENOENT, open '/home/laury/dev55/explorewesternup.gaslightmedia.com/web/wp-content/plugins/glm-member-db/package.json' +5 error package.json This is most likely not a problem with npm itself. +5 error package.json npm can't find a package.json file in your current directory. +6 error System Linux 3.19.0-42-generic +7 error command "/usr/bin/nodejs" "/usr/bin/npm" "install" +8 error cwd /home/laury/dev55/explorewesternup.gaslightmedia.com/web/wp-content/plugins/glm-member-db +9 error node -v v0.10.25 +10 error npm -v 1.4.21 +11 error path /home/laury/dev55/explorewesternup.gaslightmedia.com/web/wp-content/plugins/glm-member-db/package.json +12 error code ENOPACKAGEJSON +13 error errno 34 +14 verbose exit [ 34, true ] diff --git a/views/front/members/detail.html b/views/front/members/detail.html index aacf5fcb..ca03ca90 100644 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -1,11 +1,19 @@ {include file='front/members/header.html'} + + {apply_filters('glm-member-db-front-members-detail-pageTop', '', $member.id)} {if $haveMember} - + {if $settings.detail_show_map} +
+
(map loads here)
+
+ {/if} {if $settings.detail_show_directions}
(directions load here)
@@ -40,11 +48,10 @@ {/if} -
-
+
-
+

{$member.member} @@ -65,33 +72,32 @@ {if $member.phone && $settings.detail_show_phone}
Phone: {$member.phone}
{/if} {if $member.toll_free && $settings.detail_show_tollfree}
Toll Free: {$member.toll_free}
{/if} {if $member.region && $settings.detail_show_region}

Region: {$member.region}

{/if} +
{apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $member.id)} -

- {apply_filters('glm-member-db-front-members-detail-linksTop', '', $member.id)} - {if $member.url && $settings.detail_show_url}Website{/if} - {if $member.email && $settings.detail_show_email}Email{/if} - {if $settings.detail_show_imagegallery && $haveImageGallery}Photo Gallery{/if} - {if $settings.detail_show_coupons && $coupons}Coupons{/if} - {if $settings.detail_show_packages && $packages}Packages{/if} - {apply_filters('glm-member-db-front-members-detail-linksBottom', '', $member.id)} -
-

- {if $settings.detail_show_map} - {if $member.logo && $settings.detail_show_logo} -
- {else} -
- {/if} -
(map loads here)
-
- {/if} - {if $member.logo && $settings.detail_show_logo} -
+
+
+ + + + +
+ {apply_filters('glm-member-db-front-members-detail-linksTop', '', $member.id)} + {if $member.url && $settings.detail_show_url}Website{/if} + {if $member.email && $settings.detail_show_email}Email{/if} + + {if $settings.detail_show_coupons && $coupons}Coupons{/if} + {if $settings.detail_show_packages && $packages}Packages{/if} + {apply_filters('glm-member-db-front-members-detail-linksBottom', '', $member.id)} +
+
+ + {if $member.logo && $settings.detail_show_logo} +
- + +
+ {/if}
- {/if} -
@@ -103,13 +109,51 @@
{apply_filters('glm-member-db-front-members-detail-attributesTop', '', $member.id)} - {if ($member.amenities && $settings.detail_show_amenities) || ($member.cc_type && $settings.detail_show_creditcards) || ($member.categories && $settings.detail_show_categories)} -
-
- {apply_filters('glm-member-db-front-members-detail-attributesTop', '', $member.id)} - {if $member.amenities && $settings.detail_show_amenities} - - +
+
Amenities & Services
+ + + + {if $member.amenities && $settings.detail_show_amenities} + + {/if} + {if $settings.detail_show_imagegallery && $haveImageGallery} + + {/if} + {if $member.cc_type && $settings.detail_show_creditcards} + + {/if} + {if $member.categories && $settings.detail_show_categories} + + {/if} + {if $settings.detail_show_coupons} + + {/if} + + + {if !$havePackages} + + {/if} +
Member Info
Full profile
Description
Amenities & Services
Image Gallery
Accepted Credit Cards
Categories
Coupons
Packages
+
+
+
+
+ {apply_filters('glm-member-db-front-members-detail-descriptionTop', '', $member.id)} + {if $member.descr && $settings.detail_show_descr}{$member.descr|nl2br}{/if} + {if $member.short_descr && $settings.detail_show_short_descr}{$member.short_descr|nl2br}{/if} + {apply_filters('glm-member-db-front-members-detail-descriptionBottom', '', $member.id)} +
+
+ {apply_filters('glm-member-db-front-members-detail-descriptionAfter', '', $member.id)} + {if $member.amenities && $settings.detail_show_amenities} +
+ + {foreach $member.amenities as $a} {/foreach}
Amenities & Services
@@ -118,76 +162,195 @@
+
+ {/if} - {/if} - {if $member.cc_type && $settings.detail_show_creditcards} -

- Credit Cards Accepted: -

    - {foreach $member.cc_type.names as $c} -
  • {$c}
    • - {/foreach} -
-

- {/if} - {if $member.categories && $settings.detail_show_categories} -

- {$terms.term_member_cap} Categories -

    - {foreach $member.categories as $c} -
  • - {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} -
    • + {if $member.cc_type && $settings.detail_show_creditcards} +
    +

    + + + {foreach $member.cc_type.names as $c} + {/foreach} - +
    Credit Cards Accepted:
    {$c}

    - {/if} - {apply_filters('glm-member-db-front-members-detail-attributesBottom', '', $member.id)}
    -
- -
- {else} -
- {/if} -
- {apply_filters('glm-member-db-front-members-detail-descriptionTop', '', $member.id)} - {if $member.descr && $settings.detail_show_descr}{$member.descr|nl2br}{/if} - {if $member.short_descr && $settings.detail_show_short_descr}{$member.short_descr|nl2br}{/if} - {apply_filters('glm-member-db-front-members-detail-descriptionBottom', '', $member.id)} + {/if} + + {if $member.categories && $settings.detail_show_categories} +
+ + + {foreach $member.categories as $c} + + + + {/foreach} +
{$terms.term_member_cap} Categories
+ {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} +
+ {/if} + + {if $settings.detail_show_coupons && $coupons} +
+ +
+ {/if} + + {if $settings.detail_show_packages && $havePackages && $packages} +
+ +
+ {/if} + + {if $settings.detail_show_imagegallery && $haveImageGallery} +
+ {apply_filters('glm-member-db-front-members-detail-galleryTop', '', $member.id)} + +
+ Photo Gallery +
+ +
+
    + {foreach $imageGallery as $i} +
    • + {/foreach} +
+
+ {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)} +
+ {/if}
- {apply_filters('glm-member-db-front-members-detail-descriptionAfter', '', $member.id)} + {apply_filters('glm-member-db-front-members-detail-attributesBottom', '', $member.id)} - {if $settings.detail_show_imagegallery && $haveImageGallery} -
- {apply_filters('glm-member-db-front-members-detail-galleryTop', '', $member.id)} - -
- Photo Gallery -
- -
-
    - {foreach $imageGallery as $i} -
    • - {/foreach} -
-
- {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)} -
- {/if} - {apply_filters('glm-member-db-front-members-detail-pageBottom', '', $member.id)}
+ {apply_filters('glm-member-db-front-members-detail-pageBottom', '', $member.id)}