xforum 0.0.31 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 628d7925886e565f066e30c7fb394f7280ea631a
-  data.tar.gz: 7d5de4c3e07a5184d8991de6ec5d34800288037c
+  metadata.gz: bbb5ecbeff2816d4cdada6de761f7bef7b15fc92
+  data.tar.gz: f5530cbc54472978cfcbe6fe85e21c69d6f961c5
 SHA512:
-  metadata.gz: e22888656c577285bdff36080f25440dbfc59d5a3a35c6e97009dac214802f7232a11e43cbb4cd242ffb8224efb116791888813279f5440c0a835e7fdff484f8
-  data.tar.gz: 2e3c7597050ee5fabaa5141f71a99a4587aa91ad6e5f7e174d92f75222f5bdb79962519bdca1c2ae4aaeb3c7b563ef650e6e8d85b248ca3d137e2d4c2a4a0104
+  metadata.gz: 646132bc513c5fc7fbc3a9105d29e3035c6618b8213633cf35aeee65bf99a819ec6e3f0391ca8aa916406ba627c9411c6ed194250258a239be64f1b3466e1fab
+  data.tar.gz: d98e7c78d1a5688ea3b0aa9a294e61ec045be6b2ebd05a8d1748dd40104598126b7d2fd4fee08fb8710e23edd42afd194468a8c32a99ea16c5f8e365802e9f19

data/app/assets/javascripts/xforum/forum_basic.js.coffee

@@ -219,7 +219,10 @@ buildSpan = (page, index, params) ->
     da_class = 'forum-comment-new'
   else if page.dataset.moderator == 'true' && params.comment_state == 'reject'
     da_class = 'forum-comment-reject'
-  else  da_class = 'forum-comment'
+  else if params.needs_translation
+    da_class = 'forum-comment-translate'
+  else
+    da_class = 'forum-comment'
   the_comment=params.content.replace('::',':<br>')
   span.innerHTML = '<p>' + the_comment + '</p>'
   page.appendChild(span)
@@ -228,7 +231,7 @@ buildSpan = (page, index, params) ->
   paragraph.style.marginLeft = "#{params.indent * 20}px"       #why doesn't this make it out
   putOwnerIn(span,params)
   if params.has_photo
-    putPhotosIn(span,params.photos)
+    putPhotosIn(span,params.photos,params.video)
   if params.hyperlinks?
     hyperlinks=params.hyperlinks
     for i in [0...hyperlinks.length]
@@ -254,7 +257,7 @@ window.getSelectedId = ->
       span = spans[spans.length - 1]
   {selection: html, id: span.dataset.id}
 
-putPhotosIn=(span,urls)->
+putPhotosIn=(span,urls,video)->
   span.dataset.already_has_photo=true
   lineReturn=document.createElement('span')
   lineReturn.innerHTML='<br>'
@@ -265,6 +268,9 @@ putPhotosIn=(span,urls)->
     img.src=urls[i]
     img.className= 'forum-photo'
     img.id='forum-photo'
+    img.ddataset.index=i
+    if video
+      img.dataset.video=true
     paragraph.appendChild(img)
 
 window.putOwnerIn=(span,params)->

data/app/assets/stylesheets/xforum/custom.css.scss

@@ -38,6 +38,10 @@ $blue: #a0a0ff;
   @extend .forum-comment;
   background: rgb(255, 235, 235);
 }
+.forum-comment-translate {
+  @extend .forum-comment;
+  color: rgb(0, 0, 180);
+}
 .admin-edit-field{
   width:150px;
   font-size: 10px;
@@ -80,7 +84,7 @@ input{
 .forum-senate{
   width:100%;
   height:570px;
-  background:rgb(235,235,245);
+  background:rgb(240, 240, 240);
   overflow-y: scroll;
   padding:20px;
 }

data/app/models/xforum/photo.rb

@@ -18,21 +18,36 @@ module Xforum
     belongs_to :forum
 
     def self.get_photos(forum_id)
-      photos=Photo.where(forum_id:forum_id).pluck(:key)
+      photos=Photo.grab({forum_id:forum_id},[:key,:has_video],{order:[:id]})
       urls=[]
+      video=false
       photos.each {|photo|
-        urls.push(ForumAssist.get_url(photo)  )
+        urls.push(ForumAssist.get_url(photo[:key])  )
+        video=true if photo[:has_video]
       }
-      urls
+      {urls:urls,video:video}
     end
 
     def self.get_photo(params)
       params[:id].nil? || params[:id] == '' ? which = {tag:params[:tag]}  : which = {id:params[:id]}
       data=Forum.grab(which,[:id,:parent],{})[0]
-      urls=Photo.get_photos(data[:id])
-      {tag:params[:tag],edit:params[:edit],urls:urls,id:data[:id],parent:data[:parent],count:params[:count].to_i+1}
+      answer=Photo.get_photos(data[:id])
+      {tag:params[:tag],edit:params[:edit],urls:answer[:urls],video:answer[:video],id:data[:id],parent:data[:parent],count:params[:count].to_i+1}
     end
+    def self.get_video(params)
+      photos=Photo.grab({forum_id:params[:forum_id]},[:key,:has_video,:name],{})
+      if photos.size>1
+        {video:false}
+      else
+        photo=photos[0]
+        ext= photo[:name].split('.').last
+        name=photos[:name].split(ext).first
+        name+='mp4'
+        folder=ENV['XFORUM_VIDEOS']
+        {video:AssistMe.get_url(File.join(folder,name))}
+      end
 
+    end
     def self.upload(params,user_id)
       temp=JSON.load(params[:photo][:data])
       pforward=Hash[temp.map{|k,v| [k.to_sym,v]}]  #make the true/false strings again

data/app/views/xforum/comments/_forum_video.html.erb

@@ -3,5 +3,10 @@
     <input class='red-ellipse comment-btn'   type='button' id= 'forum-video-back'  value= "<%= t('xForum.Back')%>" >
     <input class='green-ellipse comment-btn'   type='button' id= 'forum-video-replay'  value= "<%= t('xForum.Replay')%>" >
   </div>
-  <%=image_tag('',id:'big-forum-photo', class:'biggest-forum-photo') %>
+  <span id="big-forum-picture">
+    <%=image_tag('',id:'big-forum-photo', class:'biggest-forum-photo') %>
+  </span>
+  <span id='forum-big-video' hidden>
+    <%=video_tag('',id:'big-forum-video', class:'biggest-forum-photo') %>
+  </span>
 </div>

data/db/migrate/20140604_add_has_video_to_photo.rb

@@ -0,0 +1,5 @@
+class AddHasVideoToPhoto < ActiveRecord::Migration
+  def change
+    add_column :xforum_photos,  :has_video,  :boolean, default:false
+  end
+end

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.31'
+  VERSION = '0.0.34'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.34
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -235,7 +235,8 @@ files:
 - db/migrate/20140600_add_forum_to_users.rb
 - db/migrate/20140601_create_forum_forums.rb
 - db/migrate/20140602_add_restricted_to_category.rb
-- db/migrate/20140602_change_suggestion_default.rb
+- db/migrate/20140603_change_suggestion_default.rb
+- db/migrate/20140604_add_has_video_to_photo.rb
 - lib/active_record_extension.rb
 - lib/tasks/xforum_tasks.rake
 - lib/xforum.rb