xforum 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc117ec03d67331b03463b23ad6bd5f7a497e442
-  data.tar.gz: 9ea7c11c3b567a1af0265c3c08d13dc51facb1f8
+  metadata.gz: cdd0230f71f4e32de2c94631d9b231693b29e0c5
+  data.tar.gz: 7e68d7226e5fafd6be92b7e51ff070564791c7e2
 SHA512:
-  metadata.gz: f5e609daa43c2f2ea42740b402dc8ab08de6623397426bb81abc4fc87aba334323643cb28756f970c8dbb460dc47b0f69abec8f8f299843a7478b7c7e7a29140
-  data.tar.gz: a6251e7c28d92c1785df25b1d92fa7842bfb78a74caca2bcc9ef31eb7e32c4f1fe2177f5cfb445d789ba149d5a3d06b5fa5ddc18f12247a4b48c1172aa28490f
+  metadata.gz: 52c33aed52b5a3ebd4a977e2d402011626e296eba5e2a4ba17707433117ef475038681bf7b7d4d7ea0e13ea0e9f616bc5a20ef7254a301603a9326d029cd72a4
+  data.tar.gz: 13df5290aba493ab14f34015b3347aea64190d11e352b233bdc10f3c3d856f68584badb4fea91ad237588908ce37c4dd5ee3232ee30f466a0963dbd40220c51c

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

@@ -20,8 +20,8 @@ jQuery ->
   $('#forum-box').delegate 'input[id = forum-admin-button]','click', (evt) ->
     doButtonAction(event.target)
     event.stopPropagation()
-  $('#forum-senate-admin-users').delegate 'option[id = forum-admin-option]','click', (evt) ->
-    checkForNone(event.target)
+  $('#forum-senate-admin-users').delegate '[id = forum-admin-list-option]','click', (evt) ->
+    setSelections(event.target)
   $('#forum-category-admin').change ->
     getAdminsTopic()
   $('#forum-actions').change ->
@@ -142,11 +142,18 @@ turnLanguage=(toggle)->
   showMe({id:'language-selector-span'})
   $.post('xforum/forum_ajax',{function:'get language set',list:'forum-admin-language-select',active:toggle =='off'},loadList)
 
-checkForNone = (which)->
+setSelections = (which)->
   if which.value == 'select none'
     hideMe({obj:which.parentNode.parentNode})
     name=which.parentNode.name + '-show'
     showMe({name:name})
+  selections = getSelectValues({name:'forum-user-tag',ref:true})
+  selections= selections.concat(getSelectValues({name:'forum-user-email',ref:true}))
+  selector=   $('[name=forum-email-selections]')
+  selector.children().remove()
+  for i in [0...selections.length]
+    unless selections[i]=='select none'
+      pushOption(selector,{value:selections[i]})
 
 setEmailView = ->
   blockMe({id:'forum-user-email-span'})

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

@@ -121,10 +121,15 @@ window.loadList = (params)->
 window.pushOption = (q_selector,data,offset)->
   selector=q_selector.get()[0]
   if selector?
-    option = document.createElement("option")
-    option.text = data.value
+    switch selector.tagName
+      when 'UL'
+        option= document.createElement('li')
+        option.innerHTML=data.value
+      when 'SELECT'
+        option = document.createElement("option")
+        option.text = data.value
     option.value = data.item
-    option.id =  'forum-admin-option'
+    option.id =  'forum-admin-list-option'
     ref = selector.children[selector.children.length - offset]
     if ref==undefined
       selector.appendChild(option)
@@ -133,7 +138,6 @@ window.pushOption = (q_selector,data,offset)->
   else
     alert "#{q_selector}  is not there"
 
-
 window.getLanguage = ->
   getSelectValues({id:'forum-language', ref:true})
 

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

@@ -13,6 +13,12 @@ $blue: #a0a0ff;
 .row{
   width: 100%
 }
+.forum-admin-user-list{
+  width:auto;
+  max-height:60px;
+  padding:7px;
+  overflow-y:scroll;
+}
 .admin-edit-field{
   width:150px;
   font-size: 10px;

data/app/controllers/xforum/application_controller.rb

@@ -1,25 +1,6 @@
 module Xforum
   class ApplicationController < ActionController::Base
 
-    include ApplicationHelper
-    #before_filter :set_locale
-    # Prevent CSRF attacks by raising an exception.
-    # For APIs, you may want to use :null_session instead.
-    protect_from_forgery with: :exception
-    # Force signout to prevent CSRF attacks
-
-    def handle_unverified_request
-      sign_out
-      super
-    end
-
-    private
-    def set_locale
-      I18n.locale = params[:locale] if params[:locale].present?
-    end
-    def default_url_options(options = {})
-      {locale: I18n.locale}
-    end
   end
 
 end

data/app/models/xforum/forum.rb

@@ -132,7 +132,7 @@ module Xforum
       senate_list[index].store(:moderator,options[:moderator]) unless options[:moderator].nil?
       senate_list[index].store(:vote,options[:vote])  unless options[:vote].nil?
       senate_list[index].store(:votes,options[:votes]) unless options[:votes].nil?
-      senate_list[index].store(:admin,options[:admin]) unless options[:admin].nil?
+      senate_list[index].store(:admin_lists,options[:admin_lists]) unless options[:admin_lists].nil?
       senate_list[index].store(:subscribed,options[:subscribed]) unless options[:subscribed].nil?
       new_list.push(senate_list[index])
       id=senate_list[index][:id]

data/app/models/xforum/people_list.rb

@@ -42,12 +42,10 @@ module Xforum
               list.people=params[:people].to_json
           }
         when 'add to distribution'
-          alist=user_ids+JSON.load(PeopleList.where(id: params[:distribution_list]).pluck(:people)[0])
-          alist.uniq!
-          PeopleList.where(id: params[:distribution_list]).update_all(people: alist.to_json)
-        when 'remove from distro'
-          alist=JSON.load(PeopleList.where(id: params[:distribution_list]).pluck(:people)[0])-user_ids
-          PeopleList.where(id: params[:distribution_list]).update_all(people: alist.to_json)
+          alist= user_ids
+          blist=  JSON.load(PeopleList.where(id: params[:distribution_list]).pluck(:people)[0])
+          clist=(alist|blist)-(alist&blist)
+          PeopleList.where(id: params[:distribution_list]).update_all(people: clist.to_json)
         else
       end
     end

data/app/models/xforum/translation.rb

@@ -22,7 +22,7 @@ module Xforum
 
     def self.translate_to(list)
       list.each{|entry|
-        translations=AssitMe.named_array(Translation.where(forum_id:entry[:id]).pluck(:language,:content),[:language,:content])
+        translations=Translation.grab({forum_id:entry[:id]},[:language,:content],{})
         entry.store(:translations,translations)
       }
       list
@@ -67,8 +67,8 @@ module Xforum
     def self.get_translations(params)
       language_id = Language.get_me(params)
       topic_id = Topic.where(name:params[:topic]).pluck(:id)[0]
-      ForumAssist.named_array(Translation.where(topic_id:topic_id,language_id:language_id,state:['new','open']).pluck(:forum_id,:content,:suggestion),[:forum_id,:item,:suggestion])
-      #Translation.grab({topic_id:topic_id,language_id:language_id,state:['new','open']},[:forum_id,:item,:suggestion],{swap:{name: :item}})
+      #ForumAssist.named_array(Translation.where(topic_id:topic_id,language_id:language_id,state:['new','open']).pluck(:forum_id,:content,:suggestion),[:forum_id,:item,:suggestion])
+      Translation.grab({topic_id:topic_id,language_id:language_id,state:['new','open']},[:forum_id,:content,:suggestion],{swap:{content: :item}})
 
     end
 

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

@@ -0,0 +1,28 @@
+<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'
+             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'
+             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>
+    </li>
+  </ul>
+  <span id="forum-add-category-input-span" hidden><input id='forum-add-admin-category' type="text" class="admin-edit-field" ></span> <br>
+  <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-add-category'
+         data-state='add' data-add= "<%= t('xForum.Add_Category')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Category')%>" >
+  <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-category'
+         data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
+  <input class='red-ellipse comment-btn' type="button" id="restrict-category" data-submit= "<%=t('xForum.Submit')%>" data-restrict="<%=t('xForum.Restrict')%>"  value="<%=t('xForum.Restrict')%>">
+  <input class='red-ellipse comment-btn'  type='button' id=forum-admin-button name= 'forum-add-cancel'
+         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'
+             data-action='accept' value= "<%= t('xForum.Accept')%>" >
+      <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'
+             data-action='reject' value= "<%= t('xForum.Reject')%>" >
+      <span data-type="item"></span><span data-type="user"></span>
+    </li>
+  </ul>
+</div>

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

@@ -0,0 +1,28 @@
+<div id= 'forum-language-set' class="col-md-3">
+        <span id="forum-add-language-input-span" hidden>
+          <label><%= t('xForum.Language_Name')%> </label>
+          <input id='forum-add-admin-language' type="text" class="admin-edit-field" >
+          <label><%= t('xForum.Localized_Name') %></label>
+          <input id='forum-add-admin-language-localized' type="text" class="admin-edit-field" >
+          <label><%= t('xForum.Language_code') %></label>
+          <input id='forum-add-admin-language-code' type="text" class="admin-edit-field" >
+        </span><br>
+
+      <span id="language-selector-span" hidden>
+        <%=select_tag(:users,options_for_select([t('xForum.Select_Language')] ), id:'forum-admin-language-select', class:'forum-select')%><br>
+      </span>
+  <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name= 'forum-activate-language'  value= "<%= t('xForum.Activate')%>" >
+  <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name= 'forum-deactivate-language' value= "<%= t('xForum.Deactivate')%>" >
+  <br>
+  <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name= 'forum-add-language'
+         data-state='add' data-add= "<%= t('xForum.Add_Language')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Language')%>" >
+  <input class='red-ellipse comment-btn' type='button'  id= 'forum-admin-button' name='forum-add-cancel' data-who='language' value= "<%= t('xForum.Cancel')%>" >
+
+  <ul id="forum-language-prososals-list" >
+    <li>
+      <input class='blue-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response' value= "<%= t('xForum.Close')%>" >
+      <span></span>
+      <span data-type="language"></span><span></span>
+    </li>
+  </ul>
+</div>

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

@@ -0,0 +1,29 @@
+<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'
+             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'
+             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>
+    </li>
+  </ul>
+  <span id="forum-add-topic-input-span" hidden><input  id='forum-add-admin-topic' type="text" class="admin-edit-field" ></span><br>
+  <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name='forum-add-topic'
+         data-state='add' data-add= "<%= t('xForum.Add_Topic')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Topic')%>" >
+  <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-topic'
+         data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
+  <input class='red-ellipse comment-btn' type="button" id="restrict-topic" data-submit= "<%=t('xForum.Submit')%>" data-restrict="<%=t('xForum.Restrict')%>"  value="<%=t('xForum.Restrict')%>">
+
+  <input class='red-ellipse comment-btn'  type='button' id= 'forum-admin-button' name='forum-add-cancel'
+         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'
+             data-action='accept' value= "<%= t('xForum.Accept')%>" >
+      <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name='forum-suggestion-response'
+             data-action='reject' value= "<%= t('xForum.Reject')%>" >
+      <span data-type="item"></span><span data-type='user'></span><span data-type="category"></span>
+    </li>
+  </ul>
+</div>

data/app/views/xforum/admin_users/_admin_users.html.erb

@@ -0,0 +1,40 @@
+<div class="forum-senate" id="forum-senate-admin-users" style="display: none;">
+
+  <%@empty= [[t( :empty_list),0 ]]  %>
+  <div class='forum-row'><br>
+      <span class="col-md-3">
+         <label> <%= t('xForum.Action')%>  </label> <br><br>
+        <%=select_tag(:users,options_for_select(@forum_actions ), id:'forum-actions', class:'forum-select')%>
+        <input class='red-ellipse comment-btn'  type='button' id= "forum-admin-button" name ='forum-act-on-admin-selector' value= "<%= t('xForum.Submit')%>" >
+        <span id="forum-email-selections" class="forum-admin-user-list"><br><ul name="forum-email-selections"></ul></span>
+
+      </span>
+      <span class="col-md-3">
+        <label> <%= t('xForum.User_Name') %> </label> <br><br>
+        <button class="cool-selector" name="forum-user-tag-show"><input class= 'silver-selector' type='button' id=  'forum-admin-button' name='forum-user-tag-choose'  value="<%= t('xForum.select_user')%>"></button>
+        <span id='forum-user-tag-span'><%=select_tag(:users,options_for_select(@user_tags ), multiple:true, name:'forum-user-tag',size:6, class:'forum-select')%></span>
+      </span>
+      <span class="col-md-3">
+        <label> <%= t('xForum.User_Email')%>  </label> <br><br>
+        <button class="cool-selector" name="forum-user-email-show"><input class= 'silver-selector' type='button' id=  'forum-admin-button' name='forum-user-email-choose'  value="<%= t('xForum.select_user')%>"></button>
+        <span id='forum-user-email-span'><%=select_tag(:user_email,options_for_select(@user_email), multiple:true, size:6, name:'forum-user-email', class:'forum-select')%></span>
+      </span>
+      <span class="col-md-3">
+        <span id="forum-distribution-span">
+          <label> <%= t('xForum.Distribuiton_List_Name')%>  </label> <br><br>
+          <%=select_tag(:forum,options_for_select(@distribution_lists),  id:'forum-distribution-lists', class:'forum-select')%>
+          <label><%=t('xforum.New')%></label> <input type="text" id='forum-new-distribution-list' class="admin-edit-field"  >
+        </span>
+        <span id="forum-moderator-add-span">
+          <label> <%= t('xForum.Add_Topic_Monitor')%>  </label> <br><br>
+          <%= select_tag(:forum, options_for_select(@categories),id:'forum-category-monitor', class: 'forum-select') %>
+          <%= select_tag(:forum, options_for_select(@topics), id:'forum-topic-monitor', class: 'forum-select') %>
+        </span>
+      </span>
+  </div>
+
+  <div id= 'forum-email-email' class="forum-row" style="display: none;">
+    <input type="text" id="forum-email-subject" class="forum-email-subject" placeholder="<%= t('xForum.subject')%>" >
+    <textarea  id="forum-email-body" class="forum-email-body" placeholder="<%= t('xForum.message')%>" ></textarea>
+  </div>
+</div>

data/app/views/xforum/{forums → comments}/_forum_comments.html.erb

@@ -41,5 +41,5 @@
   </div>
 
   <div class="forum-senate" id='forum-senate'>
-    <%=render partial: 'xforum/forums/forum_entry'%>
+    <%=render partial: 'xforum/comments/forum_entry'%>
   </div>

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

@@ -12,7 +12,7 @@
   <%= select_tag(:forum, options_for_select(@categories),id:'forum-category', class: 'forum-select') %>
   <%= select_tag(:forum, options_for_select(@topics), id:'forum-topic', class: 'forum-select') %>
 
-  <%=render partial: 'xforum/forums/forum_comments'%>
+  <%=render partial: 'xforum/comments/forum_comments'%>
   <%=render partial: 'xforum/forums/forum_admin'%>
-  <%=render partial: 'xforum/forums/forum_video'%>
+  <%=render partial: 'xforum/comments/forum_video'%>
 </div>

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

@@ -1,137 +1,16 @@
-<div class="forum-senate" id="forum-senate-admin-users" style="display: none;">
+<%=render partial: 'xforum/admin_users/admin_users'%>
 
-  <%@empty= [[t( :empty_list),0 ]]  %>
-  <div class='forum-row'><br>
-      <span class="col-md-3">
-         <label> <%= t('xForum.Action')%>  </label> <br><br>
-        <%=select_tag(:users,options_for_select(@forum_actions ), id:'forum-actions', class:'forum-select')%>
-        <input class='red-ellipse comment-btn'  type='button' id= "forum-admin-button" name ='forum-act-on-admin-selector' value= "<%= t('xForum.Submit')%>" >
-      </span>
-      <span class="col-md-3">
-        <label> <%= t('xForum.User_Name') %> </label> <br><br>
-
-        <button class="cool-selector" name="forum-user-tag-show"><input class= 'silver-selector' type='button' id=  'forum-admin-button' name='forum-user-tag-choose'  value="<%= t('xForum.select_user')%>"></button>
-        <span id='forum-user-tag-span'><%=select_tag(:users,options_for_select(@user_tags ), multiple:true, name:'forum-user-tag',size:6, class:'forum-select')%></span>
-      </span>
-      <span class="col-md-3">
-        <label> <%= t('xForum.User_Email')%>  </label> <br><br>
-        <button class="cool-selector" name="forum-user-email-show"><input class= 'silver-selector' type='button' id=  'forum-admin-button' name='forum-user-email-choose'  value="<%= t('xForum.select_user')%>"></button>
-        <span id='forum-user-email-span'><%=select_tag(:user_email,options_for_select(@user_email), multiple:true, size:6, name:'forum-user-email', class:'forum-select')%></span>
-      </span>
-      <span class="col-md-3">
-        <span id="forum-distribution-span">
-          <label> <%= t('xForum.Distribuiton_List_Name')%>  </label> <br><br>
-          <%=select_tag(:forum,options_for_select(@distribution_lists),  id:'forum-distribution-lists', class:'forum-select')%>
-          <label><%=t('xforum.New')%></label> <input type="text" id='forum-new-distribution-list' class="admin-edit-field"  >
-        </span>
-        <span id="forum-moderator-add-span">
-          <label> <%= t('xForum.Add_Topic_Monitor')%>  </label> <br><br>
-          <%= select_tag(:forum, options_for_select(@categories),id:'forum-category-monitor', class: 'forum-select') %>
-          <%= select_tag(:forum, options_for_select(@topics), id:'forum-topic-monitor', class: 'forum-select') %>
-        </span>
-      </span>
-    </div>
-
-
-  <div id= 'forum-email-email' class="forum-row" style="display: none;">
-    <input type="text" id="forum-email-subject" class="forum-email-subject" placeholder="<%= t('xForum.subject')%>" >
-    <textarea  id="forum-email-body" class="forum-email-body" placeholder="<%= t('xForum.message')%>" ></textarea>
-  </div>
-</div>
 <div class="forum-senate" id="forum-senate-admin-lists" style="display: none;">
   <%@categories.pop%>
   <%@categories2=@categories.clone%>
   <%@categories2.pop%>
   <%= select_tag(:forum, options_for_select(@categories2),id:'forum-category-admin', class: 'forum-select') %>
   <%= select_tag(:forum, options_for_select(@topics),id:'forum-admin-topic', class: 'forum-select') %>
-
   <%=select_tag(:forum,options_for_select(@distribution_lists),  id:'forum-restricted-list', class:'forum-select')%>
   <div class="forum-row senate-row">
-    <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'
-                 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'
-                 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>
-        </li>
-      </ul>
-      <span id="forum-add-category-input-span" hidden><input id='forum-add-admin-category' type="text" class="admin-edit-field" ></span> <br>
-      <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-add-category'
-             data-state='add' data-add= "<%= t('xForum.Add_Category')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Category')%>" >
-      <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-category'
-             data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
-      <input class='red-ellipse comment-btn' type="button" id="restrict-category" data-submit= "<%=t('xForum.Submit')%>" data-restrict="<%=t('xForum.Restrict')%>"  value="<%=t('xForum.Restrict')%>">
-      <input class='red-ellipse comment-btn'  type='button' id=forum-admin-button name= 'forum-add-cancel'
-             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'
-                 data-action='accept' value= "<%= t('xForum.Accept')%>" >
-          <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'
-                 data-action='reject' value= "<%= t('xForum.Reject')%>" >
-          <span data-type="item"></span><span data-type="user"></span>
-        </li>
-      </ul>
-    </div>
-    <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'
-                 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'
-                 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>
-        </li>
-      </ul>
-      <span id="forum-add-topic-input-span" hidden><input  id='forum-add-admin-topic' type="text" class="admin-edit-field" ></span><br>
-      <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name='forum-add-topic'
-             data-state='add' data-add= "<%= t('xForum.Add_Topic')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Topic')%>" >
-      <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-topic'
-             data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
-      <input class='red-ellipse comment-btn' type="button" id="restrict-topic" data-submit= "<%=t('xForum.Submit')%>" data-restrict="<%=t('xForum.Restrict')%>"  value="<%=t('xForum.Restrict')%>">
-
-      <input class='red-ellipse comment-btn'  type='button' id= 'forum-admin-button' name='forum-add-cancel'
-             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'
-                 data-action='accept' value= "<%= t('xForum.Accept')%>" >
-          <input class='red-ellipse btn-sm'   type='button' id= 'forum-admin-button' name='forum-suggestion-response'
-                 data-action='reject' value= "<%= t('xForum.Reject')%>" >
-          <span data-type="item"></span><span data-type='user'></span><span data-type="category"></span>
-        </li>
-      </ul>
-    </div>
-    <div id= 'forum-language-set' class="col-md-3">
-        <span id="forum-add-language-input-span" hidden>
-          <label><%= t('xForum.Language_Name')%> </label>
-          <input id='forum-add-admin-language' type="text" class="admin-edit-field" >
-          <label><%= t('xForum.Localized_Name') %></label>
-          <input id='forum-add-admin-language-localized' type="text" class="admin-edit-field" >
-          <label><%= t('xForum.Language_code') %></label>
-          <input id='forum-add-admin-language-code' type="text" class="admin-edit-field" >
-        </span><br>
-
-      <span id="language-selector-span" hidden>
-        <%=select_tag(:users,options_for_select([t('xForum.Select_Language')] ), id:'forum-admin-language-select', class:'forum-select')%><br>
-      </span>
-      <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name= 'forum-activate-language'  value= "<%= t('xForum.Activate')%>" >
-      <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name= 'forum-deactivate-language' value= "<%= t('xForum.Deactivate')%>" >
-      <br>
-      <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name= 'forum-add-language'
-             data-state='add' data-add= "<%= t('xForum.Add_Language')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Language')%>" >
-      <input class='red-ellipse comment-btn' type='button'  id= 'forum-admin-button' name='forum-add-cancel' data-who='language' value= "<%= t('xForum.Cancel')%>" >
-
-      <ul id="forum-language-prososals-list" >
-        <li>
-          <input class='blue-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response' value= "<%= t('xForum.Close')%>" >
-          <span></span>
-          <span data-type="language"></span><span></span>
-        </li>
-      </ul>
-    </div>
+    <%=render partial: 'xforum/admin_lists/category_set'%>
+    <%=render partial: 'xforum/admin_lists/topic_set'%>
+    <%=render partial: 'xforum/admin_lists/language_set'%>
   </div>
 </div>
 

data/lib/active_record_extension.rb

@@ -56,7 +56,6 @@ module ActiveRecordExtension
         datax=data[i]
         (0...what.size).each { |j|
           pseudo ? temp[i].store(what[j], data[j]) : temp[i].store(what[j], datax[j]) }
-        Rails.logger.debug 'hello'
       }
       temp.shift if double
       temp

data/lib/tasks/xforum_tasks.rake

@@ -58,7 +58,6 @@
       datax=data[i]
       (0...params.size).each { |j|
         pseudo ? temp[i].store(params[j], data[j]) : temp[i].store(params[j], datax[j]) }
-      Rails.logger.debug 'hello'
     }
     temp.shift if double
     temp

data/lib/xforum.rb

@@ -31,7 +31,6 @@ module Xforum
           datax=data[i]
           (0...params.size).each { |j|
             pseudo ? temp[i].store(params[j], data[j]) : temp[i].store(params[j], datax[j]) }
-          Rails.logger.debug 'hello'
         }
         temp.shift if double
         temp

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -191,7 +191,6 @@ files:
 - app/controllers/xforum/application_controller.rb
 - app/controllers/xforum/forums_controller.rb
 - app/helpers/xforum/application_helper.rb
-- app/mailers/xforum/user_mailer.rb
 - app/models/xforum/category.rb
 - app/models/xforum/forum.rb
 - app/models/xforum/hyperlink.rb
@@ -202,12 +201,16 @@ files:
 - app/models/xforum/translation.rb
 - app/views/layouts/xforum/application.html.erb
 - app/views/user_mailer/xforum/note_to_forum_users.html.erb
+- app/views/xforum/admin_lists/_category_set.html.erb
+- app/views/xforum/admin_lists/_language_set.html.erb
+- app/views/xforum/admin_lists/_topic_set.html.erb
+- app/views/xforum/admin_users/_admin_users.html.erb
+- app/views/xforum/comments/_forum_comments.html.erb
+- app/views/xforum/comments/_forum_entry.html.erb
+- app/views/xforum/comments/_forum_video.html.erb
 - app/views/xforum/forums/_dummy.html.erb
 - app/views/xforum/forums/_forum.html.erb
 - app/views/xforum/forums/_forum_admin.html.erb
-- app/views/xforum/forums/_forum_comments.html.erb
-- app/views/xforum/forums/_forum_entry.html.erb
-- app/views/xforum/forums/_forum_video.html.erb
 - app/views/xforum/forums/newphoto.js.erb
 - app/views/xforum/forums/the_page.html.erb
 - config/intiializers/xforum.rb
@@ -274,12 +277,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 requirements: []

data/app/mailers/xforum/user_mailer.rb

@@ -1,15 +0,0 @@
- module Xforum
-  class UserMailer < ActionMailer::Base
-    default from: 'bnacreationss@gmail.com'
-
-    def note_to_forum_users(params,user_ids)
-      emails=[]
-      users_ids.each{
-        emails.push(Xforum.user_class.where(id:id).pluck(:email)[0])
-      }
-      #attachments["notes"] =file.read("notes")
-      @content=params[:body].split("\n")
-      mail(to: emails, subject: params[:subject])
-    end
-  end
-end