social_stream 2.0.0.beta2 → 2.0.0.beta3

data/documents/app/views/videos/_video_show.html.erb

@@ -1,69 +1,19 @@
-<%= div_for video, :class => 'content_size' do %>
-<div class="video_show">
+<%= div_for video do %>
   <% if video.file_processing %>
-  <div class="processing_text">
-    <%= t('video.processing')%>
-  </div>
-  <% else %>
-  <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
-    <div class="jp-type-single">
-      <div id="jpId<%= video.id%>" class="jp-jplayer"></div>
-      <div id="jp_interface_<%= video.id%>" class="jp-interface">
-        <div class="jp-video-play"></div>
-        <ul class="jp-controls">
-          <li>
-            <a href="#" class="jp-play" tabindex="1">play</a>
-          </li>
-          <li>
-            <a href="#" class="jp-pause" tabindex="1">pause</a>
-          </li>
-          <li>
-            <a href="#" class="jp-stop" tabindex="1">stop</a>
-          </li>
-          <li>
-            <a href="#" class="jp-mute" tabindex="1">mute</a>
-          </li>
-          <li>
-            <a href="#" class="jp-unmute" tabindex="1">unmute</a>
-          </li>
-        </ul>
-        <div class="jp-progress">
-          <div class="jp-seek-bar">
-            <div class="jp-play-bar"></div>
-          </div>
-        </div>
-        <div class="jp-volume-bar">
-          <div class="jp-volume-bar-value"></div>
-        </div>
-        <div class="jp-current-time"></div>
-        <div class="jp-duration"></div>
-      </div>
-      <div id="jp_playlist_<%= video.id%>" class="jp-playlist"></div>
+    <div class="processing_text">
+      <%= t('video.processing')%>
     </div>
-<div id="inspector"></div>
-  </div>
+  <% else %>
+    <%= render partial: 'player', 
+               object: video,
+               as: :video %>
   <% end %>
-</div>
 <% end %> 
 
 <%= javascript_tag do %>
   $(function() {
-  <% unless video.file_processing %>
-    $("#jpId<%=video.id%>").jPlayer( {
-      ready: function () {
-        $(this).jPlayer("setMedia", {
-          webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
-          flv:   "<%= video_url(video, :format => 'flv') %>",
-          mp4:   "<%= video_url(video, :format => 'mp4') %>"
-        });
-      },
-      solution:"flash, html",
-      preload: "none",
-      supplied: "webmv, flv, mp4",
-      swfPath: "<%= asset_path('Jplayer.swf') %>",
-      cssSelectorAncestor: "#jp_interface_<%=video.id%>"
-    });
-  <% end %>
+    <% unless video.file_processing %>
+      SocialStream.Video.show();
+    <% end %>
   });
 <% end %>
-

data/documents/config/locales/en.yml

@@ -1,90 +1,90 @@
+---
 en:
   activerecord:
     attributes:
       document:
-        title: "Title"
+        title: Title
     models:
-      document: "File"
+      document: File
   audio:
-    confirm_delete: "Delete audio?"
-    title: "Audios"
-    mine: "My audios"
-    name: "audio"
-    not_mine: "Audios"
-    one: "an audio"
-    other: "audios"
-    processing: "Processing audio clip. Please wait..."
+    confirm_delete: Delete audio?
     title:
-      one: "Audio"
-      other: "Audios"
+      one: Audio
+      other: Audios
+    mine: My audios
+    name: audio
+    not_mine: Audios
+    one: an audio
+    other: audios
+    processing: Processing audio clip. Please wait...
   details:
-    msg: "See details..."
+    msg: See details...
   document:
     actions:
-      delete: "Delete"
-      details: "Details"
-      download: "Download"
-      edit: "Edit"
-    all: "All files"
-    by: "by %{author}"
-    confirm_delete: "Delete file?"
+      delete: Delete
+      details: Details
+      download: Download
+      edit: Edit
+    all: All files
+    by: by %{author}
+    confirm_delete: Delete file?
     description:
-      input: "Add a description here"
-    filter: "filter"
+      input: Add a description here
+    filter: filter
     form:
-      title: "File"
+      title: File
     info:
-      author: "Author"
+      author: Author
       date:
-        created_at: "Created at"
-        updated_at: "Updated at"
-      description: "Description"
-      file: "File"
-      size: "Size"
-      tags: "Tags"
-      title: "Title"
-    mine: "My files"
-    name: "file"
+        created_at: Created at
+        updated_at: Updated at
+      description: Description
+      file: File
+      size: Size
+      tags: Tags
+      title: Title
+    mine: My files
+    name: file
     new:
-      link: "Add file"
-      title: "New file"
+      link: Add file
+      title: New file
     new_activity:
-      attach: "Attach file"
-    not_mine: "Files"
-    one: "a file"
-    other: "files"
+      attach: Attach file
+    not_mine: Files
+    one: a file
+    other: files
     scope:
-      network: "Network"
-      own: "Own"
-    simple_all: "All"  
+      network: Network
+      own: Own
+    simple_all: All
     title:
-      input: "File title"
-      one: "File"
-      other: "Files"
+      input: File title
+      one: File
+      other: Files
   picture:
-    confirm_delete: "Delete picture?"
-    mine: "My pictures"  
-    name: "picture"
-    not_mine: "Pictures"
-    one: "a picture"
-    other: "pictures"
+    confirm_delete: Delete picture?
+    mine: My pictures
+    name: picture
+    not_mine: Pictures
+    one: a picture
+    other: pictures
     title:
-      one: "Picture"
-      other: "Pictures"
+      one: Picture
+      other: Pictures
   resource:
-    all: "All Resources"
-    confirm_delete: "Delete resource?"
-    title: "Resources"
-    mine: "My resources"
-    not_mine: "Resources"
+    all: All Resources
+    confirm_delete: Delete resource?
+    title: Resources
+    mine: My resources
+    not_mine: Resources
   video:
-    confirm_delete: "Delete video?"
-    mine: "My videos"  
-    name: "video" 
-    not_mine: "Videos"
-    one: "a video"
-    other: "videos"
-    processing: "Processing video. Please, wait..."
+    confirm_delete: Delete video?
+    mine: My videos
+    name: video
+    not_mine: Videos
+    one: a video
+    other: videos
+    processing: Processing video. Please, wait...
     title:
-      one: "Video"
-      other: "Videos"
+      one: Video
+      other: Videos

data/documents/config/locales/es.yml

@@ -1,87 +1,90 @@
+---
 es:
   activerecord:
     attributes:
       document:
-        title: "Título"
+        title: Título
     models:
-      document: "Fichero"
+      document: Fichero
   audio:
-    confirm_delete: "¿Borrar audios?"
-    mine: "Mis audios"
-    name: "archivo de audio"
-    not_mine: "Audios"
-    one: "un archivo de audio"
-    other: "audios"
-    processing: "Procesando fichero de audio. Espere, por favor..."
+    confirm_delete: ¿Borrar audios?
+    mine: Mis audios
+    name: archivo de audio
+    not_mine: Audios
+    one: un archivo de audio
+    other: audios
+    processing: Procesando fichero de audio. Espere, por favor...
     title:
-      one: "Audio"
-      other: "Audios"
+      one: Audio
+      other: Audios
   details:
-    msg: "Ver detalles..."
+    msg: Ver detalles...
   document:
     actions:
-      delete: "Borrar"
-      details: "Detalles"
-      download: "Descargar"
-      edit: "Editar"
-    all: "Todos los ficheros"
-    by: "por %{author}"
-    confirm_delete: "¿Borrar fichero?"
+      delete: Borrar
+      details: Detalles
+      download: Descargar
+      edit: Editar
+    all: Todos los ficheros
+    by: por %{author}
+    confirm_delete: ¿Borrar fichero?
     description:
-      input: "Añade una descripción aquí"
-    filter: "filtrar"
+      input: Añade una descripción aquí
+    filter: filtrar
     form:
-      title: "Fichero"
+      title: Fichero
     info:
-      author: "Autor"
+      author: Autor
       date:
-        created_at: "Creado"
-        updated_at: "Última modificación"
-      description: "Descripción"
-      file: "Fichero"
-      title: "Título"
-    mine: "Mis ficheros"
-    name: "fichero"
+        created_at: Creado
+        updated_at: Última modificación
+      description: Descripción
+      file: Fichero
+      title: Título
+      size: Size
+      tags: Tags
+    mine: Mis ficheros
+    name: fichero
     new:
-      link: "Añadir fichero"
-      title: "Nuevo fichero"
+      link: Añadir fichero
+      title: Nuevo fichero
     new_activity:
-      attach: "Adjuntar fichero"
-    not_mine: "Ficheros"
-    one: "un fichero"
-    other: "ficheros"
+      attach: Adjuntar fichero
+    not_mine: Ficheros
+    one: un fichero
+    other: ficheros
     scope:
-      network: "Red"
-      own: "Propios"
-    simple_all: "Todos"
+      network: Red
+      own: Propios
+    simple_all: Todos
     title:
-      input: "Título del fichero"
-      one: "Fichero"
-      other: "Ficheros"
+      input: Título del fichero
+      one: Fichero
+      other: Ficheros
   picture:
-    confirm_delete: "¿Borrar imagen?"
-    mine: "Mis imágenes"
-    name: "imagen"
-    not_mine: "Imágenes"
-    one: "una imagen"
-    other: "imagenes"
+    confirm_delete: ¿Borrar imagen?
+    mine: Mis imágenes
+    name: imagen
+    not_mine: Imágenes
+    one: una imagen
+    other: imagenes
     title:
-      one: "Imagen"
-      other: "Imágenes"
+      one: Imagen
+      other: Imágenes
   resource:
-    all: "Todos los recursos"
-    confirm_delete: "¿Borrar recursos?"
-    title: "Recursos"
-    mine: "Mis recursos"
-    not_mine: "Recursos"
+    all: Todos los recursos
+    confirm_delete: ¿Borrar recursos?
+    title: Recursos
+    mine: Mis recursos
+    not_mine: Recursos
   video:
-    confirm_delete: "¿Borrar vídeo?"
-    mine: "Mis vídeos"  
-    name: "vídeo"
-    not_mine: "Vídeos"
-    one: "un vídeo"
-    other: "videos"
-    processing: "Procesando vídeo. Espere, por favor..."
+    confirm_delete: ¿Borrar vídeo?
+    mine: Mis vídeos
+    name: vídeo
+    not_mine: Vídeos
+    one: un vídeo
+    other: videos
+    processing: Procesando vídeo. Espere, por favor...
     title:
-      one: "Vídeo"
-      other: "Vídeos"
+      one: Vídeo
+      other: Vídeos

data/documents/config/locales/zh.yml

@@ -0,0 +1,90 @@
+---
+zh:
+  activerecord:
+    attributes:
+      document:
+        title: Title
+    models:
+      document: File
+  audio:
+    confirm_delete: Delete audio?
+    title:
+      one: Audio
+      other: Audios
+    mine: My audios
+    name: audio
+    not_mine: Audios
+    one: an audio
+    other: audios
+    processing: Processing audio clip. Please wait...
+  details:
+    msg: See details...
+  document:
+    actions:
+      delete: Delete
+      details: Details
+      download: Download
+      edit: Edit
+    all: All files
+    by: by %{author}
+    confirm_delete: Delete file?
+    description:
+      input: Add a description here
+    filter: filter
+    form:
+      title: File
+    info:
+      author: Author
+      date:
+        created_at: Created at
+        updated_at: Updated at
+      description: Description
+      file: File
+      size: Size
+      tags: Tags
+      title: Title
+    mine: My files
+    name: file
+    new:
+      link: Add file
+      title: New file
+    new_activity:
+      attach: Attach file
+    not_mine: Files
+    one: a file
+    other: files
+    scope:
+      network: Network
+      own: Own
+    simple_all: All
+    title:
+      input: File title
+      one: File
+      other: Files
+  picture:
+    confirm_delete: Delete picture?
+    mine: My pictures
+    name: picture
+    not_mine: Pictures
+    one: a picture
+    other: pictures
+    title:
+      one: Picture
+      other: Pictures
+  resource:
+    all: All Resources
+    confirm_delete: Delete resource?
+    title: Resources
+    mine: My resources
+    not_mine: Resources
+  video:
+    confirm_delete: Delete video?
+    mine: My videos
+    name: video
+    not_mine: Videos
+    one: a video
+    other: videos
+    processing: Processing video. Please, wait...
+    title:
+      one: Video
+      other: Videos