social_stream 0.3.6 → 0.4.0

data/app/views/menu/_tiesUser.html.erb

@@ -0,0 +1,11 @@
+<ul class="menu noaccordion">
+  <li>
+    <%= link_to( image_tag("btn/btn_bookmark.png", :class => "menu_icon")+t('tie.add.bookmark'), '#') %>
+  </li>
+  <li>
+    <%= link_to( image_tag("btn/twitter-follow-icon.png", :size => "19x19", :class => "menu_icon")+t('tie.add.follow'), '#') %>
+  </li>
+  <li >
+    <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.add.contact'), '#') %>
+  </li>
+</ul>

data/app/views/menu/_user.html.erb

@@ -0,0 +1,15 @@
+<div class="menu_header"><b><%=t('tie.options')%></b>
+</div>
+<div id="menu_lateral_tie">
+  <%= render :partial => "menu/tiesUser" %>
+</div>
+<div class="space_center">
+</div>
+
+<div class="menu_header"><b><%=t('menu.options')%></b>
+</div>
+<div id="menu_lateral">
+  <%= render :partial => "menu/options" %>
+</div>
+<div class="space_center">
+</div>

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

@@ -0,0 +1 @@
+This is the profile for <%= link_to @profile.subject.name, @profile.subject %>

data/app/views/subjects/_contacts.html.erb

@@ -1,20 +1,19 @@
 <% if (cs = subject.subjects(:direction => :receivers)).present? %>
 
-  <div class="contacts_header">
-      <%=image_tag("btn/btn_friend.png", :class => "contacts_icon")%>
-      <div class="contacts_text_header">
+  <div class="block">
+    <div class="header">
+      <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
+      <div class="header_text">
         <%= cs.count %> <%= t('contact', :count => cs.count) %>
       </div>
+    </div>
   </div>
-  <div class ="contacts">
-      <div class="contact">
+  <div class ="content">
+      <div class="contact space_center">
         <% cs.each do |contact| %>
             <%= link_to(image_tag(contact.logo.url, :alt => contact.name , :size => "40x40"), contact) %>
         <% end %>
       </div>
   </div>
-  <div class="contacts_footer">
-    <%=link_to(image_tag("btn/btn_next.png", :alt => "next"), '#') %>
-  </div>
-
 <% end %>
+

data/app/views/subjects/_menu_options.html.erb

@@ -0,0 +1,14 @@
+
+<ul class="menu noaccordion">
+<%= content_for?(:menu_mailbox) ? content_for(:menu_mailbox) : capture do %>
+  <li>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('mailbox.mailbox'), mailbox_index_path) %>
+  </li>
+<% end %>
+  <li>
+    <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#') %>
+  </li>
+  <li>
+    <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path) %>
+  </li>
+</ul>

data/app/views/subjects/_toolbar.html.erb

@@ -0,0 +1,15 @@
+<% content_for :headers, stylesheet_link_tag("menu", :media => "screen, projection") %>
+
+<div id="logo_index" class="block">
+  <b><%= link_to(current_subject.name, current_subject)%></b><br/>
+  <%= link_to(image_tag(current_subject.logo.url(:profile) ,  :alt => current_subject.name ), current_subject ) %>
+</div>
+<div class="space_center">
+</div>
+<div class="menu_header"><b><%=t('menu.options')%></b>
+</div>
+<div id="menu_lateral">
+  <%= render :partial => "subjects/menu_options" %>
+</div>
+<div class="space_center">
+</div>

data/app/views/ties/_new.html.erb

@@ -8,8 +8,9 @@
       </div>
       <div class="activity_add_ties">
         <div><%= t('message.one')+":" %><br />
-         <%= form_for @tie,
-                      :remote => true do |f| %>
+  
+			<%= form_for @tie do |f| %>
+		  
            <%= f.hidden_field :receiver_id %>
            <%= f.hidden_field :sender_id %>
            <%= f.text_area :message,   :class =>"input_new_tie" %>

data/app/views/ties/_pendings.html.erb

@@ -1,16 +1,11 @@
 <% if current_subject.pending_ties.any? %>
-<div class="middle_box">
-  <div class="middle_box_header">
-    <%= image_tag('btn/btn_notifications.png', :class => "middle_box_picture_icon") %>
-    <div class="middle_box_text_header"><%= t 'tie.pending.other' %></div>
-    <div class="title_righ">
-      <a href="#"><%= t 'tie.pending.all' %></a>
-    </div>
+<div class="block">
+  <div class="header">
+    <%= image_tag('btn/btn_notifications.png', :class => "header_icon") %>
+    <div class="header_text"><%= t 'tie.pending.other' %></div>
+  </div>
+  <div class="content">
+    <%= render current_subject.pending_ties %>
   </div>
-
-  <%= render current_subject.pending_ties %>
-
 </div>
 <% end -%>
-
-

data/app/views/ties/_suggestions.html.erb

@@ -10,17 +10,17 @@
     });
   <% end %>
 
-
-
-<div class="tie_header">
-  <%= image_tag('btn/notifications.png', :class => "tie_icon") %>
-  <div class="tie_text_header">
-      <%=t('tie.suggestion.one') %>
+  <div class="block">
+    <div class="header">
+      <%= image_tag('btn/notifications.png', :class => "header_icon") %>
+      <div class="header_text">
+        <%=t('tie.suggestion.one') %>
+      </div>
+    </div>
+    <div class="content">
+      <% if (sgs = current_subject.suggestions(2)).present? %>
+        <%= render :partial => '/ties/tie', :collection => sgs %>
+      <%end%>
+    </div>
   </div>
-</div>
-<div class="suggestions">
-  <% if (sgs = current_subject.suggestions(2)).present? %>
-    <%= render sgs %>
-  <%end%> 
-</div>
 <%end%>

data/app/views/ties/_tie.html.erb

@@ -1,21 +1,23 @@
-<div id="tie_<%=dom_id(tie.receiver_subject)%>" class="tie">
-  <div class="tie_actor_logo">
+<div id="tie_<%=dom_id(tie.receiver_subject)%>" class="row">
+  <div class="logo">
     <%= link_to(image_tag(tie.receiver_subject.logo.url(:tie)),
                 tie.receiver_subject) %>
   </div>
-  <div class="tie_content">
-    <div class="tie_name">
+  <div class="sub-block">
+    <div class="name">
       <%= link_to(tie.receiver_subject.name, tie.receiver_subject, :class => "tie_link") %>
     </div>
-    <div class="tie_brief">
+    <div class="brief">
       <%= tie_brief(tie.receiver_subject) %>
     </div>
-    <div class="tie_link" id="tie_link<%= dom_id(tie.receiver_subject)%>">
+    <div class="link" id="tie_link<%= dom_id(tie.receiver_subject)%>">
       <%= new_tie_link(tie) %>
     </div>
   </div>
-  <div class="tie_close"><%=link_to('X','#')%></div>
+  <div class="close"><%=link_to('X','#')%></div>
   <div class="space_center">
   </div>  
 </div>
 
+
+

data/app/views/ties/new.js.erb

@@ -1,2 +1 @@
-new Boxy("<%= escape_javascript(render(:partial => "ties/new")) %>",
-         { title: "<%= escape_javascript(t('contact.new.title', :name => @tie.receiver_subject.name )) %>" });
+$('#content').html("<%= escape_javascript(render(:partial => "ties/new")) %>");

data/app/views/users/_groups.html.erb

@@ -4,16 +4,17 @@
   </div>
   <div id="groups_list" class="content_size">
   <% if (user.recent_groups.count) > 10 %>
+    <% content_for :headers, stylesheet_link_tag("carousel") %>
     <div id='carousel_container'>
       <div id='left_scroll'><%=image_tag("btn/group_left.png")%></div>
       <div id='carousel_inner'>
-        <ul id='carousel_ul'>
     <% else %>
      <div class="space_center"></div>
     <%end%>
-          <%= render user.recent_groups %>
+      <ul id='carousel_ul' class="menu_list">
+        <%= render user.recent_groups %>
+      </ul>
     <% if (user.recent_groups.count) > 10 %>
-        </ul>
      </div>
      <div id='right_scroll'><%=image_tag("btn/group_right.png")%></div>
     </div>

data/app/views/users/_index.html.erb

@@ -1,31 +1,33 @@
-
 <% cont=0; %>
-<% @users.each do |user| %>
-
-	<% if (cont%2) == 0
-			cont+=1; %>
-	  	<div class="wrap_post">
-	<% end %>
 
-			<div class="post_browse">
-			<div class="post_picture"><%= link_to (image_tag(user.logo.url , :size => "50x50", :alt => user.name )),user  %></div>
-			<div class="post_browse_content_people content_size">
-				<div class="post_browse_title content_size" ><%=link_to(user.name, user)%></div>
-                                <div class="content_size">
-                                  <%= ties_to(user) %>
-                                </div>
-			</div>
-			</div>
-
-	<% if ((cont%2) == 0) 	%>
-			</div>
-	<% end %>
+<% @users.each do |user| %>
 
+  <% if (cont%2) == 0 %>
+    <% cont+=1; %>
+     <div class="row">
+  <% end %>
+
+  <div class="label">
+    <div class="logo">
+      <%= link_to (image_tag(user.logo.url , :size => "50x50", :alt => user.name )),user  %>
+    </div>
+    <div class="sub-block">
+      <div class="name black" >
+        <%=link_to(user.name, user)%>
+      </div>
+      <div class="link">
+        <%= ties_to(user) %>
+      </div>
+    </div>
+  </div>
 <% end %>
 
-
 <% if ((cont%2) != 0) 	%>
+  <div class="label">
+  </div>
 		</div>
 <% end %>
 
-<%= will_paginate @users %>
+<div class="row">
+  <%= will_paginate @users %>
+</div>

data/app/views/users/_logo.html.erb

@@ -1,4 +1,4 @@
-<div id="logo">
+<div id="logo_index">
   <b><%= @user.name %></b><br/>
   <%=image_tag(@user.logo.url(:profile)) %>
 </div>

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

@@ -1,168 +1,171 @@
-			
-      <div class="space_center"></div>
-			<div class="space_center"></div>
-			<div class="space_center"></div>
-		  <div class="future_conference" id="personal_info" >
-				<div class="future_header">
-						<div class="title_section">
-								Personal Information
-						</div>
-						<div class="title_righ">
-								
-								<%= link_to "Edit", :controller => :users, :action => :edit, :section => :about_me %>
-								
-						</div>
-				</div>
-				<div class="post_future_conference"  >
-					<% if @user.profile.organization? %>
-						<div class="info_post">
-								<div class="info_left">
-										Organization:
-								</div>
-								<div class="info_right">
-										<%=h @user.profile.organization %>
-								</div>
-						</div>
-					<%end%>
-					<% if @user.profile.birthday? %>
-						<div class="info_post">
-								<div class="info_left">
-										BirthDay:
-								</div>
-								<div class="info_right">
-									<%=h I18n.l @user.profile.birthday, :format => :long %>
-								</div>
-						</div>
-						<div class="info_post">
-								<div class="info_left">
-										Age:
-								</div>
-								<div class="info_right">
-										<%=h @user.age %>
-								</div>
-						</div>
-					<%end%>
-					<% if @user.profile.city? %>
-						<div class="info_post">
-								<div class="info_left">
-										Actual City:
-								</div>
-								<div class="info_right">
-										<%=h @user.profile.city %>
-										<% if @user.profile.country? %>
-										  , <%=@user.profile.country%>
-										<%end%>
-								</div>
-						</div>
-					<%end%>
-					<% if @user.profile.description? %>
-						<div class="info_post">
-                <div class="info_left">
-                    About me:
-                </div>
-                <div class="info_right">
-                    <%=h @user.profile.description %>
-                </div>
-            </div>
-					<%end%>
-				</div>
-		  </div>
+<div class="space_center"></div>
+<div class="block" id="personal_info" >
+  <div class="header">
+    <div class="header_text">
+      <%=t('edit.personal_info')%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :users, :action => :edit, :section => :about_me %>
+    </div>
+  </div>
+  <div class="content">
+    <div class="sub-block"  >
+      <% if @user.profile.organization? %>
+        <div class="row">
+          <div class="label">
+            <%=t('edit.organization')%>:
+          </div>
+          <div class="field">
+              <%=h @user.profile.organization %>
+          </div>
+        </div>
+      <%end%>
+      <% if @user.profile.birthday? %>
+        <div class="row">
+          <div class="label">
+            <%=t('edit.birthday')%>:
+          </div>
+          <div class="field">
+            <%=h I18n.l @user.profile.birthday, :format => :long %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="label">
+              Age:
+          </div>
+          <div class="field">
+              <%=h @user.age %>
+          </div>
+        </div>
+      <%end%>
+      <% if @user.profile.city? %>
+        <div class="row">
+          <div class="label">
+            <%=t('edit.actualcity')%>:
+          </div>
+          <div class="field">
+            <%=h @user.profile.city %>
+            <% if @user.profile.country? %>
+              , <%=@user.profile.country%>
+            <%end%>
+          </div>
+        </div>
+      <%end%>
+      <% if @user.profile.description? %>
+        <div class="row">
+          <div class="label">
+            <%=t('edit.aboutme')%>:
+          </div>
+          <div class="row">
+              <%=h @user.profile.description %>
+          </div>
+        </div>
+      <%end%>
+    </div>
+  </div>
+</div>
 
-		  <div class="future_conference" id="contact_info">
-				<div class="future_header">
-						<div class="title_section">
-								Contact Information
-						</div>
-						<div class="title_righ">
-								<%= link_to "Edit", :controller => :users, :action => :edit, :section => :contact_info %>
-						</div>
-				</div>
-				<div class="post_future_conference">
-						<div class="future_content">
-							<% if @user.profile.phone? %>
-							   <div class="info_post">
-                    <div class="info_left">
-                        Phone
-                    </div>
-                    <div class="info_right">
-                        <%=h @user.profile.phone %>
-                    </div>
-                </div>
-							<%end%>
-							<% if @user.profile.mobile? %>
-								<div class="info_post">
-                    <div class="info_left">
-                        Mobile
-                    </div>
-                    <div class="info_right">
-                        <%=h @user.profile.mobile %>
-                    </div>
-                </div>
-							<%end%>
-							<% if @user.profile.fax? %>
-								<div class="info_post">
-                    <div class="info_left">
-                        Fax
-                    </div>
-                    <div class="info_right">
-                        <%=h @user.profile.fax %>
-                    </div>
-                </div>
-							<%end%>
-							<% if @user.profile.address? %>
-								<div class="info_post">
-                    <div class="info_left">
-                        Address
-                    </div>
-                    <div class="info_right">
-                        <%=h @user.profile.address %>
-                    </div>
-                </div>
-							<%end%>
-							<% if @user.profile.website? %>
-								<div class="info_post">
-										<div class="info_left">
-												Website
-										</div>
-										<div class="contact_link">
-												<a href="<%=h @user.profile.website %>"><%=h @user.profile.website %></a>
-										</div>
-								</div>
-							<%end%>
-							
-								<div class="info_post">
-                    <div class="info_left">
-                        E-mail
-                    </div>
-                    <div class="info_center">
-                        <%=h @user.email %>
-                    </div>
-                </div>
-						</div>
-				</div>
-		  </div>
-
-		  <div class="future_conference" id="experience_info">
-				<div class="future_header">
-						<div class="title_section">
-								Experience
-						</div>
-						<div class="title_righ">
-								<%= link_to "Edit", :controller => :users, :action => :edit, :section => :my_experience %>
-						</div>
-				</div>
-				<div class="post_future_conference">
-						<div class="future_content">
-								<div class="info_post">
-										
-										<div class="info_center">
-												<%=h @user.profile.experience %>
-										</div>
-								</div>
-								
-						</div>
-				</div>
-		 </div>
+<div class="space_center"></div>
+<div class="block" id="contact_info">
+  <div class="header">
+    <div class="header_text">
+      <%=t('edit.contact')%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :users, :action => :edit, :section => :contact_info %>
+    </div>
+  </div>
+  <div class="content">
+    <% if @user.profile.phone? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.phone')%>
+        </div>
+        <div class="field">
+          <%=h @user.profile.phone %>
+        </div>
+      </div>
+    <%end%>
+    <% if @user.profile.mobile? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.mobile')%>
+        </div>
+        <div class="field">
+          <%=h @user.profile.mobile %>
+        </div>
+      </div>
+    <%end%>
+    <% if @user.profile.fax? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.fax')%>
+        </div>
+        <div class="field">
+          <%=h @user.profile.fax %>
+        </div>
+      </div>
+    <%end%>
+    <% if @user.profile.address? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.address')%>
+        </div>
+        <div class="field">
+          <%=h @user.profile.address %>
+        </div>
+      </div>
+    <%end%>
+    <% if @user.profile.website? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.website')%>
+        </div>
+        <div class="field">
+          <a href="<%=h @user.profile.website %>"><%=h @user.profile.website %></a>
+        </div>
+      </div>
+    <%end%>
 
+    <div class="row">
+      <div class="label">
+        <%=t('edit.email')%>:
+      </div>
+      <div class="row">
+        <%=h @user.email %>
+      </div>
+    </div>
+  </div>
+</div>
 
+<div class="space_center"></div>
+<div class="block" id="experience_info">
+  <div class="header">
+    <div class="header_text">
+      <%=t('edit.experience')%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :users, :action => :edit, :section => :my_experience %>
+    </div>
+  </div>
+  <div class="content">
+    <div class="row">
+      <%=h @user.profile.experience %>
+    </div>
+  </div>
+</div>
 
+<div class="space_center"></div>
+<% if (@user.to_param==current_user.to_param and @user.authentication_token) %>
+<div class="block" id="developer_info">
+  <div class="header">
+    <div class="header_text">
+      ApiKey: <%= @user.authentication_token %>
+    </div>
+    <div class="header_icon_right">
+  <%= link_to (image_tag('/images/btn/edit.png')), :controller => :api,
+                           :action => :create_key %>
+    </div>
+  </div>
+</div>
+<% end %>