social_stream 0.4.1 → 0.4.2

data/config/routes.rb

@@ -1,5 +1,4 @@
 Rails.application.routes.draw do
-  get "contacts/index"
   root :to => "frontpage#index"
   
   match 'home' => 'home#index', :as => :home
@@ -15,6 +14,9 @@ Rails.application.routes.draw do
   
   # PubSubHubBub
   match 'pshb/callback' => 'pshb#callback', :as => :pshb_callback
+  # Test
+  match 'pshb/test_s' => 'pshb#pshb_subscription_request'
+  match 'pshb/test_p' => 'pshb#pshb_publish'
    
   # Webfinger
   match '.well-known/host-meta',:to => 'frontpage#host_meta'
@@ -23,17 +25,21 @@ Rails.application.routes.draw do
   SocialStream.subjects.each do |actor|
     resources actor.to_s.pluralize do
       resource :profile
+      resources :activities
     end
   end
 
+  match 'contacts' => 'contacts#index', :as => 'contacts'
+
   # Find subjects by slug
   match 'subjects/lrdd/:id' => 'subjects#lrdd', :as => 'subject_lrdd'
   
   resource :representation
   
-  resources :logos
+  resources :avatars
 
   resources :messages
+  resources :conversations
   
   resources :ties do
     collection do

data/lib/generators/social_stream/install_generator.rb

@@ -1,8 +1,8 @@
 class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
   include Rails::Generators::Migration
 
-  hook_for :javascript
   hook_for :authentication
+  hook_for :messages
 
   source_root File.expand_path('../templates', __FILE__)
 

data/lib/generators/social_stream/templates/migration.rb

@@ -40,10 +40,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "activity_object_id"
-      t.string   "logo_file_name"
-      t.string   "logo_content_type"
-      t.integer  "logo_file_size"
-      t.datetime "logo_updated_at"
     end
     
     add_index "actors", "activity_object_id"
@@ -58,7 +54,18 @@ class CreateSocialStream < ActiveRecord::Migration
     end
     
     add_index "authentications", "user_id"
+
+    create_table "avatars", :force => true do |t|
+      t.integer  "actor_id"
+      t.string   "logo_file_name"
+      t.string   "logo_content_type"
+      t.integer  "logo_file_size"
+      t.datetime "logo_updated_at"
+      t.boolean  "active", :default => true
+    end
     
+    add_index "avatars", "actor_id"
+   
     create_table "comments", :force => true do |t|
       t.integer  "activity_object_id"
       t.text     "text"
@@ -84,13 +91,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "updated_at"
     end
     
-    create_table "logos", :force => true do |t|
-        t.string   "logo_file_name"
-        t.string   "logo_content_type"
-        t.integer  "logo_file_size"
-        t.datetime "logo_updated_at"
-    end
-    
+      
     create_table "posts", :force => true do |t|
       t.integer  "activity_object_id"
       t.datetime "created_at"
@@ -214,6 +215,8 @@ class CreateSocialStream < ActiveRecord::Migration
     add_foreign_key "actors", "activity_objects", :name => "actors_on_activity_object_id"
     
     add_foreign_key "authentications", "users", :name => "authentications_on_user_id"
+
+    add_foreign_key "avatars", "actors", :name => "avatars_on_actor_id"
     
     add_foreign_key "comments", "activity_objects", :name => "comments_on_activity_object_id"
     
@@ -249,6 +252,8 @@ class CreateSocialStream < ActiveRecord::Migration
     remove_foreign_key "actors", :name => "actors_on_activity_object_id"
     
     remove_foreign_key "authentications", :name => "authentications_on_user_id"
+
+    remove_foreign_key "avatars", :name => "avatars_on_actor_id"
     
     remove_foreign_key "comments", :name => "comments_on_activity_object_id"
     
@@ -279,6 +284,7 @@ class CreateSocialStream < ActiveRecord::Migration
     drop_table :activity_verbs
     drop_table :actors
     drop_table :authentications
+    drop_table :avatars
     drop_table :comments
     drop_table :groups
     drop_table :permissions

data/lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js

@@ -1,5 +1,4 @@
 $(function(){
-
     $('#search_field').live('click',function(){
         if(this.value=="Search by name"){
             this.value="";
@@ -50,4 +49,5 @@ $(function(){
     if ($.fragment().letter) {
         $(document).trigger("fragmentChange.letter");
     }
+
 });

data/lib/generators/social_stream/templates/public/javascripts/menu.js

@@ -1,99 +1,9 @@
-/* 
-Simple JQuery menu.
-HTML structure to use:
-
-Notes: 
-
-Each menu MUST have a class 'menu' set. If the menu doesn't have this, the JS won't make it dynamic
-If you want a panel to be expanded at page load, give the containing LI element the classname 'expand'.
-Use this to set the right state in your page (generation) code.
-
-Optional extra classnames for the UL element that holds an accordion:
-
-noaccordion : no accordion functionality
-collapsible : menu works like an accordion but can be fully collapsed
-
-<ul class="menu [optional class] [optional class]">
-<li><a href="#">Sub menu heading</a>
-<ul>
-<li><a href="http://site.com/">Link</a></li>
-<li><a href="http://site.com/">Link</a></li>
-<li><a href="http://site.com/">Link</a></li>
-...
-...
-</ul>
-// This item is open at page load time
-<li class="expand"><a href="#">Sub menu heading</a>
-<ul>
-<li><a href="http://site.com/">Link</a></li>
-<li><a href="http://site.com/">Link</a></li>
-<li><a href="http://site.com/">Link</a></li>
-...
-...
-</ul>
-...
-...
-</ul>
-
-Copyright 2007-2010 by Marco van Hylckama Vlieg
-
-web: http://www.i-marco.nl/weblog/
-email: marco@i-marco.nl
-
-Free to use any way you like.
-*/
-
-
-jQuery.fn.initMenu = function() {  
-    return this.each(function(){
-        var theMenu = $(this).get(0);
-        $('.acitem', this).hide();
-        $('li.expand > .acitem', this).show();
-        $('li.expand > .acitem', this).prev().addClass('active');
-        $('li a', this).click(
-            function(e) {
-                e.stopImmediatePropagation();
-                var theElement = $(this).next();
-                var parent = this.parentNode.parentNode;
-                if($(parent).hasClass('noaccordion')) {
-                    if(theElement[0] === undefined) {
-                        window.location.href = this.href;
-                    }
-                    $(theElement).slideToggle('normal', function() {
-                        if ($(this).is(':visible')) {
-                            $(this).prev().addClass('active');
-                        }
-                        else {
-                            $(this).prev().removeClass('active');
-                        }    
-                    });
-                    return false;
-                }
-                else {
-                    if(theElement.hasClass('acitem') && theElement.is(':visible')) {
-                        if($(parent).hasClass('collapsible')) {
-                            $('.acitem:visible', parent).first().slideUp('normal', 
-                            function() {
-                                $(this).prev().removeClass('active');
-                            }
-                        );
-                        return false;  
-                    }
-                    return false;
-                }
-                if(theElement.hasClass('acitem') && !theElement.is(':visible')) {         
-                    $('.acitem:visible', parent).first().slideUp('normal', function() {
-                        $(this).prev().removeClass('active');
-                    });
-                    theElement.slideDown('normal', function() {
-                        $(this).prev().addClass('active');
-                    });
-                    return false;
-                }
-            }
-        }
-    );
-});
-};
-
-$(document).ready(function() {$('.toolbar').initMenu();});
+function initMenu() {
+$('.menu ul').hide();
+$('.menu li a').click(
+function() {
+$(this).next().slideToggle('normal');
+}
+);
+}
+$(document).ready(function() {initMenu();});

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

@@ -20,16 +20,18 @@ body{font-size:1.0em;  color:#2A3890;  background-color:#ffffff; }
 margin-top: auto; margin-bottom:auto;}
 
 
- /*********** Errors SECTION *********************/
-#notice {  padding:2px;  color:#1F4A75; font-weight:bold; font-size:1.3em;  display:block; text-align:center;}
+ /*********** Notices SECTION *********************/
 .error, .notice, .success {padding:.8em;margin-bottom:1em;}
-.error{padding:.8em;margin-bottom:1em;color:red;}
-
+.notice {color:#1F4A75; font-weight:bold; font-size:1.3em; display:block; text-align:center;}
+.error{color:red;}
+.success {color: #088A08}
 
 /************Forms SECTION **************/
 input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0em;  line-height:135%;
   margin-right:4px;	color:white;	padding:1px;}
-
+textarea.new_tie_text_area{ width:100%; height: 100px; }
+.colum_field_title{ text-align: center; }
+.select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;} 
 
 /************ Forms - Buttons  SECTION ***************************/
 .myButton{ cursor:pointer;
@@ -82,6 +84,7 @@ input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0
 .block .row {	display: block;}
 .block .title{ display:inline-block; }
 .block .sub-block{	display: inline-block;  padding-left:3px; width:70%; text-align:left;}
+.block .close_add_contact {  float:right;  vertical-align:top; margin-right: 1%; }
 
 /******BLOCK TAB CONTENT  SECTION********/
 .block .tab { 	margin-top: 2px;	background: #fff;	/*border-top: thin solid #D4E4EA;*/
@@ -106,6 +109,12 @@ input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0
 .block .form_field{  display:inline-block;  padding: 0px;  width:73%;}
 .block .form_row {	display: block; padding:5px; padding-left:20px; }
 .block .label{  display:inline-block;  width:49%; }
+.block .two_columns_container {	margin-top: 5px; }
+.block .form_column_left {	display: block; padding:5px; padding-left:20px; float: left; width:60%; }
+.block .form_column_right {	display: block; padding:5px; padding-left:20px; float:right; width:30%; }
+.block .form_bottom { display: block; padding:5px; padding-left:20px; clear:both; text-align: center; }
+.block .select_relations{ padding-top:20px; text-align: center; }
+
 
 /********* Links SECTION **********/
 .tie_link a{  text-decoration:none;}

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

@@ -15,6 +15,7 @@
 #toolbar {	width: 160px;	border-color: #000;	vertical-align: top;	display: table-cell;padding: 5px 5px 5px 5px;}
 #toolbarContent{}
 #wrapper_body{background-color:#fff;}
+#content_logo{width: 779px}
 
 
 /*************** HOME ****************/

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

@@ -16,9 +16,9 @@
 ----------------------------------*/
 .ui-helper-hidden { display: none; }
 .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-reset, .activity_tabs { 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; }
+.ui-helper-clearfix, .activity_tabs { display: inline-block; }
 /* required comment for clearfix to work in Opera \*/
 * html .ui-helper-clearfix { height:1%; }
 .ui-helper-clearfix { display:block; }
@@ -564,11 +564,11 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; }
 .ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; }
 .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
-.ui-corner-top { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-top, .activity_tabs li { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; }
 .ui-corner-bottom { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
 .ui-corner-right {  -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
 .ui-corner-left { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; }
-.ui-corner-all { -moz-border-radius: 4px/*{cornerRadius}*/; -webkit-border-radius: 4px/*{cornerRadius}*/; border-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all, #tabs { -moz-border-radius: 4px/*{cornerRadius}*/; -webkit-border-radius: 4px/*{cornerRadius}*/; border-radius: 4px/*{cornerRadius}*/; }
 
 /* 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}*/; }
@@ -579,7 +579,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 #tabs{
 	border: none;
 }
-.ui-widget-header {
+.ui-widget-header, .activity_tabs {
   color: #2A3890;
   font-weight: bold;
   background: #E1EEF5;
@@ -589,7 +589,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
   border-bottom: solid #D4E4EA;
   border-width: 2px;
 }
-.ui-widget-content {
+.ui-widget-content, #tabs {
   color: #2A3890;
 }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
@@ -602,16 +602,19 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 #ui-datepicker-div{
   font-size: 12px;
 }
-
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
+.activity_tabs li{
+	display: inline;
+	list-style: none;
+}
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited, .activity_tabs a {
 color: #CAD8F3;
 text-decoration: none;
 }
 
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited, .activity_tabs .ui-tabs-selected a {
 color: #2A3890;
 }
 
-.ui-tabs .ui-tabs-nav {
+.ui-tabs .ui-tabs-nav, .activity_tabs {
   background-color: white;
 }

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

@@ -1,20 +1,17 @@
 /**************MENU***********/
-div.panel {    border: 1px #2A3890 solid;    padding: 5px;    margin-top: 0px;}
-
-
-ul.menu, ul.menu ul {list-style-type:none;  margin: 0;  padding: 0;  width: 15em; }
+ul.menu {list-style-type:none;  margin: 0;  padding: 0;  width: 15em; border-bottom: thin solid #D4E4EA; }
+ul.menu ul {list-style-type:none;  margin: 0;  padding: 0;  width: 15em;  }
 ul.menu a {  display: block;  text-decoration: none; }
-
-ul.menu li {  border-bottom: thin solid #D4E4EA; padding-left:0px;  }
+ul.menu li {  border-top: thin solid #D4E4EA; padding-left:0px;  }
 ul.menu li a, ul.menu ul.menu li a {  background: #fff;  color: #2A3890;  padding: 0.3em; padding:5px 0px 5px 0px; }
 ul.menu li a:hover, ul.menu ul.menu li a:hover {  background: #DEEFF8;  color: #2A3890;  text-decoration:none; }
 ul.menu li ul li a, ul.menu ul.menu li ul li a {  background: #fff; border-left: 5px #2A3890 solid;
   color: #2A3890;  padding-left: 10px;}
-
-
+ul.menu li ul li a:hover {  background: #DEEFF8;  border-left: 5px #2A3890 solid;  padding-left: 15px;}
 
 
 /*
+div.panel {    border: 1px #2A3890 solid;    padding: 5px;    margin-top: 0px;}
 ul.menu li ul li a:hover, ul.menu ul.menu li ul li a:hover {  background: #DEEFF8;  border-left: 5px #2A3890 solid;
     text-decoration:none;  }
 ul.menu ul.menu li a:hover { border-left: 0;    padding-left: 0.5em;}
@@ -28,6 +25,3 @@ ul.menu div.panel a:hover {    color: #2A3890;    text-decoration: underline;}
 */
 
 
-
-
-

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

@@ -4,41 +4,117 @@
 	text-align: center;
 }
 /******************* Message ***********************/
-
-/***************** Conversation ********************/
-.conversation {
+.message{
+	width:549px;
+	padding: 5px 5px 5px 5px;
+}
+.message .container{
+	float:left;
+	width:509px;
+}
+.message .header{
+	padding: 5px 5px 5px 5px;
+	background-color: #E0EEF5;
+	height:40px;
+}
+.message .body{
+	padding: 5px 5px 5px 5px;
+	border: 1px solid #E0EEF5;
+}
+.message .content_left {
+	float:left;
+	width:25%;
+}
+.message .content_right {
+	float:left;
+	width:75%;
+}
+.message .sender_photo {
+	float:left;
+	padding: 0px 5px 0px 0px;
+}
+.message .sender_name {
+}
+.message .subject {
+}
+.message .date {
+}
+.conversation_full .messages .unread .header{
+	color: #FFF;
+	background-color: #708EE5;
+}
+.conversation_full .messages .unread .body{
+	border: 1px solid #708EE5;
+}
+.conversation_full .messages .unread .subject{
+	font-weight: bold;
+}
+/*************** Full Conversation *****************/
+.conversation_full {
+}
+.conversation_full .title {
+	float:left;
+	padding: 5px 5px 5px 5px;
+}
+.conversation_full .action {
+	float:right;
+	padding: 5px 5px 5px 5px;
+}
+.conversation_full .participants {
+	border-top:1px solid #E0EEF5;
+	border-bottom:1px solid #E0EEF5;
+	padding: 5px 5px 3px 5px;
+}
+/***************** Conversations *******************/
+.conversations {
+	border-top:1px solid #E0EEF5;
+	border-bottom:1px solid #E0EEF5;
+}
+.conversations .unread {
+	background-color: #E0EEF5;
+}
+.conversations .conversation {
 	color: #2A3890;
 	padding: 5px 5px 5px 5px;
 	width:549px;
+	height:40px;
+	border-bottom:1px solid #E0EEF5;
 }
-.conversation .content_left{
+.conversations .conversation .content_left {
 	float:left;
 	width:25%;
+	padding: 7px 0px 0px 0px;
 }
-.conversation .content_right{
+.conversations .conversation .content_right {
 	float:left;
 	width:60%;
+	padding: 7px 0px 0px 0px;
 }
-.active {
-	border:1px solid #E0EEF5;
-	background-color: #E0EEF5;
-}
-.conversation .actor_photo {
+.conversations .conversation .sender_photo {
 	float:left;
-	padding: 0px 5px 0px 0px;
+	padding: 2px 5px 0px 0px;
 }
-.conversation .action {
+.conversations .conversation .action {
 	float:right;
 }
-.conversation .actor_name {
-	//border:1px solid #000000;
+.conversations .conversation .sender_name {
+}
+.conversations .conversation .subject {
+}
+.conversations .unread .subject {
+	font-weight: bold;
 }
-.conversation .subject {
-	//border:1px solid #000000;
+.conversations .conversation .date {
 }
-.conversation .date {
-	//border:1px solid #000000;
+.conversations .conversation .briefing {
+	color: #2A48A0;
+}
+.conversations .conversation .notification {
+	float:left;
+	width:5px;
+	height:100%;
+	margin: 0px 5px 0px 0px;
 }
-.conversation .briefing {
-	//border:1px solid #000000;
+.conversations .unread .notification {
+	background-color: #2A3890;
 }