social_stream-base 2.0.0.beta1 → 2.0.0.beta2

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

@@ -1,5 +1,7 @@
 <section class="settings">
-  <h2><%= t('settings.for')%> <%= current_subject.name %></h2>
+  <h2 class="colorfont">
+    <%= t('settings.for')%> <%= current_subject.name %>
+  </h2>
 
   <div class="accordion" id="settings-accordion">
     <% if current_subject == current_user %>

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

@@ -7,8 +7,8 @@
     </div>        
   <% else %>
     <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "150x150"), subject %>
-   <div class= "subject-name">
-     <%= subject.name %>
-   </div>
   <% end %>
 </div>
+<div class= "subject-name-phone">
+     <%= subject.name %>
+   </div>

data/config/locales/en.yml

@@ -309,6 +309,12 @@ en:
       one: "Group"
       other: "Groups"
     view_all: "View all..."
+  header:
+    icon:
+      contacts: "Contacts"
+      home: "Home"
+      messages: "Messages"
+      repository: "Repository"
   help: "Help"
   helpers:
     submit:

data/config/locales/es.yml

@@ -307,6 +307,12 @@ es:
       one: "Grupo"
       other: "Grupos"
     view_all: "Ver todos..."
+  header:
+    icon:
+      contacts: "Contactos"
+      home: "Inicio"
+      messages: "Mensajes"
+      repository: "Repositorio"
   help: "Ayuda"
   helpers:
     submit:

data/config/locales/pt.yml

@@ -338,6 +338,7 @@ pt:
     name: "postagem"
     one: "uma postagem"
     title: "Postagens"
+    other: "%{count} postagens"
   preposition:
     and: "e"
     on: "em"

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

@@ -9,9 +9,7 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
 
   def devise_initializer_config
     inject_into_file "config/initializers/devise.rb",
-                     "\n  config.omniauth :linkedin, \"ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB\", \"WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY\"
-                      \n  config.omniauth :facebook, \"129571360447856\",\"eef39dce5e20e76f77495c59623bdb38\"
-                      \n  #config.omniauth :twitter, \"wgTxO0fTpjTeSnjKC9ZHA\",\"JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI\"
+                     "  config.omniauth :socialstream, \"4\",\"00053446bc0361d60889b734d9e5f6132cccf3d08abb25a39bc79e23edde80d5900c37ec69aa0aaf7f969bb046858429ffb318de789b553b03ed672ff75859ab\"
                       \n  config.token_authentication_key = :auth_token
                       \n  config.skip_session_storage << :token_auth",
                       :after => "  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.0.beta1".freeze
+    VERSION = "2.0.0.beta2".freeze
   end
 end

data/vendor/assets/javascripts/colorfont.js

@@ -0,0 +1,26 @@
+// Colorfont.js 1.2
+// Copyright 2011 Manufactura Independente (Ana Carvalho & Ricardo Lafuente)
+// Selection behaviour fix by Simon Budig
+// Licensed under the terms of the WTFPL.
+// http://sam.zoy.org/wtfpl/
+
+noselect_style = '-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;'
+position_style = 'position:absolute;top:0px;left:0px;right:0px;'
+
+$(document).ready(function(){
+  // append a span to all colorfont headers
+  $('.colorfont').css({position:'relative'});
+  $('.colorfont').html(function(){ 
+      // if has google note
+      if ($('.google-src-text').length > 0){
+        var googletext = $(this).find('.google-src-text').text();
+        var text = $(this).text().replace(googletext, "");
+      }
+      else {
+        var text = $(this).text();
+      }
+      return '<span style="' + noselect_style + '">' + text + '</span>' +
+             '<span class="colorfont-overlay" style="' + noselect_style + position_style + '">' + text + '</span>' +
+             '<span style="color: rgba(0,0,0,0.0);' + position_style + '">' + text + '</span>';
+  });
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -560,6 +560,7 @@ files:
 - app/assets/images/icons/mess_ico-50.png
 - app/assets/images/icons/navbar_ico-20.png
 - app/assets/images/icons/tools_ico-16.png
+- app/assets/images/jplayer.blue.monday.png
 - app/assets/images/linkedin.png
 - app/assets/images/logo-index.png
 - app/assets/images/logos/medium/group.png
@@ -637,10 +638,12 @@ files:
 - app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass
 - app/assets/stylesheets/social_stream/base/logo/_logo-in.css
 - app/assets/stylesheets/social_stream/base/logo/_logo-out.css
-- app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css
+- app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css.sass
 - app/assets/stylesheets/social_stream/base/logo/layout/_logo-out.css
 - app/assets/stylesheets/social_stream/base/logo/responsive/_responsive-767px-max.css.sass
+- app/assets/stylesheets/social_stream/base/mixins/_animation.css.sass
 - app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass
+- app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass
 - app/assets/stylesheets/social_stream/base/mixins/_inputs.css.sass
 - app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass
 - app/assets/stylesheets/social_stream/base/notifications/_notifications.css.sass
@@ -659,18 +662,23 @@ files:
 - app/assets/stylesheets/social_stream/base/search/_header.css.sass
 - app/assets/stylesheets/social_stream/base/select2/_sselect2.css.sass
 - app/assets/stylesheets/social_stream/base/select2/layout/_sselect2.css.sass
+- app/assets/stylesheets/social_stream/base/settings/_settings.css.sass
 - app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass
 - app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-1200px-min.css.sass
 - app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass
 - app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass
 - app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass
 - app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass
+- app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass
 - app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass
 - app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass
 - app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass
 - app/assets/stylesheets/social_stream/base/timeline/layout/_wrapper_activities.css.sass
 - app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass
 - app/assets/stylesheets/social_stream/base/toolbar/layout/_toolbar.css.sass
+- app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass
+- app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass
+- app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-768px-979px.css.sass
 - app/assets/stylesheets/social_stream/bootstrap-rewrite/_alerts.scss
 - app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss
 - app/assets/stylesheets/social_stream/bootstrap-rewrite/_dropdowns.scss
@@ -680,8 +688,16 @@ files:
 - app/assets/stylesheets/social_stream/bootstrap-rewrite/_navbar.scss
 - app/assets/stylesheets/social_stream/bootstrap-rewrite/_variables.scss
 - app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf
+- app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf
+- app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf
+- app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf
+- app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf
+- app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf
+- app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf
 - app/assets/stylesheets/social_stream/fonts/GiveYouGlory.ttf
+- app/assets/stylesheets/social_stream/fonts/OpenSans-Light.ttf
 - app/assets/stylesheets/social_stream/fonts/RockSalt.ttf
+- app/assets/stylesheets/social_stream/fonts/colorfont.css
 - app/assets/stylesheets/social_stream/fonts/fonts.css
 - app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.eot
 - app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.svg
@@ -739,6 +755,7 @@ files:
 - app/helpers/location_helper.rb
 - app/helpers/notifications_helper.rb
 - app/helpers/permissions_helper.rb
+- app/helpers/posts_helper.rb
 - app/helpers/profiles_helper.rb
 - app/helpers/search_helper.rb
 - app/helpers/subjects_helper.rb
@@ -895,9 +912,8 @@ files:
 - app/views/layouts/_header_signed_in.erb
 - app/views/layouts/_header_signed_out.erb
 - app/views/layouts/_loading.html.erb
-- app/views/layouts/_logo-in.html.erb
-- app/views/layouts/_logo-out.html.erb
 - app/views/layouts/_logo_in.html.erb
+- app/views/layouts/_logo_out.html.erb
 - app/views/layouts/_more.html.erb
 - app/views/layouts/application.html.erb
 - app/views/likes/create.js.erb
@@ -1154,6 +1170,7 @@ files:
 - spec/views/profiles_spec.rb
 - spec/views/settings_spec.rb
 - vendor/assets/javascripts/bootstrap-multiselect.js
+- vendor/assets/javascripts/colorfont.js
 - vendor/assets/javascripts/d3.geom.js
 - vendor/assets/javascripts/d3.js
 - vendor/assets/javascripts/d3.layout.js

data/app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css

@@ -1,93 +0,0 @@
-.cube {
-  position:relative;
-  left: -38px;
-  z-index: 2;
-  float: left;
-    -webkit-transform: rotate(10deg);
-    -moz-transform: rotate(10deg);
-}
-
-.cube:hover {
-  -webkit-animation: float 2s infinite ease-in-out;
-  -moz-animation: float 2s infinite ease-in-out;
-  -o-animation: float 2s infinite ease-in-out;
-  animation: float 2s infinite ease-in-out;
-  -webkit-transform: rotate(10deg);
-  -moz-transform: rotate(10deg);
-}
-
-@-webkit-keyframes float {
-  0% {
-    -webkit-transform: translate(0px, 3px);
-  }
-  50% {
-    -webkit-transform: translate(0px, 0px);
-    
-  }
-  100% {
-    -webkit-transform: translate(0px, 3px);
-  }
-}
-
-.face {
-  position: absolute;
-  width: 14px;
-  height: 14px;
-  background-color: #ffffff; 
-  border: 3px solid #888; 
-  border-radius: 3px;
-}
-
-.cenit {
-  margin-top: 1px;
-  margin-left: 47px;
-    -webkit-transform: rotate(-45deg) skew(15deg, 15deg);
-    -moz-transform: rotate(-45deg) skew(15deg, 15deg);
-}
-
-.cenit-shape{ 
-  background: #08C; 
-  border: 4px solid #08C; 
-  border-radius: 3px;
-  margin-top: -5px;
-  width: 12px;
-  height: 12px;
-
-} 
-.left {
-  margin-top: 15px;
-  margin-left: 39px;
-    -webkit-transform: rotate(15deg) skew(15deg, 15deg);
-    -moz-transform: rotate(15deg) skew(15deg, 15deg);
-}
-
-.left-shape{ 
-  background: #08C; 
-  border: 4px solid #08C; 
-  margin-left: 35px; 
-  border-radius: 3px;
-  margin-top: 18px;
-  width: 12px;
-  height: 12px;  
- }
-
-.demoright {
-  margin-top: 14px;
-  margin-left: 55px;
-    -webkit-transform: rotate(-15deg) skew(-15deg, -15deg);
-    -moz-transform: rotate(-15deg) skew(-15deg, -15deg);
-}
-
-.shadow{
-  z-index: 1;
-  width: 0;
-  height: 0px;
-  position: relative;
-  float: left;
-  margin-top: 54px;
-  margin-left: -1px;
-  box-shadow:  -5px -22px 11px 10px rgba(50, 50, 50, .5);
-    -webkit-box-shadow:  -5px -22px 11px 10px rgba(50, 50, 50, .5);
-    -webkit-transform: rotate(25deg) skew(-30deg, 10deg);
-    -moz-transform: rotate(25deg) skew(-30deg, 10deg)
-}

data/app/views/layouts/_logo-in.html.erb

@@ -1,17 +0,0 @@
-<div class="logo-header-in">
-  <div class="cube">
-    <div class="face cenit">
-    </div>
-    <div class="face cenit cenit-shape">
-    </div>
-    <div class="face left">
-    </div>
-    <div class="face left left-shape">
-    </div>
-    <div class="face demoright">
-    </div>
-  </div>
-  <div class="shadow">
-  </div>
-  <%= link_to(image_tag('header-logo.png', class: "logo hidden-phone hidden-tablet", :alt => t('site.name')), root_path) %>
-</div>

data/app/views/layouts/_logo-out.html.erb

@@ -1,17 +0,0 @@
-<div class="logo-header-out">
-  <div class="cube">
-    <div class="face cenit">
-    </div>
-    <div class="face cenit cenit-shape">
-    </div>
-    <div class="face left">
-    </div>
-    <div class="face left left-shape">
-    </div>
-    <div class="face demoright">
-    </div>
-  </div>
-  <div class="shadow">
-  </div>
-  <%= link_to(image_tag('header-logo-index.png', class: "logo", :alt => t('site.name')), root_path) %>
-</div>