social_stream 0.4.4 → 0.4.5

data/app/views/profiles/_experience.html.erb

@@ -0,0 +1,22 @@
+  <div class="space_center"></div>
+  <div class="block" id="experience_info">
+    <div class="header">
+      <div class="header_text">
+        <%=t('profile.' + @profile.subject.class.to_s.downcase + '.experience')%>
+      </div>
+      <% if is_owner? %>
+        <div class="header_icon_right">
+          <%= link_to (image_tag('/images/btn/edit.png')),  :controller => :profiles , :action => :edit, :section => "my_experience"%>
+        </div>
+      <%end%>
+    </div>
+    <div class="content">
+      <%if @profile.experience?%>
+        <div class="row">
+          <%=h @profile.experience %>
+        </div>
+      <%elsif is_owner?%>
+        <%=t('profile.empty')%>
+      <%end%>
+    </div>
+  </div>

data/app/views/profiles/_personal.html.erb

@@ -0,0 +1,74 @@
+
+  <div class="block" id="personal_info" >
+    <div class="header">
+      <div class="header_text">
+        <%=t('profile.' + @profile.subject.class.to_s.downcase + '.info')%>
+      </div>
+      <% if is_owner? %>
+        <div class="header_icon_right">
+          <%= link_to (image_tag('/images/btn/edit.png')),  :controller => :profiles , :action => :edit, :section => "about_me"%>
+        </div>
+      <% end %>
+    </div>
+    <div class="content">
+      <% if !is_personal_empty?%>
+        <div class="sub-block"  >
+          <% if @profile.organization? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.organization')%>:
+              </div>
+              <div class="field">
+                <%=h @profile.organization %>
+              </div>
+            </div>
+          <%end%>
+          <% if @profile.birthday? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.' + @profile.subject.class.to_s.downcase + '.birthday')%>:
+              </div>
+              <div class="field">
+                <%=h I18n.l @profile.birthday, :format => :long %>
+              </div>
+            </div>
+            <% if @profile.subject.class.eql?(User) %>
+              <div class="row">
+                <div class="label">
+                    <%=t('profile.age')%>:
+                </div>
+                <div class="field">
+                    <%=h @profile.age %>
+                </div>
+              </div>
+            <%end%>
+          <%end%>
+          <% if @profile.city? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.actualcity')%>:
+              </div>
+              <div class="field">
+                <%=h @profile.city %>
+                <% if @profile.country? %>
+                  , <%=@profile.country%>
+                <%end%>
+              </div>
+            </div>
+          <%end%>
+          <% if @profile.description? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.' + @profile.subject.class.to_s.downcase + '.about')%>:
+              </div>
+              <div class="row">
+                  <%=h @profile.description %>
+              </div>
+            </div>
+          <%end%>
+        </div>
+    <%elsif is_owner?%>
+      <%=t('profile.empty')%>
+    <%end%>
+    </div>
+  </div>

data/app/views/profiles/_profile.html.erb

@@ -1,171 +1,18 @@
-<%= location(
-  link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [current_subject, :profile])
-) %>
 <div class="space_center"></div>
 <h2><%=t('menu.information')%></h2>
 <div class="space_center"></div>
-<div class="block" id="personal_info" >
-  <div class="header">
-    <div class="header_text">
-      <%=t('profile.' + @profile.subject.class.to_s.downcase + '.info')%>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('/images/btn/edit.png')),  :controller => :profiles , :action => :edit, :section => "about_me"%>
-    </div>
-  </div>
-  <div class="content">
-    <div class="sub-block"  >
-      <% if @profile.organization? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.organization')%>:
-          </div>
-          <div class="field">
-            <%=h @profile.organization %>
-          </div>
-        </div>
-      <%end%>
-      <% if @profile.birthday? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.' + current_subject.class.to_s.downcase + '.birthday')%>:
-          </div>
-          <div class="field">
-            <%=h I18n.l @profile.birthday, :format => :long %>
-          </div>
-        </div>
-				<% if current_subject.class.eql?(User) %>
-	        <div class="row">
-	          <div class="label">
-	              <%=t('profile.age')%>:
-	          </div>
-	          <div class="field">
-	              <%=h @profile.age %>
-	          </div>
-	        </div>
-				<%end%>
-      <%end%>
-      <% if @profile.city? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.actualcity')%>:
-          </div>
-          <div class="field">
-            <%=h @profile.city %>
-            <% if @profile.country? %>
-              , <%=@profile.country%>
-            <%end%>
-          </div>
-        </div>
-      <%end%>
-      <% if @profile.description? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.' + current_subject.class.to_s.downcase + '.about')%>:
-          </div>
-          <div class="row">
-              <%=h @profile.description %>
-          </div>
-        </div>
-      <%end%>
-    </div>
-  </div>
-</div>
-
 
-<div class="space_center"></div>
-<div class="block" id="contact_info">
-  <div class="header">
-    <div class="header_text">
-      <%=t('profile.contact')%>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :profiles , :action => :edit, :section => "contact_info"%>
-    </div>
-  </div>
-  <div class="content">
-    <div class="sub-block"  >
-      <% if @profile.phone? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.phone')%>
-          </div>
-          <div class="field">
-            <%=h @profile.phone %>
-          </div>
-        </div>
-      <%end%>
-      <% if @profile.mobile? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.mobile')%>
-          </div>
-          <div class="field">
-            <%=h @profile.mobile %>
-          </div>
-        </div>
-      <%end%>
-      <% if @profile.fax? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.fax')%>
-          </div>
-          <div class="field">
-            <%=h @profile.fax %>
-          </div>
-        </div>
-      <%end%>
-      <% if @profile.address? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.address')%>
-          </div>
-          <div class="field">
-            <%=h @profile.address %>
-          </div>
-        </div>
-      <%end%>
-      <% if @profile.website? %>
-        <div class="row">
-          <div class="label">
-            <%=t('profile.website')%>
-          </div>
-          <div class="field">
-            <a href="<%=h @profile.website %>"><%=h @profile.website %></a>
-          </div>
-        </div>
-      <%end%>
-
-      <div class="row">
-        <div class="label">
-          <%=t('profile.email')%>:
-        </div>
-        <div class="field">
-          <%=h @profile.subject.email %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
+<% if (!is_personal_empty?) or(is_owner?)%>
+  <%= render :partial=> "personal"%>
+<%end%>
 
-<div class="space_center"></div>
-<div class="block" id="experience_info">
-  <div class="header">
-    <div class="header_text">
-      <%=t('profile.' + @profile.subject.class.to_s.downcase + '.experience')%>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('/images/btn/edit.png')),  :controller => :profiles , :action => :edit, :section => "my_experience"%>
-    </div>
-  </div>
-  <div class="content">
-    <div class="row">
-      <%=h @profile.experience %>
-    </div>
-  </div>
-</div>
-<% if (!@profile.blank?) && (!current_subject.blank?)%>
-  <% if (@profile.actor == current_subject.actor) %>
+<% if (!is_contact_empty?) or(is_owner?)%>
+  <%= render :partial=> "contact"%>
+<%end%>
+<% if (@profile.experience?) or(is_owner?)%>
+  <%= render :partial=> "experience"%>
+<%end%>
+<% if is_owner? %>
   <div class="space_center"></div>
   <div class="block" id="avatar_info">
     <div class="header">
@@ -181,7 +28,6 @@
       </div>
     </div>
   </div>
-  <% end %>
 <% end %>
 <div class="space_center"></div>
 <% if (@profile.to_param==current_user.to_param and @profile.authentication_token) %>
@@ -198,22 +44,7 @@
 	</div>
 <% end %>
 <div class="space_center"></div>
-<% if @profile.subject.tag_list.count > 0 %>
-<div class="block" id="tags_info">
-<div class="header">
-    <div class="header_text">
-      Tags:
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :profiles , 
-			:action => :edit, :section => "tags"%>
-    </div>
-  </div>
-  <div class="content">
-  	<div class="field">
- 		<%= @profile.subject.tag_list %>
-	</div>
-  </div>
-</div>
+<% if (@profile.subject.tag_list.count > 0) or (is_owner?) %>
+  <%= render :partial=>"tags"%>
 <% end %>
 

data/app/views/profiles/_tags.html.erb

@@ -0,0 +1,22 @@
+  <div class="block" id="tags_info">
+    <div class="header">
+      <div class="header_text">
+        <%=t('profile.tags.other')%>
+      </div>
+      <% if is_owner? %>
+        <div class="header_icon_right">
+          <%= link_to (image_tag('/images/btn/edit.png')), :controller => :profiles , 
+                       :action => :edit, :section => "tags"%>
+        </div>
+      <% end %>
+    </div>
+    <div class="content">
+      <div class="field">
+        <% if @profile.subject.tag_list.count > 0 %>
+          <%= @profile.subject.tag_list %>
+        <%else%>
+          <%=t('profile.empty')%>
+        <%end%>
+      </div>
+    </div>
+  </div>

data/app/views/profiles/edit.html.erb

@@ -88,8 +88,6 @@ end %>
 	    $(function () {
 	        $( "#profile_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>',
 	                                          changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
-	        $("#personal_info").addClass('section_highlight');
-	
 	    });
 	  <% end %>
     <div class="row">
@@ -154,13 +152,6 @@ end %>
 	  </div>
   <% end %>
   <% if !params[:section].present? or params[:section].eql?("contact_info") %>
-
-    <% content_for :javascript do %>
-      $(function() {
-          $("#contact_info").addClass('section_highlight');
-      });
-    <% end %>
-
     <div class="form_row">
         <h2><%=t('profile.contact')%></h2>
     </div>
@@ -207,11 +198,6 @@ end %>
     </div>
   <% end %>
   <% if !params[:section].present? or params[:section].eql?("my_experience") %>
-    <% content_for :javascript do %>
-      $(function() {
-          $("#experience_info").addClass('section_highlight');
-      });
-    <% end %>
     <div class="form_row">
         <h2><%=t('profile.' + current_subject.class.to_s.downcase + '.experience')%></h2>
     </div>

data/app/views/profiles/show.html.erb

@@ -1,6 +1,15 @@
 <% content_for :title do%>
   <%= @profile.subject.name %>
 <%end%>
+<% if @profile.description? %>
+  <% content_for :description do %>
+    <%= @profile.description%>
+  <% end %>
+<%end%>
+
+<% content_for :keywords do %>
+  <%= @profile.subject.tag_list%>
+<% end %>
 
 <% content_for :sidebar do %>
   <%= render :partial => 'users/sidebar_index' %>
@@ -8,4 +17,9 @@
 
 <% toolbar :profile => @profile.subject %>
 
+
+<%= location(link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), 
+              [@profile.subject, :profile])) %>
+
+
 <%= render :partial => "profile" %>

data/app/views/profiles/update.js.erb

@@ -5,38 +5,12 @@
 	
 <% if @profile.valid? %>
 
-  $("#profile_notice").html("<h2>Form Submitted!</h2>");
+  $("#profile_notice").html("<%= t('profile.update.success')%>");
 	$("#profile_notice").removeClass('error');
   $("#profile_notice").addClass('success');
 	
-  /*$("#sidebarContent").replaceWith("<%#= escape_javascript(render(:partial => 'sidebar_show'))%>");*/
-
-  $("#contact_info").addClass('section_normal');
-  $("#experience_info").addClass('section_normal');
-	$("#personal_info").addClass('section_normal');
-	
-  <% if !params[:section].present? or params[:section].eql?("about_me") %>	                  
-		$("#personal_info").removeClass('section_normal');
-		$("#personal_info").addClass('section_highlight');
-	<%end%>
-	
-	<% if !params[:section].present? or params[:section].eql?("contact_info") %>
-		$("#contact_info").removeClass('section_normal');
-		$("#contact_info").addClass('section_highlight');
-	<%end%>
-
-	<% if !params[:section].present? or params[:section].eql?("my_experience") %>
-		$("#experience_info").removeClass('section_normal');
-		$("#experience_info").addClass('section_highlight');
-	<%end%>
-	
-	<% if !params[:section].present? or params[:section].eql?("tags") %>
-		$("#tags").removeClass('section_normal');
-		$("#tags").addClass('section_highlight');
-	<%end%>
-	
 <% else %>
-  $("#profile_notice").html("<h2><%= pluralize(@profile.errors.count, "error") %> prohibited this profile from being saved:</h2>"
+  $("#profile_notice").html("<h2><%= pluralize(@profile.errors.count, "error") %> <%= t('profile.update.error')%></h2>"
 	 +"<ul><% @profile.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>");
 	$("#profile_notice").removeClass('success');
 	$("#profile_notice").addClass('error'); 

data/app/views/relation/customs/_form.html.erb

@@ -0,0 +1,29 @@
+<% @custom ||= @sphere.customs.build %>
+
+<%= form_for @custom, :remote => true do |f| %>
+  <%= f.hidden_field :sphere_id %>
+
+  <% if @custom.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@custom.errors.count, "error") %> prohibited this custom relation from being saved:</h2>
+
+      <ul>
+      <% @custom.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <p><%= f.text_field :name, :class => "privacy_input_new", :size => 20 %></p>
+  <%= f.submit nil, :class => "button" %>
+  <button class="button" id="cancel_new_relation_custom" ><%= t('button.cancel') %></button>
+<% end %>
+
+<%= javascript_tag do %>
+  $("#cancel_new_relation_custom").click(function() {   
+    $("#new_relation_custom_input_block").hide();
+    $("#new_relation_custom_title_block").show();
+    return false;
+  });
+<% end %>