xforum 0.0.376 → 0.0.377
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 +0 -1
- data/app/assets/javascripts/xforum/forum_basic.js.coffee +2 -1
- data/app/models/xforum/people_list.rb +2 -0
- data/app/views/xforum/admin_lists/_admin_users.html.erb +5 -5
- data/app/views/xforum/forums/_forum.html.erb +1 -1
- data/config/locales/forum.de.yml +8 -2
- data/config/locales/forum.en.yml +7 -1
- data/config/locales/forum.es.yml +7 -1
- data/config/locales/forum.fr.yml +6 -0
- data/lib/xforum/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9ece98c3b431521e44c2a1d790696102977f8a02
|
4
|
+
data.tar.gz: c85eccdd20ddfe8d299650d4bd8d9a9ec643b591
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2d7c3f3b22d85f99184e955db7e4b6b46e00416e4dbafa2401e24d3bc5955b34b3cbb77f0d7a0b130bf33ed4bbd6cce545a534f2eab7d7303719ed0d4bbc23ba
|
7
|
+
data.tar.gz: 7a606bca17df8ddcb1a9ddeaf8804ae774f723ebf2caa3b7f00881fe6c21ef028c5af78b1404d5656edf339c45a7c73ea858bf84a9c2374692718e460b4dc6b7
|
@@ -148,7 +148,7 @@ window.loadListData=(params,global) ->
|
|
148
148
|
when 'forum-user-names'
|
149
149
|
g_list=forum_user_names
|
150
150
|
g_list_ids=forum_user_name_ids
|
151
|
-
|
151
|
+
else
|
152
152
|
if list_data.length==0
|
153
153
|
hideMe({obj:selector})
|
154
154
|
else
|
@@ -169,6 +169,7 @@ window.pushOption = (q_selector,data,offset)->
|
|
169
169
|
when 'SELECT'
|
170
170
|
option = document.createElement("option")
|
171
171
|
option.text = data.value
|
172
|
+
else
|
172
173
|
option.value = data.item
|
173
174
|
option.id = 'forum-admin-list-option'
|
174
175
|
ref = selector.children[selector.children.length - offset]
|
@@ -122,6 +122,8 @@ module Xforum
|
|
122
122
|
!JSON.load(PeopleList.where(category_id:id,list:'invitation')[0].people).include?(user_id)
|
123
123
|
when 'forum'
|
124
124
|
!JSON.load(PeopleList.where(forum_id:id,list:'invitation')[0].people).include?(user_id)
|
125
|
+
else
|
126
|
+
true
|
125
127
|
end
|
126
128
|
end
|
127
129
|
def self.get_forum_people_lists(params,user)
|
@@ -3,7 +3,7 @@
|
|
3
3
|
<%@empty= [[t('xForum.empty_list'),0 ]] %>
|
4
4
|
<div class='forum-row'><br>
|
5
5
|
<span class="col-md-3">
|
6
|
-
<label> <%= t('xForum.
|
6
|
+
<label> <%= t('xForum.select_action')%> </label> <br><br>
|
7
7
|
<%=select_tag(:users,options_for_select(@forum_actions ), id:'forum-actions', class:'forum-select')%>
|
8
8
|
<input class='red-ellipse comment-btn' type='button' id= "forum-admin-button" name ='forum-act-on-admin-selector' value= "<%= t('xForum.Submit')%>" >
|
9
9
|
</span>
|
@@ -18,15 +18,15 @@
|
|
18
18
|
</span>
|
19
19
|
<span class="col-md-4">
|
20
20
|
<span id="forum-every-list-span" style="display:none">
|
21
|
-
<label> <%= t('xForum.
|
21
|
+
<label> <%= t('xForum.forum_list_name')%> </label>
|
22
22
|
<%=select_tag(:forum,options_for_select(@every_list), id:'forum-every-list', class:'forum-select')%> <br>
|
23
23
|
<span id="editing-every-list-entries">
|
24
|
-
<br><label><%=t('xForum.
|
25
|
-
<br><label><%=t('xForum.
|
24
|
+
<br><label><%=t('xForum.new_list_name')%></label> <input type="text" id='forum-new-list' class="admin-edit-field" >
|
25
|
+
<br><label><%=t('xForum.new_list_type')%></label> <input type="text" id='forum-list-type' class="admin-edit-field" >
|
26
26
|
|
27
27
|
</span>
|
28
28
|
|
29
|
-
<label><%=t('
|
29
|
+
<label><%=t('xForum.user_email')%></label>
|
30
30
|
<textarea id="forum-selected-emails" name="forum-selected-emails" readonly></textarea>
|
31
31
|
</span>
|
32
32
|
<span id="forum-distribution-span" style="display:none">
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<%if Xforum::Language.first.nil? then Xforum::Language.init_language_set end %>
|
8
8
|
<%unless ENV['XFORUM_LANGUAGES'].nil? then @languages= Xforum::Language.languages({active:'true',list:'forum-language'})[:list_data] end %>
|
9
9
|
<%@aphoto= 'photo' %>
|
10
|
-
<%@topics=[[t('
|
10
|
+
<%@topics=[[t('xForum.select_topic'),0] ] %>
|
11
11
|
|
12
12
|
<%= select_tag(:forum, options_for_select(@categories),id:'forum-category', class: 'forum-select') %>
|
13
13
|
<%= select_tag(:forum, options_for_select(@topics), id:'forum-topic', class: 'forum-select') %>
|
data/config/locales/forum.de.yml
CHANGED
@@ -91,6 +91,12 @@ de:
|
|
91
91
|
select_category: Kategorie auswählen
|
92
92
|
Replay: Wiederholung
|
93
93
|
Back: Zurück
|
94
|
-
Action: Forum
|
94
|
+
Action: Forum Aktion
|
95
95
|
stop_moderating: mäßig
|
96
|
-
moderate: stoppen mäßig
|
96
|
+
moderate: stoppen mäßig
|
97
|
+
forum_list_name: Forum Listennamen
|
98
|
+
new_list_name: neuen Listennamen
|
99
|
+
new_list_type: Listentyp
|
100
|
+
create_user_list: Benutzerliste erstellen
|
101
|
+
edit_user_list: Bearbeiten von Benutzerliste
|
102
|
+
user_email: E-Mail-Benutzer
|
data/config/locales/forum.en.yml
CHANGED
@@ -95,4 +95,10 @@ en:
|
|
95
95
|
Action: Action
|
96
96
|
New: New
|
97
97
|
stop_moderating: stop moderating
|
98
|
-
moderate: moderate
|
98
|
+
moderate: moderate
|
99
|
+
forum_list_name: forum list name
|
100
|
+
new_list_name: new list name
|
101
|
+
new_list_type: list type
|
102
|
+
create_user_list: create user list
|
103
|
+
edit_user_list: edit user list
|
104
|
+
user_email: user email
|
data/config/locales/forum.es.yml
CHANGED
@@ -93,4 +93,10 @@ es:
|
|
93
93
|
Replay: Repetición
|
94
94
|
Back: Atrás
|
95
95
|
stop_moderating: moderada
|
96
|
-
moderate: dejar de moderar
|
96
|
+
moderate: dejar de moderar
|
97
|
+
forum_list_name: Foro Nombre de lista
|
98
|
+
new_list_name: nuevo nombre de lista
|
99
|
+
new_list_type: tipo de lista
|
100
|
+
create_user_list: crear lista de usuarios
|
101
|
+
edit_user_list: editar lista de usuarios
|
102
|
+
user_email: correo del usuario
|
data/config/locales/forum.fr.yml
CHANGED
@@ -94,3 +94,9 @@ fr:
|
|
94
94
|
Back: Arrière
|
95
95
|
stop_moderating: modéré
|
96
96
|
moderate: arrêter modérateur
|
97
|
+
forum_list_name: forum nom de liste
|
98
|
+
new_list_name: nouveau nom de liste
|
99
|
+
new_list_type: Type de liste
|
100
|
+
create_user_list: créer liste d'utilisateur
|
101
|
+
edit_user_list: modifier liste des utilisateurs
|
102
|
+
user_email: email de l'utilisateur
|
data/lib/xforum/version.rb
CHANGED