social_stream 0.3.5 → 0.3.6

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

@@ -20,18 +20,19 @@
 
 <div id="my_conferences">
 		<div id="tabconference_browse" class="widget content_size">
-				<ul class="tabconference_browse">
-					<li>
-							<a href="/users"><%= t('user.all')%> (<%=User.count%>) </a>
-					</li>
-				</ul>
+
 				<div id="contacts" class="tabconference_browse">
 						<div class="space_center">
 						</div>
-                                                <div><input type="text" value="Search by name" id="search_field" class="search_input" /><%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %></div>
+                                                <div class="search_field_wrapper"><input type="text" value="Search by name" id="search_field" class="search_input" /><%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %></div>
                                                 <div class="space_center">
 						</div>
 						<div class="letters" class="content_size">
+						<ul class="tabconference_browse">
+							<li>
+                                                        <%= link_to t('user.all_n', :count => User.count), users_path %>
+							</li>
+						</ul>
                                                     <% for char in 'A'..'Z' %>
                                                       <%= link_to char,{:letter => char,:page => 1},:class => "user_letter_link" %>
                                                     <% end %>

data/bin/social_stream_heroku

@@ -0,0 +1,76 @@
+#!/bin/bash
+#Social_stream_heroku complete install
+#Arguments:
+#$1 --> Name of the folder to create the social_stream project
+EXPECTED_ARGS=1
+
+if [ $# -ne $EXPECTED_ARGS ]
+then
+  echo "Usage: `basename $0` path/to/your/application"
+  exit 1 
+fi
+
+
+#Linux packages
+echo 'Installing Linux packages'
+PACKAGES_COMMON='ruby ruby-dev rdoc irb libopenssl-ruby wget make curl aspell-es aspell-en libxml2-dev libxslt-dev libmagickcore-dev libmagickwand-dev libsqlite3-dev libmysqlclient-dev mysql-server rake git-core'
+PACKAGES_PRODUCTION='awstats logrotate nfs-common'
+sudo apt-get install $PACKAGES_COMMON
+sudo apt-get install $PACKAGES_PRODUCTION
+echo 'Done'
+
+#Rubygems
+RUBY_GEMS_VERSION='1.3.7'
+RUBY_GEMS_PACKAGE="rubygems-"${RUBY_GEMS_VERSION}".tgz"
+RUBY_GEMS_DOWNLOAD="http://rubyforge.org/frs/download.php/70696/"${RUBY_GEMS_PACKAGE}
+
+echo 'Installing Rubygems $RUBY_GEMS_VERSION'
+
+cd /tmp && wget $RUBY_GEMS_DOWNLOAD
+cd /tmp && tar zxf $RUBY_GEMS_PACKAGE
+cd /tmp/rubygems-$RUBY_GEMS_VERSION && sudo /usr/bin/ruby setup.rb
+
+sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
+echo 'Done'
+
+#Gems
+echo 'Installing Initial Gems'
+sudo gem install rails 
+sudo gem install bundler 
+sudo gem install heroku
+echo 'Done'
+
+#Social Stream 
+echo 'Creating and Setting up your Social Stream basic application'
+export PATH=$PATH:/var/lib/gems/1.8/bin
+echo 'Creating rails project'
+rails new $1 
+cd $1
+echo 'gem "social_stream"' >> Gemfile
+echo 'Updating bundle'
+bundle update
+echo 'Setting up the application'
+rails generate social_stream:install -y
+rake db:migrate
+rake db:seed
+echo 'Done'
+
+#Git repository
+echo 'Setting up your git repository'
+git init
+git add .
+git commit -m 'first commit'
+echo 'Done'
+
+#Heroku deployment
+echo '[!] Starting deploy to heroku, you will be asked your heroku username and password'
+echo '[!] If you do not have one visit http://www.heroku.com'
+echo '[!] You will also need properly configured SSH keys visit: '
+echo '[!] http://help.github.com/linux-key-setup/'
+read -p '[!] When both things are ready PRESS ANY KEY TO CONTINUE...'
+heroku create
+git push heroku master
+heroku rake db:migrate
+echo 'Done'
+
+echo 'Instalation & deployment are now complete. Visit https://api.heroku.com/myapps'

data/config/locales/en.yml

@@ -99,4 +99,5 @@ en:
     one: "User"
     other: "Users"
     all: "All users"
+    all_n: "All users (%{count})"
 

data/config/routes.rb

@@ -5,7 +5,7 @@ Rails.application.routes.draw do
   match 'home' => 'home#index', :as => :home
   match 'home' => 'home#index', :as => :user_root # devise after_sign_in_path_for
 
-  devise_for :users
+  devise_for :users, :controllers => {:omniauth_callbacks => 'omniauth_callbacks'}
   resources :users
 
   resource :representation
@@ -26,5 +26,4 @@ Rails.application.routes.draw do
   resources :posts
   resources :comments
   resources :messages
-
 end

data/lib/generators/social_stream/install_generator.rb

@@ -6,6 +6,14 @@ class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
 
   source_root File.expand_path('../templates', __FILE__)
 
+  def outh_for_devise_config
+    inject_into_file "config/initializers/devise.rb",
+                     "\n  config.omniauth :linked_in, \"ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB\", \"WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY\"
+                      \n  config.omniauth :facebook, \"129571360447856\",\"eef39dce5e20e76f77495c59623bdb38\"
+                      \n  #config.omniauth :twitter, \"wgTxO0fTpjTeSnjKC9ZHA\",\"JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI\"",
+                      :after => "  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'"
+  end
+
   def create_initializer_file
     copy_file 'initializer.rb', 'config/initializers/social_stream.rb'
   end

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

@@ -8,8 +8,8 @@ SocialStream.setup do |config|
   # Others available are:
   # :token_authenticatable, :confirmable, :lockable, :timeoutable, :validatable
   # config.devise_modules :database_authenticatable, :registerable,
-  #                       :recoverable, :rememberable, :trackable
-
+  #                       :recoverable, :rememberable, :trackable, :omniauthable
+  
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
   #

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

@@ -50,6 +50,15 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "actors", "email"
     add_index "actors", "permalink", :unique => true
 
+    create_table :authentications, :force => true do |t|
+      t.integer :user_id
+      t.string :provider
+      t.string :uid
+      t.timestamps
+    end
+    
+    add_index "authentications", "user_id"
+
     create_table "comments", :force => true do |t|
       t.integer  "activity_object_id"
       t.text     "text"
@@ -206,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 "comments", "activity_objects", :name => "comments_on_activity_object_id"
 
     add_foreign_key "groups", "actors", :name => "groups_on_actor_id"
@@ -231,6 +242,7 @@ class CreateSocialStream < ActiveRecord::Migration
 
     add_foreign_key "users", "actors", :name => "users_on_actor_id"
   end
+  
 
   def self.down
     remove_foreign_key "activities", :name => "index_activities_on_activity_verb_id"
@@ -240,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 "comments", :name => "comments_on_activity_object_id"
 
     remove_foreign_key "groups", :name => "groups_on_actor_id"
@@ -270,6 +284,7 @@ class CreateSocialStream < ActiveRecord::Migration
     drop_table :activity_objects
     drop_table :activity_verbs
     drop_table :actors
+    drop_table :authentications
     drop_table :comments
     drop_table :groups
     drop_table :messages

data/lib/generators/social_stream/templates/public/stylesheets/browse.css

@@ -2,11 +2,14 @@
 	padding: 5px;
 }
 .post_browse{
-	width:49%;
+	padding-left: 4%;
+	width:45%;
 	display:inline-block;
+	margin-bottom: 10px;
 }
 .post_browse_title{
 	font-weight:bold;
+	color: black;
 }
 .post_picture{
 	display:inline-block;
@@ -41,7 +44,6 @@
 
 
 #tabconferences_browse {
-	
 }
 
 .tabconference_browse {
@@ -52,7 +54,6 @@
 
 .tabconference_browse fondo {
 	
-	background-color: #deeff8;
 }
 
 .tabconference_browse li {
@@ -62,14 +63,13 @@
 }
 
 .tabconference_browse li a {
-	background-color: #deeff8;
 	text-decoration: none;
 	padding: 4px 3px;
 	outline: none;
+	float: left;
 }
 
 .tabconference_browse ul {
-	background: #deeff8;
 }
 
 .tabconference_browse li a:hover,
@@ -117,4 +117,46 @@
 	padding-top: 5px;
 }
 
+.letters a {
+	padding-right: 5px;
+}
+
+#ajax_loader_icon, .pagination{
+    text-align:center;
+    padding-top: 20px;
+}
+
+.letters{
+    text-align:center;
+	padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.search_input{
+    border-color: #0656a4;
+    color: #2A3890;
+    margin-left: 5px;
+    padding: 2px 2px 2px 2px;
+    border:1px solid #BDC7D8;
+}
+
+#search_button{
+    cursor: pointer;
+    margin-top: 2px;
+}
+
+#my_conferences{
+	background-color:white;
+}
+
+.search_field_wrapper{
+	margin-top:20px;
+	width:100%;
+	text-align:left;
+}
+
+.search_field_wrapper input{
+	float: left;
+}
+
 

data/lib/generators/social_stream/templates/public/stylesheets/edit_user.css

@@ -2,7 +2,6 @@
 
 .contact_link{
   color: #4A58E0;
-  text-align: center;
   text-decoration: underline;
 }
 
@@ -19,52 +18,66 @@
 	color: #6C6D6F;
 }
 
-.info_left{
-	float: left;
-}
-
-#personal_info {
-  padding-right: 4px;
-  padding-top: 30px;
-}
-
 /*Edit*/
+button, .button{
+	margin-top:10px;
+	margin-left: 10px;
+	padding: 3px 3px 3px 3px;
+	color:#FFFFFF;
+	background-color: #1F4A75;
+}
 .confirmed{
 	color: #009933;
   padding-left: 5%;
 }
-.editField{
+
+.edit_field{
 	padding-top: 5px;
+	display: table;
+	margin-left: 10px;
+}
+.edit_label{
+  width: 75px;
+	display:table-cell;
+}
+
+.edit_text {
+  border-color: #0656a4;
+  padding: 2px 5px 2px 0px;
+  border:1px solid #BDC7D8;
+	font-size: 12px;
+	width: 200px;
 }
 .error{
   color: #A2042B;
 	font-weight: bold;
 }
+
 .error_explanation{
   color: #A2042B;
 	padding-left: 5%;
 }
+
 .section_highlight{
 	border-left: none;
 	border-bottom: thin solid #D4E4EA;
 	border-top: thin solid #D4E4EA;
 	border-right: thin solid #D4E4EA;
-}
-.section_normal{
-	border-left: thin solid #D4E4EA;
-  background-color: #EEF;
+	background-color: #EEF;
 }
 
-.sectionEdit{
+.section_edit{
   border-bottom-color: #E1EEF5;
   border-bottom-style: solid;
-  /*text-decoration: underline;*/
   font-weight: bold;
   font-size: 14px;
+	margin-bottom: 1%;
 }
 #user_profile_attributes_description, #user_profile_attributes_experience{
-	width: 95% ;
-	max-width: 95% ;
+	width: 275px;
+	max-width: 350px ;
+	display:block;
+	margin-top: 5px;
 }
 
 

data/lib/generators/social_stream/templates/public/stylesheets/index.css

@@ -1,6 +1,7 @@
 /**********************************  body *******************************/
 #wrapper_body {
 	width: 960px;
+	display: table;
 	margin-left: auto;
 	margin-right: auto;
 	background-color: #fff;
@@ -33,7 +34,7 @@
 	border-right: thin solid #D4E4EA;
 	border-bottom: thin solid #D4E4EA;
 	vertical-align: top;
-	display: inline-block;
+	display: table-cell;
 	padding-top: 10px;
 	font-size: 14px;
 }
@@ -43,7 +44,7 @@
 	border-right: thin solid #D4E4EA;
 	border-bottom: thin solid #D4E4EA;
 	vertical-align: top;
-	display: inline-block;
+	display: table-cell;
 	padding-top: 10px;
 	font-size: 14px;
 }
@@ -52,30 +53,34 @@
 	width: 255px;
 	border-color: #000;
 	vertical-align: top;
-	display: inline-block;
+	display: table-cell;
 	padding: 5px 5px 5px 0px;
-	/*
-    border-left: thin solid #D4E4EA;
-    border-bottom: thin solid #D4E4EA;
-    */
+  border-left: thin solid #D4E4EA;
+  border-bottom: thin solid #D4E4EA;
+
 }
 
 #middle {
 	width: 220px;
-	display: inline-block;
+	display: table-cell;
 	vertical-align: top;
-	border-bottom: thin solid #D4E4EA;
-	/*border-right: thin solid #D4E4EA;*/
+	/*border-bottom: thin solid #D4E4EA;
+	border-left:thin solid #D4E4EA;
+	border-right: thin solid #D4E4EA;*/
 }
 
 #right {
 	width: 160px;
 	border-color: #000;
 	vertical-align: top;
-	display: inline-block;
+	display: table-cell;
 	padding: 5px 5px 5px 5px;
+	
+}
+
+#rightContent{
 	border-left: thin solid #D4E4EA;
-	border-bottom: thin solid #D4E4EA;
+  border-bottom: thin solid #D4E4EA;
 }
 
 #hiddenMiddle {
@@ -396,15 +401,22 @@
 }
 
 .info_post {
-	display: block;
+/*	display: block;*/
 	width: 100%;
 	padding-top: 3px;
 	padding-bottom: 2px;
 }
 
+.info_center{
+  display: inline-block;
+  text-justify: auto;
+  color: #000;
+}
+
 .info_left {
 	display: inline-block;
 	width: 35%;
+	float: left;
 }
 
 .info_right {