social_stream 0.4.0 → 0.4.1

data/app/views/{mailbox/_show.html.erb → messages/_index.html.erb}

@@ -1,4 +1,8 @@
+<% content_for :headers do %>
+<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<% end %>
 
+<%= render :partial => 'location' %>
 
 <br class="clearfloat" />
 <div class="space_center">
@@ -9,7 +13,7 @@
 </div><div class="space_center">
 </div>
 
-<h1><%= params[:id].capitalize %></h1>
+<h2><%= t('message.' + @box) %></h2>
 <div id="conversations">  
   <%= render :partial => 'conversations' %>
 </div>

data/app/views/messages/_location.html.erb

@@ -0,0 +1,3 @@
+<div id="map_location" class="content_size">
+  <%= t('location.message', :location => "#{ image_tag('btn/btn_inbox.png' , :class => 'btn_config') } #{ t('message.' + @box) }: <span class=\"name_group\">#{ sanitize current_subject.name }</span>").html_safe %>
+</div>

data/app/views/{mailbox → messages}/_menu_options.html.erb

@@ -1,19 +1,19 @@
 <li>
-	<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('mailbox.mailbox'), mailbox_index_path) %>
+	<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.other'), messages_path) %>
 </li>
 <li>
 	<ul>
 		<li>
-			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+ "New message", new_mailbox_conversation_path) %>
+			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+ t('message.new'), new_message_path) %>
 		</li>
 		<li>
-			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('mailbox.inbox')+" (" + @mailbox.inbox(:unread => true).count.to_s + ")", mailbox_path(:id => :inbox), :remote => true) %>
+			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.inbox')+" (" + @mailbox.inbox(:unread => true).count.to_s + ")", messages_path, :remote => true) %>
 		</li>
 		<li>
-			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('mailbox.sentbox'), mailbox_path(:id => :sentbox), :remote => true) %>
+			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.sentbox'), messages_path(:box => :sentbox), :remote => true) %>
 		</li>
 		<li>
-			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('mailbox.trash'), mailbox_path(:id => :trash), :remote => true) %>
+			<%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.trash'), messages_path(:box => :trash), :remote => true) %>
 		</li>
 	</ul>
 </li>

data/app/views/{mailbox/conversation → messages}/_new.html.erb

@@ -1,13 +1,15 @@
-
+<% content_for :headers do %>
+<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<% end %>
 
 <br class="clearfloat" />
 <div class="space_center">
 </div>
 <div id="new_message">
-	<% if params[:box].present? %>
-    <%= link_to 'Back', mailbox_path(:id => params[:box]) %>
+	<% if @box.present? %>
+    <%= link_to 'Back', messages_path(:box => @box) %>
 	<% else %>
-    <%= link_to 'Back', mailbox_index_path %>
+    <%= link_to 'Back', messages_path %>
 	<% end %>
 </div>
 <div class="space_center">

data/app/views/messages/_show.html.erb

@@ -0,0 +1,22 @@
+<% content_for :headers do %>
+<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<% end %>
+
+<%= render :partial => 'location' %>
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+<div id="new_message">
+	<% if @box.present? %>
+    <%= link_to 'Back', messages_path(:box => @box) %>
+	<% else %>
+    <%= link_to 'Back', messages_path %>
+	<% end %>
+</div>
+<div class="space_center">
+</div>
+<div class="space_center">
+</div>
+<div id="conversation">
+    <%= render :partial => 'conversation_full', :locals =>{:conversation => @conversation} %>
+</div>

data/app/views/{mailbox → messages}/index.html.erb

@@ -2,9 +2,8 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar_menu(:mailbox) do %>
+<% toolbar :option => :messages do %>
   <%= render :partial => 'menu_options' %>
 <% end %>
 
-<%= render :partial => 'location' %>
 <%= render :partial => 'index' %>

data/app/views/{mailbox/show.html.erb → messages/new.html.erb}

@@ -1,11 +1,10 @@
 <% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
+<%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar_menu(:mailbox) do %>
+<% toolbar :option => :messages do %>
   <%= render :partial => 'menu_options' %>
 <% end %>
 
 <%= render :partial => 'location' %>
-
-<%= render :partial => 'show' %>
+<%= render :partial => 'new' %>

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

@@ -0,0 +1,10 @@
+<% content_for :sidebar do %>
+<%= render :partial => 'home/sidebar' %>
+<% end %>
+
+<% toolbar :option => :messages do %>
+  <%= render :partial => 'menu_options' %>
+<% end %>
+
+
+<%= render :partial => 'show' %>

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

@@ -1 +1,180 @@
-This is the profile for <%= link_to @profile.subject.name, @profile.subject %>
+<%= link_to @profile.subject.name, @profile.subject %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'users/sidebar_show' %>
+<% end %>
+
+<% toolbar :profile => @profile.subject %>
+
+<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')), '#' %>
+    </div>
+  </div>
+  <div class="content">
+    <div class="sub-block"  >
+      <% if @profile.organization? %>
+        <div class="row">
+          <div class="label">
+            <%=t('edit.organization')%>:
+          </div>
+          <div class="field">
+              <%=h @profile.organization %>
+          </div>
+        </div>
+      <%end%>
+      <% if @profile.birthday? %>
+        <div class="row">
+          <div class="label">
+            <%=t('edit.birthday')%>:
+          </div>
+          <div class="field">
+            <%=h I18n.l @profile.profile.birthday, :format => :long %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="label">
+              Age:
+          </div>
+          <div class="field">
+              <%=h @profile.age %>
+          </div>
+        </div>
+      <%end%>
+      <% if @profile.city? %>
+        <div class="row">
+          <div class="label">
+            <%=t('edit.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('edit.aboutme')%>:
+          </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('edit.contact')%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to (image_tag('/images/btn/edit.png')), '#' %>
+    </div>
+  </div>
+  <div class="content">
+    <% if @profile.phone? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.phone')%>
+        </div>
+        <div class="field">
+          <%=h @profile.phone %>
+        </div>
+      </div>
+    <%end%>
+    <% if @profile.mobile? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.mobile')%>
+        </div>
+        <div class="field">
+          <%=h @profile.mobile %>
+        </div>
+      </div>
+    <%end%>
+    <% if @profile.fax? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.fax')%>
+        </div>
+        <div class="field">
+          <%=h @profile.fax %>
+        </div>
+      </div>
+    <%end%>
+    <% if @profile.address? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.address')%>
+        </div>
+        <div class="field">
+          <%=h @profile.address %>
+        </div>
+      </div>
+    <%end%>
+    <% if @profile.website? %>
+      <div class="row">
+        <div class="label">
+          <%=t('edit.website')%>
+        </div>
+        <div class="field">
+          <a href="<%=h @profile.website %>"><%=h @profile.website %></a>
+        </div>
+      </div>
+    <%end%>
+
+    <div class="row">
+      <div class="label">
+        <%=t('edit.email')%>:
+      </div>
+      <div class="row">
+        <%=h @profile.subject.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')), '#' %>
+    </div>
+  </div>
+  <div class="content">
+    <div class="row">
+      <%=h @profile.experience %>
+    </div>
+  </div>
+</div>
+
+<div class="space_center"></div>
+<% if (@profile.to_param==current_user.to_param and @profile.authentication_token) %>
+<div class="block" id="developer_info">
+  <div class="header">
+    <div class="header_text">
+      ApiKey: <%= @profile.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 %>

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

@@ -0,0 +1,9 @@
+<%= render :partial => 'subjects/toolbar_logo', :locals => { :subject => current_subject } %>
+
+<div class="block space_center">
+</div>
+
+<%= render :partial => 'subjects/toolbar_home_menu' %>
+
+<div class="block space_center">
+</div>

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

@@ -0,0 +1,6 @@
+<% content_for :headers, stylesheet_link_tag("menu", :media => "screen, projection") %>
+
+<div id="menu_lateral">
+  <%= render :partial => "subjects/toolbar_home_menu_options" %>
+</div>
+

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

@@ -0,0 +1,28 @@
+<ul class="menu noaccordion">
+
+<%= menu_options[:messages] || capture do %>
+  <li>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.other') +" (" + current_subject.mailbox.inbox(:unread => true).count.to_s + ")", messages_path) %>
+  </li>
+<% end %>
+
+<%= menu_options[:contacts] || capture do %>
+  <li>
+    <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#') %>
+  </li>
+  <li>
+    <ul>
+    <% current_subject.relations.sort.each do |r| %>
+      <li>
+      <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") + r.name , '#' %>
+      </li>
+    <% end %>
+    </ul>
+  </li>
+<% end %>
+
+<%= menu_options[:subjects] || capture do %>
+  <%= render :partial => 'subjects/toolbar_home_menu_options_subjects' %>
+<% end %>
+
+</ul>

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

@@ -0,0 +1,15 @@
+<%= menu_options[:groups] || capture do %>
+  <li>
+    <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), '#') %>
+  </li>
+
+  <li>
+    <ul>
+      <li>
+        <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path) %>
+      </li>
+    </ul>
+  </li>
+
+<% end %>
+

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

@@ -0,0 +1,4 @@
+<div id="logo_index">
+  <div class="center"><span class="title_bold" ><%= subject.name %></span> (<%= ties_to(subject) %>)</div>
+  <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x108"), subject %>
+</div>

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

@@ -0,0 +1,21 @@
+<%= render :partial => 'subjects/toolbar_logo', :locals => { :subject => subject } %>
+
+<div class="block space_center">
+</div>
+
+<%= render :partial => 'subjects/toolbar_profile_menu', :locals => { :subject => subject } %>
+
+<div class="block space_center">
+</div>
+
+<%= render :partial => 'subjects/tabs' %>
+
+<div class="block space_center">
+</div>
+
+<%= render :partial => 'subjects/contacts', :locals => { :subject => subject } %>
+
+<div class="block space_center">
+</div>
+<div class="block space_center">
+</div>

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

@@ -0,0 +1,13 @@
+<% content_for :headers, stylesheet_link_tag("menu", :media => "screen, projection") %>
+
+<div id="menu_lateral_tie">
+  <%= render :partial => "subjects/toolbar_profile_menu_tie_options", :locals => { :subject => subject } %>
+</div>
+<div class="space_center">
+</div>
+
+<div id="menu_lateral">
+  <%= render :partial => "subjects/toolbar_profile_menu_basic_options", :locals => { :subject => subject } %>
+</div>
+<div class="space_center">
+</div>

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

@@ -0,0 +1,12 @@
+<ul class="menu noaccordion">
+<%= menu_options[:messages] || capture do %>
+  <li>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.other'), messages_path) %>
+  </li>
+<% end %>
+<%= menu_options[:profile] || capture do %>
+  <li>
+    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [subject, :profile]) %>
+  </li>
+<% end %>
+</ul>