RubyGems - social_stream - Versions diffs - 0.4.4 → 0.4.5 - Mend

social_stream 0.4.4 → 0.4.5

Files changed (224) hide show

data/app/views/layouts/application.html.erb CHANGED Viewed

@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!-- HTML5 DOCTYPE -->
+<!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta charset="utf-8">
     <title><%= yield(:title).empty? ? t('socialstream') : yield(:title)%></title>
-    <meta name="keywords" content="SNA, social, stream, activity" >
-    <meta name="description" content= <%= yield(:description).empty? ? "" : yield(:description) %> >
+    <meta name="keywords" content="<%= t('profile.tags.default') %><%= yield(:keywords) %>" >
+    <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
     <%= stylesheet_link_tag "base", "header","home","footer",
                              :media => "screen, projection" %>
     <%= javascript_include_tag 'jquery.min', 'jquery-ui.min','rails', 'jquery.livequery', 'ui.dropdownchecklist'%>
@@ -17,7 +17,7 @@
       <%= csrf_meta_tag %>
     <% end %>
-    <script type="text/javascript" charset="utf-8">
+    <script type="text/javascript">
       $(document).ready(function() {
         <%= yield :javascript %>
       })
@@ -25,31 +25,34 @@
   </head>
   <body>
     <div id="wrapper">
-      <%= render :partial => "layouts/header" %>
+      <header><%= render :partial => "layouts/header" %></header>
       <div id="wrapper_body">
-        <div id="toolbar">
+        <nav id="toolbar">
           <div id="toolbarContent" class="block">
             <div class="space_center">
             </div>
               <%= yield :toolbar %>
           </div>
+        </nav>
+        <div id= "center_body">
+          <div id="map_location">
+            <%= yield :location %>
+          </div>
+          <div id="flash">
+            <%= render :partial => "layouts/flash", :locals => {:flash => flash} %>
+          </div>
+          <section id="content">
+            <%= yield %>
+          </section>
         </div>
-        <div id="content">
-          <% flash.each do |name, msg| %>
-            <div class="<%= name %>">
-            <%= msg %>
-            </div>
-          <% end %>
-          <%= yield %>
-        </div>
-        <div id="sidebar">
+        <aside id="sidebar">
           <div id="sidebarContent">
-              <%=  yield :sidebar %>
+              <%= yield :sidebar %>
           </div>
-        </div>
+        </aside>
         <div class="space_center white"></div>
       </div>
-      <%= render :partial => "layouts/footer" %>
+      <footer><%= render :partial => "layouts/footer" %></footer>
     </div>
   </body>
 </html>

data/app/views/layouts/frontpage.html.erb CHANGED Viewed

@@ -1,8 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!-- HTML5 DOCTYPE -->
+<!DOCTYPE html>
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="utf-8">
     <title><%= yield(:title).empty? ? t('socialstream') : yield(:title)%></title>
+    <meta name="keywords" content="<%= yield(:keywords).empty? ? t('profile.tags.default') : yield(:keywords) %>" >
+    <meta name="description" content= "<%= yield(:description).empty? ? "Home" : yield(:description) %>" >
     <%= stylesheet_link_tag "header","frontpage", "base", "footer",
                             :media => "screen, projection" %>
     <%= javascript_include_tag 'jquery', 'jquery.livequery' %>
@@ -10,7 +13,7 @@
     <% if protect_against_forgery? %>
       <%= csrf_meta_tag %>
     <% end %>
-    <script type="text/javascript" charset="utf-8">
+    <script type="text/javascript" >
     $(document).ready(function() {
       <%= yield :javascript%>
     });
@@ -19,12 +22,21 @@
   </head>
   <body>
     <div id="wrapper">
-      <%= render :partial => "frontpage/header" %>
-      <div id="wrapper_body">
-        <%= yield %>
-      </div>
-      <%= render :partial => "frontpage/sponsor" %>
-      <%= render :partial => "layouts/footer" %>
+      <header>
+        <%= render :partial => "frontpage/header" %>
+      </header>
+      <section>
+        <div id="flash">
+          <%= render :partial => "layouts/flash", :locals => {:flash => flash} %>
+        </div>
+        <div id="wrapper_body">
+          <%= yield %>
+        </div>
+        <%= render :partial => "frontpage/sponsor" %>
+      </section>
+      <footer>
+        <%= render :partial => "layouts/footer" %>
+      </footer>
     </div>
   </body>
 </html>

data/app/views/location/_location.html.erb CHANGED Viewed

@@ -1,3 +1,3 @@
-<div id="map_location" class="content_size">
+<div class="content_size">
 	<%= raw(location_body) %>
 </div>

data/app/views/messages/_new.html.erb CHANGED Viewed

@@ -1,10 +1,8 @@
 <%= location(
 	link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
 	link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
 ) %>
 <br class="clearfloat" />
 <div class="space_center"></div>
 <div class="space_center"></div>

data/app/views/notification_mailer/new_notification_email.html.erb ADDED Viewed

@@ -0,0 +1,21 @@
+<% self.class.send :include, NotificationsHelper %>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <h1>You have a new notification: <%= strip_tags decode_notification @notification.subject,@notification.object %></h1>
+    <p>
+      You have received a new notification:
+    </p>
+    <blockquote>
+      <p>
+        <%= raw decode_notification @notification.body,@notification.object %>
+      </p>
+    </blockquote>
+    <p>
+      Visit <%= link_to root_url,root_url %> and go to your notifications for more info.
+    </p>
+  </body>
+</html>

data/app/views/notification_mailer/new_notification_email.text.erb ADDED Viewed

@@ -0,0 +1,11 @@
+<% self.class.send :include, NotificationsHelper %>
+You have a new notification: <%= strip_tags decode_notification @notification.subject,@notification.object %>
+===============================================
+You have received a new notification:
+-----------------------------------------------
+<%= strip_tags decode_notification @notification.body,@notification.object  %>
+-----------------------------------------------
+Visit <%= root_url %> and go to your notifications for more info.

data/app/views/notifications/_index.html.erb ADDED Viewed

@@ -0,0 +1,21 @@
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+<div class="space_center"></div>
+<h2><%= t('notification.other') %></h2>
+<div class="read_all">
+  <%= link_to(t('notification.read_all'), update_all_notifications_path(:page => params[:page]),
+      :confirm => t('sure'),:method => :put, :remote => true) %>
+</div>
+<div class="conversations">
+  <% @notifications.each do |notification|%>
+    <% read_class = notification.is_unread?(@actor) ? 'unread' : '' %>
+    <%= render :partial => 'notification', :object => notification, :locals => {:read_class => read_class} %>
+  <% end %>
+  <%= will_paginate @notifications %>
+</div>

data/app/views/notifications/_notification.html.erb ADDED Viewed

@@ -0,0 +1,47 @@
+<%= div_for(notification, :class => read_class + ' conversation') do %>
+<div class="notification">
+</div>
+<div class="sender_photo">
+  <%= link_to image_tag(current_subject.logo.url(:actor),
+  :title => current_subject.name, :alt => current_subject.name),
+  current_subject %>
+</div>
+<div class="content_left">
+  <div class="sender_name">
+    <%#= link_to conversation.last_sender.name, conversation.last_sender.subject %>
+  </div>
+  <div class="date">
+    <%= t('time.ago', :time => time_ago_in_words(notification.created_at)) %>
+  </div>
+</div>
+<div class="content_right">
+  <div class="subject">
+    <%= raw decode_notification notification.subject,notification.object %>
+  </div>
+  <div class="briefing">
+    <%= raw decode_notification notification.body, notification.object %>
+  </div>
+  <div class="clearfloat">
+  </div>
+</div>
+<div class="action">
+  <% if notification.is_unread?(current_subject) %>
+    <%= link_to(image_tag('btn/btn_notification_delete.png', :alt => t('notification.read'),
+        :title => t('notification.read')), notification_path(notification, :page => params[:page], :read => "Read"),
+        :method => :put, :remote => true) %>
+  <% else%>
+    <%= link_to(image_tag('btn/btn_notification_delete.png', :alt => t('notification.unread'),
+        :title => t('notification.unread')), notification_path(notification, :page => params[:page], :read => "Unread"),
+        :method => :put, :remote => true) %>
+  <% end%>
+</div>
+<div class="action">
+  <%= link_to(image_tag('btn/btn_notification_delete.png', :alt => "Delete", :title => "Delete"),
+  notification_path(notification, :page => params[:page]),
+  :confirm => 'Do you want to delete "' + notification.subject,
+  :method => :delete, :remote => true) %>
+</div>
+<div class="clearfloat">
+</div>
+<% end %>

data/app/views/notifications/_show.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<div>
+  <%= @notification.body%>
+</div>

data/app/views/notifications/activities/_follow_body.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %{sender} added you as contact.
2	+

data/app/views/notifications/activities/_follow_subject.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %{sender.name} added you as contact.
2	+

data/app/views/notifications/activities/_like_body.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<% if activity.direct_object.is_a? Actor %>
+  <%= render :partial => 'notifications/activities/like_subject_body' %>
+<% else %>
+  <%= render :partial => 'notifications/activities/like_object_body'%>
+<% end %>

data/app/views/notifications/activities/_like_object_body.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %{sender} likes your %{object}.
2	+

data/app/views/notifications/activities/_like_object_subject.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %{sender.name} likes your %{object.name}
2	+

data/app/views/notifications/activities/_like_subject.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<% if activity.direct_object.is_a? Actor %>
+  <%= render :partial => 'notifications/activities/like_subject_subject' %>
+<% else %>
+  <%= render :partial => 'notifications/activities/like_object_subject' %>
+<% end %>

data/app/views/notifications/activities/_like_subject_body.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ %{sender} is now your fan.

data/app/views/notifications/activities/_like_subject_subject.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %{sender.name} is now your fan.
2	+

data/app/views/notifications/activities/_make-friend_body.html.erb ADDED Viewed

	@@ -0,0 +1,3 @@
1	+ %{sender} also added you as contact.
2	+
3	+

data/app/views/notifications/activities/_make-friend_subject.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %{sender.name} added you as contact.
2	+

data/app/views/notifications/activities/_post_body.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %{sender} added a %{object} in your wall.
2	+

data/app/views/notifications/activities/_post_subject.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ %{sender.name} added a %{object.name} in your wall

data/app/views/notifications/activities/_update_body.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ %{sender} updated a %{object} in your wall.

data/app/views/notifications/activities/_update_subject.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ %{sender.name} updated a %{object.name} in your wall

data/app/views/notifications/index.html.erb ADDED Viewed

@@ -0,0 +1,19 @@
+<% content_for :title do %>
+  <%= current_subject.name %>
+<% end %>
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<% end %>
+<% content_for :sidebar do %>
+  <%= render :partial => 'home/sidebar' %>
+<% end %>
+<%= location(
+    link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true)
+) %>
+<% toolbar  %>
+<%= render :partial => 'index' %>

data/app/views/notifications/index.js.erb ADDED Viewed

@@ -0,0 +1,8 @@
+$("#content").html("<%=escape_javascript(render :partial => 'index') %>");
+<%= location(link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true)) %>
+$('.pagination a').attr('data-remote', 'true');
+$("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));

data/app/views/notifications/show.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<% content_for :title do %>
+  <%= current_subject.name %>
+<% end %>
+<%= render :partial => 'show' %>

data/app/views/permissions/_index.html.erb ADDED Viewed

@@ -0,0 +1,39 @@
+<div id="columns_container">
+  <div id="permissions_list_block">
+    <p class="sectionTitle"><%= raw t('permission.of_relation.choose', :name => h(@relation.name)) %></p>
+    <div class="privacy_add_element"></div>
+    <table class="tableCheckBoxOptions">
+      <% default_permissions.each do |p| %>
+      <tr>
+        <td>
+          <div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
+            <input id=<%= dom_id p %> optionOf="permissions" type="checkbox"/>
+            <label for=<%= dom_id p %>><%= p.description(:brief) %></label>
+          </div>
+        </td>
+      </tr>
+      <% end %>
+    </table>
+  </div>
+  <div id="privacy_rules">
+    <p class="sectionTitle"><%= t 'privacy.rule.title' %></p>
+    <%= raw t('privacy.intro', :relation => h(@relation.name)) %>
+    <%= semantic_form_for @relation, :remote => true do |f| %>
+      <%= f.input :permissions, :as => :check_boxes, :collection => default_permissions.map{ |p| [p.description(:detailed, @relation), p.id] } %>
+      <%= f.submit t('button.save'), :class => 'button' %>
+    <% end %>
+  </div>
+</div>
+<%= javascript_tag do %>
+  $(function() {
+    initPrivacyRules();
+  })
+<% end %>

data/app/views/permissions/index.js.erb ADDED Viewed

@@ -0,0 +1,10 @@
+$('#permissions').html("<%= escape_javascript render(:partial => 'index') %>");
+$('input[id^="permission"]').checkBox();
+<% default_permissions.each do |p| %>
+  <% if @relation.permission_ids.include? p.id %>
+    $('input[id="permission_<%= p.id %>"]').checkBox('changeCheckStatus', true);
+  <% else %>
+    $('label[for="relation_custom_permission_ids_' + <%= p.id %> + '"]').parent().hide();
+  <% end %>
+<% end %>
+$('#permissions').show();

data/app/views/profiles/_contact.html.erb ADDED Viewed

@@ -0,0 +1,81 @@
+<div class="space_center"></div>
+  <div class="block" id="contact_info">
+    <div class="header">
+      <div class="header_text">
+        <%=t('profile.contact')%>
+      </div>
+      <% if is_owner? %>
+        <div class="header_icon_right">
+          <%= link_to (image_tag('/images/btn/edit.png')), :controller => :profiles , :action => :edit, :section => "contact_info"%>
+        </div>
+      <%end%>
+    </div>
+    <div class="content">
+      <% if !is_contact_empty?%>
+        <div class="sub-block"  >
+          <% if @profile.phone? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.phone')%>
+              </div>
+              <div class="field">
+                <%=h @profile.phone %>
+              </div>
+            </div>
+          <%end%>
+          <% if @profile.mobile? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.mobile')%>
+              </div>
+              <div class="field">
+                <%=h @profile.mobile %>
+              </div>
+            </div>
+          <%end%>
+          <% if @profile.fax? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.fax')%>
+              </div>
+              <div class="field">
+                <%=h @profile.fax %>
+              </div>
+            </div>
+          <%end%>
+          <% if @profile.address? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.address')%>
+              </div>
+              <div class="field">
+                <%=h @profile.address %>
+              </div>
+            </div>
+          <%end%>
+          <% if @profile.website? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.website')%>
+              </div>
+              <div class="field">
+                <a href="<%=h @profile.website %>"><%=h @profile.website %></a>
+              </div>
+            </div>
+          <%end%>
+          <% if @profile.subject.email? %>
+            <div class="row">
+              <div class="label">
+                <%=t('profile.email')%>:
+              </div>
+              <div class="field">
+                <%=h @profile.subject.email %>
+              </div>
+            </div>
+          <%end%>
+        </div>
+      <%elsif is_owner?%>
+        <%=t('profile.empty')%>
+      <%end%>
+    </div>
+  </div>