sdk update for groups and orbit_bootstrap by joshua

app/assets/javascripts/group.js

@@ -43,15 +43,15 @@
                 }
         },
         // Equal height for card
-        equalHeight: function() {
+        equalHeight: function(el) {
             var bigbrother = -1,
-                $card = $('.group-card-inner');
+                $el = $(el);
 
-            $card.each(function() {
+            $el.each(function() {
                 bigbrother = bigbrother > $(this).height() ? bigbrother : $(this).height();
             });
 
-            $card.each(function() {
+            $el.each(function() {
                 $(this).height(bigbrother);
             });
         },
@@ -131,7 +131,8 @@
         }
 
         group.cycleFix();
-        group.equalHeight();
+        group.equalHeight('.group-card-inner');
+        group.equalHeight('.group-admin-edit-image-item');
         group.plugins();
     });
 

app/assets/stylesheets/lib/group/group-admin.scss

@@ -37,19 +37,23 @@ body {
     .select2-container-multi {
         margin-right: 0.9375rem;
         min-width: 200px;
+
         .select2-choices {
             padding: 0;
             border-radius: $general;
+
             .select2-search-field {
                 input {
                     padding: 10px 5px;
                 }
             }
         }
+
         .select2-search-choice {
             padding: 10px 1.75rem 10px 0.7rem;
             border-color: lighten($light-gray, 5%);
             background: $white;
+
             > div {
                 &:before {
                     content: "\F007";
@@ -61,9 +65,11 @@ body {
                 }
             }
         }
+
         .select2-search-choice-close {
             right: 15px;
             left: auto;
+
             &:before {
                 content: "\f057";
                 font-family: FontAwesome;
@@ -74,6 +80,7 @@ body {
                 font-size: 0.9375rem;
                 color: $dark-gray;
             }
+
             &:hover {
                 &:before {
                     color: $red;
@@ -82,6 +89,7 @@ body {
         }
     }
 }
+
 .select2-result-label {
     > span {
         white-space: nowrap;
@@ -104,6 +112,7 @@ body {
         z-index: 3000;
     }
 }
+
 .fileupload {
     .thumbnail {
         max-width: 60%;
@@ -116,13 +125,12 @@ body {
     height: 50px;
 }
 
-
-
 // members page
 .existing-phone-avatar {
     vertical-align: top;
     margin: 0 0.5rem 0.5rem 0;
 }
+
 .existing-member-count {
     width: 60px;
     height: 60px;
@@ -134,6 +142,7 @@ body {
     padding: 8px 0.45rem;
     font-size: 0.8125rem;
 }
+
 .group-edit-button {
     box-sizing: border-box;
     vertical-align: top;
@@ -151,37 +160,42 @@ body {
 
 .group-member-edit-table {
     width: 100%;
+
     tr {
         border-bottom: 1px solid $gray;
     }
+
     td {
         padding: 8px 0.75rem;
+
         &:first-child {
             width: 60px;
         }
     }
+
     .make-admin-checkbox {
         display: inline-block;
         vertical-align: top;
         margin-right: 0.3125rem;
     }
+
     .group-member-permission {
         display: inline-block;
         vertical-align: text-top;
     }
-
 }
+
 .group-admin-edit-image-wrap {
     margin: 0 24px 1rem 0;
 }
+
 .group-admin-edit-image-item {
-    margin-bottom: 16px;
+    margin: 0 10px 16px 0;
     padding: 16px 0.5rem;
 }
+
 .group-admin-edit-image-container {
-    float: left;
+    max-width: 100px;
-    width: 15%;
-    min-width: 150px;
     margin: 0 1rem 16px 0;
 }
 
@@ -193,37 +207,64 @@ body {
     border-radius: $general;
     float: left;
 }
+
 .group-admin-edit-image-checkbox {
     display: inline-block;
     vertical-align: top;
 }
+
 .group-admin-edit-image-label {
     display: inline-block;
     vertical-align: text-top;
     font-size: 0.75rem;
 }
+
 .group-admin-edit-image-item-inner {
     padding: 16px 0.625rem;
     background: $white;
     border-radius: $general;
 }
+
 .group-admin-edit-file-wrap {
     margin-bottom: 10px;
 }
+
 .group-admin-edit-file-item {
     padding: 10px 16px;
     float: left;
     margin: 0 8px 0.5rem 0;
     font-size: 0.8125rem;
+
     .group-admin-edit-file-checkbox {
         margin: 0;
     }
 }
+
 .group-admin-edit-filename {
     margin-right: 0.3125rem;
 }
+
 .group-admin-edit-file-delete {
     padding-bottom: 4px;
     border-bottom: 1px dotted $red;
     vertical-align: top;
 }
+
+@media screen and (min-width: 700px) {
+    .group-admin-edit-image-item {
+        float: left;
+        width: 45%;
+    }
+}
+
+@media screen and (min-width: 960px) {
+    .group-admin-edit-image-item {
+        width: 30%;
+    }
+}
+
+@media screen and (min-width: 1150px) {
+    .group-admin-edit-image-item {
+        width: 20%;
+    }
+}

app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb

@@ -203,6 +203,7 @@ $orbit-bar-bgc-lighter:           lighten($orbit-bar-bgc, 20%) !default;
           border-color: #e6e6e6 #e6e6e6 #bfbfbf;
           border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
           box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+          color: #fff;
           &:hover {
             color: #fff;
             background-color: #d92b0e;

app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss

@@ -60,7 +60,6 @@ a.btn-primary {
     }
 }
 
-
 // Page heading
 .page-module-title {
     @extend .unity-title;

app/templates/orbit_bootstrap/assets/stylesheets/template/modules/faq.scss

@@ -1,4 +1,5 @@
 @charset "utf-8";
+
 @import "../initial";
 
 // Faqs MODULES
@@ -6,9 +7,11 @@
     &.widget1 {
         .widget-content {
             padding-bottom: 10px;
+
             & + .widget-content {
                 border-top: 1px dotted $theme-gray-light;
             }
+
             .widget-content-title {
                 display: inline-block;
                 padding: 5px 0;
@@ -37,10 +40,12 @@
     .index-title {
         @extend .unity-title;
     }
+
     &.index1 {
         .index-content {
             list-style-type: decimal-leading-zero;
             list-style-position: inside;
+
             & + .index-content {
                 border-top: 1px dotted $theme-gray-light;
             }

app/templates/orbit_bootstrap/assets/stylesheets/template/modules/gallery.scss

@@ -1,6 +1,6 @@
-@charset 'utf-8';
+@charset "utf-8";
 
-@import '../initial';
+@import "../initial";
 
 // Gallery MODULES
 .widget-gallery {

app/templates/orbit_bootstrap/assets/stylesheets/template/modules/menu.scss

@@ -1,14 +1,18 @@
 @charset "utf-8";
+
 @import "../initial";
 
 .modules-menu {
     font-family: $sub-font;
     max-height: none;
+
     li {
         white-space: nowrap;
+
         & > a, & > .fa {
             color: #ffffff;
         }
+
         &:hover {
             & > a, & > .fa {
                 color: $brand-primary;
@@ -16,18 +20,22 @@
             }
         }
     }
+
     .modules-menu-level-0 {
         margin: 0;
         padding: 0;
         list-style: none;
+
         & > li {
             margin: 0 -15px;
             padding: 0 15px;
             border-bottom: 1px solid lighten($theme-gray, 5%);
+
             & > a {
                 display: inline-block;
                 padding: 1rem 0;
             }
+
             & > .fa {
                 position: absolute;
                 right: 10px;
@@ -37,50 +45,62 @@
                 font-size: 1.5em;
                 text-align: center;
             }
+
             &:hover {
                 & > a {
                     background-color: transparent;
                 }
             }
+
             @media (min-width: $screen-sm) {
                 position: relative;
                 margin: 0 10px;
                 padding: 0;
                 border-bottom: none;
+
                 &:first-child {
                     margin-left: 0;
                 }
+
                 &:last-child {
                     margin-right: 0;
+
                     .modules-menu-level-1 {
                         right: 15px;
                         left: auto;
+
                         &:before {
                             right: 10px;
                             left: auto;
                         }
+
                         & > li {
                             padding-right: 15px;
                             padding-left: 15px;
+
                             & > a {
                                 padding-left: 0;
                             }
                         }
+
                         .modules-menu-level-2 {
                             right: 100%;
                             left: auto;
+
                             &:before {
                                 right: -6px;
                                 left: auto;
-                @include arrow('left', 6px, 6px, $theme-gray-darker);
+                                @include arrow("left", 6px, 6px, $theme-gray-darker);
                             }
                         }
                     }
                 }
+
                 & > a {
                     padding: 2rem 0;
                     border-bottom: 0.5rem solid transparent;
                 }
+
                 & > .fa {
                     position: static;
                     @include size(auto, auto);
@@ -89,11 +109,13 @@
                     font-size: 1em;
                     cursor: default;
                 }
+
                 &:hover {
                     & > a {
                         padding: 2rem 0;
                         border-bottom-color: $brand-primary;
                     }
+
                     .modules-menu-level-1 {
                         display: block;
                     }
@@ -101,6 +123,7 @@
             }
         }
     }
+
     .modules-menu-level-1 {
         display: none;
         min-width: 100%;
@@ -109,15 +132,19 @@
         background-color: $theme-gray-dark;
         list-style: none;
         z-index: 1;
+
         & > li {
             position: relative;
+
             & + li {
                 border-top: 1px solid lighten($theme-gray-dark, 5%);
             }
+
             & > a {
                 display: inline-block;
                 padding: 0.7em 0 0.7em 30px;
             }
+
             & > .fa {
                 position: absolute;
                 right: 15px;
@@ -127,31 +154,38 @@
                 text-align: center;
                 cursor: pointer;
             }
+
             &:hover {
                 background-color: darken($brand-primary, 10%);
+
                 & > a, & > .fa {
                     color: #FFF;
                 }
             }
         }
+
         @media (min-width: $screen-sm) {
             position: absolute;
             left: 15px;
             margin-top: -0.5rem;
             border-top: 0.5rem solid $brand-primary;
+
             &:before {
                 content: "";
                 display: block;
                 position: absolute;
                 top: -16px;
                 left: 10px;
-        @include arrow('bottom', 10px, 8px, $brand-primary);
+                @include arrow("bottom", 10px, 8px, $brand-primary);
             }
+
             & > li {
                 padding-right: 30px;
+
                 & > a {
                     padding-left: 15px;
                 }
+
                 & > .fa {
                     position: static;
                     @include size(auto, auto);
@@ -162,12 +196,14 @@
                     font-size: 1em;
                     cursor: default;
                 }
+
                 &:hover {
                     .modules-menu-level-2 {
                         display: block;
                     }
                 }
             }
+
             .fa {
                 &:before {
                     content: "\f105";
@@ -175,46 +211,56 @@
             }
         }
     }
+
     .modules-menu-level-2 {
         display: none;
         margin: 0;
         padding: 0;
         background-color: $theme-gray-darker;
         list-style: none;
+
         & > li {
             & + li {
                 border-top: 1px solid lighten($theme-gray-darker, 5%);
             }
+
             & > a {
                 display: inline-block;
                 padding: 0.5em 0 0.5em 45px;
             }
+
             &:hover {
                 background-color: darken($brand-primary, 20%);
+
                 & > a {
                     color: #FFF;
                 }
             }
         }
+
         @media (min-width: $screen-sm) {
             position: absolute;
             top: 0;
             left: 100%;
+
             &:before {
                 content: "";
                 display: block;
                 position: absolute;
                 top: 13px;
                 left: -6px;
-        @include arrow('right', 6px, 6px, $theme-gray-darker);
+                @include arrow("right", 6px, 6px, $theme-gray-darker);
             }
+
             & > li {
                 padding-right: 15px;
+
                 & > a {
                     padding-left: 15px;
                     padding: 0.7em 0 0.7em 15px;
                 }
             }
+
             .fa {
                 &:before {
                     content: "\f105";

app/templates/orbit_bootstrap/assets/stylesheets/template/modules/web_resource.scss

@@ -1,4 +1,5 @@
 @charset "utf-8";
+
 @import "../initial";
 
 // Link MODULES
@@ -7,12 +8,15 @@
     .widget-title {
         @extend .unity-title;
     }
+
     &.widget1 {
         .widget-content {
             line-height: 2.5em;
+
             & + .widget-content {
                 border-top: 1px dotted $theme-gray-light;
             }
+
             .widget-content-title {
                 display: inline-block;
             }
@@ -33,13 +37,16 @@
     .index-title {
         @extend .unity-title;
     }
+
     &.index1 {
         .index-content {
             list-style-type: decimal-leading-zero;
             list-style-position: inside;
+
             & + .index-content {
                 border-top: 1px dotted $theme-gray-light;
             }
+
             .index-context {
                 display: inline-block;
                 margin: 0 0 10px 2em;

app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss

@@ -19,3 +19,7 @@
 // Widget
 @import "widget/breadcrumb";
 @import "widget/sitemenu";
+
+.container {
+    width: 980px !important;
+}

app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss

@@ -1,17 +1,21 @@
 @charset "utf-8";
+
 @import "../initial";
 
 .sitemenu-wrap {
     padding: 10px 0;
     @include clearfix;
+
     .sitemenu-title {
         display: none;
     }
+
     .sitemenu-list {
         margin: 0;
         padding: 0;
         list-style: none;
     }
+
     .sitemenu-item.level-1 {
         font-size: 0.8125rem;
         position: relative;
@@ -23,19 +27,23 @@
         color: #fff;
         border-radius: .2em;
         background: $theme-color-second;
+
         &:hover {
             background: darken($theme-color-second, 10%);
         }
     }
+
     .sitemenu-link.level-1 {
         margin-right: .25rem;
         color: #fff;
     }
+
     .sitemenu-dropdown-toggle {
         font-size: 0.75rem;
         padding: 2px .3125rem;
         cursor: pointer;
     }
+
     // sitemenu dropdown
     .sitemenu-list.dropdown-menu {
         min-width: 100%;
@@ -44,10 +52,12 @@
         border-radius: .2em;
         background: $theme-color-main;
     }
+
     .sitemenu-link.level-2 {
         color: #fff;
         font-size: 0.8125rem;
         padding: 4px 0.625rem;
+
         &:hover {
             background: lighten($theme-color-second, 5%);
         }

app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb

@@ -16,7 +16,7 @@
         data-overlay-template="<h2>{{title}}</h2>{{desc}}"
         data-target="{{target}}"
       >
-        <img class="w-ad-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}>
+        <img class="w-ad-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
     </div>
   </div>
     <ul class="w-ad-banner__pager-3 banner-pager"></ul>

app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget4.html.erb

@@ -10,7 +10,7 @@
         data-link="{{link}}"
         data-target="{{target}}"
     >
-        <img class="w-ad-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}>
+        <img class="w-ad-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
     </div>
   </div>
 </div>

app/templates/orbit_bootstrap/modules/announcement/_annc_widget14.html.erb

@@ -3,19 +3,19 @@
     <span>{{widget-title}}</span>
   </h3>
   <div class="w-annc__inner row">
-    <div class="w-annc__img-wrap col-md-4 bullseye">
+    <div class="w-annc__img-wrap col-xs-4 bullseye">
       <img class="w-annc__img" src="{{main_picture}}" alt="{{main_picture_description}}" title="{{main_picture_description}}">
     </div>
-    <ul class="w-annc__list  col-md-8" data-level="0" data-list="announcements">
+    <ul class="w-annc__list  col-xs-8" data-level="0" data-list="announcements">
       <li class="w-annc__item">
         <div class="w-annc__content  row">
-          <h4 class="w-annc__entry-title  col-md-9">
+          <h4 class="w-annc__entry-title  col-xs-9">
             <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
               <span class="w-annc__status label {{status-class}}">{{status}}</span>
             </span>
             <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
           </h4>
-          <span class="w-annc__postdate-wrap  col-md-3" date-format="%Y-%m-%d">
+          <span class="w-annc__postdate-wrap  col-xs-3" date-format="%Y-%m-%d">
             <i class="fa fa-calendar-o"></i>
             <span class="w-annc__postdate">{{postdate}}</span>
           </span>

app/templates/orbit_bootstrap/modules/member/member_index1.html.erb

@@ -6,7 +6,7 @@
       <table class="i-member__table  table  table-striped">
         <thead data-level="2" data-list="members">
           <tr class="i-member-tr-head" data-list="profile_data" data-level="3">
-            <th>{{key}}</th>
+            <th>{{title}}</th>
           </tr>
         </thead>
         <tbody data-level="2" data-list="members">

app/views/admin/groups/_post_form.html.erb

@@ -13,6 +13,7 @@
   <%= javascript_include_tag "lib/file-type" %>
   <%= javascript_include_tag "lib/module-area" %>
   <%= javascript_include_tag "lib/dropzone" %>
+  <%= javascript_include_tag "group" %>
 <% end %>
 <div class="input-area">
   <div class="upload-status-notice hide">