xforum 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19baa9625d84a8cf34022f5b5c5ec1ecb923f1d6
-  data.tar.gz: 847149f45b76dd1c9116e1e6a99b314ffd24e4dc
+  metadata.gz: 4369de85c7a394abf4ef510f28c71b132ae9063d
+  data.tar.gz: 8814a4298a157b1f48e4028b99d9bd0eb7802053
 SHA512:
-  metadata.gz: 342c718e5f627104a56566178a79340e3f55b52e412ea3157b744c7844f31fbaeddfc377d67b77f2fa32885ab63aa72f8648a6f79d3dd6654517ff5b9c8a0abf
-  data.tar.gz: 2aebfa968eb6df6b3781966f98180fbe4ca53e5be3533195689686461906aae1bec953416e5b7f6e786fc8d062a124e6624adf9742ce5be201167d8b0fb42fba
+  metadata.gz: 358f5c1a5cd448f55e1c14041b6623262d2d3aa070e76fde152effb0f67edf0b72d68da014fdd756c90ddf7e910edd7fb1ebb9254786a8b79d41ff8224dc9b02
+  data.tar.gz: b028b9140ae9235b6ba435c45d66c2a0c7cb62998a4203c166495dba2a17983991c0beffbacff92bb6fecc2b0e0c553a930fb217d17938099be6fbc62380c8ef

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

@@ -236,20 +236,17 @@ setUpReview=(button)->
     clearSenate
 
 deleteForumObject = (which_one)->
-  id = which_one.dataset.target
-  $.post('xforum/forum_ajax',{function:'remove forum object',id:which_one.dataset.id,state_action:which_one.value})
+  #id = which_one.dataset.target
+  list=which_one.parentNode.parentNode.id
+  $.post('xforum/forum_ajax',{function:'remove forum object',id:which_one.dataset.id,which_list:list,state_action:which_one.value})
   if which_one.dataset.state == 'open'
-    which_one.value = which_one.dataset.del
-    document.getElementById(id).className = ''
+    which_one.value = which_one.dataset.open
     which_one.dataset.state = 'closed'
   else
-    which_one.value = which_one.dataset.open
-    document.getElementById(id).className = ''
+    which_one.value = which_one.dataset.del
     which_one.dataset.state= 'open'
-  $.post('xforum/forum_ajax',{function:'categories',language:getLanguage(),hold_test:true,restricted:true},loadAdminsList)
 
 addOptionTo = (which_one,item)->
-  by_name=false
   switch which_one
     when 'category'
       pushOption($('[name=category_admin]'),{item:item,value:item},0)
@@ -338,10 +335,10 @@ addCancel=(params)->
   $("[id = forum-add-admin-user]").val('me')
 
 openEditObject = (which_one)->
-  line=  document.getElementById("edit-entry-#{which_one.dataset.id}")
   id=which_one.dataset.id
+  parent = which_one.parentNode
+  line=parent.children[CHILD_EDIT_ENTRY].children[0]
   if which_one.dataset.state == 'edit'
-    parent = which_one.parentNode
     showMe({obj:parent.children[CHILD_EDIT_ENTRY]})
     which_one.value = which_one.dataset.save
     which_one.dataset.state = 'save'
@@ -349,8 +346,6 @@ openEditObject = (which_one)->
     hideMe({obj:parent.children[CHILD_EDIT_ITEM]})
     line.focus()
   else if which_one.dataset.state == 'save'
-    parent = which_one.parentNode
-    id = which_one.dataset.id
     which_one.dataset.state = 'edit'
     newline = line.value
     hideMe({obj:parent.children[CHILD_EDIT_ENTRY]})

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

@@ -30,7 +30,6 @@ goBackToSenate=->
   showForumElements()
   showMe({id:'forum-senate'})
 
-
 runPhotoGallery=(target)->
   hideMe({id:'forum-senate'})
   showMe({id:'forum-senate-video'})
@@ -41,6 +40,9 @@ runPhotoGallery=(target)->
 window.startForum = ->
   hideMe({id: showPageName()})
   showForumElements()
+  pages=  document.getElementById('xforum-help-pages')
+  if pages?
+    document.getElementById('forum-box').appendChild(pages);
   blockMe({id: 'forum-page'})
   clearSenate()
   showMe({id:'forum-category'})
@@ -85,8 +87,6 @@ window.hideForumElements=->
   hideMe({name:'forum-subscribe'})
   hideMe({id:'forum-category'})
 
-
-
 loadCustomList=(params)->
   if params? && params.list_data?  && params.list_data.length>0
     list_data = params.list_data
@@ -159,7 +159,11 @@ window.clearSenate = ->
   children = $('#just-a-comment')
   if children?
     $('span[id = just-a-comment]').remove()
-  deleteMyData(document.getElementById('forum-senate'))
+  senate= document.getElementById('forum-senate')
+  help_page= senate.dataset.helppage
+  if help_page?
+    hideMe({id:help_page})
+  deleteMyData(senate)
   hideMe({id: 'forum-voting-booth'})
   hideMe({id: 'subscribe-forum'})
   hideMe({id: 'unsubscribe-forum'})
@@ -177,8 +181,18 @@ window.setSenate = (params)->
       unless kids[i].id == 'forum-comment-span'
         removeMe({obj:kids[i]})
     unless params.the_list.length == 0
-      for i in [0...params.the_list.length]
-        buildSpan(page, i, params.the_list[i])
+      if params.the_list[0].content.search('@show@page@')>=0
+        showHelpPage(params.the_list[0].content)
+      else
+        for i in [0...params.the_list.length]
+          buildSpan(page, i, params.the_list[i])
+
+showHelpPage=(page)->
+  help_page=page.replace('@show@page@','').trim()
+  senate=document.getElementById('forum-senate')
+  senate.dataset.helppage=help_page
+  hideMe({id:'forum-senate'})
+  blockMe({id:help_page})
 
 buildSpan = (page, index, params) ->
   span = document.createElement('span')
@@ -267,13 +281,11 @@ makePhotoBig=(photo,bigger)->
     photo.classList.remove('forum-big-photo')
     photo.classList.add('forum-photo')
 
-
 activatePhoto=->
   photos=$('[data-hold_tight=true]')
   for i in [0...photos.length]
     photos[i].dataset.free_photo = true
 
-
 playPhoto=(photo)->
   photo.src=photo.src
   event.stopPropagation()

data/app/controllers/xforum/forums_controller.rb

@@ -58,7 +58,7 @@ module Xforum
           case params[:which_list]
             when 'forum-admins-category-list'
               response= Category.edit_category(params, current_user)
-            when  'forum-admin-topic-list'
+            when  'forum-admins-topic-list'
               response=Topic.edit_topic(params, current_user)
           else
             response={}
@@ -66,9 +66,9 @@ module Xforum
             render json: response
         when 'remove forum object'
           case params[:which_list]
-            when 'category'
+            when 'forum-admins-category-list'
               response= Category.remove_object(params, current_user)
-            when 'topic'
+            when 'forum-admins-topic-list'
               response= Topic.remove_object(params, current_user)
             when 'language'
               response= Language.deactivate_language(params, current_user)

data/app/models/xforum/category.rb

@@ -12,10 +12,10 @@ module Xforum
       {id:id}
     end
 
-    def self.remove_category(params,user)
+    def self.remove_object(params,user)
       case(params[:state_action])
-        when 'del'  then Forum.where(id:params[:id]).update_all(closed:true)
-        when 'open' then Forum.where(id:params[:id]).update_all(closed:false)
+        when 'del'  then Category.where(id:params[:id]).update_all(closed:true)
+        when 'open' then Category.where(id:params[:id]).update_all(closed:false)
         else
           # type code here
       end  if user.forum_admin?

data/app/models/xforum/topic.rb

@@ -1,3 +1,13 @@
+#   category_id    integer 
+#   user_id        integer 
+#   name           string   limit: 50
+#   state          string   limit: 20
+#   closed         boolean             default: false
+#   suggestion     boolean             default: false
+#   votes          binary              default: --- []\n
+#   vote           boolean             default: false
+#   restricted     boolean             default: false
+
 
 module Xforum
   class Topic < ActiveRecord::Base
@@ -16,7 +26,7 @@ module Xforum
         category_id=Category.where(name:params[:category]).pluck(:id)[0]
         params[:hold_test]=='true' ?
             topics=Topic.grab({category_id:category_id,closed:false,suggestion:false},  [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})  :
-            topics=Topic.grab({category_id:category_i}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})
+            topics=Topic.grab({category_id:category_id}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})
         topics=[] if topics[0][:id].nil?
         topics=PeopleList.check_restrictions(topics,user,'topic') unless user.forum_admin?
         a=Topic.grab({name:'select topic'},[:id,:name,:state,:restricted,:closed],{swap:{name: :item}})[0]
@@ -127,14 +137,13 @@ module Xforum
       Topic.where(id: params[:id]).update_all(name:params[:newline]) if user.forum_admin?
     end
 
-    def self.remove_topic(params,user)
+    def self.remove_object(params,user)
       case(params[:state_action])
-        when 'del'  then Forum.where(id:params[:id]).update_all(closed:true)
-        when 'open' then Forum.where(id:params[:id]).update_all(closed:false)
+        when 'del' then   Topic.where(id:params[:id]).update_all(closed:true)
+        when 'open' then  Topic.where(id:params[:id]).update_all(closed:false)
         else
           # type code here
       end  if user.forum_admin?
-      {action:'nothing to do'}
     end
   end
 end

data/app/views/xforum/admin_lists/_category_set.html.erb

@@ -1,11 +1,11 @@
 <div id= 'forum-category-set' class="col-md-4">
   <ul id= 'forum-admins-category-list'>
     <li>
-      <input class='red-ellipse btn-sm'  type='button' id= 'delete-forum-object'
+      <input class='red-ellipse btn-sm'  type='button' id= 'delete-forum-object'  data-parent='category-list'
              data-del= "<%= t('xForum.del')%>" data-open= "<%= t('xForum.open')%>" value= "<%= t('xForum.del')%>" >
-      <input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object'
+      <input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object'  data-parent='category-list'
              data-save= "<%= t('xForum.save')%>" data-edit= "<%= t('xForum.edit')%>" value= "<%= t('xForum.edit')%>" >
-      <span></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field" ></span>
+      <span></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field"  data-parent='category-list' ></span>
     </li>
   </ul>
   <span id="forum-add-category-input-span" hidden><input id='forum-add-admin-category' type="text" class="admin-edit-field" ></span> <br>
@@ -18,9 +18,9 @@
          data-who='category' value= "<%= t('xForum.Cancel')%>" >
   <ul id="forum-category-prososals-list" >
     <li>
-      <input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'
+      <input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'   data-parent='category-list'
              data-action='accept' value= "<%= t('xForum.Accept')%>" >
-      <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'
+      <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'    data-parent='category-list'
              data-action='reject' value= "<%= t('xForum.Reject')%>" >
       <span data-type="item"></span><span data-type="user"></span>
     </li>

data/app/views/xforum/admin_lists/_topic_set.html.erb

@@ -1,11 +1,11 @@
 <div id= 'forum-topic-set' class="col-md-5">
   <ul id="forum-admins-topic-list">
     <li>
-      <input class='red-ellipse btn-sm'  type='button' id= 'delete-forum-object'
+      <input class='red-ellipse btn-sm'  type='button' id= 'delete-forum-object' data-parent='topic-list'
              data-del= "<%= t('xForum.del')%>" data-open= "<%= t('xForum.open')%>" value= "<%= t('xForum.del')%>" >
-      <input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object'
+      <input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object' data-parent='topic-list'
              data-save= "<%= t('xForum.save')%>" data-edit= "<%= t('xForum.edit')%>" value= "<%= t('xForum.edit')%>" >
-      <span></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field" ></span>
+      <span ></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field"   data-parent='topic-list'></span>
     </li>
   </ul>
   <span id="forum-add-topic-input-span" hidden><input  id='forum-add-admin-topic' type="text" class="admin-edit-field" ></span><br>
@@ -19,9 +19,9 @@
          data-who='topic' value= "<%= t('xForum.Cancel')%>" >
   <ul id="forum-topic-prososals-list" >
     <li>
-      <input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name='forum-suggestion-response'
+      <input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name='forum-suggestion-response' data-parent='topic-list'
              data-action='accept' value= "<%= t('xForum.Accept')%>" >
-      <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name='forum-suggestion-response'
+      <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name='forum-suggestion-response' data-parent='topic-list'
              data-action='reject' value= "<%= t('xForum.Reject')%>" >
       <span data-type="item"></span><span data-type='user'></span><span data-type="category"></span>
     </li>

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.26'
+  VERSION = '0.0.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement