social_stream-base 0.7.0 → 0.7.1

data/app/assets/stylesheets/activities.css

@@ -1,3 +1,8 @@
+/*
+ *= require jquery-ui
+ */
+
+
 /****************** WALL - ACTIVITIES *********************/
 #wrapper_activities {}
 #wall{	text-align:center;}

data/app/assets/stylesheets/contacts.css

@@ -54,7 +54,7 @@ span.ui-helper-hidden {
   display: none;
 }
 
-label {
+#contact-form label {
   display: block;
   font-family: sans-serif;
   padding: 2px;

data/app/assets/stylesheets/conversations.css

@@ -0,0 +1,3 @@
+/*
+ *= require messages
+ */

data/app/assets/stylesheets/groups.css

@@ -0,0 +1,5 @@
+/*
+ *= require jqcloud
+ *= require fcbkComplete
+ *= require smoothness/jquery-ui-1.8.4.custom
+ */

data/app/assets/stylesheets/invitations.css

@@ -0,0 +1,3 @@
+/*
+ *= require jquery-ui
+ */

data/app/assets/stylesheets/messages.css

@@ -1,3 +1,7 @@
+/*
+ *= require fcbkComplete
+ */
+
 /******************** Common ***********************/
 
 .pagination {

data/app/assets/stylesheets/profiles.css

@@ -0,0 +1,4 @@
+/*
+ *= require jquery-ui
+ *= require fcbkComplete
+ */

data/app/assets/stylesheets/relation_customs.css

@@ -15,14 +15,14 @@ span.ui-helper-hidden {
 	display: none;
 }
 
-label {
+#relation_customs label, #permissions label {
 	display: block;
 	font-family: sans-serif;
 	padding: 2px;
 	margin-left: 20px;
 }
 
-label.ui-checkbox {
+#relation_customs label.ui-checkbox, #permissions label.ui-checkbox {
 	cursor: pointer;
 }
 

data/app/assets/stylesheets/social_stream-base.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree .
+ */

data/app/assets/stylesheets/toolbar.css

@@ -0,0 +1,3 @@
+/*
+ *= require menu
+ */

data/app/assets/stylesheets/users.css

@@ -0,0 +1,4 @@
+/*
+ * carousel breaks the page
+ * require carousel
+ */

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

@@ -1,8 +1,3 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "activities", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
-<% end %>
-
 <div id="wrapper_activities">
   <div id="wrapper_activities_header">
     <div id="activities_title" class="content_size">

data/app/views/comments/destroy.js.erb

@@ -1,2 +1 @@
-//delete comments
-$("#<%= dom_id(@post_activity) %>").hide();
+<%=render(:partial => 'objects/destroy') %>

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

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "contacts.css", :media => "screen, projection" %>
-<% end %>
-
 <div id="contact-form">
   <%= form_for @contact do |f| %>
     <%= hidden_field_tag "contact[relation_ids][]", "gotcha" %>

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

@@ -6,10 +6,6 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
-<% end %>
-
 <% content_for :javascript do %>
   $('.pagination a').attr('data-remote', 'true');
 <% end %>

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

@@ -3,7 +3,4 @@ $("#content").html("<%=escape_javascript(render :partial => 'index') %>");
 
 $('.pagination a').attr('data-remote', 'true');
 	  
-
-$("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));
-
 <%= toolbar :option => :messages %>

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

@@ -8,10 +8,6 @@
 
 <% toolbar :option => :messages %>
 
-<% content_for :headers do %>
-<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
-<% end %>
-
 <% content_for :javascript do %>
 $('.cont_conversation').validate();
 <% unless @box.eql?'trash' %>

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

@@ -1,7 +1,5 @@
 $("#content").html("<%= escape_javascript(render :partial => 'show') %>");
 
-$("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection")  %>"));
-
 <%= toolbar :option => :messages %>
 
 $('.cont_conversation').validate();

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

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-<% end %>   
-
 <% content_for :javascript do %>
   $(function() {
     $(".new_group").validate();

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

@@ -1,5 +1,3 @@
-<% content_for :headers, stylesheet_link_tag("jqcloud") %>
-
 <div class="space_center"></div>
 
 <div class="block">

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

@@ -1,9 +1,6 @@
 <% content_for :title do%>
   <%= t('group.other') %>
 <%end%>
-<% content_for :headers do  -%>
-  <%= stylesheet_link_tag 'smoothness/jquery-ui-1.8.4.custom'  %>
-<% end -%>
 
 <% toolbar if user_signed_in? %>
 

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

@@ -1,9 +1,6 @@
 <% content_for :title do%>
   <%= t('group.new.action')%>
 <%end%>
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-<% end %>   
 
 <% toolbar :option => 'groups' %>
 

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

@@ -4,10 +4,6 @@
   <%= render :partial => "home/sidebar" %>
 <% end %>
 
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
-<% end %>
-
 <%= location(
   link_to(image_tag("btn/btn_invitation.png", :class => "menu_icon")+t('invitation.other'), new_invitation_path)
 ) %>

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

@@ -6,9 +6,9 @@
     <title><%= yield(:title).empty? ? t('socialstream') : yield(:title)%></title>
     <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 'application' %>
+
+    <%= stylesheet_link_tag    "application" %>
+    <%= javascript_include_tag "application" %>
 
     <%= yield :headers %>
 

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

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

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

@@ -7,11 +7,6 @@
 
 <% toolbar :option => :messages %>
 
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-<% end %>
-
 <% content_for :javascript do %>
 
 	var recipients = $("#_recipients").fcbkcomplete({

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

@@ -1,8 +1,5 @@
 $("#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") %>"));
-
 <%= toolbar :option => :messages %>
 
 

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

@@ -5,10 +5,10 @@
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
   </head>
   <body>
-    <h1><%= raw decode_notification @notification.subject,@notification.object %></h1>
+    <h1><%= strip_tags decode_notification @notification.subject,@notification.notified_object %></h1>
     <blockquote>
       <p>
-        <%= raw decode_notification @notification.body,@notification.object %>
+        <%= raw decode_notification @notification.body,@notification.notified_object %>
       </p>
     </blockquote>
     <p>

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

@@ -1,9 +1,6 @@
 <% self.class.send :include, NotificationsHelper %>
-<%= strip_tags decode_notification @notification.subject,@notification.object %>
+<%= strip_tags decode_notification @notification.subject,@notification.notified_object %>
 ===============================================
-
------------------------------------------------
-<%= strip_tags decode_notification @notification.body,@notification.object  %>
------------------------------------------------
+<%= strip_tags decode_notification @notification.body,@notification.notified_object  %>
 
 Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.

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

@@ -2,12 +2,12 @@
 
 <div class="notification"></div>
 <div class="sender_photo">
-  <%if notification.object.nil? %>
+  <%if notification.notified_object.nil? %>
     <%= image_tag('logos/actor/user.png',:title => "unknown", :alt => "unknown")%>
   <%else%>
-    <%= link_to image_tag(notification.object.sender.logo.url(:actor),
-        :title => notification.object.sender.name, :alt => notification.object.sender.name),
-        notification.object.sender.subject %>
+    <%= link_to image_tag(notification.notified_object.sender.logo.url(:actor),
+        :title => notification.notified_object.sender.name, :alt => notification.notified_object.sender.name),
+        notification.notified_object.sender.subject %>
   <%end%>
 </div>
 <div class="content_left">
@@ -17,10 +17,10 @@
 </div>
 <div class="content_right">
   <div class="subject">
-    <%= raw decode_notification notification.subject,notification.object %>
+    <%= raw decode_notification notification.subject,notification.notified_object %>
   </div>
   <div class="briefing">
-    <%= raw decode_notification notification.body, notification.object %>
+    <%= raw decode_notification notification.body, notification.notified_object %>
   </div>
   <div class="clearfloat">
   </div>

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

@@ -2,10 +2,6 @@
   <%= 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 %>
@@ -16,4 +12,4 @@
 
 <% toolbar  %>
 
-<%= render :partial => 'index' %>
+<%= render :partial => 'index' %>

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

@@ -3,6 +3,3 @@ $("#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/objects/_destroy.js.erb

@@ -0,0 +1,2 @@
+$("#<%= dom_id(@post_activity) %>").hide();
+

data/app/views/posts/destroy.js.erb

@@ -1,2 +1 @@
-$("#<%= dom_id(@post_activity) %>").hide();
-
+<%=render(:partial => 'objects/destroy') %>

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

@@ -4,10 +4,6 @@
   <%= render :partial => "#{ current_subject.class.to_s.tableize }/sidebar_index" %>
 <% end %>
 
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
-<% end %>
-
 <%if params[:section].present? 
   case params[:section]
   when "about_me"
@@ -39,10 +35,6 @@ end %>
 <div class="block" id="profile_form">
   
   <% if !params[:section].present? or params[:section].eql?("tags") %>
-  	<% content_for :headers do %>
-  	  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
-  	<% end %>
-  	
   	<% content_for :javascript do %>
   	  $(function() {
   	    $(".new_group").validate();

data/app/views/relation/customs/index.html.erb

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "relation_customs.css", :media => "screen, projection" %>
-<% end %> 
-
 <% toolbar :profile => current_subject, :option => 'contacts' %>
 
 <div id="wrapper_section">   

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

@@ -8,10 +8,6 @@
 
 <% toolbar %>
 
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "settings.css", :media => "screen, projection" %>
-<% end %>
-
 <% content_for :javascript do %>
     
 <% end %>

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

@@ -2,7 +2,6 @@
     $('#api_token').html('<%= current_subject.authentication_token.blank? ? t('settings.api_key.empty') : current_subject.authentication_token %>')
 <% else %>
     $("#content").html("<%= escape_javascript(render :partial => 'index') %>");
-    $("head").append($("<%= escape_javascript(stylesheet_link_tag "settings.css", :media => "screen, projection") %>"));
     <%= toolbar %>
 <% end %>
 

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

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-<%= stylesheet_link_tag "menu", :media => "screen, projection" %>
-<% end %>
-
 <%= render :partial => 'toolbar/logo', :locals => {:subject => current_subject} %>
 
 <div class="block space_center">

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

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-<%= stylesheet_link_tag "menu", :media => "screen, projection" %>
-<% end %>
-
 <%= render :partial => 'toolbar/logo', :locals => { :subject => subject } %>
 
 <div class="block space_center">

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

@@ -4,7 +4,6 @@
   </div>
   <div id="groups_list" class="content_size">
   <% if (user.recent_groups.count) > 10 %>
-    <% content_for :headers, stylesheet_link_tag("carousel") %>
     <div id='carousel_container'>
       <div id='left_scroll'><%=image_tag("btn/group_left.png")%></div>
       <div id='carousel_inner'>

data/lib/generators/social_stream/base/install_generator.rb

@@ -33,23 +33,26 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     remove_file 'public/index.html'
   end
 
-  def create_application_layout
-    copy_file File.join(File.dirname(__FILE__),
-                        '..', '..', '..', '..',
-                        'app/views/layouts/application.html.erb'),
-              'app/views/layouts/application.html.erb'
+  def remove_application_layout
+    remove_file 'app/views/layouts/application.html.erb'
   end
 
   def create_navigation_config
     copy_file 'navigation.rb', 'config/navigation.rb'
   end
 
-  def add_javascripts
+  def require_javascripts
     inject_into_file 'app/assets/javascripts/application.js',
                      "//= require social_stream-base\n",
                      :before => '//= require_tree .'
   end
 
+  def require_stylesheets
+    inject_into_file 'app/assets/stylesheets/application.css',
+                     " *= require social_stream-base\n",
+                     :before => ' *= require_tree .'
+  end
+
   def create_migration_file
     require 'rake'
     Rails.application.load_tasks

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.0".freeze
+    VERSION = "0.7.1".freeze
   end
 end

data/social_stream-base.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.3.3')
+  s.add_runtime_dependency('mailboxer','~> 0.4.0')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging

data/spec/dummy/db/schema.rb

@@ -1,7 +1,12 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'support', 'migrations')
 
 ActiveRecord::Schema.define(:version => 0) do
-  CreateMailboxer.up
+  # Mailboxer
+  mailboxer_path = Gem::GemPathSearcher.new.find('mailboxer').full_gem_path
+  mailboxer_migration = File.join([mailboxer_path,'db', 'migrate'])
+  ActiveRecord::Migrator.migrate mailboxer_migration
+  #SocialStream
   CreateSocialStream.up
+  #ActAsTaggable
   ActsAsTaggableOnMigration.up
 end

data/spec/support/db.rb

@@ -1,28 +1,32 @@
 require File.join(File.dirname(__FILE__), 'migrations')
 
+
 begin
   ActsAsTaggableOnMigration.down
 rescue
-  puts "WARNING: ActsAsTaggableOnMigration failed to rollback" 
+  puts "WARNING: ActsAsTaggableOnMigration failed to rollback"
 end
 
-%w(Mailboxer).each do |m|
-  begin
-    "Create#{ m }".constantize.down
-  rescue
-    puts "WARNING: #{ m } migration failed to rollback" 
-  end
+mailboxer_path = Gem::GemPathSearcher.new.find('mailboxer').full_gem_path
+mailboxer_migration = File.join([mailboxer_path,'db', 'migrate'])
+
+begin
+  ActiveRecord::Migrator.migrate mailboxer_migration, 0
+rescue
+  puts "WARNING: Mailboxer migration failed to rollback"
 end
 
 begin
   ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__), 0
 rescue
-  puts "WARNING: Social Stream Base failed to rollback" 
+  puts "WARNING: Social Stream Base failed to rollback"
 end
 
-CreateMailboxer.up
+
 ActsAsTaggableOnMigration.up
 
+ActiveRecord::Migrator.migrate mailboxer_migration
+
 # Run any available migration
 ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__)
 

data/spec/support/migrations.rb

@@ -2,9 +2,5 @@ require 'social_stream/migration_finder'
 
 # acts-as-taggable-on
 SocialStream::MigrationFinder.new 'acts-as-taggable-on',
-                   ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
-
-# Mailboxer
-SocialStream::MigrationFinder.new 'mailboxer',
-                    ['generators', 'mailboxer', 'templates', 'migration']
+                    ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +02:00
+date: 2011-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,12 +205,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 3
-        version: 0.3.3
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -619,11 +619,11 @@ files:
 - app/assets/javascripts/users.js
 - app/assets/stylesheets/activities.css
 - app/assets/stylesheets/base.css
-- app/assets/stylesheets/carousel.css
 - app/assets/stylesheets/contacts.css
-- app/assets/stylesheets/fcbkComplete.css
+- app/assets/stylesheets/conversations.css
 - app/assets/stylesheets/footer.css
 - app/assets/stylesheets/frontpage.css
+- app/assets/stylesheets/groups.css
 - app/assets/stylesheets/header.css
 - app/assets/stylesheets/home.css
 - app/assets/stylesheets/images/add-policy.png
@@ -642,29 +642,15 @@ files:
 - app/assets/stylesheets/images/ui-icons_454545_256x240.png
 - app/assets/stylesheets/images/ui-icons_888888_256x240.png
 - app/assets/stylesheets/images/ui-icons_cd0a0a_256x240.png
-- app/assets/stylesheets/jqcloud.css
-- app/assets/stylesheets/jquery-ui.css
-- app/assets/stylesheets/jquery.ui.slider.css
-- app/assets/stylesheets/jquery.ui.slidertheme.css
+- app/assets/stylesheets/invitations.css
 - app/assets/stylesheets/menu.css
 - app/assets/stylesheets/messages.css
+- app/assets/stylesheets/profiles.css
 - app/assets/stylesheets/relation_customs.css
 - app/assets/stylesheets/settings.css
-- app/assets/stylesheets/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- app/assets/stylesheets/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- app/assets/stylesheets/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- app/assets/stylesheets/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- app/assets/stylesheets/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- app/assets/stylesheets/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- app/assets/stylesheets/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- app/assets/stylesheets/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- app/assets/stylesheets/smoothness/images/ui-icons_222222_256x240.png
-- app/assets/stylesheets/smoothness/images/ui-icons_2e83ff_256x240.png
-- app/assets/stylesheets/smoothness/images/ui-icons_454545_256x240.png
-- app/assets/stylesheets/smoothness/images/ui-icons_888888_256x240.png
-- app/assets/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
-- app/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css
-- app/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
+- app/assets/stylesheets/social_stream-base.css
+- app/assets/stylesheets/toolbar.css
+- app/assets/stylesheets/users.css
 - app/controllers/activities_controller.rb
 - app/controllers/api_controller.rb
 - app/controllers/authentications_controller.rb
@@ -795,7 +781,6 @@ files:
 - app/views/layouts/_settings.html.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/frontpage.html.erb
-- app/views/layouts/test.html
 - app/views/likes/create.js.erb
 - app/views/likes/destroy.js.erb
 - app/views/location/_location.html.erb
@@ -824,6 +809,7 @@ files:
 - app/views/notifications/activities/_update_subject.html.erb
 - app/views/notifications/index.html.erb
 - app/views/notifications/index.js.erb
+- app/views/objects/_destroy.js.erb
 - app/views/objects/_new.html.erb
 - app/views/permissions/_index.html.erb
 - app/views/permissions/index.js.erb
@@ -1199,6 +1185,25 @@ files:
 - vendor/assets/javascripts/menu.js
 - vendor/assets/javascripts/superfish.js
 - vendor/assets/javascripts/ui.checkbox.js
+- vendor/assets/stylesheets/carousel.css
+- vendor/assets/stylesheets/fcbkComplete.css
+- vendor/assets/stylesheets/jqcloud.css
+- vendor/assets/stylesheets/jquery-ui.css
+- vendor/assets/stylesheets/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- vendor/assets/stylesheets/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- vendor/assets/stylesheets/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- vendor/assets/stylesheets/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- vendor/assets/stylesheets/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- vendor/assets/stylesheets/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- vendor/assets/stylesheets/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- vendor/assets/stylesheets/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- vendor/assets/stylesheets/smoothness/images/ui-icons_222222_256x240.png
+- vendor/assets/stylesheets/smoothness/images/ui-icons_2e83ff_256x240.png
+- vendor/assets/stylesheets/smoothness/images/ui-icons_454545_256x240.png
+- vendor/assets/stylesheets/smoothness/images/ui-icons_888888_256x240.png
+- vendor/assets/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
+- vendor/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css
+- vendor/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
 has_rdoc: true
 homepage: http://social-stream.dit.upm.es/
 licenses: []

data/app/assets/stylesheets/jquery.ui.slider.css

@@ -1,24 +0,0 @@
-/*
- * jQuery UI Slider @VERSION
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }

data/app/assets/stylesheets/jquery.ui.slidertheme.css

@@ -1,32 +0,0 @@
-/*
- * jQuery UI CSS Framework @VERSION
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #dfecf1/*{bgColorContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
-.ui-widget-content a { color: #222222/*{fcContent}*/; }
-.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #dfecf1/*{bgColorHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
-.ui-widget-header a { color: #222222/*{fcHeader}*/; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #dfecf1/*{bgColorDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #dfecf1/*{fcHover}*/; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #212121/*{fcHover}*/; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; }
-.ui-widget :active { outline: none; }

data/app/views/layouts/test.html

@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-EN">
-<head>
-	<script src="jquery-1.2.1.min.js" type="text/javascript"></script>
-	<script src="menu.js" type="text/javascript"></script>
-	<link rel="stylesheet" type="text/css" href="style.css" />
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Simple JQuery Accordion menu</title>
-	<!--[if lt IE 8]>
-   <style type="text/css">
-   li a {display:inline-block;}
-   li a {display:block;}
-   </style>
-   <![endif]-->
-</head>
-<body>
-
-	<ul id="menu">
-		<li>
-			<a href="#">Weblog Tools</a>
-			<ul>
-				<li><a href="http://www.pivotx.net/">PivotX</a></li>
-				<li><a href="http://www.wordpress.org/">WordPress</a></li>
-				<li><a href="http://www.textpattern.com/">Textpattern</a></li>
-				<li><a href="http://typosphere.org/">Typo</a></li>
-			</ul>
-		</li>
-		<li>
-			<a href="#">Programming Languages</a>
-			<ul>
-				<li><a href="http://www.php.net/">PHP</a></li>
-				<li><a href="http://www.ruby-lang.org/en/">Ruby</a></li>
-				<li><a href="http://www.python.org/">Python</a></li>
-				<li><a href="http://www.perl.org/">PERL</a></li>
-				<li><a href="http://java.sun.com/">Java</a></li>
-				<li><a href="http://en.wikipedia.org/wiki/C_Sharp">C#</a></li>
-			</ul>
-		</li>
-		<li><a href="http://www.i-marco.nl/weblog/">Marco's blog (no submenu)</a></li>
-		<li>
-			<a href="#">Cool Stuff</a>
-			<ul>
-				<li><a href="http://www.apple.com/">Apple</a></li>
-				<li><a href="http://www.nikon.com/">Nikon</a></li>
-				<li><a href="http://www.xbox.com/en-US/">XBOX360</a></li>
-				<li><a href="http://www.nintendo.com/">Nintendo</a></li>
-			</ul>
-		</li>
-		<li>
-			<a href="#">Search Engines</a>
-			<ul>
-				<li><a href="http://search.yahoo.com/">Yahoo!</a></li>
-				<li><a href="http://www.google.com/">Google</a></li>
-				<li><a href="http://www.ask.com/">Ask.com</a></li>
-				<li><a href="http://www.live.com/?searchonly=true">Live Search</a></li>
-			</ul>
-		</li>
-	</ul>
-
-</body>
-</html>