social_stream 2.0.1 → 2.0.2

data/base/app/views/groups/_form.html.erb

@@ -11,19 +11,22 @@
       </ul>
     </div>
   <% end %>
-
+<section>
   <%= f.label :name, t('group.new.name') %>
   <%= f.text_field :name %>
-
+</section>
+<section>
   <%= f.label :_participants, t('group.new.participants') %>
   <%= f.hidden_field :_participants, 'data-path' => contacts_path(format: :json) %>
-
+</section>
+<section>
   <%= f.label :tags_list, t('group.tags')%>
   <%= f.text_field :tag_list, 'data-path' => tags_path(format: :json) %>
-
+</section>
+<section>
   <%= f.label :description %>
   <%= f.text_area :description %>
-
+</section>
   <%= f.submit :class => "btn" %>
 <% end %>
 

data/base/app/views/home/index.html.erb

@@ -6,4 +6,4 @@
                           owner: current_subject } %>
 
   <%= render partial: 'sidebar/show' %>
-</secion>
+</section>

data/base/app/views/profiles/_avatar.html.erb

@@ -1,11 +1,11 @@
 <section class="avatar">
-  <header>
-    <%= render partial: 'edit_icon' %>
-    <h4>
-      <%= t('avatar.profile_change') %>
-    </h4>
-  </header>
   <% if can? :update, @profile %>
+    <header>
+      <%= render partial: 'edit_icon' %>
+      <h4>
+        <%= t('avatar.profile_change') %>
+      </h4>
+    </header>
     <div class="update">
       <%= render partial: 'avatars/form',
                  object: @profile.actor,

data/base/app/views/repositories/show.html.erb

@@ -11,9 +11,6 @@
 
     <%= render partial: 'filter' %>
 
-    <%= render partial: 'common_documents/new_button',
-               locals: { owner: profile_or_current_subject } %>
-
     <section class="repository">
       <%= render partial: 'layouts/loading' %>
 

data/base/config/locales/en.yml

@@ -438,7 +438,7 @@ en:
     confirm_delete: Delete post?
     form:
       title: Post
-    input: Share you thoughts here!
+    input: Share your thoughts here!
     name: post
     one: a post
     other: posts

data/base/lib/generators/social_stream/base/templates/initializer.rb

@@ -1,4 +1,6 @@
 SocialStream.setup do |config|
+  ## Subjects
+
   # List the models that are social entities. These will have ties between them.
   # Remember you must add an "actor_id" foreign key column to your migration!
   #
@@ -10,17 +12,7 @@ SocialStream.setup do |config|
   # config.devise_modules = :database_authenticatable, :registerable,
   #                         :recoverable, :rememberable, :trackable,
   #                         :omniauthable, :token_authenticatable
-
-  # Type of activities managed by actors
-  # Remember you must add an "activity_object_id" foreign key column to your migration!
-  #
-  # config.objects += [ :foo, :bar ]
-
-  # Form for activity objects to be loaded
-  # You can write your own activity objects
-  #
-  # config.activity_forms = [ :post, :document, :foo, :bar ]
-
+  
   # Config the relation model of your network
   #
   # :custom - users define their own relation types, and post with privacy, like Google+
@@ -31,20 +23,36 @@ SocialStream.setup do |config|
   # Configure the type of actors that are suggested in the sidebar
   #
   # config.suggested_models = [ :user, :group ]
-  
-  # Configure the models that will appear in the repository tab
+ 
+  ## Objects
+
+  # Activities objects managed by actors
+  # Remember you must add an "activity_object_id" foreign key column to your migration!
   #
-  # config.repository_models = [ :document, :event, :link, :place ]
+  # config.objects += [ :foo, :bar ]
 
-  # Expose resque interface to manage background tasks at /resque
+  # Activity objects included in the wall input form
+  # You can write your own view in app/views/your_objects/_new_activity.html.erb
   #
-  # config.resque_access = true
+  # config.activity_forms = [ :post, :document, :foo, :bar ]
+ 
+  # Objects that appear in the repository tab
+  #
+  # You must create a vew in app/views/your_objects/_your_object.hmtl.erb
+  #
+  # config.repository_models = [ :document, :event, :link, :place ]
 
   # Quick search (header) and Extended search models and its order. Remember to create
-  # the indexes with thinking-sphinx if you are using customized models.
+  # the indexes with thinking-sphinx and the views at
+  # app/views/my_objects/_quick_search_result.html.erb and
+  # app/views/my_objects/_search_result.html.erb 
+  #
+  # config.quick_search_models += [:foo, :bar]
+  # config.extended_search_models += [:foo, :bar]
+  
+  # Expose resque interface to manage background tasks at /resque
   #
-  # config.quick_search_models = [:user, :group]
-  # config.extended_search_models = [:user, :group]
+  # config.resque_access = true
 
   # Cleditor controls. It is used in new message editor, for example
   # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.1".freeze
+    VERSION = "2.0.2".freeze
   end
 end

data/contacts/_contacts.css.sass

@@ -0,0 +1,64 @@
+#contacts
+  .contacts
+    .new_group-modal-link
+      @include btn-primary
+      @include border-radius(5px)
+    .add
+      @include btn-add
+
+
+    .tab-content
+      .add-goup
+        float: right
+      .contact-list
+        .contact
+          .x
+            font-size: 12px
+            color: $black
+
+
+#contact-form
+  .name_text_area
+    font-size: 16px
+
+
+
+
+/////////////////////////////////////// PRIVACITY - roles
+///////////// 
+
+
+#relation_customs
+  h2
+    @include colorfont-big-size
+
+#relation_customs,
+  .relation_list
+    border-right: 1px solid #c4c4c4
+
+
+#new_relation
+  .new_relation_custom
+    .btn
+
+    
+
+#permissions
+  h4
+    text-align: left
+
+.postit
+  font-size: 16px
+  font-family: "Giveyouglory"
+  background-image: url(nota.png)
+  
+
+.rotate
+  @include rotate(-3deg)
+
+
+.privacity-rules
+  border-top: 1px solid $grayLighter
+  p
+    word-wrap: break-word
+

data/contacts/layouts/_contacts.css.sass

@@ -0,0 +1,177 @@
+input#group_name
+  margin-left: 0px
+  width: 93% !important 
+
+#contacts
+  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+
+  .contacts
+    @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    float: left
+    margin-left: 2%
+    .btn-group
+      max-width: 400px
+      .btn
+        .caret
+          margin-left: 6px
+
+    .contact-filter
+      margin-left: 0px
+      width: 22% !important 
+      float: left
+      margin-botom: 0 !important
+    .new_group-modal-link
+      float: right
+
+    .tab-content
+      .contact-list
+        clear: both
+        min-height: 500px
+        padding-bottom: 50px
+
+        .contact
+          width: 240px
+          float: left
+          margin-left: 19px
+          min-height: 76px
+          margin-bottom: 14px
+
+        .avatar
+          float: left
+          margin-left: 0px
+          width: 50px
+          display: inline
+          margin-top: 10px
+          img
+            width: 45px 
+            vertical-align: top
+
+        .data
+          float: left
+          margin-left: 0px
+          width: 175px
+          display: inline-block
+          margin-top: 11px
+        .info
+          @include ellipsis
+          z-index: 1
+          padding-left: 2%
+      
+        .add
+          z-index: 1
+          float: left
+          .edit_contact
+            margin-bottom: 0px
+          .dropdown-toggle
+            margin-left: 0 
+            widht: 100%
+        .x
+          display: inline-block
+          float: right
+          margin-top: -40px
+
+        
+
+#contact-form
+  ul
+    @include makeColumnoMargin(3, 0)
+    input
+      &[type="check"]
+        display: inline
+    label
+      display: inline-block
+      margin-left: 10px
+
+  .new_contact_text_area
+    @include makeColumn(6, 0)
+    @include clearfix
+    height: 200px 
+  input
+    &[type="submit"]
+      float: right
+      margin-right: 74px
+
+
+
+/////////////////////////////////////// PRIVACITY - roles
+///////////// 
+
+
+
+.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
+      #relation_custom_name
+        width: 69% !important
+        margin-left: 23px
+        margin-top: -3px
+      .icon_tool16-ok
+        margin-top: -3px
+
+  .btn
+    margin-left: 32px
+
+#relation_custom_name
+  width: 215px
+  height: auto
+  margin: 3px 0 0 0
+
+
+
+#new_relation
+  a 
+    float: right
+    margin-right: 10px
+  .new_relation_custom
+    .btn
+      @include btn-secundary 
+      float: right
+      margin: 7px 0px 0 0
+    
+
+#new_relation_input_block
+  .btn
+    margin-left: 32px
+
+
+#permissions
+  @include makeColumn(4, 0)
+  h4
+    text-align: left
+  li
+    margin-left: -17px
+    input
+      display: inline
+    label
+      display: inline-block
+
+.postit
+  padding: 100px 0 0 30px
+  width: 250px
+  height: 157px
+  margin-bottom: 12px
+  
+
+.privacity-rules
+  p
+    padding-left: 10px
+  .btn
+    float: right

data/contacts/responsive/_responsive-1200px-min.css.sass

@@ -0,0 +1,29 @@
+s//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px)
+
+  #contacts
+    @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    .contacts
+      .contact-list
+        clear: both
+        min-height: 700px
+        padding-bottom: 50px
+
+  #relation_customs
+    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/contacts/responsive/_responsive-767px-max.css.sass

@@ -0,0 +1,88 @@
+//
+// Responsive: Landscape phone to desktop/tablet
+// --------------------------------------------------
+
+
+@media (max-width: 767px)
+
+  #contacts
+    .contacts
+      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
+// ---------------------
+
+@media (max-width: 480px)
+
+  #contacts
+    .contacts
+      width: 100% !important
+      margin-left: 0
+      input
+        &[type="text"]
+          width: 94% !important
+      .contact
+        width: 96% !important
+        margin-left: 0 !important
+        .avatar
+          padding-right: 0px
+          width: 30% !important
+          img
+            width: 84%  !important
+        .data
+          width: 64% !important
+          margin-left: 0 !important
+          .name
+            font-size: 140%
+            margin-top: 7px
+        .info
+          font-size: 11px
+          color: #ccc
+          z-index: 1
+          font-size: 100%
+          padding-left: 9px
+          margin-bottom: 9px
+        .add
+          margin-top: 2px
+        .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