xforum 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f5069146e8160cb8b5b9f02eaf800518b8d401
-  data.tar.gz: 864f579bd870f50b7b0f0329f11e0105c629bef0
+  metadata.gz: 628d7925886e565f066e30c7fb394f7280ea631a
+  data.tar.gz: 7d5de4c3e07a5184d8991de6ec5d34800288037c
 SHA512:
-  metadata.gz: 35a45bc2cd646d4504233db6dba94cd1a1be7821ba5c58f34b5ac2084ae7daa64fea80831ddd9976f0843d45fdad037ed834a5cf4d97d332b70232fe4c2e6872
-  data.tar.gz: 08f3645848e89d186ba69e113fdcc8a805e4a16e28f20815746c370dae248951fa8d9a86db1b7f1a5ed90908b58423271cda37b6837df337822d1a9947ffa730
+  metadata.gz: e22888656c577285bdff36080f25440dbfc59d5a3a35c6e97009dac214802f7232a11e43cbb4cd242ffb8224efb116791888813279f5440c0a835e7fdff484f8
+  data.tar.gz: 2e3c7597050ee5fabaa5141f71a99a4587aa91ad6e5f7e174d92f75222f5bdb79962519bdca1c2ae4aaeb3c7b563ef650e6e8d85b248ca3d137e2d4c2a4a0104

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

@@ -174,7 +174,7 @@ window.clearSenate = ->
 
 window.setSenate = (params)->
   page = document.getElementById('forum-senate')
-  showMe({id: '#forum-senate'})
+  blockMe({id:'forum-senate'})
   document.getElementById('forum-comment-span').dataset.next_id = params.index
   kids = $(page).children()
   unless !params.the_list?
@@ -220,7 +220,8 @@ buildSpan = (page, index, params) ->
   else if page.dataset.moderator == 'true' && params.comment_state == 'reject'
     da_class = 'forum-comment-reject'
   else  da_class = 'forum-comment'
-  span.innerHTML = '<p>' + params.content + '</p>'
+  the_comment=params.content.replace('::',':<br>')
+  span.innerHTML = '<p>' + the_comment + '</p>'
   page.appendChild(span)
   paragraph=span.getElementsByTagName('p')[0]
   paragraph.classList.add(da_class)

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

@@ -206,6 +206,7 @@ setNewComment = (id)->
 
 placeCommentSpan = (offset, id) ->
   comment = document.getElementById('forum-comment-span')
+  offset=Math.min(400,offset)
   comment.style.position = 'absolute'
   comment.style.top = offset + 'px'
   comment.style.left = '250px'

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

@@ -108,6 +108,10 @@ input{
   width:20px;
   display:inline;
 }
+.xforum-simple-list{
+  list-style-type: none;
+  padding:0;
+}
 .biggest-forum-photo{
   max-width:1140px;
   height:600px;

data/app/controllers/xforum/forums_controller.rb

@@ -43,7 +43,7 @@ module Xforum
               response= Category.add_category(params, current_user)
             when 'topic'
               response= Topic.add_topic(params, current_user)
-            when 'langauge'
+            when 'language'
               response= Language.activate_language(params, current_user)
             else
           end

data/app/models/xforum/language.rb

@@ -80,9 +80,9 @@ module Xforum
           (Language.where(id: params[:id]).update_all(suggestion: false) if user.forum_admin?) :
           Language.where(id: params[:id]).update_all(state: 'closed') if user.forum_admin?
     end
-    def self.get_locale(params)
+    def self.get_language_locale(params)
       params[:language].nil? ? id= Language.where(code:I18n.locale.to_s).pluck(:id)[0]  : id=Language.get_me(params)
-      id.nil? ? Langauge.first.id : id
+      id.nil? ? Language.first.id : id
     end
     def self.get_me(params)
       return if params[:langeuage].nil?

data/app/models/xforum/topic.rb

@@ -18,10 +18,9 @@ module Xforum
     serialize :votes
 
     def self.topics(params,user)
-      if Topic.first.nil?
-        Topic.create(name:'select topic')
-        Topic.create(name:'request new topic')
-      end
+      Topic.create(name:'select topic') if Topic.find_by(name:'select topic').nil?
+      Topic.create(name:'request new topic') if Topic.find_by(name:'request new topic').nil?
+
       unless  params[:category] == 'select category'
         category_id=Category.where(name:params[:category]).pluck(:id)[0]
         params[:hold_test]=='true' ?

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

@@ -0,0 +1,68 @@
+<div  class= "row">
+  <span class="col-md-4">
+    <ul id= 'forum-admins-category-list' class="xforum-simple-list">
+        <li>
+          <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'  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"  data-parent='category-list' ></span>
+        </li>
+    </ul>
+  </span>
+  <span class="col-md-6">
+      <ul id="forum-admins-topic-list" class="xforum-simple-list">
+        <li>
+          <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' 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"   data-parent='topic-list'></span>
+        </li>
+       </ul>
+  </span>
+  <span class="col-md-2" class="xforum-simple-list">
+    <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>
+  </span>
+</div>
+
+<div class="row" name="edit-list-buttons">
+  <span class="col-md-4">
+
+      <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')%>" >
+  </span>
+  <span class="col-md-5">
+      <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')%>" >
+  </span>
+  <span class="col-md-3">
+      <input class='blue-ellipse comment-btn right' type='button' id= 'forum-admin-button' name= 'forum-activate-language'  value= "<%= t('xForum.Activate')%>">
+      <input class='blue-ellipse comment-btn right' type='button' id= 'forum-admin-button' name= 'forum-deactivate-language' value= "<%= t('xForum.Deactivate')%>"><br>
+      <input class='blue-ellipse comment-btn right' 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')%>" >
+  </span>
+</div>

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

@@ -0,0 +1,29 @@
+<div class="row">
+  <span class="col-md-4">
+      <ul id="forum-category-prososals-list" class="xforum-simple-list">
+        <li>
+          <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'    data-parent='category-list'
+                 data-action='reject' value= "<%= t('xForum.Reject')%>" >
+          <span data-type="item"></span><span data-type="user"></span>
+        </li>
+      </ul>
+  </span>
+    <span class="col-md-6">
+        <ul id="forum-topic-prososals-list" class="xforum-simple-list" >
+          <li>
+            <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' 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>
+        </ul>
+    </span>
+   <span class="col-md-2" class="xforum-simple-list">
+
+   </span>
+
+
+</div>

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

@@ -1,4 +1,4 @@
-<%=render partial: 'xforum/admin_users/admin_users'%>
+<%=render partial: 'xforum/admin_lists/admin_users'%>
 
 <div class="forum-senate" id="forum-senate-admin-lists" style="display: none;">
   <%@categories.pop%>
@@ -8,9 +8,8 @@
   <%= 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">
-    <%=render partial: 'xforum/admin_lists/category_set'%>
-    <%=render partial: 'xforum/admin_lists/topic_set'%>
-    <%=render partial: 'xforum/admin_lists/language_set'%>
+    <%=render partial: 'xforum/admin_lists/admins_edit_lists'%>
+    <%=render partial: 'xforum/admin_lists/admins_suggestions_lists'%>
   </div>
 </div>
 

data/lib/xforum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Robert D Blanton
@@ -215,10 +215,9 @@ 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/admin_lists/_admin_users.html.erb
+- app/views/xforum/admin_lists/_admins_edit_lists.html.erb
+- app/views/xforum/admin_lists/_admins_suggestions_lists.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

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

@@ -1,28 +0,0 @@
-<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-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'  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"  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>
-  <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-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'    data-parent='category-list'
-             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

@@ -1,28 +0,0 @@
-<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

@@ -1,29 +0,0 @@
-<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-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' 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"   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>
-  <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-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' 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>
-  </ul>
-</div>