social_stream 0.3.6 → 0.4.0

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

@@ -0,0 +1,6 @@
+<% if user_signed_in? %>
+<div class="block space_center"></div>
+<%= render :partial => "ties/suggestions" %>
+<div class="block space_center"></div>
+<%= render :partial => 'ties/pendings' %>
+<% end %>

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

@@ -0,0 +1,17 @@
+<% content_for :headers, stylesheet_link_tag("menu", :media => "screen, projection") %>
+
+<%= render :partial => 'logo' %>
+
+<div class="block space_center">
+</div>
+<%= render :partial => 'menu/user' %>
+<div class="block space_center">
+</div>
+
+<%= render :partial => 'subjects/contacts', :locals => { :subject => @user } %>
+
+<div class="block space_center">
+</div>
+<div class="block space_center">
+</div>
+

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

@@ -1,167 +1,195 @@
-        <% content_for :right do %>
-        <%= render :partial => 'right_show' %>
-        <% end %>
-				
-				<% content_for :middle do %>
-        <%= render :partial => 'middle_show' %>
-        <% end %>
-				
-				<% content_for :head do %>
-	        <%= stylesheet_link_tag "jquery-ui.css", :media => "screen, projection" %>
-					<%= stylesheet_link_tag "edit_user", :media => "screen, projection" %>
-	        <%= javascript_include_tag 'jquery-ui.min','jquery.validate' %>
-				<% end %>
-				
-        <%= form_for(@user, :remote => true) do |f| %>
-        <% if @user.errors.any? %>
-        <div id="error_explanation">
-            <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
-            <ul>
-                <% @user.errors.full_messages.each do |msg| %>
-                <li>
-                    <%= msg %>
-                </li>
-                <% end %>
-            </ul>
-        </div>
-        <% end %>
+<% content_for :toolbar do %>
+<%= render :partial => 'toolbar_show' %>
+<% end %>
+
+<% content_for :sidebar do %>
+<%= render :partial => 'sidebar_show' %>
+<% end %>
 
-				<% content_for :javascript do %>
-              $(function() {         
-									$("#content").css('border-bottom', 'none');
-                  $("#edit_user_1").validate();              
-              }); 
-				<% end %> 
-
-        <div class="field">
-            <% if !params[:section].present? or params[:section].eql?("about_me") %>
-            <div class="section_edit">
-                Personal information
-            </div>
-            <div class="edit_field">
-            	<div class="edit_label">
-	             <%= f.label :name %>
-							</div>
-	             <%= f.text_field :name, :class => "required edit_text"  %>
-            </div>
-
-						<% content_for :javascript do %>
-							$(function () {
-                  $( "#user_profile_attributes_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>', 
-								                                    changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
-									$("#personal_info").addClass('section_highlight');
-									
-							});
-            <% end %>
-
-						<%= f.fields_for :profile do |profile_form| %>
-						
-						<div class="edit_field">
-							<div class="edit_label">
-                <%= profile_form.label :organization %>
-							</div>
-              <%= profile_form.text_field :organization, :class => "edit_text" %>	
-            </div>
-						
-						<div class="edit_field">
-							<div class="edit_label">
-                <%= profile_form.label :birthday %>
-						  </div>
-              <%= profile_form.text_field( :birthday , :class => "date edit_text") %>
-						</div>
-						        
-						
-						<div class="edit_field">
-							<div class="edit_label">
-                <%= profile_form.label :city %>
-							</div>
-						  <%= profile_form.text_field :city, :class => "edit_text" %>
-            </div>
-						<div class="edit_field">
-							<div class="edit_label">
-                <%= profile_form.label :country %>
-							</div>					
-              <%= profile_form.text_field :country, :class => "edit_text" %>
-            </div>
-						<div class="edit_field">
-              <%= profile_form.label "About me" %>
-						  <%= profile_form.text_area :description, :rows =>6, :maxlength => 400, :class => "edit_text" %>
-						</div>
-            
-            <% end %>
-						<% end %>
-            <% if !params[:section].present? or params[:section].eql?("contact_info") %>
-
-							<% content_for :javascript do %>
-	
-	              $(function() {
-	                  $("#contact_info").addClass('section_highlight');
-	              });
-	
-	            <% end %>
-
-	            <div class="section_edit">
-	                Contact information
-	            </div>
-							<%= f.fields_for :profile do |profile_form| %>
-							<div class="edit_field">
-								<div class="edit_label">
-	                <%= profile_form.label :phone %>
-								</div>					
-	              <%= profile_form.text_field :phone, :class => "phone edit_text" %>
-	            </div>
-							<div class="edit_field">
-								<div class="edit_label">
-	                <%= profile_form.label :mobile %>
-								</div>
-	              <%= profile_form.text_field :mobile, :class => "phone edit_text" %>
-	            </div>
-							<div class="edit_field">
-								<div class="edit_label">
-	                <%= profile_form.label :fax %>
-								</div>
-	              <%= profile_form.text_field :fax, :class => "phone edit_text" %>
-	            </div>
-							<div class="edit_field">
-								<div class="edit_label">
-	                <%= profile_form.label :address %>
-								</div>					
-	              <%= profile_form.text_field :address, :class => "edit_text" %>
-	            </div>
-							<div class="edit_field">
-								<div class="edit_label">
-	                <%= profile_form.label :website %>
-								</div>					
-	              <%= profile_form.text_field :website, :class => "url edit_text" %>
-	            </div>
-	
-	            <% end %>
-							<% end %>
-            <% if !params[:section].present? or params[:section].eql?("my_experience") %>
-
-							<% content_for :javascript do %>
-	
-	              $(function() {
-	                  $("#experience_info").addClass('section_highlight');
-	              });
-	
-	            <% end %>
-
-	            <div class="section_edit">
-	                Experience
-	            </div>
-							<div class="edit_field">
-								<%= f.fields_for :profile do |profile_form| %>
-		            <%= profile_form.text_area :experience, :rows =>6, :maxlength => 500, :class => "edit_text" %>
-							</div>
-	            <% end %>
-            <% end %>
-        </div>
-				<% if params[:section].present? %>
-				<%= hidden_field_tag("section", params[:section]) %>
-				<% end %>
-        <div class="actions">
-            <%= f.submit "Update", :class => "button" %>&nbsp;<button onclick="window.location.href='<%= user_url(@user) %>';">Cancel</button>
-        </div>
-				<br/>
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "jquery-ui.css", :media => "screen, projection" %>
+  <%= javascript_include_tag 'jquery-ui.min','jquery.validate' %>
+<% end %>
+
+<%= form_for(@user, :remote => true) do |f| %>
+<% if @user.errors.any? %>
+<div id="error_explanation">
+    <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
+    <ul>
+        <% @user.errors.full_messages.each do |msg| %>
+        <li>
+            <%= msg %>
+        </li>
         <% end %>
+    </ul>
+</div>
+<% end %>
+
+<% content_for :javascript do %>
+      $(function() {
+          $(".edit_user").validate();
+      });
+<% end %>
+
+<div class="block">
+  <% if !params[:section].present? or params[:section].eql?("about_me") %>
+  <div class="row">
+    <div class="form_row">
+        <h2><%=t('edit.personal_info')%></h2>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+       <%= f.label :name %>
+      </div>
+      <div class="form_field">
+       <%= f.text_field :name,   :class => "form_tag"  %>
+      </div>
+    </div>
+  </div>
+
+  <% content_for :javascript do %>
+    $(function () {
+        $( "#user_profile_attributes_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>',
+                                          changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
+        $("#personal_info").addClass('section_highlight');
+
+    });
+  <% end %>
+
+  <%= f.fields_for :profile do |profile_form| %>
+
+  <div class="form_row">
+    <div class="form_label">
+      <%= profile_form.label :organization %>
+    </div>
+    <div class="form_field">
+      <%= profile_form.text_field :organization , :class => "form_tag" %>
+    </div>
+  </div>
+
+  <div class="form_row">
+    <div class="form_label">
+      <%= profile_form.label :birthday %>
+    </div>
+    <div class="form_field">
+      <%= profile_form.text_field( :birthday , :class => "date form_tag") %>
+    </div>
+  </div>
+
+  <div class="form_row">
+    <div class="form_label">
+      <%= profile_form.label :city %>
+    </div>
+    <div class="form_field">
+      <%= profile_form.text_field :city,  :class => "form_tag" %>
+    </div>
+  </div>
+
+  <div class="form_row">
+    <div class="form_label">
+      <%= profile_form.label :country %>
+    </div>
+    <div class="form_field">
+      <%= profile_form.text_field :country,  :class => "form_tag" %>
+    </div>
+  </div>
+
+  <div class="form_row form_label">
+    <%= profile_form.label t('edit.aboutme') %>
+  </div>
+  <div class="form_row">
+    <%= profile_form.text_area :description, :maxlength => 200, :rows => 10, :class => "form_tag_long" %>
+  </div>
+
+  <% end %>
+  <% 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('edit.contact')%></h2>
+    </div>
+    <%= f.fields_for :profile do |profile_form| %>
+    <div class="form_row">
+      <div class="form_label">
+        <%= profile_form.label :phone %>
+      </div>
+      <div class="form_field">
+        <%= profile_form.text_field :phone, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= profile_form.label :mobile %>
+      </div>
+      <div class="form_field">
+        <%= profile_form.text_field :mobile, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= profile_form.label :fax %>
+      </div>
+      <div class="form_field">
+        <%= profile_form.text_field :fax, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= profile_form.label :address %>
+      </div>
+      <div class="form_field">
+        <%= profile_form.text_field :address, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= profile_form.label :website %>
+      </div>
+      <div class="form_field">
+        <%= profile_form.text_field :website, :class => "form_tag" %>
+      </div>
+    </div>
+
+    <% end %>
+    <% 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('edit.experience')%></h2>
+    </div>
+    <div class="row center">
+      <%= f.fields_for :profile do |profile_form| %>
+      <%= profile_form.text_area :experience, :maxlength => 500, :rows => 10, :class => "form_tag_long" %>
+    </div>
+    <% end %>
+  <% end %>
+
+  <% if params[:section].present? %>
+  <%= hidden_field_tag("section", params[:section]) %>
+  <% end %>
+  <div class="form_row space_center">
+    <%= f.submit "Update", :class => "button" %>&nbsp;
+    <button class="button" onclick="window.location.href='<%= user_url(@user) %>';">Cancel</button>
+  </div>
+
+<% end %>
+
+
+</div>
+

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

@@ -1,58 +1,45 @@
-<% content_for :head, stylesheet_link_tag("users") %>
-
-
-<% content_for :middle do %>
-	<%= render :partial => "users/middle_index" %>
+<% content_for :headers do %>
+  <%= javascript_include_tag 'ajax.paginate' %>
 <% end %>
 
-<% content_for :right do %>
-	<%= render :partial => "users/right_index" %>
-<% end %>
+<% toolbar_menu if user_signed_in? %>
 
+<% content_for :sidebar do %>
+	<%= render :partial => "users/sidebar_index" %>
+<% end %>
 
 <div id="map_location" class="content_size">
-  Your are here ><img src="images/btn/btn_browse.png" class="btn_config" /> <%= t('browse') %>: <span id="name_group"><%= t('user.other')%></span>
-</div>
-<div id="by_options" class="content_size"><%=link_to(t('group.by'),groups_path)%></div>
-<br class="clearfloat" />
-<div class="space_center">
+  Your are here ><img src="images/btn/btn_browse.png" class="btn_config" /> <%= t('browse') %>: <span id="name_group"><b><%= t('user.other')%></b></span>, <%=link_to(t('group.by'),groups_path)%>
 </div>
 
-<div id="my_conferences">
-		<div id="tabconference_browse" class="widget content_size">
-
-				<div id="contacts" class="tabconference_browse">
-						<div class="space_center">
-						</div>
-                                                <div class="search_field_wrapper"><input type="text" value="Search by name" id="search_field" class="search_input" /><%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %></div>
-                                                <div class="space_center">
-						</div>
-						<div class="letters" class="content_size">
-						<ul class="tabconference_browse">
-							<li>
-                                                        <%= link_to t('user.all_n', :count => User.count), users_path %>
-							</li>
-						</ul>
-                                                    <% for char in 'A'..'Z' %>
-                                                      <%= link_to char,{:letter => char,:page => 1},:class => "user_letter_link" %>
-                                                    <% end %>
-						</div>
-						<div class="space_center" class="content_size">
-
-						</div>
-                                  <div id="list_users_ajax">
-                                                  <%= render :partial => "users/index"%>
-                                  </div>
-						<div class="space_center">
-						</div>
-				</div>
 
 
-</div>
-</div>
+<div class="space_center"></div>
 
- 
-<br class="clearfloat" />
-<div class="space_center">
+<div id="my_conferences">
+  <div id="contacts" class="block">
+    <div class="search_field_wrapper">
+      <input type="text" value="Search by name" id="search_field" class="search_input" />
+      <%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %>
+    </div>
+    <div class="space_center"></div>
+    <div class="row" >
+      <div class="center">
+        <%= link_to t('user.all_n', :count => User.count), users_path %> -
+        <% for u in User.distinct_initials %>
+          <%= link_to u.initial,{:letter => u.initial,:page => 1},:class => "user_letter_link" %>
+        <% end %>
+      </div>
+    </div>
+    <div class="space_center"></div>
+    <div id="list_users_ajax" class="tab_content block">
+      <%= render :partial => "users/index"%>
+    </div>
+    <div class="space_center"></div>
+  </div>
 </div>
-<%= javascript_include_tag "ajax.paginate" %>
+
+
+<div class="space_center"></div>
+
+