social_stream-base 0.6.8 → 0.7.0

data/app/views/contacts/_form.html.erb

@@ -1,20 +1,5 @@
 <% content_for :headers do %>
   <%= stylesheet_link_tag "contacts.css", :media => "screen, projection" %>
-  <%= javascript_include_tag 'ui.checkbox'%>
-<% end %>
-
-<%= javascript_tag do %>
-  $(function() {
-    $('input[id^="relation_custom"]').checkBox();
-  })
-	
-  function checkBoxEnable(id) {
-    $('div[contain$=' + id + ']').addClass("checked-option");
-  }
-
-  function checkBoxDisable(id) {
-    $('div[contain$='+id+']').removeClass("checked-option");
-  } 
 <% end %>
 
 <div id="contact-form">

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

@@ -1,11 +1,14 @@
+<% if params[:pending].present? %>
+  <h2><%= t('contact.pending.other') %></h2>
+<% else %>
+  <h2><%= t('contact.addressbook') %></h2>
+<% end %>
+
+<div class="space_center"></div>
 <% cont=0; %>
 
 <% @contacts.each do |contact| %>
-  <% if params[:pending].present? %>
-    <% contact = contact.sender.subject %>
-  <% else %>
     <% contact = contact.receiver.subject %>
-  <% end %>
   <% if (cont%2) == 0 %>
     <% cont+=1; %>
      <div class="row">

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

@@ -2,10 +2,6 @@
   <%= t('contact.other')%>
 <%end%>
 
-<% content_for :headers do %>
-  <%= javascript_include_tag 'jquery.ba-url','ajax.paginate' %>
-<% end %>
-
 <% content_for :sidebar do %>
   <%= render :partial => 'home/sidebar' %>
 <% end %>

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

@@ -10,7 +10,6 @@
 
 <% content_for :headers do %>
 <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
-<%= javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.js', 'jquery.validate' %>
 <% end %>
 
 <% content_for :javascript do %>

data/app/views/conversations/show.js.erb

@@ -2,8 +2,6 @@ $("#content").html("<%= escape_javascript(render :partial => 'show') %>");
 
 $("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection")  %>"));
 
-$("head").append($("<%= escape_javascript(javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.js', 'jquery.validate')  %>"));
-
 <%= toolbar :option => :messages %>
 
 $('.cont_conversation').validate();
@@ -38,4 +36,4 @@ $('.cont_conversation').validate();
 		}else{
 			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
 		}
-<% end %>
+<% end %>

data/app/views/groups/_new.html.erb

@@ -1,6 +1,5 @@
 <% content_for :headers do %>
   <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-  <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
 <% end %>   
 
 <% content_for :javascript do %>

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

@@ -14,8 +14,6 @@
 
 <%= render :partial => 'contacts/suggestions_and_pendings' %>
 
-<%= javascript_include_tag "jqcloud-0.1.3.min.js" %>
-
 <% tags = ActivityObject.tag_counts %>
 
 <script type="text/javascript">

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

@@ -2,7 +2,6 @@
   <%= t('group.other') %>
 <%end%>
 <% content_for :headers do  -%>
-  <%= javascript_include_tag 'jqcloud-0.1.3.min','jquery.ba-url','ajax.paginate' %>
   <%= stylesheet_link_tag 'smoothness/jquery-ui-1.8.4.custom'  %>
 <% end -%>
 

data/app/views/groups/new.html.erb

@@ -3,7 +3,6 @@
 <%end%>
 <% content_for :headers do %>
   <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-  <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
 <% end %>   
 
 <% toolbar :option => 'groups' %>

data/app/views/invitation_mailer/send_invitation.html.erb

@@ -1,71 +1,79 @@
-<div>
-  <div>
-    <div style="padding: 10px 5px 5px 5px;">
-      <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
-    </div>
-    <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
-      <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
-        <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
-      </div>
-      <div style=" margin: 5px 5px 5px 5px;">
-        <p style="font-weight: bold; "><%= @sender.name %>
-          <% if @sender.profile.organization? %>
-            <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @sender.profile.organization%></span>
-          <% end %>
-        </p>       
-        <% if @message.blank? %>
-          <p style="text-align: justify;"><%= t('invitation.join_me')%></p>         
-        <%else%>
-          <p style="text-align: justify; font-style: italic;">"<%= @message%>"</p>
-        <%end%>
-      </div>
-    </div>
-  </div>
-  <div style="padding: 10px 5px 5px 5px;">
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
     <div>
       <div>
-        <%= t('frontpage.share.default')%>:
+        <div style="padding: 10px 5px 5px 5px;">
+          <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
+        </div>
+        <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
+          <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
+            <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
+          </div>
+          <div style=" margin: 5px 5px 5px 5px;">
+            <p style="font-weight: bold; "><%= @sender.name %>
+              <% if @sender.profile.organization? %>
+                <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @sender.profile.organization%></span>
+              <% end %>
+            </p>       
+            <% if @message.blank? %>
+              <p style="text-align: justify;"><%= t('invitation.join_me')%></p>         
+            <%else%>
+              <p style="text-align: justify; font-style: italic;">"<%= @message%>"</p>
+            <%end%>
+          </div>
+        </div>
       </div>
-      <div>
-        <ul>
-          <li>
-            <%= t('frontpage.share.sentence1') %>
-          </li>
-          <li>
-            <%= t('frontpage.share.sentence2') %>
-          </li>
-        </ul>
-      </div>
-    </div>
-  
-    <div>
-      <div>
-        <%= t('frontpage.meet.default')%>:
-      </div>
-      <div>
-        <ul>
-          <li>
-            <%= t('frontpage.meet.sentence1') %>
-          </li>
-        </ul>
-      </div>
-    </div>
-  
-    <div>
-      <div>
-        <%= t('frontpage.collaborate.default')%>:
-      </div>
-      <div>
-        <ul>
-          <li>
-            <%= t('frontpage.collaborate.sentence1') %>
-          </li>
-          <li>
-            <%= t('frontpage.collaborate.sentence2') %>
-          </li>
-        </ul>
+      <div style="padding: 10px 5px 5px 5px;">
+        <div>
+          <div>
+            <%= t('frontpage.share.default')%>:
+          </div>
+          <div>
+            <ul>
+              <li>
+                <%= t('frontpage.share.sentence1') %>
+              </li>
+              <li>
+                <%= t('frontpage.share.sentence2') %>
+              </li>
+            </ul>
+          </div>
+        </div>
+      
+        <div>
+          <div>
+            <%= t('frontpage.meet.default')%>:
+          </div>
+          <div>
+            <ul>
+              <li>
+                <%= t('frontpage.meet.sentence1') %>
+              </li>
+            </ul>
+          </div>
+        </div>
+      
+        <div>
+          <div>
+            <%= t('frontpage.collaborate.default')%>:
+          </div>
+          <div>
+            <ul>
+              <li>
+                <%= t('frontpage.collaborate.sentence1') %>
+              </li>
+              <li>
+                <%= t('frontpage.collaborate.sentence2') %>
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
-</div>
+  </body>
+</html>
 

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

@@ -5,7 +5,6 @@
 <% end %>
 
 <% content_for :headers do %>
-  <%= javascript_include_tag 'jquery.validate' %>
   <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
 <% end %>
 
@@ -13,4 +12,4 @@
   link_to(image_tag("btn/btn_invitation.png", :class => "menu_icon")+t('invitation.other'), new_invitation_path)
 ) %>
 
-<%= render :partial => 'new' %>
+<%= render :partial => 'new' %>

data/app/views/layouts/_header.erb

@@ -1,6 +1,3 @@
-<% content_for :headers do %>
-  <%= javascript_include_tag 'hoverIntent','superfish' %>
-<% end %>
 <div id="headerFront">
   <div class="banner_top banner_top_height">
     <div id="header_left">
@@ -39,4 +36,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</div>

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

@@ -8,7 +8,7 @@
     <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','modernizr.min'%>
+    <%= javascript_include_tag 'application' %>
 
     <%= yield :headers %>
 

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

@@ -8,8 +8,6 @@
     <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' %>
-
     <%= favicon_link_tag "icons/favicon.ico" %>
 
     <% if protect_against_forgery? %>

data/app/views/message_mailer/new_message_email.html.erb

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <h1>You have a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
+    <p>
+      You have received a new message:
+    </p>
+    <blockquote>
+      <p>
+        <%= raw @message.body %>
+      </p>
+    </blockquote>
+    <p>
+      Visit <%= link_to root_url,root_url %> and go to your inbox for more info.
+    </p>
+  </body>
+</html>

data/app/views/message_mailer/new_message_email.text.erb

@@ -0,0 +1,10 @@
+You have a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
+===============================================
+ 
+You have received a new message:
+
+-----------------------------------------------
+<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
+-----------------------------------------------
+
+Visit <%= root_url %> and go to your inbox for more info.

data/app/views/message_mailer/reply_message_email.html.erb

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <h1>You have a new reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
+    <p>
+      You have received a new reply:
+    </p>
+    <blockquote>
+      <p>
+        <%= raw @message.body %>
+      </p>
+    </blockquote>
+    <p>
+      Visit <%= link_to root_url,root_url %> and go to your inbox for more info.
+    </p>
+  </body>
+</html>

data/app/views/message_mailer/reply_message_email.text.erb

@@ -0,0 +1,10 @@
+You have a new reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
+===============================================
+ 
+You have received a new reply:
+
+-----------------------------------------------
+<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
+-----------------------------------------------
+
+Visit <%= root_url %> and go to your inbox for more info.

data/app/views/messages/new.html.erb

@@ -10,7 +10,6 @@
 <% content_for :headers do %>
   <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
   <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-  <%= javascript_include_tag 'jquery.fcbkcomplete.min','jquery.validate','ckeditor/ckeditor.js','ckeditor/adapters/jquery.js' %>
 <% end %>
 
 <% content_for :javascript do %>

data/app/views/messages/new.js.erb

@@ -3,8 +3,6 @@ $("#content").html("<%= escape_javascript(render :partial => 'new') %>");
 $("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));
 $("head").append($("<%= escape_javascript(stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection") %>"));
 
-$("head").append($("<%= escape_javascript(javascript_include_tag 'jquery.fcbkcomplete.min','jquery.validate','ckeditor/ckeditor.js','ckeditor/adapters/jquery.js') %>"));
-
 <%= toolbar :option => :messages %>
 
 

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

@@ -5,17 +5,14 @@
     <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>
+    <h1><%= raw decode_notification @notification.subject,@notification.object %></h1>
     <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.
+      Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
     </p>
   </body>
 </html>

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

@@ -1,11 +1,9 @@
 <% self.class.send :include, NotificationsHelper %>
-You have a new notification: <%= strip_tags decode_notification @notification.subject,@notification.object %>
+<%= 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.
+Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.

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

@@ -1,5 +1,5 @@
 <% if activity.direct_object.is_a? Actor %>
-  %{sender.name} is now your fan.
+  %{sender} is now your fan.
 <% else %>
-  %{sender.name} likes your %{object.name} 
+  %{sender} likes your %{object.name} 
 <% end %>

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

@@ -6,13 +6,6 @@
 
 <% content_for :headers do %>
   <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
-  <%= javascript_include_tag 'jquery.validate' %>
-<% end %>
-
-<% content_for :javascript do %>
-  $(function() {
-	   $(".edit_profile").validate();
-  });
 <% end %>
 
 <%if params[:section].present? 
@@ -48,7 +41,6 @@ end %>
   <% if !params[:section].present? or params[:section].eql?("tags") %>
   	<% content_for :headers do %>
   	  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-  	  <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
   	<% end %>
   	
   	<% content_for :javascript do %>