social_stream 0.11.1 → 0.11.2

data/base/vendor/assets/stylesheets/tipsy.css

@@ -0,0 +1,7 @@
+.tipsy { padding: 5px; font-size: 10px; opacity: 0.8; filter: alpha(opacity=80); background-repeat: no-repeat;  background-image: url(../images/tipsy.gif); }
+  .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; }
+  .tipsy-inner { -moz-border-radius:3px; -webkit-border-radius:3px; }
+  .tipsy-north { background-position: top center; }
+  .tipsy-south { background-position: bottom center; }
+  .tipsy-east { background-position: right center; }
+  .tipsy-west { background-position: left center; }

data/events/app/views/frontpage/index.html.erb

@@ -60,13 +60,13 @@
     </div>
   </div>
   <div class="espacio"></div>
-  <div id="join_form">
-      <%= link_to image_tag("frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
-  </div>
 </div>
 
 <div id="wrapper_right">
   <%= render :partial => 'frontpage/caracteristics' %>
 </div>
 
+<div id="join_form">
+  <%= button_to t('frontpage.register'), new_user_registration_path, :method=> :get %>
+</div>
 <div id="espacio_body_bottom"></div>

data/events/config/locales/en.yml

@@ -59,6 +59,7 @@ en:
     suscribed: "Last Suscribed"
   frontpage:
     elements:
+      conferences: "Conferences"
     collaborate:
       sentence1: "Organize your projects and activities"
       sentence2: "Participate in conferences and events"

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.9".freeze
+    VERSION = "0.0.10".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.16')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.18')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.11.1".freeze
+  VERSION = "0.11.2".freeze
 end

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.16')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.18')
   s.add_runtime_dependency('social_stream-documents', '~> 0.3.1')
-  s.add_runtime_dependency('social_stream-events', '~> 0.0.9')
+  s.add_runtime_dependency('social_stream-events', '~> 0.0.10')
  
   # Development Gem dependencies
   #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 +02:00
+date: 2011-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 31
         segments: 
         - 0
         - 9
-        - 16
-        version: 0.9.16
+        - 18
+        version: 0.9.18
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 0
         - 0
-        - 9
-        version: 0.0.9
+        - 10
+        version: 0.0.10
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -311,7 +311,6 @@ files:
 - base/app/assets/images/frontpage/collaborate.png
 - base/app/assets/images/frontpage/comments.png
 - base/app/assets/images/frontpage/green_sq.png
-- base/app/assets/images/frontpage/join.gif
 - base/app/assets/images/frontpage/meet.png
 - base/app/assets/images/frontpage/people.png
 - base/app/assets/images/frontpage/purple_sq.png
@@ -347,6 +346,7 @@ files:
 - base/app/assets/images/logos/representation/user.png
 - base/app/assets/images/mini-loading.gif
 - base/app/assets/images/right.png
+- base/app/assets/images/tipsy.gif
 - base/app/assets/images/title_background.png
 - base/app/assets/javascripts/activities.js.erb
 - base/app/assets/javascripts/contacts.js
@@ -370,10 +370,6 @@ files:
 - base/app/assets/stylesheets/0_devise_sign.css
 - base/app/assets/stylesheets/_colors.scss
 - base/app/assets/stylesheets/activities.css.scss
-- base/app/assets/stylesheets/ad_next.png
-- base/app/assets/stylesheets/ad_prev.png
-- base/app/assets/stylesheets/ad_scroll_back.png
-- base/app/assets/stylesheets/ad_scroll_forward.png
 - base/app/assets/stylesheets/base.css.scss
 - base/app/assets/stylesheets/contacts.css.scss
 - base/app/assets/stylesheets/conversations.css
@@ -399,8 +395,6 @@ files:
 - base/app/assets/stylesheets/images/ui-icons_888888_256x240.png
 - base/app/assets/stylesheets/images/ui-icons_cd0a0a_256x240.png
 - base/app/assets/stylesheets/invitations.css
-- base/app/assets/stylesheets/jquery.ad-gallery.css
-- base/app/assets/stylesheets/loader.gif
 - base/app/assets/stylesheets/location.css.scss
 - base/app/assets/stylesheets/menu.css.scss
 - base/app/assets/stylesheets/messages.css.scss
@@ -523,8 +517,6 @@ files:
 - base/app/views/devise/sessions/new.html.erb
 - base/app/views/devise/shared/_links.erb
 - base/app/views/frontpage/_caracteristics.html.erb
-- base/app/views/frontpage/_header.html.erb
-- base/app/views/frontpage/_social_networks.html.erb
 - base/app/views/frontpage/_sponsor.html.erb
 - base/app/views/frontpage/host_meta.xml.builder
 - base/app/views/frontpage/index.html.erb
@@ -537,7 +529,6 @@ files:
 - base/app/views/groups/_new_activity.html.erb
 - base/app/views/groups/_new_activity_fields.html.erb
 - base/app/views/groups/_show.html.erb
-- base/app/views/groups/_show_frontpage.html.erb
 - base/app/views/groups/_sidebar_index.html.erb
 - base/app/views/groups/_sidebar_show.html.erb
 - base/app/views/groups/index.html.erb
@@ -560,6 +551,8 @@ files:
 - base/app/views/layouts/_header.erb
 - base/app/views/layouts/_header_dropdown_menu.html.erb
 - base/app/views/layouts/_header_dropdown_menu_sessions.html.erb
+- base/app/views/layouts/_header_signed_in.erb
+- base/app/views/layouts/_header_signed_out.erb
 - base/app/views/layouts/_representation.html.erb
 - base/app/views/layouts/_search.html.erb
 - base/app/views/layouts/_settings.html.erb
@@ -626,7 +619,6 @@ files:
 - base/app/views/search/_form.html.erb
 - base/app/views/search/_header_search.html.erb
 - base/app/views/search/_index.html.erb
-- base/app/views/search/_index_frontpage.html.erb
 - base/app/views/search/index.html.erb
 - base/app/views/search/index.js.erb
 - base/app/views/settings/_api_key.html.erb
@@ -648,7 +640,6 @@ files:
 - base/app/views/users/_groups.html.erb
 - base/app/views/users/_index.html.erb
 - base/app/views/users/_show.html.erb
-- base/app/views/users/_show_frontpage.html.erb
 - base/app/views/users/_sidebar_index.html.erb
 - base/app/views/users/_user.html.erb
 - base/app/views/users/_user_focus_search.html.erb
@@ -785,6 +776,7 @@ files:
 - base/vendor/assets/javascripts/jquery.fcbkcomplete.js
 - base/vendor/assets/javascripts/jquery.livequery.js
 - base/vendor/assets/javascripts/jquery.scrollTo.min.js
+- base/vendor/assets/javascripts/jquery.tipsy.js
 - base/vendor/assets/javascripts/jquery.validate.js
 - base/vendor/assets/javascripts/jquery.validate.old.js
 - base/vendor/assets/javascripts/jquery.watermarkinput.js
@@ -813,6 +805,7 @@ files:
 - base/vendor/assets/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
 - base/vendor/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css
 - base/vendor/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
+- base/vendor/assets/stylesheets/tipsy.css
 - bin/social_stream
 - bin/social_stream_heroku
 - documents/.gitignore

data/base/app/assets/stylesheets/jquery.ad-gallery.css

@@ -1,171 +0,0 @@
-.ad-gallery {
-  width: 320px;
-}
-
-.ad-gallery, .ad-gallery * {
-  margin: 0;
-  padding: 0;
-}
-
-  .ad-gallery .ad-image-wrapper {
-    width: 100%;
-    height: 210px;
-    /*margin-bottom: 10px;*/
-    position: relative;
-    overflow: hidden;
-  }
-    .ad-gallery .ad-image-wrapper .ad-loader {
-      position: absolute;
-      z-index: 3;
-      top: 2px;
-      left: 48%;
-      border: 1px solid #CCC;
-    }
-    .ad-gallery .ad-image-wrapper .ad-next {
-      position: absolute;
-      right: 0;
-      top: 0px;
-      width: 25%;
-      height: 95%;
-      cursor: pointer;
-      display: block;
-      z-index: 100;
-    }
-    .ad-gallery .ad-image-wrapper .ad-prev {
-      position: absolute;
-      left: 0;
-      top: 0px;
-      width: 25%;
-      height: 95%;
-      cursor: pointer;
-      display: block;
-      z-index: 150;
-    }
-    .ad-gallery .ad-image-wrapper .ad-prev, .ad-gallery .ad-image-wrapper .ad-next {
-      /* Or else IE will hide it */
-      background: url(non-existing.jpg)\9
-    }
-      .ad-gallery .ad-image-wrapper .ad-prev .ad-prev-image, .ad-gallery .ad-image-wrapper .ad-next .ad-next-image {
-        background: url(ad_prev.png);
-        width: 30px;
-        height: 30px;
-        display: none;
-        position: absolute;
-        /*top: 47%;*/
-        top:80px;
-        left: 0;
-        z-index: 101;
-      }
-      .ad-gallery .ad-image-wrapper .ad-next .ad-next-image {
-        background: url(ad_next.png);
-        width: 30px;
-        height: 30px;
-        right: 0;
-        left: auto;
-      }
-    .ad-gallery .ad-image-wrapper .ad-image {
-      position: absolute;
-      overflow: hidden;
-      top: 0;
-      left: 0;
-      z-index: 9;
-    }
-      .ad-gallery .ad-image-wrapper .ad-image a img {
-        border: 0;
-      }
-      .ad-gallery .ad-image-wrapper .ad-image .ad-image-description {
-        position: absolute;
-        bottom: 0px;
-        left: 0px;
-        padding: 7px;
-        text-align: left;
-        width: 100%;
-        z-index: 2;
-        background: url(opa75.png);
-        color: #000;
-      }
-      * html .ad-gallery .ad-image-wrapper .ad-image .ad-image-description {
-        background: none;
-        filter:progid:DXImageTransform.Microsoft.AlphaImageLoader (enabled=true, sizingMethod=scale, src='opa75.png');
-      }
-        .ad-gallery .ad-image-wrapper .ad-image .ad-image-description .ad-description-title {
-          display: block;
-        }
-  .ad-gallery .ad-controls {
-    height: 15px;
-  }
-    .ad-gallery .ad-info {
-      float: left;
-    }
-    .ad-gallery .ad-slideshow-controls {
-      float: right;
-    }
-      .ad-gallery .ad-slideshow-controls .ad-slideshow-start, .ad-gallery .ad-slideshow-controls .ad-slideshow-stop {
-        padding-left: 5px;
-        cursor: pointer;
-      }
-      .ad-gallery .ad-slideshow-controls .ad-slideshow-countdown {
-        padding-left: 5px;
-        font-size: 0.9em;
-      }
-    .ad-gallery .ad-slideshow-running .ad-slideshow-start {
-      cursor: default;
-      font-style: italic;
-    }
-  .ad-gallery .ad-nav {
-    width: 100%;
-    position: relative;
-  }
-    .ad-gallery .ad-forward, .ad-gallery .ad-back {
-      position: absolute;
-      top: 0;
-      height: 100%;
-      z-index: 10;
-    }
-    /* IE 6 doesn't like height: 100% */
-    * html .ad-gallery .ad-forward, .ad-gallery .ad-back {
-      height: 100px;
-    }
-    .ad-gallery .ad-back {
-      cursor: pointer;
-      left: -20px;
-      width: 13px;
-      display: block;
-      background: url(ad_scroll_back.png) 0px 22px no-repeat;
-    }
-    .ad-gallery .ad-forward {
-      cursor: pointer;
-      display: block;
-      right: -20px;
-      width: 13px;
-      background: url(ad_scroll_forward.png) 0px 22px no-repeat;
-    }
-    .ad-gallery .ad-nav .ad-thumbs {
-      overflow: hidden;
-      width: 100%;
-    }
-      .ad-gallery .ad-thumbs .ad-thumb-list {
-        float: left;
-        width: 9000px;
-        list-style: none;
-      }
-        .ad-gallery .ad-thumbs li {
-          float: left;
-          /* padding-right: 5px;*/
-        }
-          .ad-gallery .ad-thumbs li a {
-            display: block;
-          }
-            .ad-gallery .ad-thumbs li a img {
-              border: 3px solid #CCC;
-              display: block;
-            }
-            .ad-gallery .ad-thumbs li a.ad-active img {
-              border: 3px solid #616161;
-            }
-/* Can't do display none, since Opera won't load the images then */
-.ad-preloads {
-  position: absolute;
-  left: -9000px;
-  top: -9000px;
-}

data/base/app/views/frontpage/_header.html.erb

@@ -1,30 +0,0 @@
-<div id="headerFront">
-  <div class="banner_top">
-    <div id="logo"><%= link_to(image_tag('logo.png', :alt => t('site.name')), '/'); %></div>
-    <div class="div_login">
-      <%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
-        <div id="login_data">
-          <div class="login_data_block">
-            <span><%= f.label :email %></span>
-            <%= f.email_field :email, :class => "input_username" %>
-          </div>
-          <div class="login_data_block">
-            <span><%= f.label :password %></span>
-            <%= f.password_field :password, :class => "input_username" %>
-          </div>
-        </div>
-        <div>
-        <%= f.submit t(:sign_in), :class => 'other_blue'%>
-        </div>
-      <% end -%>
-      <div class="subtexto">
-        <%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %>
-        <span>|</span>
-        <%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %>
-
-        <%= render :partial => 'frontpage/social_networks' %>
-      </div>
-    </div>
-  <br class="clearfloat" />
-  </div>
-</div>

data/base/app/views/frontpage/_social_networks.html.erb

@@ -1,5 +0,0 @@
-<span>|</span>
-<%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
-
-<%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
-

data/base/app/views/groups/_show_frontpage.html.erb

@@ -1,11 +0,0 @@
-<nav id="toolbar">
-  <div id="toolbarContent" class="block">
-    <div class="space_center"></div>
-    <%= yield :toolbar %>
-  </div>
-</nav>
-<div id= "center_body" class="frontpage_view">
-  <section id="content">
-    <%= render :partial => 'show' %>
-  </section>
-</div>