social_stream 1.1.12 → 2.0.0.beta1

data/base/app/views/groups/show.html.erb

@@ -1 +1,17 @@
+<% content_for :title do %>
+  <%= "#{ @group.name } | #{ t 'site.name' }" %>
+<% end %>
+
+<% content_for :description do %>
+  <% if @group.profile.description? %>
+    <%= @group.profile.description%>
+  <% else %>
+    <%= "#{ @group.name } #{ t 'profile.is_on' } #{ t 'site.name' }" %>
+  <% end %>
+<% end %>
+
+<% content_for :keywords do %>
+  <%= @group.profile.subject.tag_list%>
+<% end %>
+
 <%= render :partial => 'show' %>

data/base/app/views/home/index.html.erb

@@ -1,19 +1,9 @@
-<% sidebar %>
+<section id="home">
+  <%= render partial: 'toolbar/home' %>
 
-<%= location(link_to(t('home')+": "+ truncate_name(sanitize current_subject.name)))%>
-                      
-<% toolbar %>
+  <%= render :partial => "activities/index",
+             :locals => { section: :home,
+                          owner: current_subject } %>
 
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-
-<% if current_subject.respond_to?(:recent_groups) %>
-<div id="my_groups">
-  <%= render :partial => "groups" %>
-</div>
-<% end %>
-
-<%= render :partial => "activities/index",
-           :locals => { :activities => current_subject.wall(:home).page(params[:page]),
-                        :owner => current_subject } %>
+  <%= render partial: 'sidebar/show' %>
+</secion>

data/base/app/views/home/index.js.erb

@@ -1,5 +1,5 @@
-$('#wall').replaceWith("<%= escape_javascript render(:partial => 'activities/wall', :locals => { :activities => current_subject.wall(:home).page(params[:page]) }) %>");
+$('#timeline').replaceWith("<%= escape_javascript render(:partial => 'activities/timeline', :locals => { :activities => current_subject.wall(:home).page(params[:page]) }) %>");
 
 setActivityPrivacyTooltips();
 
-$.scrollTo('#wall', 1500,{axis:'y'});
+$.scrollTo('#timeline', 1500,{axis:'y'});

data/base/app/views/invitations/_new.html.erb

@@ -1,28 +1,20 @@
+<h2><%=t('invitation.other')%></h2>
 
-<div class="space_center"></div>
+<%= form_tag invitations_path, :method=> :post, :class => "invitation_form", :remote => true  do %> 
+  <h3>
+    <%=t('invitation.join', :site => t('site.name'))%>
+  </h3>
+  
+  <%= label_tag t('invitation.e-mails')%>
+  
+  <span class= "form_comment">(Separated by commas)</span>
+  
+  <%= text_field_tag 'mails', nil, :class => "required emails form_tag" %>
+ 
+  <%=t('invitation.text')%>
 
-<h2><%=t('invitation.other')%></h2>
+  <%= text_area_tag 'message', nil, :class => "form_tag", :maxlength => 500, :rows => 10 %>
 
-<%= form_tag invitations_path, :method=> :post, :class => "invitation_form", :remote => true  do %>
-  <div class="block">   
-    <h3 class= "form_row"><%=t('invitation.join', :site => t('site.name'))%></h3>
-    <div class="form_row form_label ">
-      <%= label_tag t('invitation.e-mails')%>
-      <span class= "form_comment">(Separated by commas)</span>
-    </div>
+  <%= submit_tag t('action.send'), :class => "btn" %>
 
-    <div class="form_row">
-      <%= text_field_tag 'mails', nil, :class => "required emails form_tag" %>
-    </div>  
-    <div class="form_row form_label">
-      <%=t('invitation.text')%>
-    </div>
-    <div class="form_row">
-      <%= text_area_tag 'message', nil, :class => "form_tag", :maxlength => 500, :rows => 10 %>
-    </div>
-  </div>
-  
-  <div class="form_row space_center">
-    <%= submit_tag t('action.send'), :class => "button" %>
-  </div>
 <%end%>

data/base/app/views/invitations/new.html.erb

@@ -1,9 +1,7 @@
-<% toolbar  %>
+<section id="new_invitation">
+  <%= render partial: 'toolbar/home' %>
 
-<% sidebar %>
+  <%= render :partial => 'new' %>
 
-<%= location(
-  link_to(t('invitation.other'), new_invitation_path)
-) %>
-
-<%= render :partial => 'new' %>
+  <%= render partial: 'sidebar/show' %>
+</section>

data/base/app/views/layouts/_account.html.erb

@@ -1,18 +1,20 @@
 <div id="account_menu">
-    <ul class="sf-menu" >
-        <li class="current" id="account">
-            <a href="#" class="sf-with-ul" id="btn_menu_account">
-            <%= t('account.one') %>
-            <span class="sf-sub-indicator"> »</span>
-            </a>
-            <ul>
-                <li>
-                    <%= link_to t('account.edit'), edit_user_registration_path %>
-                </li>
-                <li class="btn_menu_exit">
-                <%= link_to t('sign_out'), destroy_user_session_path, :method => :delete, :id => "btn_menu_account_logout"  %>
-                </li>
-            </ul>
+  <ul class="sf-menu" >
+    <li class="current" id="account">
+      <a href="#" class="sf-with-ul" id="btn_menu_account">
+        <%= t('account.one') %>
+        <span class="sf-sub-indicator">
+          »
+        </span>
+      </a>
+      <ul>
+        <li>
+          <%= link_to t('account.edit'), edit_user_registration_path %>
         </li>
-    </ul>
+        <li class="btn_menu_exit">
+          <%= link_to t('sign_out'), destroy_user_session_path, :method => :delete, :id => "btn_menu_account_logout"  %>
+        </li>
+      </ul>
+    </li>
+  </ul>
 </div>

data/base/app/views/layouts/_explanation.html.erb

@@ -0,0 +1,10 @@
+<section class="explanation">
+  <h3 class="big">
+    <%= t 'frontpage.main_title' %>
+  </h3>
+  <h4 class="lite">
+    <%= t 'frontpage.stats', users: User.count, groups: Group.count %>
+  </h4>
+
+  <%= link_to t('explore.link'), explore_path, class: 'btn' %>
+</section>

data/base/app/views/layouts/_footer.html.erb

@@ -1,16 +1,19 @@
-<div id="footerFront">
-	<div id="footer">
-    <div class="rowfooter">
+<footer class="container">
+  <ul>
+    <li>
+      <%= Date.today.year %> © 
+    </li>
+    <li id="trade_mark">
+      <%= link_to t('site.name'), 'http://social-stream.dit.upm.es/' %>
+    </li>
+    <li>
       <%= link_to(image_tag('HTML5.png'), 'http://validator.w3.org/check?uri=referer') %>
+    </li>
+    <li>
       <%= link_to(image_tag('HTML5_Styling.png'),'http://jigsaw.w3.org/css-validator/check/referer') %>
+    </li>
+    <li>
       <%= link_to(image_tag('HTML5_Semantics.png'),'http://jigsaw.w3.org/css-validator/check/referer') %>
-    </div>
-	  <ul>
-                <li><%= Date.today.year %> © </li>
-		<li id="trade_mark"><%= link_to t('site.name'), 'http://social-stream.dit.upm.es/' %></li>
-	  </ul>
-	</div>
-</div>
-
-
-
+    </li>
+  </ul>
+</footer>

data/base/app/views/layouts/_header.erb

@@ -1,5 +1,5 @@
 <% if user_signed_in? %>
-<%= render :partial => 'layouts/header_signed_in' %>
-<% else %>
-<%= render :partial => 'layouts/header_signed_out' %>
-<% end %> 
+  <%= render :partial => 'layouts/header_signed_in' %>
+  <% else %>
+  <%= render :partial => 'layouts/header_signed_out' %>
+<% end %>

data/base/app/views/layouts/_header_dropdown_menu.html.erb

@@ -1,21 +1,31 @@
-<div id="header_dropdown_menu">
-  <ul class="sf-menu" >
-    <li class="header_dropdown_li">
-      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name, :length => 15 %><span class="sf-sub-indicator"> »</span></a>
-      <ul>
-        <%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
-        <li>
-          <%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
-        </li>
-        <% if SocialStream.relation_model == :custom %>
-          <li>
-            <%= link_to t('account.privacy'), relation_customs_path %>
-          </li>
-        <% end %>
-        <li>
-          <%= link_to t('sign_out'), destroy_user_session_path, :method => :delete  %>
-        </li>
-      </ul>
+<div class="dropdown">
+
+  <%= link_to '#', class: 'dropdown-toggle', "data-toggle" => "dropdown" do %>
+    <i class='icon_navbar-settings'></i> 
+  <% end %>
+
+  <ul class="dropdown-menu">
+    <%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
+
+    <li>
+      <%= link_to t('dropdown.notifications'), notifications_path, :id => "btn_menu_settings" %>
+    </li>
+
+    <li>
+      <%= link_to t('dropdown.settings'), settings_path, :id => "btn_menu_settings" %>
+    </li>
+
+    <% if SocialStream.relation_model == :custom %>
+      <li>
+        <%= link_to t('dropdown.privacy'), relation_customs_path %>
+      </li>
+    <% end %>
+
+    <li class="divider">
+    </li>
+    
+    <li>
+      <%= link_to t('sign_out'), destroy_user_session_path, :method => :delete  %>
     </li>
   </ul>
 </div>

data/base/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -1,17 +1,17 @@
 <% representations = current_user.represented.unshift(current_user) - [current_subject] %>
-<% unless representations.empty? %>
-<li>
-  <%= link_to t('representation.switch'), "javascript:;", :class=>"session_change" %>
-  <ul>
-    <% representations.each do |representation| %>
-    <li>
-      <%= content_tag :span do %>
-        <%= link_to truncate_name(representation.name, :length => 15), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat 0% 5px;margin-left:2px;" } %>
-        <%  pending_total = representation.mailbox.notifications.not_trashed.unread.count %>
-        <%= link_to content_tag(:span, pending_total.to_s, :class => "switch_pending_count"), notifications_path(:s => representation.slug), { :style => 'margin: 1px; padding: 0;' }  if pending_total > 0 %>
+
+<% if representations.present? %>
+  <li class="dropdown-submenu pull-left">
+    <%= link_to t('representation.switch'), "#", tabindex: "-1" %>
+    <ul class="dropdown-menu dropdown-menu-header">
+      <% representations.each do |representation| %>
+      <li>
+        <%= link_to :s => representation.slug do %>
+          <%= image_tag representation.logo.url(:small) %>
+          <%= truncate_name(representation.name, :length => 15) %>
+        <% end %>
+      </li>
       <% end %>
-    </li>
-    <% end %>
-  </ul>
-</li>
+    </ul>
+  </li>
 <% end %> 

data/base/app/views/layouts/_header_signed_in.erb

@@ -1,45 +1,76 @@
-<div id="headerFront">
-  <div class="banner_top banner_top_height">
-    <div id="header_left">
-      <div id="logo_txt">
-        <%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>   
-      </div>
+<header class="navbar">
+  <nav class="navbar-inner">
+    <%= render partial: 'layouts/logo_in' %>
+    <div class="brand"></div>
+    <!-- FIXME: search javascript functionality in 'layouts/search' -->
+
+    <div class="search-mobile">
+      <i class='icon_tool16-searcher'></i>
     </div>
-    <% if user_signed_in? %>
-      <%= render :partial => 'layouts/search' %>
-    <%end%>
-    <div id="header_right">
-       <% if user_signed_in? %>
-        <div class="menu_list menu_white" id="menu_home">
-          <ul>
-            <li>
-              <%= link_to(t('home'), root_path)%>
-            </li>   
-            <li class="pipe">·</li>
-            <li>
-              <%= link_to(t('profile.one'), current_subject)%>
-            </li>            
-            <li class="pipe">·</li>
-            <li>
-              <%= link_to(t('message.other'), conversations_path) %>
-              <span id="header_inbox_count">
-              <%= link_to(current_subject.unread_messages_count.to_s, conversations_path) %>
-              </span>
-            </li>            
-            <li class="pipe">·</li>
-            <li>
-              <%= link_to(t('notification.other'), notifications_path) %>
-              <span id="header_notifications">
-              <%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
-              </span>
-            </li>
-            <li class="pipe">·</li>
-            <li>
-              <%= render :partial => 'layouts/header_dropdown_menu' %>  
-            </li>
-          </ul>
+    <div class="search-nav hidden-phone">
+      <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
+        <%= text_field_tag :q, nil, autocomplete: :off, class: 'search-query input-small', placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
+      <% end %>
+      <%= javascript_tag do %>
+        $(function() {
+          SocialStream.SearchHeader.show();
+        });
+      <% end %>
+      <div class="mat">
+        <%= render partial: 'layouts/loading' %>
+
+        <div class="query_too_short">
+          <%= t 'search.at_least', count: SocialStream::Search::MIN_QUERY %>
+        </div>
+
+        <div class="no_results">
+          <%= t 'search.nothing' %>
+        </div>
+
+        <div class="results">
         </div>
+      </div>
+    </div>
+    <div class="explore-nav hidden-phone">
+      <%= link_to explore_path do %>
+    
+        <%= t('explore.or') %>
       <% end %>
+
     </div>
-  </div>
-</div>
+     <ul class="nav pull-right">
+      <li>
+        <%= link_to current_subject do %>
+          <%= image_tag current_subject.logo.url(:small) %>
+          <span class="name hidden-phone"><%= truncate_name(current_subject.name, length: 15) %></span>
+        <% end %>
+      </li>
+      <li>
+        <%= link_to root_path do %>
+          <i class='icon_navbar-home <%= current_header_icon_class(:home) %>'></i>
+        <% end %>
+      </li>   
+      <li>
+        <%= link_to contacts_path do %>
+          <i class='icon_navbar-contacts <%= current_header_icon_class(:contacts) %>'></i>
+        <% end %>
+      </li>
+    
+      <% if SocialStream.repository_models.present? %>
+      <li>
+      <%= link_to repository_path do %>
+        <i class='icon_navbar-resources <%= current_header_icon_class(:resources) %>'></i>
+      <% end %>
+      </li>
+      <% end %>
+      <li>
+        <%= link_to conversations_path do %> 
+          <i class='icon_navbar-message <%= current_header_icon_class(:messages) %>'></i>
+        <% end %>
+      </li>              
+      <li> 
+        <%= render partial: 'layouts/header_dropdown_menu' %>
+      </li>
+    </ul>
+  </nav>
+</header>

data/base/app/views/layouts/_header_signed_out.erb

@@ -1,34 +1,7 @@
-<div id="headerFront">
-  <div class="banner_top">
-    <div id="logo">
-      <%= link_to(image_tag('logo.png', :alt => t('site.name')), '/'); %>
-    </div>
-    <% unless params[:controller].eql? 'devise/sessions' and params[:action].eql? 'new' %> 
-    <div class="div_login">
-      <%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
-      <div id="login_data">
-        <div class="login_data_block">
-          <span><%= f.label :email %></span>
-          <%= f.email_field :email, :class => "input_username" %>
-        </div>
-        <div class="login_data_block">
-          <span><%= f.label :password %></span>
-          <%= f.password_field :password, :class => "input_username" %>
-        </div>
-        
-        <div class="login_data_block">
-          <%= f.submit t(:sign_in), :class => 'other_blue storePass'%>
-        </div>
-      </div>
-      <div class="options">
-        <%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %> 
-        <span>|</span>
-        <%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %> 
-        <%= render :partial => "frontpage/social_networks" %>
-      </div>
-      <% end -%>
-    </div>
-    <% end %>
-    <br class="clearfloat" />
+<header class="headerFront <%= header_logo_class %>">
+  <%= render partial: 'layouts/logo-out' %>
+  <div class="brand">
   </div>
-</div>
+  <% unless params[:controller].eql? 'devise/sessions' and params[:action].eql? 'new' %> 
+  <% end %>
+</header>