Merge branch 'master' of https://github.com/ging/social_stream

ging · Oct 10, 2011 · a375664 · a375664
2 parents 7e9de54 + fb2319e
commit a375664
Show file tree

Hide file tree

Showing 47 changed files with 211 additions and 370 deletions.
diff --git a/base/app/assets/images/frontpage/join.gif b/base/app/assets/images/frontpage/join.gif
diff --git a/base/app/assets/javascripts/activities.js.erb b/base/app/assets/javascripts/activities.js.erb
@@ -7,6 +7,8 @@ $(function() {
   $('#new_<%= SocialStream.activity_forms.first %>').show();
   $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
   $('#security').chosen();
+  // Remove width calculation
+  $('#securities input.default').css('width', '');
 });
 
 

diff --git a/base/app/assets/stylesheets/_colors.scss b/base/app/assets/stylesheets/_colors.scss
@@ -12,6 +12,8 @@ $input-border-color: #BDC7D8;
 $main-color: #1F4A75; /* #2A3890*/
 $secondary-color: #DEEFF8; /* #E0EEF5*/
 $separation-color: #D4E4EA;
+$header-color: #1F4A75;
+$header-notification-color: #879EB5;
 
 /**GREYS**/
 $details-color: #666; /* #6C6D6F*/
@@ -20,4 +22,4 @@ $fill-color: #f5f5f5;
 /**OTHERS**/
 $sentence-color: #000;
 $text-over-main: #FFF;
-$unread-color: #E0E0FF;
+$unread-color: #E0E0FF;
diff --git a/base/app/assets/stylesheets/activities.css.scss b/base/app/assets/stylesheets/activities.css.scss
@@ -19,6 +19,10 @@
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
 #securities{  display:inline-block;  text-align:left; float: left; padding-left:5px;}
 
+#security_chzn .chzn-choices {
+	padding-left: 20px;
+	background: url('btn/btn_security.png') no-repeat 10px center;
+}
 /******************* WALL - ACTIVITY ***************/
 .super_activity{width: 95%;}
 .activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 5px 0px;
@@ -76,8 +80,3 @@
 .copy_new_comment{visibility: hidden; padding:6px; padding-bottom: 1.5em;font-size:inherit; line-height: 1.15em;
                   margin-bottom:7px;}
 .input_new_comments_container{min-height: 30px; position: relative;  }
-/*********** DROP DOWN**********/
-#security_chzn .chzn-choices {
-	padding-left: 20px;
-	background: url('btn/btn_security.png') no-repeat 10px center;
-}
diff --git a/base/app/assets/stylesheets/ad_next.png b/base/app/assets/stylesheets/ad_next.png
diff --git a/base/app/assets/stylesheets/ad_prev.png b/base/app/assets/stylesheets/ad_prev.png
diff --git a/base/app/assets/stylesheets/ad_scroll_back.png b/base/app/assets/stylesheets/ad_scroll_back.png
diff --git a/base/app/assets/stylesheets/ad_scroll_forward.png b/base/app/assets/stylesheets/ad_scroll_forward.png
diff --git a/base/app/assets/stylesheets/frontpage.css.scss b/base/app/assets/stylesheets/frontpage.css.scss
@@ -38,7 +38,8 @@ span.find{  padding-right:5px;}
 #icon_meet{  background: transparent url(frontpage/meet.png);  width:56px;  height:57px;}
 #icon_collaborate{  background: transparent url(frontpage/collaborate.png);  width:56px;  height:57px;}
 .icon_text{  text-align:center;  width:100%;  font-weight:bold;}
-#join_form{  float:right;  padding-right:50px;}
+#join_form{  margin: 15px 0px; text-align:center;}
+#join_form input[type="submit"] {font-size: 17px; padding: 6px 20px;}
 .sentences{  width:80%;  display:inline-block;  vertical-align:top;  padding-top:10px;}
 .sentences ul,.sentences li{  list-style-type:none;  font-size:14px;  margin-left:10px;  padding-top:3px;}
 .sentences li.purple{  list-style-image:url("frontpage/purple_sq.png");}

diff --git a/base/app/assets/stylesheets/header.css.scss b/base/app/assets/stylesheets/header.css.scss
@@ -1,7 +1,7 @@
 @import "colors";
 
 /****************** HEADER STRUCTURE ******/
-#headerFront {	width: 100%;	padding: 0;	background: $main-color;  padding: 2px 0px 0px 0px;}
+#headerFront {	width: 100%;	padding: 0;	background: $header-color;  padding: 2px 0px 0px 0px;}
 #header_left {	left: 0px;	float: left;	padding-left: 5px;}
 #header_right {	right: 0px;	float: right; padding-right: 10px;  }
 .banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 3px;  padding-bottom: 3px;
@@ -14,19 +14,20 @@
 #logo{  width:218px;  height:50px;  float:left;  vertical-align:top; }
 #logo_txt {color: $text-over-main;	display: inline;	vertical-align: top;	padding-top: 2px; }
 .div_login {	color:$text-over-main;	width:65%;	display:inline-block;	text-align: right;	vertical-align: top;
-	padding-top: 5px;	font-weight:normal;	margin-top:3px;  float:right; }
+	font-weight:normal;	 float:right; }
 .div_login #username{	height:10px; }
-.div_login, .input_username{	position:relative;	padding: 0px;	border: 0px; }
+.div_login .input_username{	position:relative;	padding: 2px;	border: 0px; }
 .div_login #login_button{	width:61px;	height:18px; }
 .div_login #login_data{display: block;}
 .div_login .login_data_block{ display: inline-block; padding-left: 10px;}
-.div_login .login_data_block input{ width: 250px;}
-.div_login .subtexto{	padding-top: 8px;	height:20px;	font-size: 11px; }
+.div_login .login_data_block input{ width: 200px;}
+.div_login .login_data_block input[type=submit]{ width: 70px;}
+.div_login .options{ height:20px;	font-size: 11px;}
 .div_login .a_border{	border-right:thin solid;	padding-right:7px;	text-decoration:underline; }
 #new_representation {	display: inline-block;}
 #header_notifications a{color: white; padding: 4px 10px 6px 11px;
                       background: transparent url('btn/header_notifications.png') no-repeat center center;}
-#header_inbox_count a{ color: white; background-color: $auxiliar-color; padding: 2px 7px 2px 7px;}
+#header_inbox_count a{ color: white; background-color: $header-notification-color; padding: 2px 7px 2px 7px;}
 #representation {  display: inline;  padding-left:3px;  padding-right:3px;}
 .txt_config {color: $text-over-main;	vertical-align: top;	display: inline;	padding-top: 2px;	
               border-right: thin solid; padding-right: 3px;}
@@ -125,14 +126,14 @@ ul.sf-menu li li li.sfHover ul {
 
 }
 .sf-menu li {
-	background:		$main-color;
+	background:		$header-color;
 }
 
 .sf-menu li li {
-	background:		$main-color;
+	background:		$header-color;
 }
 .sf-menu li li li {
-	background:		$main-color;
+	background:		$header-color;
 }
 .sf-menu li:hover, .sf-menu li.sfHover,
 .sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {

diff --git a/base/app/assets/stylesheets/jquery.ad-gallery.css b/base/app/assets/stylesheets/jquery.ad-gallery.css
diff --git a/base/app/assets/stylesheets/loader.gif b/base/app/assets/stylesheets/loader.gif
diff --git a/base/app/controllers/groups_controller.rb b/base/app/controllers/groups_controller.rb
@@ -15,15 +15,9 @@ def index
                     tagged_with(params[:tag]).
                     page(params[:page]).per(10)
 
-    index! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
   end
 
   def show
-    show! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
   end
 
   def create

diff --git a/base/app/controllers/search_controller.rb b/base/app/controllers/search_controller.rb
@@ -22,10 +22,6 @@ def index
         end
       end
     end
-    respond_to do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-      format.js
-    end
   end
 
   private

diff --git a/base/app/controllers/users_controller.rb b/base/app/controllers/users_controller.rb
@@ -10,15 +10,10 @@ def index
                   tagged_with(params[:tag]).
                   page(params[:page]).per(10)
 
-    index! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
+
   end
 
   def show
-    show! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
   end
 
   # Supported through devise

diff --git a/base/app/models/activity.rb b/base/app/models/activity.rb
@@ -281,7 +281,7 @@ def fill_relations
 
     self.relation_ids =
       if contact.reflexive?
-        Array(receiver.relation_public.id)
+        receiver.relation_customs.map(&:id)
       else
         receiver.relation_customs.allow(contact.sender, 'create', 'activity').map(&:id)
       end

diff --git a/base/app/models/actor.rb b/base/app/models/actor.rb
@@ -333,9 +333,11 @@ def represented_by?(subject)
   #
   #
   def activity_relations(subject, options = {})
-    return relation_customs if Actor.normalize(subject) == self
-
-    Array.new
+    if Actor.normalize(subject) == self
+      return relation_customs + Array.wrap(relation_public)
+    else
+      Array.new
+    end
   end
 
   # Are there any activity_relations present?

diff --git a/base/app/views/activities/_new.html.erb b/base/app/views/activities/_new.html.erb
@@ -22,9 +22,19 @@
   <% end %> 	
 </div>
 
-<% if current_subject == receiver %>
-  <div id="securities"><%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t('relation_public.name') %></div>
-<% end %>
+<div id="securities">
+  <% if current_subject == receiver %>
+    <%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.contacts.#{ receiver.class.to_s.underscore }", :receiver => receiver.name) %>
+  <% else %>
+    <div id="security_chzn" class="chzn-container chzn-container-multi">
+      <ul class="chzn-choices">
+        <li class="search-field">
+        <input type="text" value="<%= t "activity.privacy.contacts.#{ receiver.class.to_s.underscore }", :receiver => receiver.name %>" class="default" disabled="disabled">
+        </li>
+      </ul>
+    </div>
+  <% end %>
+</div>
 
 <div id="activities_share_btn">
   <%= submit_tag(t('share'), :class => "button submitActivity", :id => "masterSubmitButton") %>

diff --git a/base/app/views/devise/registrations/new.html.erb b/base/app/views/devise/registrations/new.html.erb
@@ -23,7 +23,7 @@
     </div>
     <div class="form_row">
       <div class="form_label" id="user_password_confirmation_label">
-        <%= f.label t('devise.passwords.confirm') %>
+        <%= f.label :password_confirmation %>
       </div>
       <div class="form_field"><%= f.password_field :password_confirmation, :class =>"form_tag"  %></div>
     </div>