social_stream 0.4.0 → 0.4.1

data/lib/generators/social_stream/templates/public/stylesheets/default/jquery-ui.css

@@ -1,17 +1,21 @@
 /*
- * jQuery UI CSS Framework 1.8.6
+ * jQuery UI CSS Framework 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * 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
  */
 
+/*
+ * Modified for social-stream project
+ */
+
 /* Layout helpers
 ----------------------------------*/
 .ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-hidden-accessible { position: absolute !important;/* clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px);*/ }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
 .ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 .ui-helper-clearfix { display: inline-block; }
@@ -40,9 +44,9 @@
 /* Overlays */
 .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
 /*
- * jQuery UI Accordion 1.8.6
+ * jQuery UI Accordion 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -57,22 +61,23 @@
 .ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
 .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
 .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }/*
- * jQuery UI Autocomplete 1.8.6
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * 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/Autocomplete#theming
  */
-.ui-autocomplete { position: absolute; cursor: default; }	
+.ui-autocomplete { position: absolute; cursor: default; } 
 
 /* workarounds */
 * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
 
 /*
- * jQuery UI Menu 1.8.6
+ * jQuery UI Menu 1.8.11
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -81,39 +86,39 @@
  * http://docs.jquery.com/UI/Menu#theming
  */
 .ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
+  list-style:none;
+  padding: 2px;
+  margin: 0;
+  display:block;
+  float: left;
 }
 .ui-menu .ui-menu {
-	margin-top: -3px;
+  margin-top: -3px;
 }
 .ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
+  margin:0;
+  padding: 0;
+  zoom: 1;
+  float: left;
+  clear: left;
+  width: 100%;
 }
 .ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
+  text-decoration:none;
+  display:block;
+  padding:.2em .4em;
+  line-height:1.5;
+  zoom:1;
 }
 .ui-menu .ui-menu-item a.ui-state-hover,
 .ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
+  font-weight: normal;
+  margin: -1px;
 }
 /*
- * jQuery UI Button 1.8.6
+ * jQuery UI Button 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -149,15 +154,15 @@ input.ui-button { padding: .4em 1em; }
 /* workarounds */
 button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
 /*
- * jQuery UI Datepicker 1.8.6
+ * jQuery UI Datepicker 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * 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/Datepicker#theming
  */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
 .ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
 .ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
@@ -216,17 +221,17 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
     width: 200px; /*must have*/
     height: 200px; /*must have*/
 }/*
- * jQuery UI Dialog 1.8.6
+ * jQuery UI Dialog 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * 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/Dialog#theming
  */
 .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } 
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
@@ -237,9 +242,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
 /*
- * jQuery UI Progressbar 1.8.6
+ * jQuery UI Progressbar 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -247,9 +252,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  */
 .ui-progressbar { height:2em; text-align: left; }
 .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/*
- * jQuery UI Resizable 1.8.6
+ * jQuery UI Resizable 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -266,9 +271,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
 .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
 .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
- * jQuery UI Selectable 1.8.6
+ * jQuery UI Selectable 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -276,9 +281,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  */
 .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
 /*
- * jQuery UI Slider 1.8.6
+ * jQuery UI Slider 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -299,9 +304,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .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; }/*
- * jQuery UI Tabs 1.8.6
+ * jQuery UI Tabs 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -317,9 +322,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tabs .ui-tabs-hide { display: none !important; }
 /*
- * jQuery UI CSS Framework 1.8.6
+ * jQuery UI CSS Framework 1.8.11
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -567,4 +572,46 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 
 /* Overlays */
 .ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
-.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
+.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
+
+/*Modified*/
+
+#tabs{
+	border: none;
+}
+.ui-widget-header {
+  color: #2A3890;
+  font-weight: bold;
+  background: #E1EEF5;
+	border-top: none;
+	border-left: none;
+	border-right: none;
+  border-bottom: solid #D4E4EA;
+  border-width: 2px;
+}
+.ui-widget-content {
+  color: #2A3890;
+}
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+  background: #E1EEF5;
+  border: solid #D4E4EA;
+  border-width: 2px;
+  color: #2A3890;
+  font-weight: normal;
+}
+#ui-datepicker-div{
+  font-size: 12px;
+}
+
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
+color: #CAD8F3;
+text-decoration: none;
+}
+
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
+color: #2A3890;
+}
+
+.ui-tabs .ui-tabs-nav {
+  background-color: white;
+}

data/lib/generators/social_stream/templates/public/stylesheets/default/messages.css

@@ -0,0 +1,44 @@
+/******************** Common ***********************/
+.pagination {
+	padding: 5px 5px 5px 5px;
+	text-align: center;
+}
+/******************* Message ***********************/
+
+/***************** Conversation ********************/
+.conversation {
+	color: #2A3890;
+	padding: 5px 5px 5px 5px;
+	width:549px;
+}
+.conversation .content_left{
+	float:left;
+	width:25%;
+}
+.conversation .content_right{
+	float:left;
+	width:60%;
+}
+.active {
+	border:1px solid #E0EEF5;
+	background-color: #E0EEF5;
+}
+.conversation .actor_photo {
+	float:left;
+	padding: 0px 5px 0px 0px;
+}
+.conversation .action {
+	float:right;
+}
+.conversation .actor_name {
+	//border:1px solid #000000;
+}
+.conversation .subject {
+	//border:1px solid #000000;
+}
+.conversation .date {
+	//border:1px solid #000000;
+}
+.conversation .briefing {
+	//border:1px solid #000000;
+}

data/lib/social_stream/rails.rb

@@ -48,6 +48,10 @@ module SocialStream
       end
     end
 
+    initializer "social_stream.mime_types" do
+      Mime::Type.register 'application/xrd+xml', :xrd
+    end
+
     initializer "social_stream.controller_helpers" do
       ActiveSupport.on_load(:action_controller) do
         include SocialStream::Controllers::Helpers

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

data/social_stream.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('nifty-generators','~> 0.4.5')
   
   #mailboxer  
-  s.add_runtime_dependency('mailboxer','~> 0.0.8')
+  s.add_runtime_dependency('mailboxer','~> 0.0.11')
   s.add_runtime_dependency('rmagick','~> 2.13.1')
 
 end

data/spec/controllers/frontpage_controller_spec.rb

@@ -7,5 +7,10 @@ describe FrontpageController do
     get :index
     assert_response :success
   end
+
+  it "should render host_meta" do
+    get :host_meta, :format => :all
+    assert_response :success
+  end
 end
 

data/spec/controllers/subjects_controller.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe SubjectsController do
+  render_views
+
+  it "should redirect lrdd" do
+    @user = Factory(:user)
+
+    get :lrdd, :id => "#{ @user.slug }@test.host"
+
+    response.should redirect_to(user_path(@user, :format => :xrd))
+  end
+end
+

data/spec/dummy/db/schema.rb

@@ -1,9 +1,18 @@
-# Use migration template
+# Use Social Stream migration template
 path = %w( .. .. .. lib generators social_stream templates migration )
 path.unshift File.dirname(__FILE__)
 
 require File.join(*path)
 
+# Use Mailboxer migration template
+finder = Gem::GemPathSearcher.new
+mailboxer_spec = finder.find('mailboxer')
+mailboxer_migration =
+  finder.matching_files(mailboxer_spec,
+                        File.join("generators", "mailboxer", "templates", "migration")).first
+require mailboxer_migration
+
 ActiveRecord::Schema.define(:version => 0) do
+  CreateMailboxer.up
   CreateSocialStream.up
 end

data/spec/support/db.rb

@@ -1,11 +1,23 @@
-require File.join(Rails.root, '../../lib/generators/social_stream/templates/migration')
+# Social Stream migration template
+require File.join(Rails.root, File.join('..', '..', 'lib', 'generators', 'social_stream', 'templates', 'migration'))
 
-begin
-  CreateSocialStream.down
-rescue
-  puts "WARNING: SocialStream migration failed to rollback"
+# Mailboxer migration template
+finder = Gem::GemPathSearcher.new
+mailboxer_spec = finder.find('mailboxer')
+mailboxer_migration =
+  finder.matching_files(mailboxer_spec,
+                        File.join('generators', 'mailboxer', 'templates', 'migration')).first
+require mailboxer_migration
+
+%w( SocialStream Mailboxer ).each do |m|
+  begin
+    "Create#{ m }".constantize.down
+  rescue
+    puts "WARNING: #{ m } migration failed to rollback" 
+  end
 end
 
+CreateMailboxer.up
 CreateSocialStream.up
 
 require File.expand_path("../../dummy/db/seeds", __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +01:00
+date: 2011-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -379,12 +379,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 9
         segments: 
         - 0
         - 0
-        - 8
-        version: 0.0.8
+        - 11
+        version: 0.0.11
   type: :runtime
   version_requirements: *id023
 - !ruby/object:Gem::Dependency 
@@ -429,12 +429,13 @@ files:
 - app/controllers/home_controller.rb
 - app/controllers/likes_controller.rb
 - app/controllers/logos_controller.rb
-- app/controllers/mailbox/conversation_controller.rb
-- app/controllers/mailbox_controller.rb
+- app/controllers/messages_controller.rb
 - app/controllers/omniauth_callbacks_controller.rb
 - app/controllers/posts_controller.rb
 - app/controllers/profiles_controller.rb
+- app/controllers/pshb_controller.rb
 - app/controllers/representations_controller.rb
+- app/controllers/subjects_controller.rb
 - app/controllers/ties_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/activities_helper.rb
@@ -485,6 +486,7 @@ files:
 - app/views/frontpage/_header.html.erb
 - app/views/frontpage/_search.html.erb
 - app/views/frontpage/_sponsor.html.erb
+- app/views/frontpage/host_meta.xml.builder
 - app/views/frontpage/index.html.erb
 - app/views/groups/_group.html.erb
 - app/views/groups/_index.html.erb
@@ -494,8 +496,6 @@ files:
 - app/views/groups/_profile.html.erb
 - app/views/groups/_sidebar_index.html.erb
 - app/views/groups/_sidebar_show.html.erb
-- app/views/groups/_tabs.html.erb
-- app/views/groups/_toolbar_show.html.erb
 - app/views/groups/edit.html.erb
 - app/views/groups/index.html.erb
 - app/views/groups/index.js.erb
@@ -520,41 +520,45 @@ files:
 - app/views/logos/index.html.erb
 - app/views/logos/new.html.erb
 - app/views/logos/show.html.erb
-- app/views/mailbox/_conversation.html.erb
-- app/views/mailbox/_conversations.html.erb
-- app/views/mailbox/_index.html.erb
-- app/views/mailbox/_location.html.erb
-- app/views/mailbox/_menu_options.html.erb
-- app/views/mailbox/_show.html.erb
-- app/views/mailbox/conversation/_conversation.html.erb
-- app/views/mailbox/conversation/_form.html.erb
-- app/views/mailbox/conversation/_location.html.erb
-- app/views/mailbox/conversation/_new.html.erb
-- app/views/mailbox/conversation/_show.html.erb
-- app/views/mailbox/conversation/edit.html.erb
-- app/views/mailbox/conversation/new.html.erb
-- app/views/mailbox/conversation/new.js.erb
-- app/views/mailbox/conversation/show.html.erb
-- app/views/mailbox/edit.html.erb
-- app/views/mailbox/index.html.erb
-- app/views/mailbox/index.js.erb
-- app/views/mailbox/new.html.erb
-- app/views/mailbox/show.html.erb
-- app/views/mailbox/show.js.erb
 - app/views/menu/_group.html.erb
 - app/views/menu/_home_user.html.erb
-- app/views/menu/_options.html.erb
+- app/views/menu/_optionsGroups.html.erb
+- app/views/menu/_optionsUser.html.erb
 - app/views/menu/_services.html.erb
 - app/views/menu/_tiesGroup.html.erb
 - app/views/menu/_tiesUser.html.erb
 - app/views/menu/_user.html.erb
+- app/views/messages/_conversation.html.erb
+- app/views/messages/_conversation_full.html.erb
+- app/views/messages/_conversations.html.erb
+- app/views/messages/_form.html.erb
+- app/views/messages/_index.html.erb
+- app/views/messages/_location.html.erb
+- app/views/messages/_menu_options.html.erb
+- app/views/messages/_new.html.erb
+- app/views/messages/_show.html.erb
+- app/views/messages/edit.html.erb
+- app/views/messages/index.html.erb
+- app/views/messages/index.js.erb
+- app/views/messages/new.html.erb
+- app/views/messages/new.js.erb
+- app/views/messages/show.html.erb
+- app/views/messages/show.js.erb
 - app/views/posts/_post.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb
 - app/views/profiles/show.html.erb
 - app/views/subjects/_contacts.html.erb
-- app/views/subjects/_menu_options.html.erb
-- app/views/subjects/_toolbar.html.erb
+- app/views/subjects/_tabs.html.erb
+- app/views/subjects/_toolbar_home.html.erb
+- app/views/subjects/_toolbar_home_menu.html.erb
+- app/views/subjects/_toolbar_home_menu_options.html.erb
+- app/views/subjects/_toolbar_home_menu_options_subjects.html.erb
+- app/views/subjects/_toolbar_logo.html.erb
+- app/views/subjects/_toolbar_profile.html.erb
+- app/views/subjects/_toolbar_profile_menu.html.erb
+- app/views/subjects/_toolbar_profile_menu_basic_options.html.erb
+- app/views/subjects/_toolbar_profile_menu_tie_options.html.erb
 - app/views/ties/_form.html.erb
 - app/views/ties/_new.html.erb
 - app/views/ties/_pendings.html.erb
@@ -568,11 +572,9 @@ files:
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
 - app/views/users/_location.html.erb
-- app/views/users/_logo.html.erb
 - app/views/users/_profile.html.erb
 - app/views/users/_sidebar_index.html.erb
 - app/views/users/_sidebar_show.html.erb
-- app/views/users/_toolbar_show.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/index.html.erb
 - app/views/users/index.js.erb
@@ -669,7 +671,6 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/twitter.png
 - lib/generators/social_stream/templates/public/images/btn/uno.png
 - lib/generators/social_stream/templates/public/images/btn/viewer.png
-- lib/generators/social_stream/templates/public/images/fcbkcomplete/close.gif
 - lib/generators/social_stream/templates/public/images/frontpage/collaborate.png
 - lib/generators/social_stream/templates/public/images/frontpage/comments.png
 - lib/generators/social_stream/templates/public/images/frontpage/green_sq.png
@@ -704,6 +705,216 @@ files:
 - lib/generators/social_stream/templates/public/images/w3c_css.png
 - lib/generators/social_stream/templates/public/images/w3c_xhtml.png
 - lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/.htaccess
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/adapters/jquery.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/ckeditor.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/ckeditor_basic.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/ckeditor_basic_source.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/ckeditor_source.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/config.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/contents.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/images/spacer.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/_languages.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/_translationstatus.txt
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/af.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/ar.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/bg.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/bn.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/bs.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/ca.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/cs.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/cy.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/da.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/de.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/el.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/en-au.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/en-ca.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/en-gb.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/en.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/eo.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/es.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/et.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/eu.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/fa.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/fi.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/fo.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/fr-ca.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/fr.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/gl.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/gu.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/he.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/hi.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/hr.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/hu.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/is.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/it.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/ja.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/km.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/ko.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/lt.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/lv.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/mn.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/ms.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/nb.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/nl.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/no.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/pl.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/pt-br.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/pt.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/ro.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/ru.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/sk.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/sl.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/sr-latn.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/sr.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/sv.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/th.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/tr.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/uk.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/vi.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/zh-cn.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/lang/zh.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/a11yhelp/lang/en.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/a11yhelp/lang/he.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/about/dialogs/about.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/about/dialogs/logo_ckeditor.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/adobeair/plugin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/autogrow/plugin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/dialog/dialogDefinition.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/div/dialogs/div.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/find/dialogs/find.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/flash/dialogs/flash.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/flash/images/placeholder.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/button.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/checkbox.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/form.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/hiddenfield.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/radio.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/select.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/textarea.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/dialogs/textfield.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/forms/images/hiddenfield.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/iframe/dialogs/iframe.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/iframe/images/placeholder.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/iframedialog/plugin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/image/dialogs/image.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/link/dialogs/anchor.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/link/dialogs/link.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/link/images/anchor.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/liststyle/dialogs/liststyle.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/pagebreak/images/pagebreak.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/pastefromword/filter/default.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/pastetext/dialogs/pastetext.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/placeholder/dialogs/placeholder.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/placeholder/lang/en.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/placeholder/placeholder.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/placeholder/plugin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/scayt/dialogs/options.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/scayt/dialogs/toolbar.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_address.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_blockquote.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_div.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_h1.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_h2.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_h3.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_h4.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_h5.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_h6.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_p.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/showblocks/images/block_pre.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/dialogs/smiley.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/angel_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/angry_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/broken_heart.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/confused_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/cry_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/devil_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/embaressed_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/envelope.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/heart.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/kiss.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/lightbulb.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/omg_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/regular_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/sad_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/shades_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/teeth_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/thumbs_down.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/thumbs_up.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/tounge_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/smiley/images/wink_smile.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/specialchar/dialogs/specialchar.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/specialchar/lang/en.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/styles/styles/default.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/table/dialogs/table.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/tableresize/plugin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/tabletools/dialogs/tableCell.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/templates/dialogs/templates.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/templates/templates/default.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/templates/templates/images/template1.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/templates/templates/images/template2.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/templates/templates/images/template3.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/dialogs/uicolor.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/lang/en.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/lang/he.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/plugin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/uicolor.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/yui/assets/yui.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/uicolor/yui/yui.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/wsc/dialogs/ciframe.html
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/wsc/dialogs/wsc.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/plugins/wsc/dialogs/wsc.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/dialog.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/editor.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/icons.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/icons_rtl.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/dialog_sides.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/dialog_sides.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/dialog_sides_rtl.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/mini.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/noimage.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/sprites.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/sprites_ie6.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/images/toolbar_start.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/skin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/kama/templates.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/dialog.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/editor.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/icons.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/icons_rtl.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/images/dialog_sides.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/images/dialog_sides.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/images/dialog_sides_rtl.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/images/mini.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/images/noimage.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/images/sprites.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/images/sprites_ie6.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/skin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/office2003/templates.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/dialog.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/editor.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/icons.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/icons_rtl.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/dialog_sides.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/dialog_sides.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/dialog_sides_rtl.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/mini.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/noimage.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/sprites.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/sprites_ie6.png
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/images/toolbar_start.gif
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/skin.js
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/templates.css
+- lib/generators/social_stream/templates/public/javascripts/ckeditor/themes/default/theme.js
 - lib/generators/social_stream/templates/public/javascripts/jqcloud-0.1.3.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui-1.8.4.custom.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui-personalized-1.5.2.packed.js
@@ -715,6 +926,7 @@ files:
 - lib/generators/social_stream/templates/public/javascripts/jquery.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.livequery.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.min.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.scrollTo.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.validate.js
 - lib/generators/social_stream/templates/public/javascripts/main.js
 - lib/generators/social_stream/templates/public/javascripts/menu-collapsed.js
@@ -730,6 +942,7 @@ files:
 - lib/generators/social_stream/templates/public/stylesheets/default/frontpage.css
 - lib/generators/social_stream/templates/public/stylesheets/default/header.css
 - lib/generators/social_stream/templates/public/stylesheets/default/home.css
+- lib/generators/social_stream/templates/public/stylesheets/default/images/fcbkcomplete/close.gif
 - lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_flat_0_aaaaaa_40x100.png
 - lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_flat_75_ffffff_40x100.png
 - lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -747,6 +960,7 @@ files:
 - lib/generators/social_stream/templates/public/stylesheets/default/jquery-ui.css
 - lib/generators/social_stream/templates/public/stylesheets/default/jquery.Jcrop.css
 - lib/generators/social_stream/templates/public/stylesheets/default/menu.css
+- lib/generators/social_stream/templates/public/stylesheets/default/messages.css
 - lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
 - lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
 - lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -785,6 +999,7 @@ files:
 - spec/controllers/likes_controller_spec.rb
 - spec/controllers/posts_controller_spec.rb
 - spec/controllers/profiles_controller_spec.rb
+- spec/controllers/subjects_controller.rb
 - spec/controllers/ties_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/.gitignore