xforum 0.0.26 → 0.0.27
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/xforum/forum_admin.js.coffee +7 -12
- data/app/assets/javascripts/xforum/forum_basic.js.coffee +20 -8
- data/app/controllers/xforum/forums_controller.rb +3 -3
- data/app/models/xforum/category.rb +3 -3
- data/app/models/xforum/topic.rb +14 -5
- data/app/views/xforum/admin_lists/_category_set.html.erb +5 -5
- data/app/views/xforum/admin_lists/_topic_set.html.erb +5 -5
- data/lib/xforum/version.rb +1 -1
- metadata +16 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4369de85c7a394abf4ef510f28c71b132ae9063d
|
4
|
+
data.tar.gz: 8814a4298a157b1f48e4028b99d9bd0eb7802053
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 358f5c1a5cd448f55e1c14041b6623262d2d3aa070e76fde152effb0f67edf0b72d68da014fdd756c90ddf7e910edd7fb1ebb9254786a8b79d41ff8224dc9b02
|
7
|
+
data.tar.gz: b028b9140ae9235b6ba435c45d66c2a0c7cb62998a4203c166495dba2a17983991c0beffbacff92bb6fecc2b0e0c553a930fb217d17938099be6fbc62380c8ef
|
@@ -236,20 +236,17 @@ setUpReview=(button)->
|
|
236
236
|
clearSenate
|
237
237
|
|
238
238
|
deleteForumObject = (which_one)->
|
239
|
-
id = which_one.dataset.target
|
240
|
-
|
239
|
+
#id = which_one.dataset.target
|
240
|
+
list=which_one.parentNode.parentNode.id
|
241
|
+
$.post('xforum/forum_ajax',{function:'remove forum object',id:which_one.dataset.id,which_list:list,state_action:which_one.value})
|
241
242
|
if which_one.dataset.state == 'open'
|
242
|
-
which_one.value = which_one.dataset.
|
243
|
-
document.getElementById(id).className = ''
|
243
|
+
which_one.value = which_one.dataset.open
|
244
244
|
which_one.dataset.state = 'closed'
|
245
245
|
else
|
246
|
-
which_one.value = which_one.dataset.
|
247
|
-
document.getElementById(id).className = ''
|
246
|
+
which_one.value = which_one.dataset.del
|
248
247
|
which_one.dataset.state= 'open'
|
249
|
-
$.post('xforum/forum_ajax',{function:'categories',language:getLanguage(),hold_test:true,restricted:true},loadAdminsList)
|
250
248
|
|
251
249
|
addOptionTo = (which_one,item)->
|
252
|
-
by_name=false
|
253
250
|
switch which_one
|
254
251
|
when 'category'
|
255
252
|
pushOption($('[name=category_admin]'),{item:item,value:item},0)
|
@@ -338,10 +335,10 @@ addCancel=(params)->
|
|
338
335
|
$("[id = forum-add-admin-user]").val('me')
|
339
336
|
|
340
337
|
openEditObject = (which_one)->
|
341
|
-
line= document.getElementById("edit-entry-#{which_one.dataset.id}")
|
342
338
|
id=which_one.dataset.id
|
339
|
+
parent = which_one.parentNode
|
340
|
+
line=parent.children[CHILD_EDIT_ENTRY].children[0]
|
343
341
|
if which_one.dataset.state == 'edit'
|
344
|
-
parent = which_one.parentNode
|
345
342
|
showMe({obj:parent.children[CHILD_EDIT_ENTRY]})
|
346
343
|
which_one.value = which_one.dataset.save
|
347
344
|
which_one.dataset.state = 'save'
|
@@ -349,8 +346,6 @@ openEditObject = (which_one)->
|
|
349
346
|
hideMe({obj:parent.children[CHILD_EDIT_ITEM]})
|
350
347
|
line.focus()
|
351
348
|
else if which_one.dataset.state == 'save'
|
352
|
-
parent = which_one.parentNode
|
353
|
-
id = which_one.dataset.id
|
354
349
|
which_one.dataset.state = 'edit'
|
355
350
|
newline = line.value
|
356
351
|
hideMe({obj:parent.children[CHILD_EDIT_ENTRY]})
|
@@ -30,7 +30,6 @@ goBackToSenate=->
|
|
30
30
|
showForumElements()
|
31
31
|
showMe({id:'forum-senate'})
|
32
32
|
|
33
|
-
|
34
33
|
runPhotoGallery=(target)->
|
35
34
|
hideMe({id:'forum-senate'})
|
36
35
|
showMe({id:'forum-senate-video'})
|
@@ -41,6 +40,9 @@ runPhotoGallery=(target)->
|
|
41
40
|
window.startForum = ->
|
42
41
|
hideMe({id: showPageName()})
|
43
42
|
showForumElements()
|
43
|
+
pages= document.getElementById('xforum-help-pages')
|
44
|
+
if pages?
|
45
|
+
document.getElementById('forum-box').appendChild(pages);
|
44
46
|
blockMe({id: 'forum-page'})
|
45
47
|
clearSenate()
|
46
48
|
showMe({id:'forum-category'})
|
@@ -85,8 +87,6 @@ window.hideForumElements=->
|
|
85
87
|
hideMe({name:'forum-subscribe'})
|
86
88
|
hideMe({id:'forum-category'})
|
87
89
|
|
88
|
-
|
89
|
-
|
90
90
|
loadCustomList=(params)->
|
91
91
|
if params? && params.list_data? && params.list_data.length>0
|
92
92
|
list_data = params.list_data
|
@@ -159,7 +159,11 @@ window.clearSenate = ->
|
|
159
159
|
children = $('#just-a-comment')
|
160
160
|
if children?
|
161
161
|
$('span[id = just-a-comment]').remove()
|
162
|
-
|
162
|
+
senate= document.getElementById('forum-senate')
|
163
|
+
help_page= senate.dataset.helppage
|
164
|
+
if help_page?
|
165
|
+
hideMe({id:help_page})
|
166
|
+
deleteMyData(senate)
|
163
167
|
hideMe({id: 'forum-voting-booth'})
|
164
168
|
hideMe({id: 'subscribe-forum'})
|
165
169
|
hideMe({id: 'unsubscribe-forum'})
|
@@ -177,8 +181,18 @@ window.setSenate = (params)->
|
|
177
181
|
unless kids[i].id == 'forum-comment-span'
|
178
182
|
removeMe({obj:kids[i]})
|
179
183
|
unless params.the_list.length == 0
|
180
|
-
|
181
|
-
|
184
|
+
if params.the_list[0].content.search('@show@page@')>=0
|
185
|
+
showHelpPage(params.the_list[0].content)
|
186
|
+
else
|
187
|
+
for i in [0...params.the_list.length]
|
188
|
+
buildSpan(page, i, params.the_list[i])
|
189
|
+
|
190
|
+
showHelpPage=(page)->
|
191
|
+
help_page=page.replace('@show@page@','').trim()
|
192
|
+
senate=document.getElementById('forum-senate')
|
193
|
+
senate.dataset.helppage=help_page
|
194
|
+
hideMe({id:'forum-senate'})
|
195
|
+
blockMe({id:help_page})
|
182
196
|
|
183
197
|
buildSpan = (page, index, params) ->
|
184
198
|
span = document.createElement('span')
|
@@ -267,13 +281,11 @@ makePhotoBig=(photo,bigger)->
|
|
267
281
|
photo.classList.remove('forum-big-photo')
|
268
282
|
photo.classList.add('forum-photo')
|
269
283
|
|
270
|
-
|
271
284
|
activatePhoto=->
|
272
285
|
photos=$('[data-hold_tight=true]')
|
273
286
|
for i in [0...photos.length]
|
274
287
|
photos[i].dataset.free_photo = true
|
275
288
|
|
276
|
-
|
277
289
|
playPhoto=(photo)->
|
278
290
|
photo.src=photo.src
|
279
291
|
event.stopPropagation()
|
@@ -58,7 +58,7 @@ module Xforum
|
|
58
58
|
case params[:which_list]
|
59
59
|
when 'forum-admins-category-list'
|
60
60
|
response= Category.edit_category(params, current_user)
|
61
|
-
when 'forum-
|
61
|
+
when 'forum-admins-topic-list'
|
62
62
|
response=Topic.edit_topic(params, current_user)
|
63
63
|
else
|
64
64
|
response={}
|
@@ -66,9 +66,9 @@ module Xforum
|
|
66
66
|
render json: response
|
67
67
|
when 'remove forum object'
|
68
68
|
case params[:which_list]
|
69
|
-
when 'category'
|
69
|
+
when 'forum-admins-category-list'
|
70
70
|
response= Category.remove_object(params, current_user)
|
71
|
-
when 'topic'
|
71
|
+
when 'forum-admins-topic-list'
|
72
72
|
response= Topic.remove_object(params, current_user)
|
73
73
|
when 'language'
|
74
74
|
response= Language.deactivate_language(params, current_user)
|
@@ -12,10 +12,10 @@ module Xforum
|
|
12
12
|
{id:id}
|
13
13
|
end
|
14
14
|
|
15
|
-
def self.
|
15
|
+
def self.remove_object(params,user)
|
16
16
|
case(params[:state_action])
|
17
|
-
when 'del' then
|
18
|
-
when 'open' then
|
17
|
+
when 'del' then Category.where(id:params[:id]).update_all(closed:true)
|
18
|
+
when 'open' then Category.where(id:params[:id]).update_all(closed:false)
|
19
19
|
else
|
20
20
|
# type code here
|
21
21
|
end if user.forum_admin?
|
data/app/models/xforum/topic.rb
CHANGED
@@ -1,3 +1,13 @@
|
|
1
|
+
# category_id integer
|
2
|
+
# user_id integer
|
3
|
+
# name string limit: 50
|
4
|
+
# state string limit: 20
|
5
|
+
# closed boolean default: false
|
6
|
+
# suggestion boolean default: false
|
7
|
+
# votes binary default: --- []\n
|
8
|
+
# vote boolean default: false
|
9
|
+
# restricted boolean default: false
|
10
|
+
|
1
11
|
|
2
12
|
module Xforum
|
3
13
|
class Topic < ActiveRecord::Base
|
@@ -16,7 +26,7 @@ module Xforum
|
|
16
26
|
category_id=Category.where(name:params[:category]).pluck(:id)[0]
|
17
27
|
params[:hold_test]=='true' ?
|
18
28
|
topics=Topic.grab({category_id:category_id,closed:false,suggestion:false}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}}) :
|
19
|
-
topics=Topic.grab({category_id:
|
29
|
+
topics=Topic.grab({category_id:category_id}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})
|
20
30
|
topics=[] if topics[0][:id].nil?
|
21
31
|
topics=PeopleList.check_restrictions(topics,user,'topic') unless user.forum_admin?
|
22
32
|
a=Topic.grab({name:'select topic'},[:id,:name,:state,:restricted,:closed],{swap:{name: :item}})[0]
|
@@ -127,14 +137,13 @@ module Xforum
|
|
127
137
|
Topic.where(id: params[:id]).update_all(name:params[:newline]) if user.forum_admin?
|
128
138
|
end
|
129
139
|
|
130
|
-
def self.
|
140
|
+
def self.remove_object(params,user)
|
131
141
|
case(params[:state_action])
|
132
|
-
when 'del'
|
133
|
-
when 'open' then
|
142
|
+
when 'del' then Topic.where(id:params[:id]).update_all(closed:true)
|
143
|
+
when 'open' then Topic.where(id:params[:id]).update_all(closed:false)
|
134
144
|
else
|
135
145
|
# type code here
|
136
146
|
end if user.forum_admin?
|
137
|
-
{action:'nothing to do'}
|
138
147
|
end
|
139
148
|
end
|
140
149
|
end
|
@@ -1,11 +1,11 @@
|
|
1
1
|
<div id= 'forum-category-set' class="col-md-4">
|
2
2
|
<ul id= 'forum-admins-category-list'>
|
3
3
|
<li>
|
4
|
-
<input class='red-ellipse btn-sm' type='button' id= 'delete-forum-object'
|
4
|
+
<input class='red-ellipse btn-sm' type='button' id= 'delete-forum-object' data-parent='category-list'
|
5
5
|
data-del= "<%= t('xForum.del')%>" data-open= "<%= t('xForum.open')%>" value= "<%= t('xForum.del')%>" >
|
6
|
-
<input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object'
|
6
|
+
<input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object' data-parent='category-list'
|
7
7
|
data-save= "<%= t('xForum.save')%>" data-edit= "<%= t('xForum.edit')%>" value= "<%= t('xForum.edit')%>" >
|
8
|
-
<span></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field" ></span>
|
8
|
+
<span></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field" data-parent='category-list' ></span>
|
9
9
|
</li>
|
10
10
|
</ul>
|
11
11
|
<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 @@
|
|
18
18
|
data-who='category' value= "<%= t('xForum.Cancel')%>" >
|
19
19
|
<ul id="forum-category-prososals-list" >
|
20
20
|
<li>
|
21
|
-
<input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'
|
21
|
+
<input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response' data-parent='category-list'
|
22
22
|
data-action='accept' value= "<%= t('xForum.Accept')%>" >
|
23
|
-
<input class='red-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response'
|
23
|
+
<input class='red-ellipse btn-sm' type='button' id= 'forum-admin-button' name= 'forum-suggestion-response' data-parent='category-list'
|
24
24
|
data-action='reject' value= "<%= t('xForum.Reject')%>" >
|
25
25
|
<span data-type="item"></span><span data-type="user"></span>
|
26
26
|
</li>
|
@@ -1,11 +1,11 @@
|
|
1
1
|
<div id= 'forum-topic-set' class="col-md-5">
|
2
2
|
<ul id="forum-admins-topic-list">
|
3
3
|
<li>
|
4
|
-
<input class='red-ellipse btn-sm' type='button' id= 'delete-forum-object'
|
4
|
+
<input class='red-ellipse btn-sm' type='button' id= 'delete-forum-object' data-parent='topic-list'
|
5
5
|
data-del= "<%= t('xForum.del')%>" data-open= "<%= t('xForum.open')%>" value= "<%= t('xForum.del')%>" >
|
6
|
-
<input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object'
|
6
|
+
<input class='blue-ellipse btn-sm' type='button' id= 'edit-forum-object' data-parent='topic-list'
|
7
7
|
data-save= "<%= t('xForum.save')%>" data-edit= "<%= t('xForum.edit')%>" value= "<%= t('xForum.edit')%>" >
|
8
|
-
<span></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field"
|
8
|
+
<span ></span><span id="forum-edit-me" hidden><input type="text" class="admin-edit-field" data-parent='topic-list'></span>
|
9
9
|
</li>
|
10
10
|
</ul>
|
11
11
|
<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 @@
|
|
19
19
|
data-who='topic' value= "<%= t('xForum.Cancel')%>" >
|
20
20
|
<ul id="forum-topic-prososals-list" >
|
21
21
|
<li>
|
22
|
-
<input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name='forum-suggestion-response'
|
22
|
+
<input class='green-ellipse btn-sm' type='button' id= 'forum-admin-button' name='forum-suggestion-response' data-parent='topic-list'
|
23
23
|
data-action='accept' value= "<%= t('xForum.Accept')%>" >
|
24
|
-
<input class='red-ellipse btn-sm' type='button' id= 'forum-admin-button' name='forum-suggestion-response'
|
24
|
+
<input class='red-ellipse btn-sm' type='button' id= 'forum-admin-button' name='forum-suggestion-response' data-parent='topic-list'
|
25
25
|
data-action='reject' value= "<%= t('xForum.Reject')%>" >
|
26
26
|
<span data-type="item"></span><span data-type='user'></span><span data-type="category"></span>
|
27
27
|
</li>
|
data/lib/xforum/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: xforum
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.27
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert D Blanton
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-06-
|
11
|
+
date: 2014-06-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sqlite3
|
@@ -150,6 +150,20 @@ dependencies:
|
|
150
150
|
- - "~>"
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '2.0'
|
153
|
+
- !ruby/object:Gem::Dependency
|
154
|
+
name: rails-i18n
|
155
|
+
requirement: !ruby/object:Gem::Requirement
|
156
|
+
requirements:
|
157
|
+
- - "~>"
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: '4.0'
|
160
|
+
type: :runtime
|
161
|
+
prerelease: false
|
162
|
+
version_requirements: !ruby/object:Gem::Requirement
|
163
|
+
requirements:
|
164
|
+
- - "~>"
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: '4.0'
|
153
167
|
- !ruby/object:Gem::Dependency
|
154
168
|
name: turbolinks
|
155
169
|
requirement: !ruby/object:Gem::Requirement
|