xforum 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbb5ecbeff2816d4cdada6de761f7bef7b15fc92
-  data.tar.gz: f5530cbc54472978cfcbe6fe85e21c69d6f961c5
+  metadata.gz: 7f4eb6df653dcbfd2fb36f28f9be5a7224bea8a4
+  data.tar.gz: 27abc8487fc43cb744cadbbac3e617995b457f1c
 SHA512:
-  metadata.gz: 646132bc513c5fc7fbc3a9105d29e3035c6618b8213633cf35aeee65bf99a819ec6e3f0391ca8aa916406ba627c9411c6ed194250258a239be64f1b3466e1fab
-  data.tar.gz: d98e7c78d1a5688ea3b0aa9a294e61ec045be6b2ebd05a8d1748dd40104598126b7d2fd4fee08fb8710e23edd42afd194468a8c32a99ea16c5f8e365802e9f19
+  metadata.gz: 9c0f6ae2f4720cf33eb452701d663154e78026a2fcde7abf05f065434b5a0ad46920d1a577edb88d8681f7c8fc723c6f2896ae6f820be50909f3f66a877bf85f
+  data.tar.gz: dcc38311759fdc8f7c10cbcbb77206c2cb5825aa12da0b55574c5fcb15deb657f763bdd67d1cee5d31ac482eefdd1b6085b93e29733e2a1b2fa275b20d5ad3f6

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

@@ -20,7 +20,7 @@ jQuery ->
   $('#forum-category').change ->
     changeTopic()
   $('#forum-video-replay').click ->
-    img=document.getElementById('big-forum-photo')
+    img=document.getElementById('big-forum-picture')
     img.src=img.src
   $('#forum-video-back').click ->
     goBackToSenate()
@@ -33,10 +33,29 @@ goBackToSenate=->
 runPhotoGallery=(target)->
   hideMe({id:'forum-senate'})
   showMe({id:'forum-senate-video'})
-  img=document.getElementById('big-forum-photo')
-  img.src=target.src
+  console.log('target.video  ' + target.dataset.video)
+  if target.dataset.video=='true'
+    getTheVideo(target)
+  else
+    showMe({id:'big-forum-picture-span'})
+    img=document.getElementById('big-forum-picture')
+    img.src=target.src
   hideForumElements()
 
+
+getTheVideo=(photo)->
+  console.log('in get video')
+  showMe({id:'big-forum-video-span'})
+  hideMe({id:'big-forum-picture-span'})
+  forumWait()
+  $.post('xforum/forum_ajax',{function:'get video',forum_id:photo.dataset.forum_id},playVideo)
+
+playVideo=(params)->
+  video=document.getElementById('big-forum-video')
+  video.src=params.video
+  video.canplay=forumGo()
+
+
 window.startForum = ->
   hideMe({id: showPageName()})
   showForumElements()
@@ -231,7 +250,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,params.video)
+    putPhotosIn(span,params.photos.urls,params.photos.video,params.photos.forum)
   if params.hyperlinks?
     hyperlinks=params.hyperlinks
     for i in [0...hyperlinks.length]
@@ -257,7 +276,8 @@ window.getSelectedId = ->
       span = spans[spans.length - 1]
   {selection: html, id: span.dataset.id}
 
-putPhotosIn=(span,urls,video)->
+putPhotosIn=(span,urls,video,forum_id)->
+  console.log('photo ', video)
   span.dataset.already_has_photo=true
   lineReturn=document.createElement('span')
   lineReturn.innerHTML='<br>'
@@ -268,7 +288,8 @@ putPhotosIn=(span,urls,video)->
     img.src=urls[i]
     img.className= 'forum-photo'
     img.id='forum-photo'
-    img.ddataset.index=i
+    img.dataset.index=i
+    img.dataset.forum_id=forum_id
     if video
       img.dataset.video=true
     paragraph.appendChild(img)

data/app/assets/javascripts/xforum/global_java.js

@@ -144,4 +144,21 @@ function deleteMyData(obj) {
         ref = 'data-' + the_keys[i];
         obj.removeAttribute(ref);
     }
+}
+function forumWait() {
+    'use strict';
+    $('#forum-box').spin({
+        lines: 18, // The number of lines to draw
+        length: 14, // The length of each line
+        width: 9, // The line thickness
+        radius: 30, // The radius of the inner circle
+        color: '#fff', // #rgb or #rrggbb
+        speed: 1, // Rounds per second
+        trail: 60, // Afterglow percentage
+        shadow: false // Whether to render a shadow
+    });
+}
+function forumGo() {
+    'use strict';
+    $('#forum-box').spin(false);
 }

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

@@ -48,6 +48,13 @@ $blue: #a0a0ff;
   padding:3px;
   margin-left:10px;
 }
+
+.big-forum-video{
+  width:960px;
+  position:relative;
+  margin-left:75px;
+  margin-top:10px;
+}
 input{
   border: 1px solid rgb(187, 187, 187);
   width: 95%;

data/app/controllers/xforum/forums_controller.rb

@@ -21,6 +21,8 @@ module Xforum
               render json: PeopleList.get_forum_distribution_lists(params,current_user)
             else
           end
+        when 'get video'
+          render json: Photo.get_video(params)
         when 'forum admin action'
           render json: Forum.do_admin_action(params, current_user)
         when 'categories'

data/app/models/xforum/photo.rb

@@ -25,7 +25,7 @@ module Xforum
         urls.push(ForumAssist.get_url(photo[:key])  )
         video=true if photo[:has_video]
       }
-      {urls:urls,video:video}
+      {urls:urls,video:video,forum:forum_id}
     end
 
     def self.get_photo(params)
@@ -34,6 +34,8 @@ module Xforum
       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
@@ -41,10 +43,10 @@ module Xforum
       else
         photo=photos[0]
         ext= photo[:name].split('.').last
-        name=photos[:name].split(ext).first
+        name=photo[:name].split(ext).first
         name+='mp4'
         folder=ENV['XFORUM_VIDEOS']
-        {video:AssistMe.get_url(File.join(folder,name))}
+        {video:ForumAssist.get_url(File.join(folder,name))}
       end
 
     end

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

@@ -42,4 +42,8 @@
 
   <div class="forum-senate" id='forum-senate'>
     <%=render partial: 'xforum/comments/forum_entry'%>
-  </div>
+  </div>
+  <div id="forum-senate-video" style="display: none;">
+    <%=render partial: 'xforum/comments/forum_video'%>
+  </div>
+

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

@@ -1,12 +1,11 @@
-<div id="forum-senate-video" style="display: none;">
-  <div>
+
+<div>
     <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>
-  <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>
+</div>
+<span id="big-forum-picture-span">
+    <%=image_tag('',id:'big-forum-picture', class:'biggest-forum-photo') %>
+</span>
+<span id='big-forum-video-span' hidden>
+    <%=video_tag('' ,  {:canplay=> '' , :controls=>true ,:class => 'big-forum-video',:id=>'big-forum-video'} ) %>
+</span>

data/app/views/xforum/forums/_forum.html.erb

@@ -14,5 +14,4 @@
 
   <%=render partial: 'xforum/comments/forum_comments'%>
   <%=render partial: 'xforum/forums/forum_admin'%>
-  <%=render partial: 'xforum/comments/forum_video'%>
 </div>

data/lib/tasks/xforum_tasks.rake

@@ -25,6 +25,7 @@
   def  load_the_forum_file(file_name)
     CSV.foreach(file_name, headers: true) { |row|
       the_row=row.to_hash
+      puts "'row ' #{the_row['topic']} , #{the_row['content']}"
       category_id=Xforum::Category.where(name:the_row['category']).pluck(:id)[0]
       category_id=Xforum::Category.create(name:the_row['category']).id if category_id.nil?
       topic_id=Xforum::Topic.where(name:the_row['topic']).pluck(:id)[0]

data/lib/xforum/version.rb

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

data/test/dummy/config/environments/test.rb

@@ -3,7 +3,7 @@ Rails.application.configure do
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
+  # your test database is "PDM Dues.csv space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: spinjs-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement