social_stream-linkser 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1548c0f36650905866abf240fb1d56883e856418
-  data.tar.gz: f089084ecc6ed58386b4879b5aa78d4b7ba54aff
+  metadata.gz: c0c6e100db723ba2cf2e42d0f709682d6ade782f
+  data.tar.gz: cbc74aec2c30c59a2c96535c9091eceaa77a65f7
 SHA512:
-  metadata.gz: 7c492e86909a93611ade7aeb6117922c1499e1f73882f00c7322f80e9efadee8655481f30aa6dd4ac37d78bc310550f794c650f8f1593625c6650d546b345b00
-  data.tar.gz: 4b5e178ec29ecd30ba7e43ce755755cf5771e255347cd7844ecb3d419ff1ff96835d8cab65646ce52b1eabf9025029b7bed589e69e417e09076728b4b1249a3f
+  metadata.gz: 3a4ee998ea57d47c5941b2c2bfb2b2cc7eb0a4da0e7f933dd377e6582ffe7065c5966eebd6f9f783323c1750ac3caca415b4f6b6def68a3d924a5c488dbc9c99
+  data.tar.gz: c199ce9b4088170235baafd56bd150b00c61f1da678ba96f6cf9d641b7d6ea2440aa6360b40664049eef7a608ac3bca5a688bbd2c7c0360993634cd0f34f4300

data/app/assets/javascripts/social_stream/linkser.wall.js

@@ -11,9 +11,12 @@ SocialStream.Linkser.Wall = (function(SS, $) {
     }
 
     if (regexp.test($("#post_text").val())) {
+      $('#post_text').data('link', true);
+
       $("#link_url").val($("#post_text").val());
       $("#link_loaded").val(false);
       SS.Wall.changeAction($('#link_preview_loading').attr('data-link_path'));
+      SS.Wall.changeOwner('link');
       SS.Wall.changeRelationSelect('link');
 
       if(this.currentValue != this.lastValue) {
@@ -43,15 +46,18 @@ SocialStream.Linkser.Wall = (function(SS, $) {
 
       $("#link_preview").show();
     } else {
-      resetWallInput({ postText: false });
+      if ($('#post_text').data('link')) {
+        $('#post_text').data('link', false);
+        resetWallInput({ postText: false });
+      }
     }
-  }
+  };
 
   var resetWallInput = function(options) {
-    $("#new_post").attr("action", "/posts");
     $("#link_preview").hide().html('');
     $("#link_url").val("");
     SS.Wall.changeAction();
+    SS.Wall.changeOwner('post');
     SS.Wall.changeRelationSelect('post');
 
     if (options.postText) {
@@ -61,7 +67,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
 
   var showLoading = function() {
     $('#link_preview').html($('#link_preview_loading').html());
-  }
+  };
 
   var init = function(){
     $('#link_preview_loading').hide();
@@ -75,7 +81,7 @@ SocialStream.Linkser.Wall = (function(SS, $) {
         }).css('display', 'none')
       );
     }
-  }
+  };
 
 
   var create = function() {
@@ -86,6 +92,6 @@ SocialStream.Linkser.Wall = (function(SS, $) {
 
   return {
     create: create
-  }
+  };
 
 })(SocialStream, jQuery);

data/app/assets/stylesheets/social_stream/linkser/repository/layout/_repository.css.sass

@@ -25,3 +25,4 @@
         @include ellipsis
       a
         @include ellipsis
+        font-size: 14px

data/app/assets/stylesheets/social_stream/linkser/timeline/layout/_timeline-link.css.sass

@@ -35,9 +35,12 @@
     margin-left: 19px
     width: 100%
     .thumb
-      @include makeColumnoMargin(2, 0)
+      width: 170px
       display: inline
       margin-right: 16px
+      float: left
+      img
+        float: left
     .text
       width: 54%
       display: inline-block
@@ -45,6 +48,8 @@
         p
           a
             display: block 
+    iframe
+      width: 100%
   .actions
     width: 100%
     display: inline-block

data/app/views/links/_new_activity.html.erb

@@ -1,4 +1,3 @@
-<%= hidden_field_tag 'link[owner_id]', Actor.normalize_id(receiver) %>
 <%= hidden_field_tag 'link[url]' %>
 <%= hidden_field_tag 'link[loaded]', false %>
 <div id="link_preview_loading" data-link_path="<%= links_path %>">

data/app/views/links/_timeline.html.erb

@@ -1,6 +1,6 @@
 <%= div_for link do %>
   <% if link.image %>
-    <div class="thumb">
+    <div class="thumb <%= 'thumb-play' if link.callback_url %>">
       <% if link.callback_url %>
         <%= image_tag(link.image) %>
         <div class="play_over" data-url="<%= link.improved_callback_url %>" data-width="<%= link.width %>" data-height="<%= link.height %>"></div>

data/config/locales/en.yml

@@ -1,16 +1,17 @@
+---
 en:
   linkser:
-    title: "Linkser"
+    title: Linkser
   link:
-    by: "by %{author}"
-    confirm_delete: "Delete link?"
+    by: by %{author}
+    confirm_delete: Delete link?
     errors:
-      loading: "Error loading"
-      only_webs: "Only webpages are supported"
+      loading: Error loading
+      only_webs: Only webpages are supported
     form:
-      title: "Link"
-    input: "Write the web address"
-    name: "link"
-    one: "a link"
-    other: "links"
-    title: "Links"  
+      title: Link
+    input: Write the web address
+    name: link
+    one: a link
+    other: links
+    title: Links

data/config/locales/es.yml

@@ -1,16 +1,17 @@
+---
 es:
   linkser:
-    title: "Linkser"
+    title: Linkser
   link:
-    by: "por %{author}"
-    confirm_delete: "¿Borrar enlace?"
+    by: por %{author}
+    confirm_delete: ¿Borrar enlace?
     errors:
-      loading: "Error cargando"
-      only_webs: "Solo puedes compartir págnas web"
+      loading: Error cargando
+      only_webs: Solo puedes compartir págnas web
     form:
-      title: "Enlace"
-    input: "Escribe una dirección"
-    name: "enlace"
-    one: "un enlace"
-    other: "enlaces"
-    title: "Enlaces"
+      title: Enlace
+    input: Escribe una dirección
+    name: enlace
+    one: un enlace
+    other: enlaces
+    title: Enlaces

data/config/locales/zh.yml

@@ -0,0 +1,17 @@
+---
+zh:
+  linkser:
+    title: Linkser
+  link:
+    by: by %{author}
+    confirm_delete: Delete link?
+    errors:
+      loading: Error loading
+      only_webs: Only webpages are supported
+    form:
+      title: Link
+    input: Write the web address
+    name: link
+    one: a link
+    other: links
+    title: Links

data/lib/social_stream/linkser/version.rb

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

data/social_stream-linkser.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', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-linkser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Eduardo Casanova Cuesta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: linkser
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - app/views/links/show.html.erb
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/zh.yml
 - config/routes.rb
 - db/migrate/20120208143739_create_social_stream_linkser.rb
 - lib/generators/social_stream/linkser/install_generator.rb
@@ -168,8 +169,11 @@ files:
 - spec/support/devise.rb
 - spec/support/mock.rb
 - vendor/assets/javascripts/jquery.jplayer.js
+- vendor/assets/jplayer.blue.monday.video.play.hover.png
+- vendor/assets/jplayer.blue.monday.video.play.png
 - vendor/assets/stylesheets/jplayer.blue.monday.css
 - vendor/assets/stylesheets/jplayer.blue.monday.jpg
+- vendor/assets/stylesheets/jplayer.blue.monday.png
 - vendor/assets/stylesheets/jplayer.blue.monday.video.play.hover.png
 - vendor/assets/stylesheets/jplayer.blue.monday.video.play.png
 - vendor/assets/stylesheets/jquery.lightbox.css