social_stream-base 1.1.11 → 2.0.0.beta1

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

@@ -1,12 +1,39 @@
-<%= location(link_to(t('search.global.name')))%>
-<br class="clearfloat" />
-<div class="space_center"></div>
-<h2><%= t('search.name') %></h2>
-<div class="space_center"></div>
-<div id="search_form_div">
-<%= render :partial => 'form' %> 
-</div>
-<div class="space_center"></div>
-<div id="search_results" class="block">  
-    <%= render :partial => 'extended_search' %>
-</div>
+<section id="search" class="sub-content-full">
+  <h4>
+    <%= t 'explore.search.title' %>
+  </h4>
+  <!-- TODO
+  <div class="btn-group" data-toggle="buttons-checkbox">
+      <button type="button" class="btn">todo</button>
+      <button type="button" class="btn">usuarios</button>
+      <button type="button" class="btn">instituciones</button>
+      <button type="button" class="btn">publicaciones</button>
+      <button type="button" class="btn">comentarios</button>
+      <button type="button" class="btn">imagenes</button>
+      <button type="button" class="btn">videos</button>
+      <button type="button" class="btn">audios</button>
+      <button type="button" class="btn">ficheros</button>
+    </div>
+  -->
+  <%= form_tag search_path, method: :get do %>
+     <%= select_tag 'type', options_for_select(SocialStream::Search.options_for_type_select, params[:type]) %>
+
+     <%= text_field_tag :q, params[:q], class: "input-xlarge", placeholder: t('explore.search.placeholder') %>
+     <%= submit_tag t('explore.search.submit'), class: "btn btn-large" %>
+  <% end %>
+
+  <article id="search-results">
+    <%= render partial: 'search/results' %>
+
+    <%= render partial: 'layouts/more',
+               locals: {
+                 path: search_path(q: params[:q], type: params[:type]),
+                 per_page: SearchController::RESULTS_SEARCH_PER_PAGE,
+                 total: @search_result.total_count
+              } %>
+
+    <%= javascript_tag do %>
+      SocialStream.Search.show();
+    <% end %>
+  </article>
+</section>

data/app/views/search/_quick.html.erb

@@ -0,0 +1,13 @@
+<% if @search_result.present? %>
+  <ul>
+    <% @search_result.each do |model|%>
+      <li><%= render partial: "#{ model.class.to_s.tableize }/quick_search_result", object: model, as: model.class.to_s.underscore %></li>
+    <% end %>
+
+    <li class="more">
+      <%= link_to search_path(:q => params[:q]) do %>
+        <%= t('search.global.query', :query => truncate(h(params[:q]), :length => 20)) %>
+      <% end %>
+    </li>
+  </ul>
+<% end %>

data/app/views/search/_results.html.erb

@@ -0,0 +1,4 @@
+<% @search_result.each do |r| %>
+  <%= render partial: "#{ r.class.to_s.tableize }/search_result",
+             locals:  { r.class.to_s.underscore.to_sym => r }  %>
+<% end %>

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

@@ -2,8 +2,4 @@
 <%= t('search.name')%> <%= params[:q].present? ? ": #{params[:q]}" : ""%>
 <% end %>
 
-<% sidebar %>
-
-<% toolbar if user_signed_in? %>
-
-<%= render :partial => 'index' %>
+<%= render :partial => 'explore/index' %>

data/app/views/settings/_api_key.html.erb

@@ -1,18 +1,10 @@
-<div class="block" id="api_key_settings">
-    <div class="header">
-        <div class="header_text">
-            <%= t('settings.api_key.name')%>
-        </div>
-        <div class="header_icon_right">
-      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"api_key_settings\");" %>
-        </div>
-    </div>
-    <div id="api_key_settings_briefing" class="settings_briefing content">        
-        <div class="form_row">
-            <%= t('settings.api_key.briefing')%>
-        </div>
-    </div>
-    <div class="content settings_content" id="api_key_settings_content" style="display:none;">
+<div id="api_key_settings" class="accordion-group">
+    <header class="accordion-heading">
+        <h5>
+          <%= link_to t('settings.api_key.briefing'), "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#api_key_settings_content" %></h5>
+    </header>
+    
+    <div class="content settings_content collapse" id="api_key_settings_content">
         <div class="settings_block">
             <div class="form_row">
                <%=t('settings.api_key.explanation') %>: <span id="api_token"><%= current_subject.authentication_token.blank? ? t('settings.api_key.empty') : current_subject.authentication_token %></span>
@@ -23,4 +15,4 @@
 
         </div>
     </div>
-</div>
+</div>

data/app/views/settings/_destroy.html.erb

@@ -1,10 +1,10 @@
-<div class="block">
-  <div class="header">
-    <div class="header_text">
-      <%= t("#{ current_subject.class.to_s.underscore }.destroy.one")%>
-    </div>
-  </div>
-  <div class="content">
+<div class="accordion">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t("#{ current_subject.class.to_s.underscore }.destroy.one"), "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#destroy_settings_content" %>
+    </h5>
+  </header>
+  <div class="content settings_content collapse" id="destroy_settings_content">
     <div class="form_row">
       <%= t("#{ current_subject.class.to_s.underscore }.destroy.explanation") %>
       <%= link_to t("#{ current_subject.class.to_s.underscore }.destroy.go_ahead"),

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

@@ -1,8 +1,27 @@
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-<h2><%= t('settings.for')%> <%= current_subject.name %></h2>
-<div class="space_center">
-</div>
-
-<%= render_settings %>
+<section class="settings">
+  <h2><%= t('settings.for')%> <%= current_subject.name %></h2>
+
+  <div class="accordion" id="settings-accordion">
+    <% if current_subject == current_user %>
+      <%= render partial: "devise/registrations/edit_user",
+                 locals: { resource: current_user,
+                           resource_name: :user } %>
+
+      <%= render partial: "language" %>
+    <% end %>
+
+    <%= render partial: "notifications" %>
+
+    <% if current_subject.respond_to? :authentication_token %>
+      <%= render partial: 'api_key' %>
+    <% end %>
+
+    <% if current_subject == current_user %>
+      <%= render partial: "devise/registrations/delete_account",
+                 locals: { resource: current_user,
+                           resource_name: :user } %>
+    <% else %>
+      <%= render partial: 'destroy' %>
+    <% end %>
+  </div>
+</section>

data/app/views/settings/_language.html.erb

@@ -1,31 +1,22 @@
-<div class="block" id="language_settings">
-  <div class="header">
-    <div class="header_text">
- <%= t("account.lang.change")%>
-    </div>
-    <div class="header_icon_right">
- <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"language_settings\");" %>
-    </div>
-  </div>
-  <div id="lang_form_briefing" class="settings_briefing content">
-    <div class="form_row">
- <%= t('settings.lang_change.briefing')%>
-    </div>
-  </div>
-  <div class="content settings_content" id="language_settings_content" style="display:none;">
+<div id="language_settings" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t("settings.lang_change.briefing"),  "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#language_settings_content" %>
+    </h5>
+  </header>
+  
+  <div class="content settings_content collapse" id="language_settings_content">
     <%= form_tag update_all_settings_path, :method => :put, :id => 'form_lang', :remote => false do %>
-    <div class="form_row">
- <div class="form_label"><%= label_tag :language, t('settings.lang_change.name') %></div>
- <div class="form_field">
- <%= select_tag(:language, options_for_select([[t('lang.browser'), 'browser']] + I18n.available_locales.map{|l| [ t(:language_name, :locale => l.to_s), l.to_s ] }, (current_user.language.blank? ? 'browser' : current_user.language)), :class => 'form_tag', :onchange => "$(\'#form_lang\').submit();" )%>
- </div>
+    <div class="form_label">
+      <%= label_tag :language, t('settings.lang_change.name') %>
+    </div>
+    <div class="form_field">
+      <%= select_tag(:language, options_for_select([[t('lang.browser'), 'browser']] + I18n.available_locales.map{|l| [ t(:language_name, :locale => l.to_s), l.to_s ] }, (current_user.language.blank? ? 'browser' : current_user.language)), :class => 'form_tag', :onchange => "$(\'#form_lang\').submit();" )%>
     </div>
-            <div class="actions center">
-                <%= hidden_field_tag :settings_section, :language %>
+    <%= hidden_field_tag :settings_section, :language %>
 		<noscript>
-                <%= submit_tag "Update Settings", :class => "button" %>
+      <%= submit_tag "Update Settings", :class => "btn" %>
 		</noscript>
-            </div>
     <% end%>
   </div>
 </div>

data/app/views/settings/_notifications.html.erb

@@ -1,34 +1,23 @@
-<div class="block" id="notifications_settings">
-    <div class="header">
-        <div class="header_text">
-            <%= t('settings.notifications.name')%>
-        </div>
-        <div class="header_icon_right">
-      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"notifications_settings\");" %>
-        </div>
-    </div>
-    <div id="notifications_settings_briefing" class="settings_briefing content">        
-        <div class="form_row">
-            <%= t('settings.notifications.briefing')%>
-        </div>
-    </div>
-    <div class="content settings_content" id="notifications_settings_content" style="display:none;">
-        <%= form_tag update_all_settings_path, :method => :put do %>
-        <ul>
-        <div class="settings_block">
-            <div class="form_row">
-                <li><%= t('settings.notifications.by_email.name')%></li>
-            </div>
-            <div class="form_sub_row">
-                <%= radio_button_tag :notify_by_email, 'always', current_subject.notify_by_email %> <%= t('settings.notifications.by_email.always') %>
-                <%= radio_button_tag :notify_by_email, 'never', !current_subject.notify_by_email %> <%= t('settings.notifications.by_email.never') %>
-            </div>
-            <div class="actions center">
-                <%= hidden_field_tag :settings_section, :notifications %>
-                <%= submit_tag "Update Settings", :class => "button" %>
-            </div>
-        </div>
-        </ul>
-        <% end %>
+<div id="notifications_settings" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t('settings.notifications.briefing'),  "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#notifications_settings_content" %>
+    </h5>
+  </header>
+
+  <div class="content settings_content collapse" id="notifications_settings_content">
+    <%= form_tag update_all_settings_path, :method => :put do %>
+    
+    <%= t('settings.notifications.by_email.name')%>
+
+    <div class="options">          
+      <%= radio_button_tag :notify_by_email, 'always', current_subject.notify_by_email %> <%= t('settings.notifications.by_email.always') %>
+      <%= radio_button_tag :notify_by_email, 'never', !current_subject.notify_by_email %> <%= t('settings.notifications.by_email.never') %>
     </div>
+  
+   
+    <%= hidden_field_tag :settings_section, :notifications %>
+    <%= submit_tag "Update Settings", :class => "btn" %>
+    <% end %>
+  </div>
 </div>

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

@@ -2,15 +2,8 @@
   <%=t('settings.one')%>
 <% end %>
 
-<% sidebar %>
+<section id="settings">
+  <%= render partial: 'toolbar/profile', locals: { subject: current_subject } %>
 
-<% toolbar :profile, :subject => current_subject %>
-
-<% content_for :javascript do %>
-    
-<% end %>
-<%= location(t('account.one'), 
-  link_to(t('settings.main'), settings_path)
-) %>
-
-<%= render :partial => 'index' %>
+  <%= render :partial => 'index' %>
+</section>

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

@@ -0,0 +1,7 @@
+<aside id="sidebar" class="sidebar-groups">
+  <%= render partial: 'sidebar/groups_tag_cloud' %>
+
+  <% if user_signed_in? %>
+    <%= render partial: 'sidebar/suggestions_and_pendings' %>
+  <% end %>
+</aside>

data/app/views/{groups/_tag_cloud.html.erb → sidebar/_groups_tag_cloud.html.erb}

@@ -1,14 +1,11 @@
-<div class="space_center"></div>
+<header>
+  <%= image_tag('btn/btn_tag.png', :class => "header_icon") %>
+  <h5>
+    <%= t 'group.cloud' %>
+  </h5>
+</header>
+<div id="wordcloud" class="content"></div>
 
-<div class="block">
-  <div class="header">
-    <%= image_tag('btn/btn_tag.png', :class => "header_icon") %>
-    <div class="header_text">
-      <%= t 'group.cloud' %>
-    </div>
-  </div>
-  <div id="wordcloud" class="content"></div>
-</div>
 
 <% tags = ActivityObject.tag_counts %>
 

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

@@ -0,0 +1,5 @@
+<aside id="sidebar" class="sidebar-show">
+  <% if user_signed_in? %>
+    <%= render partial: 'sidebar/suggestions_and_pendings' %>
+  <% end %>
+</aside>

data/app/views/sidebar/_suggestions_and_pendings.html.erb

@@ -0,0 +1,4 @@
+<% if user_signed_in? %>
+    <%= render :partial => "contacts/suggestions" %>
+    <%= render :partial => 'contacts/pendings' %>
+<% end %>

data/app/views/subjects/_show.js.erb

@@ -1,4 +1,4 @@
-$('#wall').replaceWith("<%= escape_javascript render(:partial => 'activities/wall', :locals => { :activities => subject.wall(:profile, :for => current_subject).page(params[:page]) }) %>");
+$('#timeline').replaceWith("<%= escape_javascript render(:partial => 'activities/timeline', :locals => { :activities => subject.wall(:profile, :for => current_subject).page(params[:page]) }) %>");
 
 setActivityPrivacyTooltips();
 

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

@@ -1,8 +1,15 @@
-<%= div_for subject do %>
-  <div class="logo">
-    <%=link_to(image_tag(subject.logo.url(:actor), :class => 'btn_subject', :alt => subject.name, :title => subject.name), subject) %>
+<div class="contact">
+  <div class="avatar">
+    <%= link_to image_tag(subject.logo.url(:small)), subject %>
   </div>
-  <div class="title">
-    <%=link_to(truncate_name(subject.name), subject)%>
+
+  <div class="data">
+    <div class="name">
+      <%= link_to truncate_name(subject.name), subject %>
+    </div>
+
+    <div class="info">
+      2 contactos en comun
+    </div>
   </div>
-<% end %>
+</div>

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

@@ -0,0 +1,8 @@
+<%= div_for subject do %>
+  <div class="avatar">
+    <%=link_to(image_tag(subject.logo.url(:small), :class => 'btn_subject', :alt => subject.name, :title => subject.name), subject) %>
+  </div>
+  <div class="group_name">
+    <%=link_to(truncate_name(subject.name), subject)%>
+  </div>
+<% end %>

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

@@ -0,0 +1,18 @@
+<section class="contacts-toolbar">
+  <% if (cs = subject.contact_subjects(:direction => :sent).first(6)).present? %>
+    <h4>
+      <%= t('contacts') %>
+    </h4>
+    <span class="line"></span>
+    <ul>
+      <% cs.each do |contact| %>
+        <li>
+          <%= link_to(image_tag(contact.logo.url(:small), :alt => contact.name, :title => contact.name, :size => "small"), contact) %>
+        </li>
+      <% end %>
+    </ul>
+    <nav class="contacts-more">
+      <%= link_to t("contact.view_all"), [ profile_subject, Contact.new ] %>
+    </nav>    
+  <% end %>
+</section>

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

@@ -0,0 +1,18 @@
+<section class="groups">
+  <% if (gs = subject.contact_subjects(direction: :sent, type: :group) { |as| as.recent.first(6) }).present? %>
+    <h4>
+      <%= t('group.n', :count => subject.contact_subjects(:direction => :sent, type: :group).count) %>
+    </h4>
+    <span class="line"></span>
+    <ul>
+      <% gs.each do |g| %>
+        <li>
+          <%= link_to(image_tag(g.logo.url(:small), :alt => g.name, :title => g.name, :size => "small"), g) %>
+        </li>
+      <% end %>
+    </ul>
+    <nav class="groups-more">
+      <%= link_to t("group.view_all"), polymorphic_path([ profile_subject, Contact.new ], type: :group) %>
+    </nav>
+  <% end %>
+</section>

data/app/views/toolbar/_home.html.erb

@@ -0,0 +1,5 @@
+<section id="toolbar" class="toolbar-home">
+  <%= render partial: 'toolbar/subject' %>
+
+  <%= render partial: 'toolbar/groups', locals: { subject: current_subject } %>
+</section>

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

@@ -1,16 +1,14 @@
-<div id="logo_index">
+<div id="avatar_profile">
   <% if subject == current_subject %>
-    <div class="center">
-      <span class="title_bold" ><%= subject.name %></span>
-      <div class="logo_grid logo_full">          
-        <%= link_to image_tag(subject.logo.url(:profile), :alt => subject.name , :size => "119x119", :id => "current_avatar_img"), subject %>    
-        <div class="logo_menu logo_caption">    
-          <%= link_to t('avatar.profile_change'), avatars_path  %>
-        </div>
-      </div>        
+
+    <%= link_to image_tag(subject.logo.url(:medium), :alt => subject.name , :size => "150x150", :id => "current_avatar_img"), subject %>    
+    <div class="logo_menu logo_caption">    
+      <%= link_to t('avatar.profile_change'), polymorphic_path([subject, :profile], section: :avatar)  %>       
     </div>        
   <% else %>
-    <div class="center"><span class="title_bold" ><%= subject.name %></span></div>
-    <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x119"), subject %>
+    <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "150x150"), subject %>
+   <div class= "subject-name">
+     <%= subject.name %>
+   </div>
   <% end %>
 </div>