social_stream 1.1.12 → 2.0.0.beta1

data/base/app/views/conversations/_index.html.erb

@@ -1,11 +1,10 @@
+<div class="conversations">
+  <%= render @conversations %>
 
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-<div class="space_center"></div>
-
-
-<h2><%= t('message.' + @box) %></h2>
-<div class="conversations">  
-  <%= render :partial => 'conversations' %>
+  <%= render partial: 'layouts/more',
+             locals: {
+               path: conversations_path,
+               per_page: 9,
+               total: @conversations.total_count
+            } %>
 </div>

data/base/app/views/conversations/_show.html.erb

@@ -1,13 +1,3 @@
-<%= location(
-	link_to(t('message.' + @box), conversations_path(:box => @box),:remote => true),
-	link_to(truncate(@conversation.subject, :length => 45), conversation_path(@conversation.id,:box => @box,:page => params[:page]))
-) %>
-
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-<div class="space_center">
-</div>
 <div class="conversation_full">  
- <%= render :partial => 'conversation_full', :locals =>{:conversation => @conversation} %>
+  <%= render :partial => 'conversation_full', :locals =>{:conversation => @conversation} %>
 </div>

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

@@ -2,14 +2,16 @@
   <%=t('message.other')%>
 <% end %>
 
-<% sidebar %>
+<section id="conversations">
 
-<% content_for :javascript do %>
-  $('.pagination a').attr('data-remote', 'true');
-<% end %>
+  <%= render partial: 'toolbar/messages' %>
 
-<%= location(link_to(t('message.' + @box), conversations_path(:box => @box),:remote => true)) %>
+  <%= render :partial => 'index' %>
 
-<% toolbar :messages %>
+  <%= javascript_tag do %>
+    $(function() {
+      SocialStream.Conversation.index();
+    });
+  <% end %>
 
-<%= render :partial => 'index' %>
+</section>

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

@@ -2,11 +2,12 @@
   <%=t('message.other')%>
 <% end %>
 
-<% sidebar %>
+<section id="conversation">
+  <%= render partial: 'toolbar/messages' %>
 
-<% toolbar :messages %>
+  <%= render :partial => 'show' %>
 
-<% content_for :javascript do %>
+  <%= javascript_tag do %>
 $('.cont_conversation').validate({errorClass: "validation_error"});
 <% unless @box.eql?'trash' %>
   $("#body").cleditor({
@@ -29,5 +30,4 @@ $('.cont_conversation').validate({errorClass: "validation_error"});
 		}
 <% end %>
 <% end %>
-
-<%= render :partial => 'show' %>
+</section>

data/base/app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,14 @@
+<section id="confirmation">
+  <h2>Resend confirmation instructions</h2>
+
+  <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+    <%= devise_error_messages! %>
+
+    <div><%= f.label :email %><br />
+    <%= f.email_field :email, :autofocus => true %></div>
+
+    <div><%= f.submit "Resend confirmation instructions" %></div>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
+</section>

data/base/app/views/devise/passwords/edit.html.erb

@@ -1,21 +1,30 @@
 <div id="login">
-  <h2><%= t('devise.passwords.update') %></h2>
-  <div class="space_height">
+  <h2>
+    <%= t('devise.passwords.update') %>
+  </h2>
+</div>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+<%= devise_error_messages! %>
+<%= f.hidden_field :reset_password_token %>
+<div class="line">
+  <div class="label">
+    <%= f.label :password %>
+  </div>
+  <div class="field">
+    <%= f.password_field :password, :class =>"field_x" %>
   </div>
-  <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-    <%= devise_error_messages! %>
-    <%= f.hidden_field :reset_password_token %>
-    <div class="line">
-      <div class="label"><%= f.label :password %></div>
-      <div class="field"><%= f.password_field :password, :class =>"field_x" %></div>
-    </div>
-    <div class="line">
-      <div class="label"><%= f.label :password_confirmation %></div>
-      <div class="field"><%= f.password_field :password_confirmation, :class =>"field_x" %></div>
-    </div>
-    <div class="space_height"></div>
-    <div class="btn_login">
-      <%= f.submit "Change my password" %>
-    </div>
-  <% end %>
 </div>
+<div class="line">
+  <div class="label">
+    <%= f.label :password_confirmation %>
+  </div>
+  <div class="field">
+    <%= f.password_field :password_confirmation, :class =>"field_x" %>
+  </div>
+</div>
+
+
+  <%= f.submit "Change my password", :class =>"btn" %>
+
+  <% end %>
+

data/base/app/views/devise/passwords/new.html.erb

@@ -1,27 +1,30 @@
-<% content_for :headers do%>
-  <%= render :partial => 'layouts/devise_style' %>
-<%end%>
-<div id="welcome">
-  <div id="login" class="block">
-    <h2><%= t('devise.passwords.forgot') %></h2>
-    <div class="space_center"></div>
-    <div class="space_center"></div>
+<section id="forgot-pass">
+  <section class="forgot-img">
+    
+  </section>
+  <section class="forgot">
+    <header>
+    <h2>
+      <%= t('devise.passwords.forgot') %>
+    </h2>
+
     <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
       <%= devise_error_messages! %>
-      <div class="instructions"><%= t('devise.passwords.instructions') %></div>
-      <div class="form_row">
-        <div class="form_label"<%= f.label :email %></div>
-        <div class="form_field"><%= f.text_field :email, :class => "form_tag" %></div>
-      </div>
+      <h4>
+        <%= t('devise.passwords.instructions') %>
+      </h4>
+    </header>
+
+    <section class="password">
+      <%= f.label :email %>
 
-      <div id="devise_links">
-        <%= render :partial => "devise/shared/links" %>
-      </div>
+      <%= f.text_field :email, :class => "form_tag" %>
+        
+      <%= f.submit t('action.send'), :class =>"btn" %>
+      
+      <hr class="soften">
 
-      <div class="space_center"></div>
-      <div class="btn_login">
-        <%= f.submit t('action.send'), :class =>"button" %>
-      </div>
+      <%= render :partial => "devise/shared/links" %>
+    </section>
     <% end %>
-  </div>
-</div>
+</section>

data/base/app/views/devise/registrations/_delete_account.html.erb

@@ -1,20 +1,12 @@
-<div class="block" id="cancel_account">
-  <div class="header">
-    <div class="header_text">
-      <%= t("account.cancel")%>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"cancel_account\");" %>
-    </div>
-  </div>
-  <div id="cancel_account_briefing" class="settings_briefing content">
-    <div class="form_row">
-      <%= t('settings.cancel_account.briefing')%>
-    </div>
-  </div>
-  <div class="content settings_content" id="cancel_account_content" style="display:none;">
-    <div class="form_row">
-      Unhappy? <b><%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</b>
-    </div>
+<div id="cancel_account" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t('settings.cancel_account.briefing'), "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#cancel_account_content" %>
+    </h5>
+  </header>
+  
+  <div class="content settings_content collapse" id="cancel_account_content">
+    Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>
   </div>
+
 </div>

data/base/app/views/devise/registrations/_edit_user.html.erb

@@ -1,87 +1,69 @@
 <% content_for :javascript do %>
 $(".user_edit").validate({errorClass: "validation_error"});
 <%end%>
-<div class="block" id="password_form">
-  <div class="header">
-    <div class="header_text">
-      <%= t("account.password.change")%>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"password_form\");" %>
-    </div>
-  </div>
-  <div id="password_form_briefing" class="settings_briefing content">
-    <div class="form_row">
-      <%= t('settings.password_change.briefing')%>
-    </div>
-  </div>
-  <div class="content settings_content" id="password_form_content" style="display:none;">
+
+<div id="password_form" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t("settings.password_change.briefing"),  "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#password_form_content" %>
+    </h5>
+  </header>
+
+  <div class="content settings_content collapse" id="password_form_content">
     <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
-    <div class="form_row">
+
       <div class="form_label">
         <%= f.label t('account.password.new') %>
       </div>
       <div class="form_field">
         <%= f.password_field :password, :class => "form_tag" %>
       </div>
-    </div>
-    <div class="form_row">
+
       <div class="form_label">
         <%= f.label t('account.password.retype') %>
       </div>
       <div class="form_field">
         <%= f.password_field :password_confirmation, :class => "form_tag" %>
       </div>
-    </div>
-    <div class="form_row">
+
       <div class="form_label">
         <%= f.label :current_password %>
       </div>
       <div class="form_field">
         <%= f.password_field :current_password, :class => "form_tag" %>
       </div>
-    </div>
-    <div class="form_row space_center">
-      <%= f.submit t('button.update'), :class => "button" %>
-    </div>
+
+      <%= f.submit t('button.update'), :class => "btn" %>
     <% end%>
   </div>
 </div>
-<div class="block" id="email_form">
-  <div class="header">
-    <div class="header_text">
-      <%= t("account.email.change")%>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"email_form\");" %>
-    </div>
-  </div>
-  <div id="email_form_briefing" class="settings_briefing content">
-    <div class="form_row">
-      <%= t('settings.email_change.briefing')%>
-    </div>
-  </div>
-  <div class="content settings_content" id="email_form_content" style="display:none;">
+
+<div id="email_form" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t("settings.email_change.briefing"),  "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => "collapse", "data-parent" => "#settings-accordion", 'data-target' => '#email_form_content' %>
+    </h5>
+  </header>
+
+  <div class="content settings_content collapse" id="email_form_content">
     <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
-    <div class="form_row">
+
       <div class="form_label">
         <%= f.label :email %>
       </div>
       <div class="form_field">
         <%= f.email_field :email, :class => "required form_tag" %>
       </div>
-    </div>
-    <div class="form_row">
+
       <div class="form_label">
         <%= f.label :current_password %>
       </div>
       <div class="form_field">
         <%= f.password_field :current_password, :class => "required form_tag" %>
       </div>
-    </div>
-    <div class="form_row space_center">
-      <%= f.submit t('button.update'), :class => "button" %>
-    </div>
+
+      <%= f.submit t('button.update'), :class => "btn" %>
+
     <% end%>
   </div>
 </div>

data/base/app/views/devise/registrations/edit.html.erb

@@ -1,21 +1,15 @@
-<% toolbar :profile, :subject => current_subject %>
-
-<% sidebar %>
-
 <%= location(t('account.one'), 
   link_to(t('settings.main'), settings_path)
 ) %>
-<br class="clearfloat" />
-<div class="space_center">
-</div>
-<h2><%= t('settings.for')%> <%= current_subject.name %></h2>
-<div class="space_center">
-</div>
-<%= render :partial => "edit_user"%>
 
+<h2>
+	<%= t('settings.for')%> <%= current_subject.name %>
+</h2>
+
+<%= render :partial => "edit_user"%>
 <%= render :partial => "settings/language" %>
 <%= render :partial => "settings/notifications" %>
 <% if current_subject.respond_to? :authentication_token%>
-<%= render :partial => "settings/api_key" %>
+  <%= render :partial => "settings/api_key" %>
 <% end %>
 <%= render :partial => "delete_account"%>

data/base/app/views/devise/registrations/new.html.erb

@@ -1,44 +1,44 @@
-<% content_for :headers do%>
-  <%= render :partial => 'layouts/devise_style' %>
-<%end%>
+<section id="registration"> 
+  <section class="welcome">
+    
+  </section>
 
-<div id="welcome">
-  <div id="login" class="block">
-  <h2><%= t('sign_up').capitalize %></h2>
-  <div class="space_center"></div>
-  <div class="space_center"></div>
-  <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-    <%= devise_error_messages! %>
-    <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 class="form_row">
-      <div class="form_label"><%= f.label :email %></div>
-      <div class="form_field"><%= f.text_field :email, :class =>"form_tag"  %></div>
-    </div>
-    <div class="form_row">
-      <div class="form_label"><%= f.label :password %></div>
-      <div class="form_field"><%= f.password_field :password, :class =>"form_tag", :id => "password"  %></div>
-    </div>
-    <div class="form_row">
-      <div class="form_label" id="user_password_confirmation_label">
+  <section class="registration">
+    <h3>
+      <%= t('sign_up').capitalize %>
+    </h3>
+
+    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+      <%= devise_error_messages! %>
+    <div class="reg-labels">
+      <%= f.label :name %>
+      
+      <%= f.text_field :name, :class =>"form_tag"  %>
+      
+      <%= f.label :email %>
+      
+      <%= f.text_field :email, :class =>"form_tag"  %>
+      
+      <%= f.label :password %>
+      
+      <%= f.password_field :password, :class =>"form_tag", :id => "password"  %>
+
+      <div id="user_password_confirmation_label">
         <%= f.label :password_confirmation %>
       </div>
-      <div class="form_field"><%= f.password_field :password_confirmation, :class =>"form_tag"  %></div>
-    </div>
-    <div class="form_row center">
-      <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-        <%= link_to t('confirmation.not_received.long'), new_confirmation_path(resource_name) %><br />
-      <% end -%>
-    </div>
-    <div id="devise_links">
-      <%= render :partial => "devise/shared/links" %>
-    </div>
-    <div class="form_row center">
-      <div class="btn_login"><%= f.submit t('action.accept').capitalize,:class=>"button storePass"%></div>
-    </div>
-  <% end %>
-</div>
+      
+      <%= f.password_field :password_confirmation, :class =>"form_tag"  %>
 
+      <%= f.submit t('action.accept').capitalize,:class=>"btn pull-right"%>
+    </div>
+    <hr class="soften">
 
+    <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+      <%= link_to t('confirmation.not_received.long'), new_confirmation_path(resource_name) %><br />
+    <% end -%>
+      
+    <%= render :partial => "devise/shared/links" %>
+      
+      <% end %>
+  </section>
+</section>