Merge remote-tracking branch 'origin/group-pages' into group-pages

app/assets/javascripts/templates/partials/group-contact.html.haml

@@ -1,12 +1,26 @@
-%div.contact-container{bindonce: true}
-  %p test 123
-  
-  / - if "@group.email || @group.website || @group.phone"
+%div.contact-container{bindonce: true}  
+  / - if @group.email || @group.website || @group.phone
   %div.modal-centered
     %p.modal-header Contact
-    %p
+    %p 
+      Container for contact info
       / = @group.phone
 
+%div.contact-container{bindonce: true}  
+  / - if @group.email || @group.website || @group.phone
+  %div.modal-centered
+    %p.modal-header Address
+    %p 
+      Container for address info
+      / = @group.phone
+
+%div.contact-container{bindonce: true}  
+  / - if @group.email || @group.website || @group.phone
+  %div.modal-centered
+    %p.modal-header Follow
+    %p 
+      Container for follow us info
+      / = @group.phone
 
     / %p.word-wrap{"ng-if" => "enterprise.email"}
     /   %a{"ng-href" => "{{enterprise.email | stripUrl}}", target: "_blank", mailto: true}

app/assets/stylesheets/darkswarm/branding.css.sass

@@ -22,4 +22,5 @@ $disabled-dark: #999
 $disabled-v-dark: #808080
 $med-grey: #666
 $dark-grey: #333
+$light-grey: #ddd
 $black: #000

app/assets/stylesheets/darkswarm/groups.css.sass

@@ -26,4 +26,22 @@
   .group-name
     border-bottom: 1px solid #ccc
   .producers
-    background-image: none
+    background-image: none
+  .tabs dd a
+    border: none
+    // border-bottom: 1px solid grey
+    margin-bottom: -2px
+    margin-right: 2px
+  .tabs dd.active a
+    margin-bottom: -1px
+    border-top: 1px solid $light-grey
+    border-left: 1px solid $light-grey
+    border-right: 1px solid $light-grey
+    border-bottom: 1px solid white
+
+  .tabs-content
+    border-top: 1px solid $light-grey
+    border-left: 1px solid $light-grey
+    border-right: 1px solid $light-grey
+    border-bottom: 1px solid $light-grey
+    padding: 1.5em

app/views/groups/show.html.haml

@@ -13,7 +13,7 @@
 
   .small-12.columns.pad-top
     .row.pad-top
-      .small-12.medium-7.columns
+      .small-12.medium-8.columns
         %div{"ng-controller" => "TabsCtrl"}
           %tabset
             %tab{heading: 'Map',
@@ -56,7 +56,7 @@
 
                       = render partial: 'shared/components/enterprise_no_results'
       
-      .small-12.medium-4.medium-offset-1.columns
+      .small-12.medium-4.columns
         %ng-include{src: "'partials/group-contact.html'"}
   /       %h4 Contact us
   /       - if @group.phone
@@ -123,8 +123,7 @@
       .small-12.columns.text-center.small
         %hr
         %p.text-small
-          Copyright this year
-          = @group.name
+          = "Copyright #{Date.today.year} #{@group.name}"
         %h2
           -if @group.facebook
             %a{title:'Follow us on Facebook', href: 'https://www.facebook.com/' + @group.facebook, target: '_blank'}