social_stream-base 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cbaf4427ff9647cdb85cbad59f5ba5de54022ef
-  data.tar.gz: c2fbc16a0e3c8aa37d6804baa4357e2ecd084708
+  metadata.gz: 1b083770d40a45ea0f4a805492af2099c37be402
+  data.tar.gz: 3ef6df8d031778b94c0bdc8bfe6fb531cf5e2b78
 SHA512:
-  metadata.gz: 86b671c92c5eb6c27d57edbf47965f39ea714dd35e9845ac2eeaef6bacecb17529e1feb4251c9a8708d2303315180c43bf69369ca2d3c6394e6177dff44514a1
-  data.tar.gz: 545cbe015bd1b30ae0bd0072a069a795f44f469e2380177cf98ad46a7ba8a89c7ea5fb4423cdc19907785a776708c09684fa437e6057b67562b60b302c569658
+  metadata.gz: 27d419481f415fed4dc8c4e2fbe706a2df8269d70f0539bf1764af2c8767345b839dc8c6cac9ab18db0a90bfde0dbec42fedc555d24e803b1f9c39b6921990ed
+  data.tar.gz: 45123f46b4897d99bdcfc2d34e36b11f3fec3b3821712b86cbfa4a653191b171ec8d697c53e552088b31dbfad6f4b10a6e467e9f7adf60c329fa1389c2fc1c7c

data/app/assets/javascripts/social_stream/contact.js

@@ -1,45 +1,9 @@
 // require jquery.ba-url
+//
+//= require social_stream/callback
 
 SocialStream.Contact = (function($, SS, undefined) {
-  var indexCallbacks = [];
-
-  var addIndexCallback = function(callback){
-    indexCallbacks.push(callback);
-  };
-
-  var index = function(){
-    $.each(indexCallbacks, function(i, callback){ callback(); });
-  };
-
-  var showCallbacks = [];
-
-  var addShowCallback = function(callback){
-    showCallbacks.push(callback);
-  };
-
-  var show = function(){
-    $.each(showCallbacks, function(i, callback){ callback(); });
-  };
-
-  var updateCallbacks = [];
-
-  var addUpdateCallback = function(callback){
-    updateCallbacks.push(callback);
-  };
-
-  var update = function(options){
-    $.each(updateCallbacks, function(i, callback){ callback(options); });
-  };
-
-  var destroyCallbacks = [];
-
-  var addDestroyCallback = function(callback){
-    destroyCallbacks.push(callback);
-  };
-
-  var destroy = function(options){
-    $.each(destroyCallbacks, function(i, callback){ callback(options); });
-  };
+  var callback = new SS.Callback();
 
   var getForms = function(id) {
     return $('[data-contact_id="' + id + '"]');
@@ -66,7 +30,7 @@ SocialStream.Contact = (function($, SS, undefined) {
       success: function(data) {
         $(tab.attr('href')).find('.contact-list').html(data);
         tab.attr('data-loaded', 'true');
-        index();
+        callback.handlers.index();
       }
     });
   };
@@ -190,7 +154,7 @@ SocialStream.Contact = (function($, SS, undefined) {
       success: function(data) {
         $('#contacts-loading').hide();
          currentTab.find('.contact-list').html(data);
-        index();
+        callback.handlers.index();
       }
     });
   };
@@ -199,6 +163,10 @@ SocialStream.Contact = (function($, SS, undefined) {
     $('#contacts-loading').hide();
   };
 
+  var initNewGroupModal = function() {
+    $('.new_group-modal-link').attr('href', '#new_group-modal');
+  };
+
   var initContactFormsHtmlListener = function() {
     $('html').on('click.dropdown.data-api', saveForms);
   };
@@ -297,16 +265,19 @@ SocialStream.Contact = (function($, SS, undefined) {
     callback([ { id: element.val(), name: element.attr('data-recipient-name') } ]);
   };
 
-  addIndexCallback(initTabs);
-  addIndexCallback(initContactButtons);
-  addIndexCallback(initFilter);
-  addIndexCallback(hideLoading);
+  callback.register('index',
+                    initTabs,
+                    initContactButtons,
+                    initFilter,
+                    initNewGroupModal,
+                    hideLoading);
 
-  addUpdateCallback(updateForms);
-  addUpdateCallback(replaceContact);
-  addUpdateCallback(checkAndHideContact);
+  callback.register('update',
+                    updateForms,
+                    replaceContact,
+                    checkAndHideContact);
 
-  addDestroyCallback(hideContact);
+  callback.register('destroy', hideContact);
 
   // FIXME There is probably a more efficient way to do this..
   $(function() {
@@ -314,11 +285,7 @@ SocialStream.Contact = (function($, SS, undefined) {
     initContactFormsHtmlListener();
   });
 
-  return {
-    index: index,
-    show: show,
-    update: update,
-    select2: select2,
-    destroy: destroy
-  };
+  return callback.extend({
+    select2: select2
+  });
 })(jQuery, SocialStream);

data/app/assets/javascripts/social_stream/object.js

@@ -70,6 +70,10 @@ SocialStream.Object = (function(SS, $, undefined){
     $('[name$="[relation_ids][]"]').attr('name', type + '[relation_ids][]');
   };
 
+  var changeOwner = function(type) {
+    $('[name$="[owner_id]"]').attr('name', type + '[owner_id]');
+  };
+
   callback.register('show',
                     SS.Comment.index,
                     SS.Audience.index);
@@ -78,6 +82,7 @@ SocialStream.Object = (function(SS, $, undefined){
                     initRelationSelect);
 
   return callback.extend({
+    changeOwner: changeOwner,
     changeRelationSelect: changeRelationSelect
   });
 

data/app/assets/javascripts/social_stream/relation_customs.js

@@ -50,7 +50,7 @@ SocialStream.RelationCustom = (function(SS, $, undefined){
   };
 
   var editFormsListener = function(event) {
-    if (event && $(event.srcElement).closest('.relation_custom').length > 0) {
+    if (event && $(event.target).closest('.relation_custom').length) {
       return;
     }
 

data/app/assets/javascripts/social_stream/wall.js

@@ -39,6 +39,7 @@ SocialStream.Wall = (function(SS, $, undefined){
 
   return callback.extend({
     changeAction: changeAction,
+    changeOwner: SS.Object.changeOwner, 
     changeRelationSelect: SS.Object.changeRelationSelect 
   });
 }) (SocialStream, jQuery);

data/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass}

@@ -2,14 +2,10 @@
   h2
     font-weight: bold
     color: #8e8e8e
-    margin-top: 0px
 
 textarea
   resize: none
 
-.loading
-  width: auto
-
 .avatar_profile
   @include border-radius(8px)
 .avatar
@@ -27,5 +23,5 @@ textarea
     img
       @include border-radius(4px)
 
-a#fbdk_tab
+#fdbk_tab
   background-color: $blue !important

data/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass

@@ -0,0 +1,10 @@
+#content
+  h2
+    margin-top: 0px
+    
+.loading
+  width: auto
+
+input
+  &[type="file"]
+    line-height: 17px

data/app/assets/stylesheets/social_stream/base/adjust.css.sass

@@ -0,0 +1,5 @@
+/****************************** Style
+@import "social_stream/base/adjust/adjust"
+
+/****************************** layouta
+@import "social_stream/base/adjust/layouts/adjust"

data/app/assets/stylesheets/social_stream/base/buttons.css.sass

@@ -0,0 +1,2 @@
+/****************************** Style
+@import "social_stream/base/buttons/buttons"

data/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass

@@ -1,15 +1,20 @@
 #contacts
   .contacts
+    .new_group-modal-link
+      @include btn-primary
+      @include border-radius(5px)
     .add
       @include btn-add
 
 
-      .tab-content
-        .contact-list
-          .contact
-            .x
-              font-size: 12px
-              color: $black
+    .tab-content
+      .add-goup
+        float: right
+      .contact-list
+        .contact
+          .x
+            font-size: 12px
+            color: $black
 
 
 #contact-form
@@ -35,7 +40,7 @@
 #new_relation
   .new_relation_custom
     .btn
-      @include buttonBackground($blueDark, $blue, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) 
+
     
 
 #permissions

data/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass

@@ -15,8 +15,11 @@
       &[type="text"]
         margin-left: 0px
         width: 20% !important
-        float: right
+        float: left
         margin-botom: 0 !important
+    .new_group-modal-link
+      float: right
+
     .tab-content
       .contact-list
         clear: both
@@ -90,32 +93,37 @@
 ///////////// 
 
 
-#relation_customs
-  .relation_customs
-    @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
-    float: left
-  .relation_list
-    @include makeColumn(3, 0)
-    padding-right: 5px
-    input
-      margin-right: 10px
-    label
-      display: inline-block
 
-    .actions
-      display: inline-block
-      float: right
-      margin-right: 10px
+.relation_customs
+  width: 80%
+  float: left
+  margin-left: 2.5%
+.relation_list
+  @include makeColumn(3, 0)
+  padding-right: 5px
+  input
+    margin-right: 10px
+  label
+    display: inline-block
+
+  .actions
+    display: inline-block
+    float: right
+    margin-right: 10px
 
-    .edit_name
-      margin-top: -22px
-      .edit_relation_custom
-        margin-bottom: 0px
-        .icon_tool16-ok
-          margin-top: -6px
+  .edit_name
+    margin-top: -22px
+    .edit_relation_custom
+      margin-bottom: 0px
+      #relation_custom_name
+        width: 69% !important
+        margin-left: 23px
+        margin-top: -3px
+      .icon_tool16-ok
+        margin-top: -3px
 
-    .btn
-      margin-left: 32px
+  .btn
+    margin-left: 32px
 
 #relation_custom_name
   width: 215px
@@ -130,9 +138,9 @@
     margin-right: 10px
   .new_relation_custom
     .btn
-      @include buttonBackground($blueDark, $blue, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) 
+      @include btn-secundary 
       float: right
-      margin: 7px 13px 0 0
+      margin: 7px 0px 0 0
     
 
 #new_relation_input_block
@@ -141,7 +149,7 @@
 
 
 #permissions
-  @include makeColumn(5, 0)
+  @include makeColumn(4, 0)
   h4
     text-align: left
   li

data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass

@@ -8,12 +8,22 @@ s//
   #contacts
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
     .contacts
-
       .contact-list
         clear: both
         min-height: 700px
         padding-bottom: 50px
 
   #relation_customs
-    h2
-      margin-bottom: 20px
+    width: 80%
+    .relation_customs
+      h2
+        margin-bottom: 20px
+      .relation_list
+        .relation_custom
+          .actions
+            margin-top: 9px
+    #permissions
+      .permissions ul li
+        input
+          &[type="checkbox"]
+            margin: 0

data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass

@@ -10,8 +10,37 @@
       width: 100% !important
       margin-left: 0
 
-   
-
+  #relation_customs
+    .relation_customs
+      @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+      @include gradient-vertical($startColor: #fff, $endColor: rgba(250, 250, 250, .01))
+      @include border-radius(5px)
+      margin-top: 20px
+      margin-left: 0
+      h2.colorfont
+        padding-bottom: 1px
+        color: #d9d9d9
+        margin-top: 0px
+        padding-top: 16px
+        height: 23px
+      span.colorfont-overlay
+        top: 17px !important
+        margin-left: 10px
+        color: #f1f1f1
+    .relation_list
+      padding-left: 10px !important
+      width: 41% !important
+      input
+        &[type="radio"]
+          margin-right: 0px
+      label
+        @include ellipsis
+        width: 50%
+    #permissions
+      .permissions ul li
+        label
+          @include ellipsis
+          width: 84%
 // UP TO LANDSCAPE PHONE
 // ---------------------
 
@@ -50,4 +79,10 @@
         .x
           margin-top: -45px
           font-size: 18px
- 
+  #relation_customs
+    .relation_list
+      padding-left: 10px !important
+      .edit_name
+        .edit_relation_custom
+          #relation_custom_name
+            width: 54% !important

data/app/assets/stylesheets/social_stream/base/contacts.css.sass

@@ -0,0 +1,10 @@
+/****************************** Style
+@import "social_stream/base/contacts/contacts"
+
+/****************************** Layout
+@import "social_stream/base/contacts/layouts/contacts"
+
+/****************************** Responsive
+@import "social_stream/base/contacts/responsive/responsive-768px-979px"
+@import "social_stream/base/contacts/responsive/responsive-1200px-min"
+@import "social_stream/base/contacts/responsive/responsive-767px-max"

data/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass

@@ -48,7 +48,7 @@
   h3
     @include ellipsis
   .participants
-    @extend .border-radius-5
+    @include border-radius(5px)
     background-color: #f1f1f1
     img
       @include border-radius (5px)
@@ -73,13 +73,13 @@
   .message
     border-bottom: 1px solid #f1f1f1
     background-color: $white
-    @extend .border-bottom-left-radius-15
     .media
       .pull-left
         img
           @include border-radius (5px)
       .date
-        color: $grayLighter
+        color: #999
+        font-size: 13px
 
 #new_message
   .toolbar_menu

data/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass

@@ -34,6 +34,7 @@
 
         .briefing
           width: 85%
+          font-family: "OpenSansLight"
         .date
           display: inline
           margin: 0 13px 0 4px
@@ -61,6 +62,8 @@
   .conversation_full
     @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
     float: left
+    h4
+      font-family: "OpenSansLight"
     .participants
       padding: 7px 10px 9px 10px
       border: 1px solid #f1f1f1

data/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass

@@ -23,8 +23,11 @@
       background-color: $white
       @include border-radius(5px)
       display: block !important
+      .toolbar_menu
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)  
+        margin-left: 0px
       ul
-        @include grid-core-span(8, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
         height: 60px
         margin-left: auto
         margin-right: auto

data/app/assets/stylesheets/social_stream/base/conversation.css.sass

@@ -0,0 +1,10 @@
+/****************************** Style
+@import "social_stream/base/conversation/conversation"
+
+/****************************** Layout
+@import "social_stream/base/conversation/layout/conversation"
+
+/****************************** Responsive
+@import "social_stream/base/conversation/responsive/responsive-768px-979px"
+@import "social_stream/base/conversation/responsive/responsive-1200px-min"
+@import "social_stream/base/conversation/responsive/responsive-767px-max"

data/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass

@@ -10,20 +10,25 @@
   .sub-content-full-offset,
   .sub-content-small-offset,
   .sub-content-mini-offset
-    header
-      font-size: 18px
+    h4
+      font-size: 25px
       line-height: 15px
+      font-family: "OpenSansLight"
     .content
       border-top: 1px solid #e3e3e3
       .case
         font-size: 12px
         word-wrap: break-word
+        margin-top: 6px
         .first-line-large,
-        .first-line-mini,
+        .first-line-mini
+          margin-bottom: 2px
           a
             font-size: 14px
             font-weight: bold
         .second-line
           color: #a3a3a3
+          font-family: "OpenSansLight"
+          line-height: 19px
       .well-small
         text-align: right

data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass

@@ -42,6 +42,7 @@
 #search
   h4
     margin: 0 0 10px
+    line-height: 50px !important
   .btn-group
     padding-bottom: 10px
     margin-bottom: 10px

data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-timeline.css.sass

@@ -38,17 +38,21 @@
             margin-right: 10px
             img
               width: 170px
-            .play_button
-              width: auto
-              margin-left: -107px
+            img.video
+              z-index: 20
+              position: absolute
           .text
             font-size: 12px
+            float: left
             h6
               font-size: 14px 
+              margin: 1px 0 3px
+              @include ellipsis
           .description
             margin: 0 0 4px
-            .view-more
-              font-size: 12px
+            p
+              a
+                display: block
 
         .actions
           width: 100%

data/app/assets/stylesheets/social_stream/base/explore/layout/_explore.css.sass

@@ -69,12 +69,8 @@
         width: auto
         margin-bottom: 0px
         float: right
+        margin-top: 7px
   
-  .sub-content-small
-    .content
-      .case
-        width: 94%
-
   #resources
     .sub-content-small
       margin-left: 0px     
@@ -82,6 +78,9 @@
     display: inline-block
     margin-left: 40px
   
+  #search
+    margin-top: 0px
+
 #explore-header
   width: 100%
   display: table

data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass

@@ -38,17 +38,20 @@
     .sub-content-full-offset,
     .sub-content-small-offset,
     .sub-content-mini-offset
+      h4
+        font-size: 29px
       .content
-        .case
-          font-size: 13px
-          .first-line-large,
-          .first-line-mini,
-            a
-              font-size: 17px
-              margin-bottom: 10px
-          .second-line
+        .well
+          .top
+            font-size: 13px
+        .first-line-large,
+        .first-line-mini,
+          a
+            font-size: 17px
+            margin-bottom: 10px
+        .second-line
 
-            margin-top: 10px
+          margin-top: 10px
     
     .timeline
       .media
@@ -56,5 +59,4 @@
           font-size: 18px
 
     #search
-      margin-top: 0px
       width: 100%

data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass

@@ -34,6 +34,8 @@
             font-size: 14px
           .media-body
             width: 75%
+            .thumb
+              float: none
             .details
               width: 70%
   

data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass

@@ -23,6 +23,8 @@
       .root
         .media-body
           width: 86%
+          .thumb
+            float none
           .details
             width: 70%
 /*  #explore-content