Compare commits
104 Commits
pm
...
permission
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
40337f9e68 | ||
|
|
42722d03a0 | ||
|
|
94fc2bd1a9 | ||
|
|
780598ca6d | ||
|
|
ec085121a4 | ||
|
|
b807a8f4ab | ||
|
|
e7cd6d6e99 | ||
|
|
badb94ff07 | ||
|
|
5a534a4dda | ||
|
|
ac583b7351 | ||
|
|
b4af851ad0 | ||
|
|
34cb9e9dfc | ||
|
|
8fbbe1b1a5 | ||
|
|
52e32808b5 | ||
|
|
7ed1c2ac57 | ||
|
|
b9dcf0ac63 | ||
|
|
0646747780 | ||
|
|
553b373d5e | ||
|
|
3fb5924318 | ||
|
|
d70df0deef | ||
|
|
3c7bfa9338 | ||
|
|
2d9fdcd802 | ||
|
|
7d766c8cf2 | ||
|
|
5b3b0fe3ef | ||
|
|
7520efb683 | ||
|
|
82b4dd5280 | ||
|
|
9aad746649 | ||
|
|
32c72ca016 | ||
|
|
ea4799fc28 | ||
|
|
0093daedd9 | ||
|
|
b1f739f6f8 | ||
|
|
2223f88d7b | ||
|
|
577961d122 | ||
|
|
ff61be48f7 | ||
|
|
f66d6e9f13 | ||
|
|
61c1f36b50 | ||
|
|
5ab615e18f | ||
|
|
d2d64d20f0 | ||
|
|
91d6082d37 | ||
|
|
1ec1c09490 | ||
|
|
29ef493a1b | ||
|
|
8c99e9631b | ||
|
|
751462bbed | ||
|
|
a6148790da | ||
|
|
3e7a0e550f | ||
|
|
da2e66d0b8 | ||
|
|
611c52223a | ||
|
|
adf1966b97 | ||
|
|
fd40ac82ff | ||
|
|
a323613b9a | ||
|
|
908e67482c | ||
|
|
170f7bad54 | ||
|
|
291c4fb568 | ||
|
|
3f0bddeda3 | ||
|
|
adf7108941 | ||
|
|
07b96a0c2d | ||
|
|
563aa376e3 | ||
|
|
bd85a2c3ae | ||
|
|
e5e8caf38e | ||
|
|
faeba0ec70 | ||
|
|
6aee102114 | ||
|
|
5f17385343 | ||
|
|
767084cc2f | ||
|
|
2819989b72 | ||
|
|
8c6eb8ac17 | ||
|
|
72a6dcc54a | ||
|
|
4e1b6b430b | ||
|
|
f90257fe73 | ||
|
|
9b64c2c6d9 | ||
|
|
170fba42db | ||
|
|
12fb7584bc | ||
|
|
a8ffba8f8b | ||
|
|
fcdcbe2514 | ||
|
|
496e08393a | ||
|
|
b225dc57b2 | ||
|
|
b84db2bc87 | ||
|
|
43cee7d2e0 | ||
|
|
1ec464a4fc | ||
|
|
8dc051ea46 | ||
|
|
bcc1f192f5 | ||
|
|
5e4e6583bb | ||
|
|
6d70fd3309 | ||
|
|
b73ba5d739 | ||
|
|
91169ab103 | ||
|
|
65f7c3c97f | ||
|
|
1e267a64fb | ||
|
|
9837f12b59 | ||
|
|
d2de01100a | ||
|
|
4619306744 | ||
|
|
1b8744abdb | ||
|
|
617890c209 | ||
|
|
79ad8b201e | ||
|
|
b99e62b7e7 | ||
|
|
0c939f044c | ||
|
|
deba1b76e3 | ||
|
|
e2a16f3ae6 | ||
|
|
a250c411eb | ||
|
|
4105f1c61f | ||
|
|
1316d7ca03 | ||
|
|
e7463524af | ||
|
|
a24d26dd7c | ||
|
|
db3aea185b | ||
|
|
2c02a797b8 | ||
|
|
1b4a270038 |
2
Gemfile
2
Gemfile
@@ -15,6 +15,8 @@ gem 'activerecord-session_store'
|
||||
gem 'highlight_js-rails', github: 'RedstonerServer/highlight_js-rails'
|
||||
gem 'kaminari', github: 'jomo/kaminari', branch: 'patch-2' # pagination
|
||||
gem 'jquery-textcomplete-rails', github: 'RedstonerServer/jquery-textcomplete-rails' # @mentions
|
||||
gem 'actionpack-action_caching', github: 'antulik/actionpack-action_caching', ref: '8c6e52c69315d67437f480da5dce4b7c8737fb32'
|
||||
gem 'mail-gpg', github: 'jomo/mail-gpg', ref: 'a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9'
|
||||
|
||||
# Gems used only for assets and not required
|
||||
# in production environments by default.
|
||||
|
||||
22
Gemfile.lock
22
Gemfile.lock
@@ -14,6 +14,14 @@ GIT
|
||||
railties (>= 3.2.0)
|
||||
sass-rails (>= 3.2.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/antulik/actionpack-action_caching.git
|
||||
revision: 8c6e52c69315d67437f480da5dce4b7c8737fb32
|
||||
ref: 8c6e52c69315d67437f480da5dce4b7c8737fb32
|
||||
specs:
|
||||
actionpack-action_caching (1.2.0)
|
||||
actionpack (>= 4.0.0, < 6)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/jomo/kaminari.git
|
||||
revision: e49066e94d77a6abb03a0819f3c4b0cc6923cb70
|
||||
@@ -23,6 +31,15 @@ GIT
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/jomo/mail-gpg.git
|
||||
revision: a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9
|
||||
ref: a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9
|
||||
specs:
|
||||
mail-gpg (0.3.1)
|
||||
gpgme (~> 2.0, >= 2.0.2)
|
||||
mail (~> 2.5, >= 2.5.3)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rails/rails.git
|
||||
revision: 2c8f567e53580872d8c6dfe61201e58793ca131e
|
||||
@@ -127,6 +144,8 @@ GEM
|
||||
execjs (2.6.0)
|
||||
globalid (0.3.6)
|
||||
activesupport (>= 4.1.0)
|
||||
gpgme (2.0.11)
|
||||
mini_portile (>= 0.5.0)
|
||||
hirb (0.7.3)
|
||||
http-cookie (1.0.2)
|
||||
domain_name (~> 0.5)
|
||||
@@ -142,6 +161,7 @@ GEM
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mime-types (2.99)
|
||||
mini_portile (0.6.2)
|
||||
mini_portile2 (2.0.0)
|
||||
minitest (5.8.4)
|
||||
mysql2 (0.4.2)
|
||||
@@ -223,6 +243,7 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
actionpack-action_caching!
|
||||
activerecord-session_store
|
||||
bcrypt
|
||||
better_errors
|
||||
@@ -235,6 +256,7 @@ DEPENDENCIES
|
||||
jquery-rails
|
||||
jquery-textcomplete-rails!
|
||||
kaminari!
|
||||
mail-gpg!
|
||||
mysql2
|
||||
rails!
|
||||
rails-erd
|
||||
|
||||
BIN
app/assets/images/mastodon.png
Normal file
BIN
app/assets/images/mastodon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 477 B |
BIN
app/assets/images/tor.png
Normal file
BIN
app/assets/images/tor.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 581 B |
@@ -88,5 +88,45 @@ $(function() {
|
||||
}], {
|
||||
debounce: 300
|
||||
});
|
||||
$('.md_editor .field_container_user .editor_field').textcomplete([{
|
||||
// match up to 2 words (everything except some special characters)
|
||||
// each word can have up to 16 characters (up to 32 total)
|
||||
// words must be separated by a single space
|
||||
match: /(^|\s)([^!"§$%&\/()=?.,;+*@\s]{1,16})$/,
|
||||
search: function (text, callback, match) {
|
||||
console.log("Searching " + text);
|
||||
text = text.toLowerCase();
|
||||
$.ajax("/users/suggestions", {
|
||||
type: "post",
|
||||
data: {name: text},
|
||||
dataType: "json",
|
||||
headers: {
|
||||
"X-CSRF-Token": $('meta[name="csrf-token"]').attr("content")
|
||||
},
|
||||
success: function(data) {
|
||||
callback(data);
|
||||
},
|
||||
error: function(xhr, status, err) {
|
||||
console.error(err);
|
||||
callback([]);
|
||||
}
|
||||
});
|
||||
},
|
||||
template: function(user) {
|
||||
var name = user[0];
|
||||
var ign = user[1];
|
||||
if (name != ign) {
|
||||
return name + " <small>(" + ign + ")</small>";
|
||||
} else {
|
||||
return ign;
|
||||
}
|
||||
},
|
||||
cache: true,
|
||||
replace: function (word) {
|
||||
return "$1" + word[1] + " ";
|
||||
}
|
||||
}], {
|
||||
debounce: 300
|
||||
});
|
||||
|
||||
});
|
||||
105
app/assets/stylesheets/dark.css.scss
Normal file
105
app/assets/stylesheets/dark.css.scss
Normal file
@@ -0,0 +1,105 @@
|
||||
body {
|
||||
background-color:rgb(50, 50, 50);
|
||||
text-shadow:none !important;
|
||||
color:rgb(190, 190, 190) !important;
|
||||
}
|
||||
::selection {
|
||||
background-color:rgb(100, 150, 255);
|
||||
}
|
||||
a {
|
||||
color:rgb(203, 75, 22);
|
||||
border-color:black !important;
|
||||
}
|
||||
a:hover {
|
||||
color:rgb(215, 100, 40);
|
||||
}
|
||||
#main-content {
|
||||
border-color:black !important;
|
||||
padding:30px 100px;
|
||||
box-shadow:none;
|
||||
}
|
||||
#main-content-scroll {
|
||||
padding: 131px 100px;
|
||||
border: 1px solid #000;
|
||||
box-shadow: 0 0 5px #000;
|
||||
}
|
||||
hr {
|
||||
background-color:black !important;
|
||||
border-color:black !important;
|
||||
}
|
||||
code {
|
||||
background-color:rgb(30, 30, 30) !important;
|
||||
border-color:black !important;
|
||||
color:white !important;
|
||||
}
|
||||
#head_top {
|
||||
width:100%;
|
||||
z-index:100;
|
||||
}
|
||||
#head_scroll {
|
||||
@extend #head_top;
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
z-index: 1;
|
||||
}
|
||||
div#userbar {
|
||||
background-color:rgb(90, 90, 90) !important;
|
||||
border-color:black !important;
|
||||
color:white !important;
|
||||
text-shadow:none !important;
|
||||
}
|
||||
#head a {
|
||||
text-shadow:none !important;
|
||||
color:white !important;
|
||||
}
|
||||
#head a:hover {
|
||||
color:rgb(190, 190, 190) !important;
|
||||
}
|
||||
.header {
|
||||
background-color:rgb(0, 0, 0);
|
||||
border:none !important;
|
||||
}
|
||||
input[type="email"], input[type="text"], input[type="password"] {
|
||||
background-color:rgb(110, 110, 110) !important;
|
||||
color:white !important;
|
||||
}
|
||||
::placeholder {
|
||||
color:lightgray;
|
||||
}
|
||||
.item {
|
||||
background-color:rgb(40, 40, 40) !important;
|
||||
border-color:black !important;
|
||||
}
|
||||
.item-group {
|
||||
border-color:black !important;
|
||||
}
|
||||
div.header {
|
||||
background-color:rgb(20, 20, 20) !important;
|
||||
}
|
||||
.avatar {
|
||||
border-color:black !important;
|
||||
}
|
||||
.items {
|
||||
border-color:black !important;
|
||||
}
|
||||
.markdown-help {
|
||||
background-color:rgb(90, 90, 90);
|
||||
color:white;
|
||||
border-color:black;
|
||||
}
|
||||
textarea {
|
||||
background-color:rgb(100, 100, 100);
|
||||
color:white;
|
||||
}
|
||||
.headline {
|
||||
border-color:black !important;
|
||||
}
|
||||
.role {
|
||||
opacity:0.7 !important;
|
||||
}
|
||||
.label {
|
||||
opacity:0.7 !important;
|
||||
}
|
||||
.notice {
|
||||
color:white;
|
||||
}
|
||||
@@ -4,12 +4,12 @@
|
||||
|
||||
th, td {
|
||||
// force tables into line-mode
|
||||
// it's a bit ugly, but probably the best
|
||||
// it''s a bit ugly, but probably the best
|
||||
// solution for small screens
|
||||
display: block;
|
||||
}
|
||||
|
||||
#head {
|
||||
#head_top {
|
||||
#menu {
|
||||
#logo {
|
||||
display: none;
|
||||
@@ -17,10 +17,19 @@
|
||||
}
|
||||
}
|
||||
|
||||
#head_scroll {
|
||||
@extend #head_top;
|
||||
position: fixed;
|
||||
}
|
||||
|
||||
#main-content {
|
||||
padding: 30px 5px;
|
||||
}
|
||||
|
||||
#main-content-scroll {
|
||||
padding: 181px 5px;
|
||||
}
|
||||
|
||||
.front-page {
|
||||
h1 {
|
||||
font-size: 2em !important;
|
||||
|
||||
@@ -80,7 +80,7 @@ a {
|
||||
}
|
||||
}
|
||||
|
||||
#head {
|
||||
#head_top {
|
||||
background: #3f3f3f;
|
||||
|
||||
#menu {
|
||||
@@ -181,6 +181,13 @@ a {
|
||||
}
|
||||
}
|
||||
|
||||
#head_scroll {
|
||||
@extend #head_top;
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.front-page {
|
||||
margin: auto;
|
||||
text-align: center;
|
||||
@@ -260,6 +267,11 @@ span.no-about {
|
||||
}
|
||||
}
|
||||
|
||||
#main-content-scroll {
|
||||
@extend #main-content;
|
||||
padding: 131px 100px;
|
||||
}
|
||||
|
||||
#user-info {
|
||||
.user-avatar {
|
||||
margin-bottom: 30px;
|
||||
@@ -437,18 +449,14 @@ blockquote p {
|
||||
color: #ddd !important;
|
||||
}
|
||||
}
|
||||
|
||||
.donor {
|
||||
color: #fff;
|
||||
background: #f60 !important;
|
||||
margin-left: 2px !important;
|
||||
}
|
||||
|
||||
.ign {
|
||||
display: block;
|
||||
color: #000;
|
||||
font-style: italic;
|
||||
}
|
||||
.badge {
|
||||
margin-left: 2px !important;
|
||||
}
|
||||
}
|
||||
|
||||
#online-users {
|
||||
@@ -458,6 +466,7 @@ blockquote p {
|
||||
}
|
||||
|
||||
.md_editor {
|
||||
|
||||
.field_container {
|
||||
position: relative;
|
||||
|
||||
@@ -465,7 +474,7 @@ blockquote p {
|
||||
position: absolute;
|
||||
top: 1em;
|
||||
left: 1em;
|
||||
z-index: 10;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.editor_field {
|
||||
@@ -480,6 +489,10 @@ blockquote p {
|
||||
padding: 4em 1em 1em;
|
||||
}
|
||||
}
|
||||
.field_container_user {
|
||||
.editor_field {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ul.dropdown-menu {
|
||||
@@ -675,6 +688,13 @@ tr.spacer {
|
||||
color: #ddd;
|
||||
}
|
||||
|
||||
&.variable-size {
|
||||
background: #4096ee;
|
||||
@media only screen and (max-width: 500px) {
|
||||
font-size: 9px;
|
||||
}
|
||||
}
|
||||
|
||||
&.blue {
|
||||
background: #4096ee;
|
||||
|
||||
@@ -1027,3 +1047,19 @@ nav.pagination {
|
||||
border-radius: 0.2em;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
.searchfield {
|
||||
height:40px;
|
||||
display: inline-block;
|
||||
&.field {
|
||||
width: 300px;
|
||||
}
|
||||
&.btn {
|
||||
margin: 4px 1px 0 0;
|
||||
cursor: default;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
background: #4096ee;
|
||||
width: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ class BlogpostsController < ApplicationController
|
||||
before_filter :auth, except: [:index, :show]
|
||||
|
||||
def index
|
||||
@posts = Blogpost.order("created_at desc").page(params[:page]).per(10)
|
||||
@posts = Blogpost.order(id: :desc).page(params[:page]).per(10)
|
||||
end
|
||||
|
||||
def show
|
||||
@@ -69,7 +69,7 @@ class BlogpostsController < ApplicationController
|
||||
end
|
||||
|
||||
def auth
|
||||
unless mod?
|
||||
unless mod? && current_user.confirmed?
|
||||
flash[:alert] = "You are not allowed to edit posts!"
|
||||
redirect_to @post ? @post : blogposts_path
|
||||
end
|
||||
|
||||
@@ -17,7 +17,7 @@ class ForumgroupsController < ApplicationController
|
||||
end
|
||||
|
||||
def update
|
||||
if admin?
|
||||
if admin? && current_user.confirmed?
|
||||
@group = Forumgroup.find(params[:id])
|
||||
if @group.update_attributes(group_params)
|
||||
flash[:notice] = "Forum group updated"
|
||||
@@ -41,7 +41,7 @@ class ForumgroupsController < ApplicationController
|
||||
end
|
||||
|
||||
def create
|
||||
if admin?
|
||||
if admin? && current_user.confirmed?
|
||||
@group = Forumgroup.new(group_params)
|
||||
if @group.save
|
||||
flash[:notice] = "Forum group created."
|
||||
@@ -57,7 +57,7 @@ class ForumgroupsController < ApplicationController
|
||||
end
|
||||
|
||||
def destroy
|
||||
if admin?
|
||||
if admin? && current_user.confirmed?
|
||||
@group = Forumgroup.find(params[:id])
|
||||
if @group.destroy
|
||||
flash[:notice] = "forum group deleted."
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
class ForumsController < ApplicationController
|
||||
|
||||
before_filter :check_permission, only: [:show, :edit, :update, :destroy]
|
||||
|
||||
def index
|
||||
@@ -10,7 +11,7 @@ class ForumsController < ApplicationController
|
||||
@threads = @forum.forumthreads.select {|f| f.can_read?(current_user) }.to_a
|
||||
@threads.sort_by! do |t|
|
||||
# sticky goes first, then sort by last activity (new replies)
|
||||
[t.sticky ? 0 : 1, -(t.replies.last.try(:created_at) || t.created_at).to_i]
|
||||
[t.sticky ? 0 : 1, -(t.replies.order(:id).last.try(:created_at) || t.created_at).to_i]
|
||||
end
|
||||
@threads = Kaminari.paginate_array(@threads).page(params[:page])
|
||||
end
|
||||
@@ -33,7 +34,7 @@ class ForumsController < ApplicationController
|
||||
end
|
||||
|
||||
def update
|
||||
if admin?
|
||||
if admin? && current_user.confirmed?
|
||||
if @forum.update_attributes(forum_params)
|
||||
flash[:notice] = "Forum updated"
|
||||
redirect_to @forum
|
||||
@@ -47,7 +48,7 @@ class ForumsController < ApplicationController
|
||||
end
|
||||
|
||||
def create
|
||||
if admin?
|
||||
if admin? && current_user.confirmed?
|
||||
@forum = Forum.new(forum_params([:forumgroup_id]))
|
||||
if @forum.save
|
||||
flash[:notice] = "Forum created."
|
||||
@@ -63,7 +64,7 @@ class ForumsController < ApplicationController
|
||||
end
|
||||
|
||||
def destroy
|
||||
if admin?
|
||||
if admin? && current_user.confirmed?
|
||||
if @forum.destroy
|
||||
flash[:notice] = "Forum deleted."
|
||||
else
|
||||
@@ -77,7 +78,6 @@ class ForumsController < ApplicationController
|
||||
redirect_to forums_path
|
||||
end
|
||||
|
||||
|
||||
private
|
||||
|
||||
def check_permission
|
||||
@@ -89,7 +89,7 @@ class ForumsController < ApplicationController
|
||||
end
|
||||
|
||||
def forum_params(add = [])
|
||||
a = [:name, :position, :role_read_id, :role_write_id] + add
|
||||
a = [:name, :position, :role_read_id, :role_write_id, :necro_length] + add
|
||||
params.require(:forum).permit(a)
|
||||
end
|
||||
end
|
||||
@@ -3,11 +3,19 @@ class ForumthreadsController < ApplicationController
|
||||
before_filter :check_permission, only: [:show, :edit, :update, :destroy]
|
||||
|
||||
def index
|
||||
redirect_to forum_path(@thread.forum.forumgroup, f)
|
||||
end
|
||||
params[:forum] = nil if params[:forum] && !Forum.find_by(id: params[:forum])
|
||||
|
||||
params.delete_if{|k,v| v.blank?}
|
||||
|
||||
@threads = Forumthread.filter(current_user, params[:title].try(:slice, 0..255), params[:content].try(:slice, 0..255), params[:reply].try(:slice, 0..255), params[:label], User.find_by(ign: params[:author].to_s.strip) || params[:author], params[:query].try(:slice, 0..255), Forum.find_by(id: params[:forum]))
|
||||
.page(params[:page]).per(30)
|
||||
end
|
||||
def show
|
||||
@replies = @thread.replies.page(params[:page])
|
||||
if params[:reverse] == "true"
|
||||
@replies = @thread.replies.order(id: :desc).page(params[:page])
|
||||
else
|
||||
@replies = @thread.replies.order(:id).page(params[:page])
|
||||
end
|
||||
end
|
||||
|
||||
def edit
|
||||
@@ -76,6 +84,9 @@ class ForumthreadsController < ApplicationController
|
||||
redirect_to @thread.forum
|
||||
end
|
||||
|
||||
def search
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def check_permission
|
||||
|
||||
@@ -22,9 +22,9 @@ class InfoController < ApplicationController
|
||||
def create
|
||||
@info = Info.new(info_params)
|
||||
if @info.save
|
||||
redirect_to @info, notice: 'Info has been created.'
|
||||
redirect_to @info, notice: 'The info page has been created!'
|
||||
else
|
||||
flash[:alert] = "Error creating info"
|
||||
flash[:alert] = "An error occured while creating the info page."
|
||||
render action: "new"
|
||||
end
|
||||
end
|
||||
@@ -32,18 +32,18 @@ class InfoController < ApplicationController
|
||||
def update
|
||||
@info.attributes = info_params()
|
||||
if @info.save
|
||||
redirect_to @info, notice: 'Info has been updated.'
|
||||
redirect_to @info, notice: 'The info page has been updated!'
|
||||
else
|
||||
flash[:alert] = "There was a problem while updating the info"
|
||||
flash[:alert] = "An error occured while updating the info page."
|
||||
render action: "edit"
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
if @info.destroy
|
||||
flash[:notice] = "Info deleted!"
|
||||
flash[:notice] = "The info page has been deleted!"
|
||||
else
|
||||
flash[:alert] = "There was a problem while deleting this info"
|
||||
flash[:alert] = "An error occured while deleting the info page."
|
||||
end
|
||||
redirect_to info_index_path
|
||||
end
|
||||
@@ -62,8 +62,8 @@ class InfoController < ApplicationController
|
||||
end
|
||||
|
||||
def auth
|
||||
unless mod?
|
||||
flash[:alert] = "You are not allowed to edit info!"
|
||||
unless mod? && current_user.confirmed?
|
||||
flash[:alert] = "You are not allowed to edit info pages!"
|
||||
redirect_to @info ? @info : info_index_path
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
class StaticsController < ApplicationController
|
||||
|
||||
caches_action :online, expires_in: 10.seconds, layout: false
|
||||
|
||||
def index
|
||||
if current_user
|
||||
redirect_to blogposts_path
|
||||
@@ -14,4 +16,30 @@ class StaticsController < ApplicationController
|
||||
def donate
|
||||
end
|
||||
|
||||
def online
|
||||
@players = []
|
||||
@count = 0
|
||||
begin
|
||||
json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json"))
|
||||
rescue
|
||||
flash.now[:alert] = "The server is currently offline."
|
||||
else
|
||||
case json["dataFormat"]
|
||||
when "v1"
|
||||
@players = json["players"].collect!{ |p| User.find_by(uuid: p["UUID"].tr("-", "")) or User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true) }
|
||||
@count = json["amount"]
|
||||
when "v2"
|
||||
json["players"].reject{|p| !mod? && p["vanished"] == "true"}.each do |p|
|
||||
@players.push(User.find_by(uuid: p["UUID"].tr("-", "")) || User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true))
|
||||
end
|
||||
@count = @players.count
|
||||
else
|
||||
flash.now[:alert] = "The server is using an incompatible data format. We are aware of this issue and are most likely already working on it."
|
||||
end
|
||||
@players.sort_by!(&:role).reverse!
|
||||
end
|
||||
end
|
||||
|
||||
def privacy
|
||||
end
|
||||
end
|
||||
|
||||
@@ -37,7 +37,7 @@ class ThreadrepliesController < ApplicationController
|
||||
if @reply.update_attributes(reply_params)
|
||||
@reply.send_new_reply_mail(old_content)
|
||||
flash[:notice] = "Reply updated!"
|
||||
position = @reply.thread.replies.index(@reply)
|
||||
position = @reply.thread.replies.order(:id).index(@reply)
|
||||
page = position / Kaminari.config.default_per_page + 1
|
||||
redirect_to forumthread_path(@reply.thread, page: page) + "#reply-#{@reply.id}"
|
||||
else
|
||||
|
||||
@@ -7,29 +7,25 @@ class UsersController < ApplicationController
|
||||
before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions]
|
||||
|
||||
def index
|
||||
if params[:role]
|
||||
if params[:role].downcase == "staff"
|
||||
@users = User.joins(:role).where("roles.value >= ?", Role.get(:mod).to_i)
|
||||
elsif params[:role].downcase == "donor"
|
||||
@users = User.joins(:role).where(donor: true)
|
||||
else
|
||||
if role = Role.get(params[:role])
|
||||
@users = User.joins(:role).where(role: role)
|
||||
else
|
||||
flash[:alert] = "role '#{params[:role]}' does not exist!"
|
||||
redirect_to users_path
|
||||
return
|
||||
end
|
||||
end
|
||||
else
|
||||
@users = User.joins(:role).where.not(id: User.first.id) #Remove first user
|
||||
end
|
||||
@users = @users.order("roles.value desc", "confirmed desc", :name)
|
||||
role = Role.find_by(name: params[:role])
|
||||
badge = Badge.find_by(name: params[:badge])
|
||||
|
||||
@users = User.search(params[:search], role, badge, params.include?(:staff), params.include?(:donor))
|
||||
@count = @users.size
|
||||
@users = @users.page(params[:page]).per(100)
|
||||
end
|
||||
|
||||
def show
|
||||
begin
|
||||
@ban_json = JSON.parse(File.read("/etc/minecraft/redstoner/banned-players.json")).detect {|u| u["uuid"].tr("-", "") == @user.uuid}
|
||||
rescue
|
||||
if @user.is?(current_user)
|
||||
flash.now[:alert] = "An error occured while checking if you are banned from the server!"
|
||||
else
|
||||
flash.now[:alert] = "An error occured while checking if this user is banned from the server!"
|
||||
end
|
||||
@ban_json = nil
|
||||
end
|
||||
end
|
||||
|
||||
# SIGNUP
|
||||
@@ -139,7 +135,7 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def resend_mail
|
||||
if (@user.is?(current_user) || mod?) && !@user.confirmed?
|
||||
if (@user.is?(current_user) || (mod? && current_user.confirmed?)) && !@user.confirmed?
|
||||
RedstonerMailer.register_mail(@user, false).deliver_now
|
||||
flash[:notice] = "Check your inbox for the confirmation mail."
|
||||
else
|
||||
@@ -149,11 +145,16 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def update
|
||||
if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
|
||||
if (mod? && current_user.role >= @user.role && current_user.confirmed?) || (@user.is?(current_user) && confirmed?)
|
||||
if mod?
|
||||
userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :role, :confirmed, :donor])
|
||||
userdata = user_params([:name, :skype, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
|
||||
else
|
||||
userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about])
|
||||
userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
|
||||
end
|
||||
if User.find_by(name: userdata[:name]) && User.find_by(name: userdata[:name]) != @user
|
||||
flash[:alert] = "You have entered a name that belongs to someone else. Please try another."
|
||||
redirect_to edit_user_path(@user)
|
||||
return
|
||||
end
|
||||
if userdata[:role]
|
||||
role = Role.get(userdata[:role])
|
||||
@@ -164,6 +165,9 @@ class UsersController < ApplicationController
|
||||
userdata.delete(:role)
|
||||
end
|
||||
end
|
||||
if userdata[:badge]
|
||||
userdata[:badge] = Badge.get(userdata[:badge])
|
||||
end
|
||||
if @user.youtube != userdata[:youtube]
|
||||
youtube = get_youtube(userdata[:youtube])
|
||||
userdata[:youtube] = youtube[:channel]
|
||||
@@ -184,7 +188,7 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def ban
|
||||
if mod? && current_user.role >= @user.role
|
||||
if mod? && current_user.role >= @user.role && current_user.confirmed?
|
||||
@user.role = Role.get :banned
|
||||
flash[:notice] = "'#{@user.name}' has been banned!"
|
||||
else
|
||||
@@ -194,7 +198,7 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def unban
|
||||
if mod? && current_user.role >= @user.role
|
||||
if mod? && current_user.role >= @user.role && current_user.confirmed?
|
||||
@user.role = Role.get :normal
|
||||
flash[:notice] = "\"#{@user.name}\" has been unbanned!"
|
||||
else
|
||||
@@ -204,7 +208,7 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def destroy
|
||||
if superadmin?
|
||||
if superadmin? && current_user.confirmed?
|
||||
if @user.destroy
|
||||
flash[:notice] = "User deleted forever."
|
||||
redirect_to users_url
|
||||
@@ -219,21 +223,28 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def edit_notifications
|
||||
unless @user.is?(current_user) || admin? && current_user.role > @user.role || superadmin?
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role) || superadmin?
|
||||
flash[:alert] = "You are not allowed to edit this user's notification settings!"
|
||||
redirect_to @user
|
||||
end
|
||||
end
|
||||
|
||||
def edit_login
|
||||
unless @user.is?(current_user) || admin? && current_user.role > @user.role || superadmin?
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role) || superadmin?
|
||||
flash[:alert] = "You are not allowed to edit this user's login details!"
|
||||
redirect_to @user
|
||||
end
|
||||
end
|
||||
|
||||
def edit_website_settings
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role) || superadmin?
|
||||
flash[:alert] = "You are not allowed to edit this user's website settings!"
|
||||
redirect_to @user
|
||||
end
|
||||
end
|
||||
|
||||
def update_login
|
||||
if @user.is?(current_user) || admin? && current_user.role > @user.role || superadmin?
|
||||
if @user.is?(current_user) || (admin? && current_user.role > @user.role && current_user.confirmed?) || (superadmin? && current_user.confirmed?)
|
||||
authenticated = !@user.is?(current_user) || @user.authenticate(params[:current_password])
|
||||
if params[:user][:password].present?
|
||||
@user.password = params[:user][:password]
|
||||
@@ -351,7 +362,7 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def user_params(add = [])
|
||||
a = [:ign, :email, :password, :password_confirmation, :mail_own_thread_reply, :mail_other_thread_reply, :mail_own_blogpost_comment, :mail_other_blogpost_comment, :mail_mention] + add
|
||||
a = [:ign, :email, :password, :password_confirmation, :mail_own_thread_reply, :mail_other_thread_reply, :mail_own_blogpost_comment, :mail_other_blogpost_comment, :mail_mention, :public_key] + add
|
||||
params.require(:user).permit(a)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -11,10 +11,12 @@ module ApplicationHelper
|
||||
end
|
||||
|
||||
def ago(tm)
|
||||
if tm
|
||||
if tm && current_user.try(:utc_time) != true
|
||||
content_tag :time, title: tm.strftime("%e %b %Y, %H:%M %Z"), datetime: tm.to_datetime.rfc3339 do
|
||||
tm.strftime("%e %b %Y, %H:%M")
|
||||
end
|
||||
else
|
||||
tm
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -19,29 +19,49 @@ class RedstonerMailer < ActionMailer::Base
|
||||
def new_thread_mention_mail(user, thread)
|
||||
@user = user
|
||||
@thread = thread
|
||||
if @user.public_key?
|
||||
mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
|
||||
else
|
||||
mail(to: @user.email, subject: "#{thread.author.name} mentioned you in '#{thread.title}' on Redstoner")
|
||||
end
|
||||
end
|
||||
|
||||
def new_thread_reply_mail(user, reply)
|
||||
@user = user
|
||||
@reply = reply
|
||||
if @user.public_key?
|
||||
mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
|
||||
else
|
||||
mail(to: @user.email, subject: "#{reply.author.name} replied to '#{reply.thread.title}' on Redstoner")
|
||||
end
|
||||
end
|
||||
|
||||
def new_post_mention_mail(user, post)
|
||||
@user = user
|
||||
@post = post
|
||||
if @user.public_key?
|
||||
mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
|
||||
else
|
||||
mail(to: @user.email, subject: "#{post.author.name} mentioned you in '#{post.title}' on Redstoner")
|
||||
end
|
||||
end
|
||||
|
||||
def new_post_comment_mail(user, comment)
|
||||
@user = user
|
||||
@comment = comment
|
||||
if @user.public_key?
|
||||
mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
|
||||
else
|
||||
mail(to: @user.email, subject: "#{comment.author.name} replied to '#{comment.blogpost.title}' on Redstoner")
|
||||
end
|
||||
end
|
||||
|
||||
def email_change_confirm_mail(user)
|
||||
@user = user
|
||||
if @user.public_key?
|
||||
mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
|
||||
else
|
||||
mail(to: @user.email, subject: "Email change on Redstoner.com")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
18
app/models/badge.rb
Normal file
18
app/models/badge.rb
Normal file
@@ -0,0 +1,18 @@
|
||||
class Badge < ActiveRecord::Base
|
||||
include Comparable
|
||||
has_many :users
|
||||
|
||||
def self.get (input)
|
||||
if input.is_a?(String) || input.is_a?(Symbol)
|
||||
Badge.find_by(name: input)
|
||||
elsif input.is_a?(Fixnum)
|
||||
Badge.find_by(id: input)
|
||||
elsif input.is_a?(Badge)
|
||||
return input
|
||||
end
|
||||
end
|
||||
|
||||
def to_s
|
||||
self.name
|
||||
end
|
||||
end
|
||||
@@ -8,6 +8,8 @@ class Blogpost < ActiveRecord::Base
|
||||
belongs_to :user_editor, class_name: "User", foreign_key: "user_editor_id"
|
||||
has_many :comments, :dependent => :destroy
|
||||
accepts_nested_attributes_for :comments
|
||||
validates_length_of :title, in: 5..255
|
||||
validates_length_of :content, in: 5..20000
|
||||
|
||||
def author
|
||||
@author ||= if self.user_author.present?
|
||||
|
||||
@@ -4,6 +4,7 @@ class Forum < ActiveRecord::Base
|
||||
belongs_to :role_read, class_name: "Role", foreign_key: "role_read_id"
|
||||
belongs_to :role_write, class_name: "Role", foreign_key: "role_write_id"
|
||||
has_and_belongs_to_many :labels
|
||||
validates_length_of :name, in: 4..30
|
||||
|
||||
def to_s
|
||||
name
|
||||
|
||||
@@ -7,7 +7,7 @@ class Forumgroup < ActiveRecord::Base
|
||||
|
||||
|
||||
validates_presence_of :name, :position
|
||||
validates_length_of :name, in: 2..20
|
||||
validates_length_of :name, in: 4..20
|
||||
|
||||
def to_s
|
||||
name
|
||||
|
||||
@@ -11,6 +11,7 @@ class Forumthread < ActiveRecord::Base
|
||||
|
||||
validates_presence_of :title, :author, :forum
|
||||
validates_presence_of :content
|
||||
validates_length_of :title, in: 5..255
|
||||
validates_length_of :content, in: 5..20000
|
||||
|
||||
accepts_nested_attributes_for :threadreplies
|
||||
@@ -65,4 +66,49 @@ class Forumthread < ActiveRecord::Base
|
||||
def to_param
|
||||
[id, to_s.parameterize].join("-")
|
||||
end
|
||||
|
||||
def self.filter (user, title, content, reply, label, author, query, forum)
|
||||
order_phrase = query || [title, content, reply].select(&:present?).join(" ")
|
||||
user_id = user.try(:id).to_i
|
||||
role_value = user.try(:role).to_i
|
||||
can_read = "COALESCE(forum_role_read.value, 0) <= ? AND COALESCE(forumgroup_role_read.value, 0) <= ?"
|
||||
# A user can view sticky threads in write-only forums without read permissions.
|
||||
sticky_can_write = "sticky = true AND (COALESCE(forum_role_write.value, 0) <= ? AND COALESCE(forumgroup_role_write.value, 0) <= ?)"
|
||||
match = ["MATCH (title, forumthreads.content) AGAINST (#{Forumthread.sanitize(order_phrase)})", "MATCH (threadreplies.content) AGAINST (#{Forumthread.sanitize(order_phrase)})", "MATCH (title, forumthreads.content) AGAINST (?) OR MATCH (threadreplies.content) AGAINST (?)", "MATCH (title) AGAINST (?)", "MATCH (forumthreads.content) AGAINST (?)", "MATCH (threadreplies.content) AGAINST (?)"]
|
||||
|
||||
threads = forum.try(:forumthreads) || Forumthread
|
||||
|
||||
threads = threads.select("forumthreads.*", "#{match[0]} AS relevance", "#{match[1]} AS reply_rel")
|
||||
|
||||
threads = threads.joins(forum: :forumgroup)
|
||||
.joins("LEFT JOIN threadreplies ON forumthreads.id = threadreplies.forumthread_id")
|
||||
.joins("LEFT JOIN roles as forum_role_read ON forums.role_read_id = forum_role_read.id")
|
||||
.joins("LEFT JOIN roles as forum_role_write ON forums.role_write_id = forum_role_write.id")
|
||||
.joins("LEFT JOIN roles as forumgroup_role_read ON forumgroups.role_read_id = forumgroup_role_read.id")
|
||||
.joins("LEFT JOIN roles as forumgroup_role_write ON forumgroups.role_write_id = forumgroup_role_write.id")
|
||||
|
||||
threads = threads.where("forumthreads.user_author_id = ? OR (#{can_read}) OR (#{sticky_can_write})", user_id, role_value, role_value, role_value, role_value)
|
||||
if query
|
||||
threads = threads.where("#{match[2]}", query[0..99], query[0..99])
|
||||
elsif [title, content, reply].any?
|
||||
threads = threads.where("#{match[3]}", title[0..99]) if title
|
||||
threads = threads.where("#{match[4]}", content[0..99]) if content
|
||||
threads = threads.where("#{match[5]}", reply[0..99]) if reply
|
||||
end
|
||||
if label.try(:downcase) == "no label"
|
||||
threads = threads.where(label: nil)
|
||||
elsif label && l = Label.find_by(name: label)
|
||||
threads = threads.where(label: l)
|
||||
end
|
||||
threads = threads.where(user_author: author) if author
|
||||
|
||||
threads = threads.group("forumthreads.id")
|
||||
|
||||
if order_phrase.present?
|
||||
threads = threads.order("GREATEST(relevance, reply_rel) DESC")
|
||||
else
|
||||
threads = threads.order("sticky DESC", "threadreplies.id DESC", "forumthreads.id DESC")
|
||||
end
|
||||
threads
|
||||
end
|
||||
end
|
||||
|
||||
@@ -14,14 +14,14 @@ class Role < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def is? (name)
|
||||
!!(Role.find_by_name(name) == self)
|
||||
!!(Role.find_by(name: name) == self)
|
||||
end
|
||||
|
||||
def self.get (input)
|
||||
if input.is_a?(String) || input.is_a?(Symbol)
|
||||
Role.find_by_name(input)
|
||||
Role.find_by(name: input)
|
||||
elsif input.is_a?(Fixnum)
|
||||
Role.find_by_id(input)
|
||||
Role.find_by(id: input)
|
||||
elsif input.is_a?(Role)
|
||||
return input
|
||||
end
|
||||
@@ -31,7 +31,7 @@ class Role < ActiveRecord::Base
|
||||
if role.is_a?(Role)
|
||||
self.value - role.value
|
||||
elsif role.is_a?(Symbol)
|
||||
self <=> Role.find_by_name(role)
|
||||
self <=> Role.find_by(name: role)
|
||||
else
|
||||
self.to_i <=> role
|
||||
end
|
||||
|
||||
@@ -43,7 +43,7 @@ class Threadreply < ActiveRecord::Base
|
||||
unless old_content.present?
|
||||
posts.each do |post|
|
||||
# don't send mail to the author of this reply, don't send to banned/disabled users
|
||||
if post.author != author && post.author.normal? && post.author.confirmed? # &&
|
||||
if post.author != author && post.author.normal? && post.author.confirmed? && thread.can_read?(post.author)
|
||||
users << post.author if post.author.mail_other_thread_reply?
|
||||
end
|
||||
end
|
||||
|
||||
@@ -5,10 +5,11 @@ class User < ActiveRecord::Base
|
||||
strip_attributes
|
||||
|
||||
belongs_to :role
|
||||
belongs_to :badge
|
||||
|
||||
has_secure_password
|
||||
|
||||
before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token, :set_role
|
||||
before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token, :set_role, :set_badge
|
||||
|
||||
validates_presence_of :password, :password_confirmation, :email_token, on: :create
|
||||
validates_presence_of :name, :email, :ign
|
||||
@@ -21,6 +22,8 @@ class User < ActiveRecord::Base
|
||||
validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@(.+\..{2,}|\[(IPv6)?[0-9a-f:.]+\])\z/i, message: "That doesn't look like an email address."}
|
||||
validates :ign, uniqueness: {case_sensitive: false}, format: {with: /\A[a-z\d_]+\z/i, message: "Username is invalid (a-z, 0-9, _)."}
|
||||
|
||||
validates :public_key, format: {with: /\A(-----BEGIN PGP PUBLIC KEY BLOCK-----((.|\n)*?)-----END PGP PUBLIC KEY BLOCK-----)?\z/i, message: "That doesn't look like a PGP formatted public key."}
|
||||
|
||||
has_many :blogposts
|
||||
has_many :comments
|
||||
|
||||
@@ -29,10 +32,6 @@ class User < ActiveRecord::Base
|
||||
self == user
|
||||
end
|
||||
|
||||
def donor?
|
||||
!!self.donor
|
||||
end
|
||||
|
||||
def confirmed?
|
||||
!!self.confirmed
|
||||
end
|
||||
@@ -150,6 +149,10 @@ class User < ActiveRecord::Base
|
||||
self.role ||= Role.get(:normal)
|
||||
end
|
||||
|
||||
def set_badge
|
||||
self.badge ||= Badge.get(:none)
|
||||
end
|
||||
|
||||
def set_uuid
|
||||
if !self.uuid.present?
|
||||
# idk
|
||||
@@ -173,4 +176,23 @@ class User < ActiveRecord::Base
|
||||
def set_email_token
|
||||
self.email_token ||= SecureRandom.hex(16)
|
||||
end
|
||||
|
||||
def self.search (search, role, badge, staff, donor)
|
||||
users = User.joins(:role)
|
||||
if role
|
||||
users = users.where(role: role)
|
||||
elsif staff
|
||||
users = users.where("roles.value >= ?", Role.get(:mod).to_i)
|
||||
elsif donor
|
||||
users = users.where("badge_id = ? OR badge_id = ?", Badge.get(:donor), Badge.get(:donorplus))
|
||||
end
|
||||
users = users.where(badge: badge) if badge
|
||||
if search
|
||||
search_san = User.send(:sanitize_sql_like, search.to_s)
|
||||
users = users.where("users.name like ? OR ign like ?", "%#{search_san}%", "%#{search_san}%")
|
||||
end
|
||||
users = users.where.not(id: User.first.id) unless [search, role, badge].any?
|
||||
users = users.order("roles.value desc", "confirmed desc", :name)
|
||||
users
|
||||
end
|
||||
end
|
||||
8
app/views/application/_md_editor_user.html.erb
Normal file
8
app/views/application/_md_editor_user.html.erb
Normal file
@@ -0,0 +1,8 @@
|
||||
<div class="md_editor">
|
||||
<div class="field_container_user">
|
||||
<% options = (defined?(options) && options || {}) %>
|
||||
<% options[:class] = "#{options[:class]} editor_field" %>
|
||||
<% options[:placeholder] ||= "Enter user's name." %>
|
||||
<%= text_field_tag name, content, options %>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,10 +1,20 @@
|
||||
<% title "Edit News: #{@post.title}" %>
|
||||
|
||||
<%
|
||||
def can_edit?
|
||||
mod? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<h1>Edit post</h1>
|
||||
<%= form_for @post do |f|%>
|
||||
<%= f.text_field :title %>
|
||||
<%= render partial: "md_editor", locals: {name: "blogpost[content]", content: @post.content} %>
|
||||
<p><%= f.submit "Update Post", class: "btn blue left" %></p>
|
||||
<%= f.text_field :title, disabled: !can_edit? %>
|
||||
<%= render partial: "md_editor", locals: {name: "blogpost[content]", content: @post.content, options: {disabled: !can_edit?}} %>
|
||||
<p><%= f.submit "Update Post", class: "btn blue left", disabled: !can_edit? %></p>
|
||||
<% end %>
|
||||
<p><%= button_to "Delete post", @post, method: "delete", data: {confirm: "Delete post & comments forever?"}, class: "btn red right" %></p>
|
||||
<p><%= button_to "Delete post", @post, method: "delete", data: {confirm: "Delete post & comments forever?"}, class: "btn red right", disabled: !can_edit? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can edit blog posts.</span>
|
||||
<% end %>
|
||||
|
||||
@@ -1,9 +1,19 @@
|
||||
<% title "New Blog Post" %>
|
||||
|
||||
<%
|
||||
def can_create?
|
||||
admin? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<h1>New Post</h1>
|
||||
<%= form_for @post do |f|%>
|
||||
<%= f.text_field :title, placeholder: "Title" %>
|
||||
<%= render partial: "md_editor", locals: {name: "blogpost[content]", content: @post.content} %>
|
||||
<p><%= f.submit "Create Post", class: "btn blue left" %></p>
|
||||
<%= f.text_field :title, placeholder: "Title", disabled: !can_create? %>
|
||||
<%= render partial: "md_editor", locals: {name: "blogpost[content]", content: @post.content, options: {disabled: !can_create?}} %>
|
||||
<p><%= f.submit "Create Post", class: "btn blue left", disabled: !can_create? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can create new blog posts.</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
<% title "Manage Forums" %>
|
||||
|
||||
<%
|
||||
def can_edit?
|
||||
admin? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<h1>Manage Forums</h1>
|
||||
<div class="item-group">
|
||||
<div class="header">
|
||||
@@ -19,22 +25,26 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td><%= f.label :name %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name" %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name", disabled: !can_edit? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :position %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position" %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position", disabled: !can_edit? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_read_id, "Min. read role" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, { include_blank: "None" }, { disabled: !can_edit? } %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_write_id, "Min. write role" %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, { include_blank: false }, { disabled: !can_edit? } %></td>
|
||||
</tr>
|
||||
</table>
|
||||
<p><%= f.submit "Update group", class: "btn blue left" %></p>
|
||||
<p><%= f.submit "Update group", class: "btn blue left", disabled: !can_edit? %></p>
|
||||
<% end %>
|
||||
<p><%= button_to "Delete group", @group, :method => "delete", data: {confirm: "Delete group?\nForums + Threads will not be accessible!"}, class: "btn red right" %></p>
|
||||
<p><%= button_to "Delete group", @group, :method => "delete", data: {confirm: "Delete group?\nForums + Threads will not be accessible!"}, class: "btn red right", disabled: !can_edit? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can edit forum groups.</span>
|
||||
<% end %>
|
||||
|
||||
@@ -1,26 +1,36 @@
|
||||
<% title "New Forum: #{@group.name}" %>
|
||||
|
||||
<%
|
||||
def can_create?
|
||||
admin? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<h1>New forum group</h1>
|
||||
<% role_selection = Role.all_from_to(:normal, :admin).collect{|p|[p.name, p.id]} %>
|
||||
<%= form_for @group do |f|%>
|
||||
<table>
|
||||
<tr>
|
||||
<td><%= f.label :name %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name" %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name", disabled: !can_create? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :position %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position" %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position", disabled: !can_create? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_read_id, "Min. read role" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, { include_blank: "None" }, { disabled: !can_create? } %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_write_id, "Min. write role" %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, { include_blank: false }, { disabled: !can_create? } %></td>
|
||||
</tr>
|
||||
</table>
|
||||
<p><%= f.submit "Create group", class: "btn blue left" %></p>
|
||||
<p><%= f.submit "Create group", class: "btn blue left", disabled: !can_create? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can create new forum groups.</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
@@ -1,5 +1,11 @@
|
||||
<% title "Edit Forum: #{@forum.name}" %>
|
||||
|
||||
<%
|
||||
def can_edit?
|
||||
admin? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<%= link_to "(Edit) #{@forum.group.name}", edit_forumgroup_path(@forum.group) %> → <%= @forum.name %>
|
||||
<h1>Edit Forum</h1>
|
||||
<% role_selection = Role.all_from_to(:normal, :admin).collect{|p|[p.name, p.id]} %>
|
||||
@@ -7,22 +13,30 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td><%= f.label :name %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name" %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name", disabled: !can_edit? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :position %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position" %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position", disabled: !can_edit? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_read_id, "Min. read role" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, { include_blank: "None" }, { disabled: !can_edit? } %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_write_id, "Min. write role" %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, { include_blank: false }, { disabled: !can_edit? } %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :necro_length, "Necropost warning delay (in days)" %></td>
|
||||
<td><%= f.number_field :necro_length, placeholder: "Warning Delay (leave blank for no warning)", disabled: !can_edit? %></td>
|
||||
</tr>
|
||||
</table>
|
||||
<p><%= f.submit "Update forum", class: "btn blue left" %></p>
|
||||
<p><%= f.submit "Update forum", class: "btn blue left", disabled: !can_edit? %></p>
|
||||
<% end %>
|
||||
<p><%= button_to "Delete forum", @forum, method: "delete", data: {confirm: "Delete forum forever?\nThreads won't be accessible!"}, class: "btn red right" %></p>
|
||||
<p><%= button_to "Delete forum", @forum, method: "delete", data: {confirm: "Delete forum forever?\nThreads won't be accessible!"}, class: "btn red right", disabled: !can_edit? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can edit forums.</span>
|
||||
<% end %>
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<% title "Forums" %>
|
||||
|
||||
<%= link_to "All threads", forumthreads_path, class: "btn blue right" %>
|
||||
<br>
|
||||
<div id="forum_groups">
|
||||
<% @groups.each do |group| %>
|
||||
<div class="item-group" id="group-<%= group.id %>">
|
||||
@@ -16,7 +18,7 @@
|
||||
<%= link_to f.name, f, id: "forum-#{f.id}"%>
|
||||
<div class="item-info">
|
||||
<% if last_thread = f.threads.last %>
|
||||
<% last_reply = Threadreply.where(forumthread: f.threads).order(:created_at).last %>
|
||||
<% last_reply = Threadreply.where(forumthread: f.threads).order(:id).last %>
|
||||
<% if last_reply && last_reply.created_at > last_thread.created_at %>
|
||||
<% if last_reply.thread.can_read?(current_user) %>
|
||||
<%= last_reply.author.name %>
|
||||
@@ -54,6 +56,4 @@
|
||||
|
||||
<% if admin? %>
|
||||
<%= link_to "New group", new_forumgroup_path, class: "btn blue" %>
|
||||
<% elsif mod? %>
|
||||
<%= link_to "New group", "#", class: "btn blue", disabled: true %>
|
||||
<% end %>
|
||||
@@ -1,5 +1,11 @@
|
||||
<% title "New Forum: #{@forum.group.name}" %>
|
||||
|
||||
<%
|
||||
def can_create?
|
||||
admin? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<%= link_to @forum.group, forumgroup_path(@forum.group) %> → New forum
|
||||
<h1>New Forum</h1>
|
||||
<% role_selection = Role.all_from_to(:normal, :admin).collect{|p|[p.name, p.id]} %>
|
||||
@@ -7,22 +13,30 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td><%= f.label :name %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name" %></td>
|
||||
<td><%= f.text_field :name, placeholder: "Name", disabled: !can_create? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :position %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position" %></td>
|
||||
<td><%= f.number_field :position, placeholder: "Position", disabled: !can_create? %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_read_id, "Min. read role" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
|
||||
<td><%= f.select :role_read_id, role_selection, { include_blank: "None"}, { disabled: !can_create? } %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :role_write_id, "Min. write role" %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
|
||||
<td><%= f.select :role_write_id, role_selection, { include_blank: false }, { disabled: !can_create? } %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= f.label :necro_length, "Necropost warning delay (in days)" %></td>
|
||||
<td><%= f.number_field :necro_length, placeholder: "Warning Delay (leave blank for no warning)", disabled: !can_create? %></td>
|
||||
</tr>
|
||||
</table>
|
||||
<%= f.hidden_field :forumgroup_id %>
|
||||
<p><%= f.submit "Create forum", class: "btn blue left" %></p>
|
||||
<p><%= f.submit "Create forum", class: "btn blue left", disabled: !can_create? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can create new forums.</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
@@ -1,8 +1,13 @@
|
||||
<%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= @forum %>
|
||||
|
||||
<h1><%= title @forum %></h1>
|
||||
<h1>
|
||||
<%= title @forum %>
|
||||
<%= link_to "Search Threads", forumthreads_path(forum: @forum.id), class: "btn blue right" %>
|
||||
</h1>
|
||||
<% if @forum.can_write?(current_user) %>
|
||||
<p><%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %></p>
|
||||
<p>
|
||||
<%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %>
|
||||
</p>
|
||||
<% end %>
|
||||
|
||||
<% if @forum.role_read && @forum.role_write && @forum.role_write < @forum.role_read %>
|
||||
@@ -33,7 +38,7 @@
|
||||
<div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>">
|
||||
<%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %>
|
||||
<div class="item-info">
|
||||
<% if rpl = thread.replies.last %>
|
||||
<% if rpl = thread.replies.order(:id).last %>
|
||||
<%= rpl.author.name %>
|
||||
<%
|
||||
position = thread.replies.count - 1
|
||||
|
||||
85
app/views/forumthreads/index.html.erb
Normal file
85
app/views/forumthreads/index.html.erb
Normal file
@@ -0,0 +1,85 @@
|
||||
<%= link_to "Forums", forums_path %> →
|
||||
<% params_list = params.slice(:query, :title, :content, :author, :label, :reply) %>
|
||||
<% if params_list.any? %>
|
||||
<%= link_to "All Threads", forumthreads_path %> → Search Results
|
||||
<% else %>
|
||||
<%= "All Threads" %>
|
||||
<% end %>
|
||||
<h1>
|
||||
<%
|
||||
if params[:forum]
|
||||
text = "forum '#{Forum.find(params[:forum]).name}'"
|
||||
if params_list.except(:forum).any?
|
||||
text = "Search results in #{text} (#{@threads.total_count})"
|
||||
else
|
||||
text = text.capitalize
|
||||
end
|
||||
elsif params_list.any?
|
||||
text = "Search results (#{@threads.total_count})"
|
||||
else
|
||||
text = "All threads"
|
||||
end
|
||||
%>
|
||||
<%= title text %>
|
||||
</h1>
|
||||
<br>
|
||||
<%= form_tag(forumthreads_path, method: :get) do %>
|
||||
<%= text_field_tag "query", params[:query], placeholder: "Search...", class: "searchfield field" %>
|
||||
<%= submit_tag "Go", class: "searchfield btn" %>
|
||||
<%= link_to "Advanced Search", search_forumthreads_path(params_list), class: "btn right blue" %>
|
||||
<% if params_list.any? %>
|
||||
<% if params[:forum] %>
|
||||
<%= link_to "Show All Threads", forumthreads_path(params_list.except("forum")), class: "btn right blue" %>
|
||||
<% elsif params_list.except(:controller, :action).any? %>
|
||||
<%= link_to "Show All Threads", forumthreads_path, class: "btn right blue" %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if params[:forum] %>
|
||||
<%= link_to "Go to Forum", forum_path(params[:forum]), class: "btn right blue" %>
|
||||
<% end %>
|
||||
<% params.slice(:forum, :title, :content, :reply, :label, :author).each do |key, value| %>
|
||||
<%= hidden_field_tag key, params[key] %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<div id="forum_groups">
|
||||
<% @threads.each do |thread| %>
|
||||
<div class="item-group with-avatar" id="thread-<%= thread.id %>">
|
||||
<div class="header">
|
||||
<%= link_to(thread.author.avatar(64), thread.author, title: thread.author.ign) %>
|
||||
<%= render partial: "users/username", locals: { user: thread.author } %>
|
||||
<%= link_to thread do %>
|
||||
<%= ago thread.created_at %>
|
||||
<% end %>
|
||||
<span class="comment-counter">
|
||||
<%= link_to pluralize(thread.replies.count, "Reply"), thread %>
|
||||
</span>
|
||||
<div class="clear-right"></div>
|
||||
</div>
|
||||
<div class="items bold">
|
||||
<div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>">
|
||||
<%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %>
|
||||
<div class="item-info">
|
||||
<% if rpl = thread.replies.order(:id).last %>
|
||||
<%= rpl.author.name %>
|
||||
<%
|
||||
position = thread.replies.count - 1
|
||||
page = position / Kaminari.config.default_per_page + 1
|
||||
%>
|
||||
<%= link_to "replied", forumthread_path(thread, page: page) + "#reply-#{rpl.id}" %>
|
||||
<%= ago rpl.created_at %>.
|
||||
<% else %>
|
||||
No replies yet.
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% if @threads.empty? %>
|
||||
<br>
|
||||
<h3>No results found</h3>
|
||||
<% end %>
|
||||
<%= paginate @threads %>
|
||||
</div>
|
||||
54
app/views/forumthreads/search.html.erb
Normal file
54
app/views/forumthreads/search.html.erb
Normal file
@@ -0,0 +1,54 @@
|
||||
<% title "Thread Search" %>
|
||||
<h1>Thread Search</h1>
|
||||
<h3>Leave a field blank to ignore that search aspect.</h3>
|
||||
<% label = Label.where(name: params[:label]).first %>
|
||||
<table>
|
||||
<tbody>
|
||||
<%= form_tag(forumthreads_path, method: :get) do %>
|
||||
<%
|
||||
forums = []
|
||||
Forum.select{|f| f.can_read?(current_user)}.sort_by{ |f| f.forumgroup && f.forumgroup.position || 0 }.each do |f|
|
||||
forums << ["#{f.forumgroup.name} → #{f.name}", f.id] if f.forumgroup
|
||||
end
|
||||
%>
|
||||
<% label_list = Label.pluck(:name).prepend("No Label") %>
|
||||
<tr>
|
||||
<td>Forum</td>
|
||||
<td><%= select_tag "forum", options_for_select(forums, params[:forum]), include_blank: "Search All Threads" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Label</td>
|
||||
<td>
|
||||
<%= select_tag "label", options_for_select(label_list, params[:label]), include_blank: "Label" %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Title</td>
|
||||
<td>
|
||||
<%= text_field_tag "title", params[:title], placeholder: "Search Titles" %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Content</td>
|
||||
<td>
|
||||
<%= text_field_tag "content", params[:content], placeholder: "Search Contents" %>
|
||||
</td>
|
||||
<tr>
|
||||
<td>Author</td>
|
||||
<td>
|
||||
<%= render partial: "md_editor_user", locals: {name: "author", content: params[:author]} %>
|
||||
</td>
|
||||
</tr>
|
||||
<td>Replies</td>
|
||||
<td>
|
||||
<%= text_field_tag "reply", params[:reply], placeholder: "Search Replies" %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<%= submit_tag "Go", class: "btn blue", style: "width:50px", name: nil %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -1,6 +1,8 @@
|
||||
<%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → <%=truncate(@thread.title, length: 60, omission: " …") %>
|
||||
<h1><%= render partial: "labels/label", locals: {label: @thread.label} %><%= title @thread.title %></h1>
|
||||
|
||||
<h1>
|
||||
<%= render partial: "labels/label", locals: {label: @thread.label} %><%= title @thread.title %>
|
||||
<%= link_to "Reverse Replies", forumthread_path(@thread, reverse: params[:reverse] != "true"), class: "btn right blue" %>
|
||||
</h1>
|
||||
<div class="item-group thread with-avatar" id="thread-<%= @thread.id %>">
|
||||
<div class="header">
|
||||
<%= link_to(@thread.author.avatar(64), @thread.author, title: @thread.author.ign) %>
|
||||
|
||||
@@ -1,10 +1,20 @@
|
||||
<% title "Edit Info: #{@info.title}" %>
|
||||
|
||||
<%
|
||||
def can_edit?
|
||||
mod? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<h1>Edit Info</h1>
|
||||
<%= form_for @info do |f|%>
|
||||
<%= f.text_field :title%>
|
||||
<%= render partial: "md_editor", locals: {name: "info[content]", content: @info.content} %>
|
||||
<p><%= f.submit "Update Info", class: "btn blue left" %></p>
|
||||
<%= f.text_field :title, disabled: !can_edit? %>
|
||||
<%= render partial: "md_editor", locals: {name: "info[content]", content: @info.content, options: {disabled: !can_edit?}} %>
|
||||
<p><%= f.submit "Update Info", class: "btn blue left", disabled: !can_edit? %></p>
|
||||
<% end %>
|
||||
<p><%= button_to "Delete Info", @info, method: "delete", data: {confirm: "Delete Info forever?"}, class: "btn red right" %></p>
|
||||
<p><%= button_to "Delete Info", @info, method: "delete", data: {confirm: "Are you sure you want to delete this info page?"}, class: "btn red right", disabled: !can_edit? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can edit info pages.</span>
|
||||
<% end %>
|
||||
|
||||
@@ -1,9 +1,19 @@
|
||||
<% title "New Info" %>
|
||||
|
||||
<%
|
||||
def can_create?
|
||||
mod? && current_user.confirmed?
|
||||
end
|
||||
%>
|
||||
|
||||
<h1>New Info</h1>
|
||||
<%= form_for @info, url: info_index_path do |f|%>
|
||||
<%= f.text_field :title, placeholder: "Title" %>
|
||||
<%= render partial: "md_editor", locals: {name: "info[content]", content: @info.content} %>
|
||||
<p><%= f.submit "Create Info", class: "btn blue left" %></p>
|
||||
<%= f.text_field :title, placeholder: "Title", disabled: !can_create? %>
|
||||
<%= render partial: "md_editor", locals: {name: "info[content]", content: @info.content, options: {disabled: !can_create?}} %>
|
||||
<p><%= f.submit "Create Info", class: "btn blue left", disabled: !can_create? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your email before you can create new info pages.</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -13,6 +13,12 @@
|
||||
<% end %> |
|
||||
<%= link_to "https://twitter.com/RedstonerServer", title: "Redstoner on Twitter" do %>
|
||||
Twitter <%= image_tag("twitter.png") %>
|
||||
<% end %> |
|
||||
<%= link_to "https://mstdn.io/@RedstonerServer", title: "Redstoner on Mastodon" do %>
|
||||
Mastodon <%= image_tag("mastodon.png") %>
|
||||
<% end %> |
|
||||
<%= link_to "http://rdstnr4biap5nao2.onion", title: "Redstoner over Tor" do %>
|
||||
Onion Service <%= image_tag("tor.png") %>
|
||||
<% end %>
|
||||
<% if current_user %>
|
||||
| <%= link_to "/slack/?" + {mail: current_user.try(:email)}.to_param do %>
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
<div id="head">
|
||||
<% head = "head_top" %>
|
||||
<% if current_user != nil && current_user.header_scroll == true %>
|
||||
<% head = "head_scroll" %>
|
||||
<% end %>
|
||||
|
||||
<div id="<%= head %>">
|
||||
<div id="menu">
|
||||
<%= link_to "", root_path, id: "logo" %>
|
||||
<ul>
|
||||
@@ -26,6 +31,9 @@
|
||||
<li>
|
||||
<%= link_to "Donate", donate_statics_path, class: ("active" if con == "statics" && params[:action] == "donate") %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to "Who's Playing?", online_statics_path, class: ("active" if con == "statics" && params[:action] == "online") %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="userbar">
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
<meta name="viewport" content="initial-scale=1,maximum-scale=1">
|
||||
<meta name="description" content="Redstoner is a creative minecraft server made for redstoners">
|
||||
<%= stylesheet_link_tag "application", :media => "all" %>
|
||||
<% if current_user.try(:dark) == true %>
|
||||
<%= stylesheet_link_tag "dark", :media => "all" %>
|
||||
<% end %>
|
||||
<%= csrf_meta_tags %>
|
||||
<%= favicon_link_tag "favicon.ico" %>
|
||||
<%= javascript_include_tag "https://cdn.rawgit.com/jomo/ago.js/v0.0.1/ago.min.js", crossorigin: :anonymous, integrity: "sha256-xw0JUUdbuZQCVO+QScoxrlEsD4nZGCjMRh9PP8GLhcY=" %>
|
||||
@@ -14,7 +17,11 @@
|
||||
</head>
|
||||
<body>
|
||||
<%= render partial: "/layouts/head" %>
|
||||
<div id="main-content" class="<%= yield(:main_class) %>">
|
||||
<% content = "main-content" %>
|
||||
<% if current_user.try(:header_scroll) == true %>
|
||||
<% content = "main-content-scroll" %>
|
||||
<% end %>
|
||||
<div id="<%=content%>" class="<%=yield(:main_class) %>">
|
||||
<% if alert %>
|
||||
<div class='flash alert'><%= alert %></div>
|
||||
<% end %>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
</div>
|
||||
<p></p>
|
||||
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
|
||||
<p>Your Redstoner team</p>
|
||||
|
||||
</div>
|
||||
@@ -25,7 +25,7 @@
|
||||
<p>You can contact us via:
|
||||
<%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
%>
|
||||
<p><%= link_to "Click here", blogpost_url(@comment.blogpost, page: page) + "#comment-#{@comment.id}", style: "text-decoration: none; color: #4096EE;" %> to view the blog post.</p>
|
||||
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>Your Redstoner team</p>
|
||||
|
||||
</div>
|
||||
@@ -24,7 +24,7 @@
|
||||
<p>You can contact us via:
|
||||
<%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
<p><%= link_to "Click here", blogpost_url(@post), style: "text-decoration: none; color: #4096EE;" %> to view the blog post.</p>
|
||||
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>Your Redstoner team</p>
|
||||
|
||||
</div>
|
||||
@@ -21,7 +21,7 @@
|
||||
<p>You can contact us via:
|
||||
<%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<p><%= link_to "Click here", forumthread_url(@thread), style: "text-decoration: none; color: #4096EE;" %> to view the thread.</p>
|
||||
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>Your Redstoner team</p>
|
||||
|
||||
</div>
|
||||
@@ -23,7 +23,7 @@
|
||||
<p>You can contact us via:
|
||||
<%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
%>
|
||||
<p><%= link_to "Click here", forumthread_url(@reply.thread, page: page) + "#reply-#{@reply.id}", style: "text-decoration: none; color: #4096EE;" %> to view the thread.</p>
|
||||
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
|
||||
<p>Your Redstoner team</p>
|
||||
|
||||
</div>
|
||||
@@ -26,7 +26,7 @@
|
||||
<p>You can contact us via:
|
||||
<%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
</div>
|
||||
<p></p>
|
||||
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
|
||||
<p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
|
||||
<p>Your Redstoner team</p>
|
||||
|
||||
</div>
|
||||
@@ -37,7 +37,7 @@
|
||||
<p>You can contact us via:
|
||||
<%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
|
||||
<%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<% title "Donate" %>
|
||||
<h1>Donate</h1>
|
||||
|
||||
<p>Running a server is really stressful and requires a lot of work.<br>
|
||||
@@ -11,7 +12,7 @@
|
||||
<li>Donator+ ($20 or more)
|
||||
</ul>
|
||||
|
||||
<p>We also have <%= link_to "list of users who donated", users_path(role: "donor") %> already!</p>
|
||||
<p>We also have a <%= link_to "list of users who donated", users_path(donor: "") %> already!</p>
|
||||
|
||||
<h3>Perks for you</h3>
|
||||
<p>For <i>Donator</i> and <i>Donator+</i></p>
|
||||
@@ -19,16 +20,17 @@
|
||||
<li>The warm feeling of donating for a good thing, plus a huge "<b>thank you</b>"!
|
||||
<li>You can have a nickname. See <%= link_to "our nickname guidelines", info_path("12-nickname-guidelines") %>
|
||||
<li>A "$" next to your name <i>(Including website)</i>
|
||||
<li><i>Donator+</i> has access to the in-game command <code>/lol id</code></li>
|
||||
</ul>
|
||||
<hr>
|
||||
<div class="donations">
|
||||
<div class="donation">
|
||||
<div class="left">
|
||||
<img src="<%= image_url("anonymous_skin.png") %>" alt="sponsor's skin" class="body">
|
||||
<img src="https://crafatar.com/renders/body/97a4928198f045998e0e7a97eabae6ae?overlay=true&scale=3" alt="sponsor's skin" class="body">
|
||||
</div>
|
||||
<div>
|
||||
<h1>Donate to our server sponsor</h1>
|
||||
<h4>They pay for our server, but prefer to stay anonymous</h4>
|
||||
<h4>PotatoKek pays for the server hardware. You can help him by donating here.</h4>
|
||||
<form target="_blank" method="post" action="https://www.paypal.com/cgi-bin/webscr">
|
||||
<% if current_user %>
|
||||
<input name="custom" type="hidden" placeholder="Your Minecraft name" value="<%= current_user.ign %>">
|
||||
|
||||
18
app/views/statics/online.html.erb
Normal file
18
app/views/statics/online.html.erb
Normal file
@@ -0,0 +1,18 @@
|
||||
<% title "Who's Playing?" %>
|
||||
<h1>These players are currently playing on Redstoner (<%= @count %>):</h1>
|
||||
<div id="userlist">
|
||||
<% @players.each do |u| %>
|
||||
<div class="list-user">
|
||||
<%= link_to(u.avatar(64), u) %>
|
||||
<div class="detail">
|
||||
<%= render partial: "users/username", locals: { user: u } %><br>
|
||||
<% if u.id %>
|
||||
<i><%= u.ign %></i>
|
||||
<% else %>
|
||||
<i>(Not signed up)</i>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
41
app/views/statics/privacy.html.erb
Normal file
41
app/views/statics/privacy.html.erb
Normal file
@@ -0,0 +1,41 @@
|
||||
<% title "Privacy Policy" %>
|
||||
<h1>Privacy Policy</h1>
|
||||
<p>Please note that this privacy policy is not legally binding. It is simply a reference intended to inform you about what is done with your information. Also, this privacy policy only applies to the Redstoner website and forums. The Minecraft server will have its own privacy policy at some point.</p>
|
||||
<h2>How your information is stored and protected</h2>
|
||||
<p>Everything on the website is stored in a database, to which access is strictly limited. Only users of the administrator rank or former administrators who are well known and are trusted by the rest of the current administrators may access the database. Offsite backups of this data are made daily only to the network and servers of at least one current administrator via an encrypted SSH connection.</p>
|
||||
<p>Passwords are stored using the bcrypt algorithm. Plaintext passwords are never logged or stored anywhere.</p>
|
||||
<p>The website code is <%= link_to "open source", "https://github.com/RedstonerServer/redstoner.com" %> and undergoes heavy testing and review before it is deployed to ensure no exploitable bugs or backdoors make it onto the production server.</p>
|
||||
<p>All connections to our website are automatically forced to be made over HTTPS to ensure your data is protected while in transit. We maintain <%= link_to "good TLS paramters", "https://www.ssllabs.com/ssltest/analyze.html?d=redstoner.com" %> and also employ other techniques to ensure secure connections such as <%= link_to "being on the HSTS preload list", "https://hstspreload.org/?domain=redstoner.com" %> and OCSP stapling.</p>
|
||||
<h2>Information we collect</h2>
|
||||
<p>This information is needed in order for your account to be created:</p>
|
||||
<ul>
|
||||
<li>Your Minecraft account's IGN and UUID.</li>
|
||||
<li>Your email address.</li>
|
||||
<li>A unique password.</li>
|
||||
</ul>
|
||||
<p>This information is optional and is obtained only if you provide it:</p>
|
||||
<ul>
|
||||
<li>Your Skype username.</li>
|
||||
<li>Your YouTube channel ID.</li>
|
||||
<li>Your Twitter username.</li>
|
||||
</ul>
|
||||
<p>This information is also collected, however does not affect your Redstoner account directly:</p>
|
||||
<ul>
|
||||
<li>Your IP address.</li>
|
||||
</ul>
|
||||
<h2>How your information is used and who it is visible to</h2>
|
||||
<ul>
|
||||
<li><b>Minecraft account IGN and UUID</b> - This is used to link your Minecraft account with your Redstoner account. Anyone can see these.</li>
|
||||
<li><b>Your email address</b> - This is used to send you email notifications about forums activity that you are involved in. These notifications can be disabled in your account settings. This is also used to perform a password reuse check, which is explained in more detail below. Only users of the moderator rank or higher can see your email address.</li>
|
||||
<li><b>Your password</b> - This is used to authenticate you. This too is used to perform a password reuse check. The plaintext version is visible to no one, but the hashed version is visible only to users of the administrator rank or higher.</li>
|
||||
<li><b>Your Skype username</b> - This is used to add a link to your profile that allows others to easily contact you over Skype. Anyone can see this.</li>
|
||||
<li><b>Your YouTube channel</b> - This is used to add a link to your profile that allows others to easily find your YouTube channel. Anyone can see this.</li>
|
||||
<li><b>Your Twitter username</b> - This is used to add a link to your profile that allows others to easily contact you over Twitter. Anyone can see this.</li>
|
||||
<li><b>Your IP address</b> - This is used to help us identify and ban troublemakers from our forums. Only users of the moderator rank and above can see this.</li>
|
||||
</ul>
|
||||
<h2>Password reuse check</h2>
|
||||
<p>When you first sign up on our website, we use your email address and password to check if you are reusing your password with your Mojang account. This is done by attempting to log into Mojang's server using this information. If it succeeds, then your confirmation email will contain a note warning you not to reuse your password. <b>The information used to perform this check is never used to actually take over your Minecraft account. In fact, we can't because your password is hashed after the check and is totally unusable to us. If you get this warning not to reuse your password, it is still highly recommended that you change your password for your Mojang account and also use a password manager.</b></p>
|
||||
<h2>Who your information is shared with</h2>
|
||||
<p>We do not share your information with any third parties. The only time we will release information is if we are legally required to.</p>
|
||||
<hr>
|
||||
<p><sup>This privacy policy was last revised October 31, 2017.</sup></p>
|
||||
@@ -1,4 +1,19 @@
|
||||
<%= form_for [reply.thread, reply] do |f| %>
|
||||
<%= render partial: "md_editor", locals: {name: "threadreply[content]", content: reply.content} %>
|
||||
<p><%= f.submit "Reply#{ ' (Locked)' if reply.thread.locked? }", class: "btn blue" %></p>
|
||||
<% nec_msg = "" %>
|
||||
<% forum = Forum.find(reply.thread.forum_id) %>
|
||||
<% if forum.necro_length %>
|
||||
<% if reply.thread.label.try(:name).try(:downcase) == "closed" %>
|
||||
<% nec_msg = "This thread is closed. Are you sure you want to make this reply? If so, press 'Ok'" %>
|
||||
<% elsif Threadreply.where(forumthread: reply.thread).any? %>
|
||||
<% prevAgo = Threadreply.where(forumthread: reply.thread).order(:id).last.created_at %>
|
||||
<% if prevAgo <= forum.necro_length.days.ago.utc %>
|
||||
<% nec_msg = "You may be necroposting, as the last reply was made at least #{forum.necro_length} days ago. If you still wish to make this reply, press 'Ok'." %>
|
||||
<% end %>
|
||||
<% elsif reply.thread.created_at <= forum.necro_length.days.ago.utc %>
|
||||
<% nec_msg = "You may be necroposting, as this thread was posted at least #{forum.necro_length} days ago. If you still wish to make this reply, press 'Ok'." %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<p><%= f.submit "Reply#{ ' (Locked)' if reply.thread.locked? }", class: "btn blue", data: { confirm: nec_msg } %></p>
|
||||
<% nec_msg = "" %>
|
||||
<% end %>
|
||||
@@ -1,7 +1,7 @@
|
||||
<% title "Edit Thread Reply: #{@reply.thread.title}" %>
|
||||
|
||||
<%
|
||||
position = @reply.thread.replies.index(@reply)
|
||||
position = @reply.thread.replies.order(:id).index(@reply)
|
||||
page = position / Kaminari.config.default_per_page + 1
|
||||
%>
|
||||
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
<div class="user">
|
||||
<%= link_to user.name, user, class: "role #{user.role.name} #{"banned" if user.banned?} #{"disabled" if user.disabled?} #{"unconfirmed" unless user.confirmed?}", title: "#{user.ign} – #{user.role}", style: "color: #{fcolor(user.role.color)}; background-color: #{user.role.color}" %>
|
||||
<%= link_to "$", donate_statics_path, class: "role donor", title: "Donator" if user.donor? %>
|
||||
<% if user.badge %>
|
||||
<%= link_to user.badge.symbol, users_path(badge: user.badge.name), class: "role badge", title: user.badge.name, style: "color: #{fcolor(user.badge.color)}; background-color: #{user.badge.color}" unless user.badge.symbol.blank? %>
|
||||
<% end %>
|
||||
</div>
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<%
|
||||
def can_edit?
|
||||
(@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)
|
||||
(@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role && current_user.confirmed?)
|
||||
end
|
||||
%>
|
||||
|
||||
@@ -23,7 +23,15 @@
|
||||
<td>Role</td>
|
||||
<td>
|
||||
<% if current_user.role >= @user.role %>
|
||||
<%= f.select :role, Role.all_to(current_user.role) %>
|
||||
<%= f.select :role, Role.all_to(current_user.role), {}, { disabled: !can_edit? } %>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Badge</td>
|
||||
<td>
|
||||
<% if current_user.role >= Role.get(:mod) %>
|
||||
<%= f.select :badge, Badge.all, {}, { disabled: !can_edit? } %>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -33,12 +41,6 @@
|
||||
<%= f.select :confirmed, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Donator</td>
|
||||
<td>
|
||||
<%= f.select :donor, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<tr>
|
||||
<td>Skype username</td>
|
||||
@@ -46,12 +48,6 @@
|
||||
<%= f.text_field :skype, placeholder: "Skype username", disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show Skype to</td>
|
||||
<td>
|
||||
<%= f.select :skype_public, [["Staff only", false], ["All users", true]], {}, { disabled: !can_edit? } %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>YouTube Channel ID</td>
|
||||
<td>
|
||||
@@ -61,7 +57,7 @@
|
||||
<tr>
|
||||
<td>Twitter username</td>
|
||||
<td>
|
||||
<%= f.text_field :twitter, placeholder: "Twitter username", disabled: !(@user.is?(current_user) && confirmed? || (mod? && current_user.role >= @user.role)) %>
|
||||
<%= f.text_field :twitter, placeholder: "Twitter username", disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -73,14 +69,17 @@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<p><%= f.submit "Save profile", class: "btn blue left", disabled: (!@user.confirmed? && @user.is?(current_user)) %></p>
|
||||
<p><%= f.submit "Save profile", class: "btn variable-size left", disabled: !can_edit? %></p>
|
||||
<p>
|
||||
<%= link_to "Edit login details", edit_login_user_path(@user), class: "btn blue right" %>
|
||||
<%= link_to "Notification settings", edit_notifications_user_path(@user), class: "btn blue right" %>
|
||||
<%= link_to "Edit login details", edit_login_user_path(@user), class: "btn variable-size right" %>
|
||||
<%= link_to "Notification settings", edit_notifications_user_path(@user), class: "btn variable-size right" %>
|
||||
<%= link_to "Website settings", edit_website_settings_user_path(@user), class: "btn variable-size right" %>
|
||||
</p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !@user.confirmed? %>
|
||||
<% if !@user.is?(current_user) && !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your own email before you can edit other profiles.</span>
|
||||
<% elsif !@user.confirmed? %>
|
||||
<% if @user.is?(current_user) %>
|
||||
<span class='red-alert'>Please confirm your email address first!</span>
|
||||
<% else %>
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
<% title "Edit Notification Settings: #{@user.name}" %>
|
||||
|
||||
<%
|
||||
def can_edit?
|
||||
(@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role && current_user.confirmed?)
|
||||
end
|
||||
%>
|
||||
|
||||
<%= link_to @user.name, @user %> → Edit Notification Settings
|
||||
<h1>Edit Notification Settings</h1>
|
||||
|
||||
@@ -11,13 +17,13 @@
|
||||
<tr>
|
||||
<td>replies to my thread</td>
|
||||
<td>
|
||||
<%= f.check_box :mail_own_thread_reply %>
|
||||
<%= f.check_box :mail_own_thread_reply, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>replies to a thread I already replied to</td>
|
||||
<td>
|
||||
<%= f.check_box :mail_other_thread_reply %>
|
||||
<%= f.check_box :mail_other_thread_reply, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -26,13 +32,13 @@
|
||||
<i>(Currently used for staff only)</i>
|
||||
</td>
|
||||
<td>
|
||||
<%= f.check_box :mail_own_blogpost_comment %>
|
||||
<%= f.check_box :mail_own_blogpost_comment, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>comments a blog post I already commented</td>
|
||||
<td>
|
||||
<%= f.check_box :mail_other_blogpost_comment %>
|
||||
<%= f.check_box :mail_other_blogpost_comment, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -40,11 +46,20 @@
|
||||
mentions me in a thread or comment
|
||||
</td>
|
||||
<td>
|
||||
<%= f.check_box :mail_mention %>
|
||||
<%= f.check_box :mail_mention, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<p><%= f.submit "Save changes", class: "btn blue left" %></p>
|
||||
<h3>Public Key</h1>
|
||||
<p>All notification emails will be encrypted with this key if you supply it.</p>
|
||||
<%= f.text_area :public_key, placeholder: "-----BEGIN PGP PUBLIC KEY BLOCK-----", disabled: !can_edit? %>
|
||||
<p><%= f.submit "Save changes", class: "btn blue left", disabled: !can_edit? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !@user.is?(current_user) && !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your own email before you can edit other user's notification settings.</span>
|
||||
<% elsif !@user.confirmed? && @user.is?(current_user) %>
|
||||
<span class='red-alert'>You need to confirm your email before you can edit your notification settings.</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
46
app/views/users/edit_website_settings.html.erb
Normal file
46
app/views/users/edit_website_settings.html.erb
Normal file
@@ -0,0 +1,46 @@
|
||||
<% title "Edit Website Settings: #{@user.name}" %>
|
||||
|
||||
<%
|
||||
def can_edit?
|
||||
(@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role && current_user.confirmed?)
|
||||
end
|
||||
%>
|
||||
|
||||
<%= link_to @user.name, @user %> → Edit Website Settings
|
||||
<h1>Edit Website Settings</h1>
|
||||
|
||||
|
||||
<%= form_for @user do |f| %>
|
||||
<table>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Header moves with scrolling (Experimental - do not report bugs)</td>
|
||||
<td>
|
||||
<%= f.check_box :header_scroll, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show exact UTC times</td>
|
||||
<td>
|
||||
<%= f.check_box :utc_time, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Dark theme*</td>
|
||||
<td>
|
||||
<%= f.check_box :dark, disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<p><%= f.submit "Save changes", class: "btn blue left", disabled: !can_edit? %></p>
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if !@user.is?(current_user) && !current_user.confirmed? %>
|
||||
<span class='red-alert'>You must confirm your own email before you can edit other user's website settings.</span>
|
||||
<% elsif !@user.confirmed? && @user.is?(current_user) %>
|
||||
<span class='red-alert'>You need to confirm your email before you can edit your website settings.</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<br><br><br>
|
||||
*Warning: If as a result to enabling this style your eyes get infected with a severe case of eye cancer, we are not reliable for any damage. Please contact your doctor in advance to ensure that in case of infection you will be treated accordingly. Quality theme brought to you by Redempt™.
|
||||
@@ -1,12 +1,34 @@
|
||||
<h1>
|
||||
<% if params[:role] %>
|
||||
<%= title "All '#{params[:role]}' users" %>
|
||||
<% else %>
|
||||
<%= title "All Users" %>
|
||||
<%= form_tag(users_path, method: :get) do %>
|
||||
<%= text_field_tag "search", params[:search], placeholder: "Search for a user", class: "searchfield field" %>
|
||||
<%= submit_tag "Go", class: "searchfield btn", name: nil %>
|
||||
<%= hidden_field_tag "role", params[:role] if params[:role] %>
|
||||
<%= hidden_field_tag "badge", params[:badge] if params[:badge]%>
|
||||
<% end %>
|
||||
<h1>
|
||||
<%
|
||||
if params[:role] && !params[:badge]
|
||||
text = "All '#{params[:role]}' users"
|
||||
elsif params[:badge] && !params[:role]
|
||||
text = "All '#{params[:badge]}' users"
|
||||
elsif params[:role] && params[:badge]
|
||||
text = "All '#{params[:role]}' and '#{params[:badge]}' users"
|
||||
elsif params.include?(:staff)
|
||||
text = "All staff"
|
||||
elsif params.include?(:donor)
|
||||
text = "All donors"
|
||||
else
|
||||
text = "All users"
|
||||
end
|
||||
text += " that contain '#{params[:search]}'" if params[:search]
|
||||
%>
|
||||
<%= title text %>
|
||||
<% if params[:search] %>
|
||||
(<%= @users.total_count %>)
|
||||
<% else %>
|
||||
(<%= @count %>)
|
||||
<% end %>
|
||||
</h1>
|
||||
<%= link_to "show all", users_path if params[:role] %>
|
||||
<%= link_to "show all", users_path if params[:role] || params[:badge] %>
|
||||
|
||||
<div id="userlist">
|
||||
<% @users.each do |u| %>
|
||||
|
||||
@@ -40,5 +40,5 @@
|
||||
|
||||
<%= f.submit "Sign up", class: "btn blue" %>
|
||||
|
||||
<p>Contact us ingame if you have problems singing up!</p>
|
||||
<p>Contact us ingame if you have problems signing up!</p>
|
||||
<% end %>
|
||||
@@ -15,15 +15,28 @@
|
||||
<h1><%= @user.name %></h1>
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
<% if @user.banned? %>
|
||||
<span class="user-banned">This user is banned!</span>
|
||||
<% if @ban_json && (@ban_json["expires"] == "forever" || !(DateTime.parse(@ban_json["expires"]) <= DateTime.now)) %>
|
||||
<% if @user.is?(current_user) %>
|
||||
<span class="user-banned">You are banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span>
|
||||
<% else %>
|
||||
<span class="user-banned">This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span>
|
||||
<% end %>
|
||||
|
||||
<% end %>
|
||||
<% if @user.banned? %>
|
||||
<% if @user.is?(current_user) %>
|
||||
<span class="user-banned">You are banned on the website!</span>
|
||||
<% else %>
|
||||
<span class="user-banned">This user is banned on the website!</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<br>
|
||||
<% if !@user.confirmed? %>
|
||||
<% if @user.is?(current_user) || mod? %>
|
||||
<span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>
|
||||
<% if @user.is?(current_user) %>
|
||||
<span class="user-unconfirmed">You haven't confirmed your email "<u><%= @user.email %></u>" yet!</span>
|
||||
<%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn dark", form_class: "inline-block", data: {confirm: "Did you check your spam folder?"} %>
|
||||
<% elsif mod? %>
|
||||
<span class="user-unconfirmed">This user hasn't confirmed their email "<u><%= @user.email %></u>" yet!</span>
|
||||
<%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn dark", form_class: "inline-block" %>
|
||||
<% else %>
|
||||
<span class="user-unconfirmed">This user hasn't confirmed their email yet!</span>
|
||||
<% end %>
|
||||
@@ -52,7 +65,7 @@
|
||||
<td><b>Role</b></td>
|
||||
<td><%= link_to @user.role, users_path(:role => @user.role.name) %></td>
|
||||
</tr>
|
||||
<% if current_user && !@user.skype.blank? && (@user.skype_public || current_user == @user || mod?) %>
|
||||
<% if current_user && !@user.skype.blank? %>
|
||||
<tr>
|
||||
<td><b>Skype</b></td>
|
||||
<td><%= link_to @user.skype, "skype:#{@user.skype}?chat", target: "_blank" %></a></td>
|
||||
|
||||
@@ -6,6 +6,8 @@ Redstoner::Application.configure do
|
||||
# since you don't have to restart the web server when you make code changes.
|
||||
config.cache_classes = false
|
||||
|
||||
config.action_controller.perform_caching = true
|
||||
|
||||
# Log error messages when you accidentally call methods on nil.
|
||||
config.whiny_nils = true
|
||||
|
||||
|
||||
1
config/initializers/assets.rb
Normal file
1
config/initializers/assets.rb
Normal file
@@ -0,0 +1 @@
|
||||
Rails.application.config.assets.precompile += %w( dark.css )
|
||||
@@ -4,10 +4,12 @@ Redstoner::Application.routes.draw do
|
||||
resources :comments
|
||||
end
|
||||
|
||||
resources :statics, only: [:home, :donate], path: '/' do
|
||||
resources :statics, only: [:home, :donate, :online], path: '/' do
|
||||
collection do
|
||||
get 'donate'
|
||||
get 'home'
|
||||
get 'online'
|
||||
get 'privacy'
|
||||
get 'index'
|
||||
end
|
||||
end
|
||||
@@ -21,6 +23,7 @@ Redstoner::Application.routes.draw do
|
||||
post 'resend_mail'
|
||||
get 'edit_notifications'
|
||||
put 'update_login'
|
||||
get 'edit_website_settings'
|
||||
end
|
||||
collection do
|
||||
get 'lost_password'
|
||||
@@ -30,10 +33,13 @@ Redstoner::Application.routes.draw do
|
||||
end
|
||||
|
||||
resources :forumgroups, path: '/forums/groups'
|
||||
resources :forums, path: '/forums'
|
||||
resources :forumthreads, path: '/forums/threads' do
|
||||
resources :threadreplies, path: 'replies'
|
||||
collection do
|
||||
get 'search'
|
||||
end
|
||||
end
|
||||
resources :forums, path: '/forums'
|
||||
|
||||
resources :tools do
|
||||
collection do
|
||||
|
||||
17
db/migrate/20170319193517_add_badge_id_to_users.rb
Normal file
17
db/migrate/20170319193517_add_badge_id_to_users.rb
Normal file
@@ -0,0 +1,17 @@
|
||||
class AddBadgeIdToUsers < ActiveRecord::Migration
|
||||
def change
|
||||
|
||||
create_table "badges", force: :cascade do |t|
|
||||
t.string "name"
|
||||
t.string "symbol"
|
||||
t.string "color"
|
||||
end
|
||||
|
||||
Badge.create!({name: "none", symbol: "", color: "#000"})
|
||||
dbadge = Badge.create!({name: "donor", symbol: "$", color: "#f60"})
|
||||
|
||||
add_column :users, :badge_id, :integer, default: 1
|
||||
User.where(donor: true).update_all(badge_id: dbadge.id)
|
||||
remove_column :users, :donor
|
||||
end
|
||||
end
|
||||
5
db/migrate/20170320195301_add_utc_time_to_users.rb
Normal file
5
db/migrate/20170320195301_add_utc_time_to_users.rb
Normal file
@@ -0,0 +1,5 @@
|
||||
class AddUtcTimeToUsers < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :users, :utc_time, :boolean, default: false
|
||||
end
|
||||
end
|
||||
5
db/migrate/20170328100851_add_header_scroll_to_users.rb
Normal file
5
db/migrate/20170328100851_add_header_scroll_to_users.rb
Normal file
@@ -0,0 +1,5 @@
|
||||
class AddHeaderScrollToUsers < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :users, :header_scroll, :boolean, default: false
|
||||
end
|
||||
end
|
||||
5
db/migrate/20170409135858_add_necro_length_to_forums.rb
Normal file
5
db/migrate/20170409135858_add_necro_length_to_forums.rb
Normal file
@@ -0,0 +1,5 @@
|
||||
class AddNecroLengthToForums < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :forums, :necro_length, :integer
|
||||
end
|
||||
end
|
||||
5
db/migrate/20170515200733_add_dark_to_users.rb
Normal file
5
db/migrate/20170515200733_add_dark_to_users.rb
Normal file
@@ -0,0 +1,5 @@
|
||||
class AddDarkToUsers < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :users, :dark, :boolean, default: false
|
||||
end
|
||||
end
|
||||
8
db/migrate/20170522210610_add_search_indexes.rb
Normal file
8
db/migrate/20170522210610_add_search_indexes.rb
Normal file
@@ -0,0 +1,8 @@
|
||||
class AddSearchIndexes < ActiveRecord::Migration
|
||||
def change
|
||||
add_index :forumthreads, [:title, :content], type: :fulltext
|
||||
add_index :forumthreads, :title, type: :fulltext
|
||||
add_index :forumthreads, :content, type: :fulltext
|
||||
add_index :threadreplies, :content, type: :fulltext
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,5 @@
|
||||
class AddIndexForumthreadIdOnThreadreplies < ActiveRecord::Migration
|
||||
def change
|
||||
add_index :threadreplies, :forumthread_id
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,6 @@
|
||||
class RemoveSkypeVisibilityFromUsers < ActiveRecord::Migration
|
||||
def change
|
||||
remove_column :users, :skype_public
|
||||
User.update_all skype: nil
|
||||
end
|
||||
end
|
||||
5
db/migrate/20171013001146_add_public_key_to_users.rb
Normal file
5
db/migrate/20171013001146_add_public_key_to_users.rb
Normal file
@@ -0,0 +1,5 @@
|
||||
class AddPublicKeyToUsers < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :users, :public_key, :text
|
||||
end
|
||||
end
|
||||
88
db/schema.rb
88
db/schema.rb
@@ -11,11 +11,18 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20160926220738) do
|
||||
ActiveRecord::Schema.define(version: 20171013001146) do
|
||||
|
||||
create_table "badges", force: :cascade do |t|
|
||||
t.string "name", limit: 191
|
||||
t.string "symbol", limit: 191
|
||||
t.string "color", limit: 191
|
||||
t.integer "value", limit: 4
|
||||
end
|
||||
|
||||
create_table "blogposts", force: :cascade do |t|
|
||||
t.string "title"
|
||||
t.text "content", limit: 65535
|
||||
t.string "title", limit: 255
|
||||
t.text "content", limit: 16777215
|
||||
t.integer "user_author_id", limit: 4
|
||||
t.integer "user_editor_id", limit: 4
|
||||
t.datetime "created_at"
|
||||
@@ -23,7 +30,7 @@ ActiveRecord::Schema.define(version: 20160926220738) do
|
||||
end
|
||||
|
||||
create_table "comments", force: :cascade do |t|
|
||||
t.text "content", limit: 65535
|
||||
t.text "content", limit: 16777215
|
||||
t.integer "user_author_id", limit: 4
|
||||
t.integer "user_editor_id", limit: 4
|
||||
t.integer "blogpost_id", limit: 4
|
||||
@@ -32,18 +39,19 @@ ActiveRecord::Schema.define(version: 20160926220738) do
|
||||
end
|
||||
|
||||
create_table "forumgroups", force: :cascade do |t|
|
||||
t.string "name"
|
||||
t.string "name", limit: 255
|
||||
t.integer "position", limit: 4
|
||||
t.integer "role_read_id", limit: 4
|
||||
t.integer "role_write_id", limit: 4
|
||||
end
|
||||
|
||||
create_table "forums", force: :cascade do |t|
|
||||
t.string "name"
|
||||
t.string "name", limit: 255
|
||||
t.integer "position", limit: 4
|
||||
t.integer "role_read_id", limit: 4
|
||||
t.integer "role_write_id", limit: 4
|
||||
t.integer "forumgroup_id", limit: 4
|
||||
t.integer "necro_length", limit: 4
|
||||
end
|
||||
|
||||
create_table "forums_labels", id: false, force: :cascade do |t|
|
||||
@@ -52,8 +60,8 @@ ActiveRecord::Schema.define(version: 20160926220738) do
|
||||
end
|
||||
|
||||
create_table "forumthreads", force: :cascade do |t|
|
||||
t.string "title"
|
||||
t.text "content", limit: 65535
|
||||
t.string "title", limit: 255
|
||||
t.text "content", limit: 16777215
|
||||
t.boolean "sticky", default: false
|
||||
t.boolean "locked", default: false
|
||||
t.integer "user_author_id", limit: 4
|
||||
@@ -64,44 +72,50 @@ ActiveRecord::Schema.define(version: 20160926220738) do
|
||||
t.integer "label_id", limit: 4
|
||||
end
|
||||
|
||||
add_index "forumthreads", ["content"], name: "index_forumthreads_on_content", type: :fulltext
|
||||
add_index "forumthreads", ["title", "content"], name: "forumthreads_title_content", type: :fulltext
|
||||
add_index "forumthreads", ["title", "content"], name: "index_forumthreads_on_title_and_content", type: :fulltext
|
||||
add_index "forumthreads", ["title"], name: "index_forumthreads_on_title", type: :fulltext
|
||||
|
||||
create_table "info", force: :cascade do |t|
|
||||
t.string "title"
|
||||
t.text "content", limit: 65535
|
||||
t.string "title", limit: 255
|
||||
t.text "content", limit: 16777215
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
end
|
||||
|
||||
create_table "labels", force: :cascade do |t|
|
||||
t.string "name"
|
||||
t.string "color"
|
||||
t.string "name", limit: 255
|
||||
t.string "color", limit: 255
|
||||
end
|
||||
|
||||
create_table "register_tokens", force: :cascade do |t|
|
||||
t.string "uuid", null: false
|
||||
t.string "token", null: false
|
||||
t.string "email", null: false
|
||||
t.string "uuid", limit: 32, null: false
|
||||
t.string "token", limit: 6, null: false
|
||||
t.string "email", limit: 191
|
||||
end
|
||||
|
||||
add_index "register_tokens", ["email"], name: "index_register_tokens_on_email", unique: true, using: :btree
|
||||
add_index "register_tokens", ["uuid"], name: "index_register_tokens_on_uuid", unique: true, using: :btree
|
||||
|
||||
create_table "roles", force: :cascade do |t|
|
||||
t.string "name"
|
||||
t.string "name", limit: 255
|
||||
t.integer "value", limit: 4
|
||||
t.string "color"
|
||||
t.string "color", limit: 255
|
||||
end
|
||||
|
||||
create_table "sessions", force: :cascade do |t|
|
||||
t.string "session_id", null: false
|
||||
t.text "data", limit: 65535
|
||||
t.string "session_id", limit: 255, null: false
|
||||
t.text "data", limit: 16777215
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
end
|
||||
|
||||
add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
|
||||
add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", length: {"session_id"=>191}, using: :btree
|
||||
add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
|
||||
|
||||
create_table "threadreplies", force: :cascade do |t|
|
||||
t.text "content", limit: 65535
|
||||
t.text "content", limit: 16777215
|
||||
t.integer "user_author_id", limit: 4
|
||||
t.integer "user_editor_id", limit: 4
|
||||
t.integer "forumthread_id", limit: 4
|
||||
@@ -109,21 +123,22 @@ ActiveRecord::Schema.define(version: 20160926220738) do
|
||||
t.datetime "updated_at"
|
||||
end
|
||||
|
||||
add_index "threadreplies", ["content"], name: "index_threadreplies_on_content", type: :fulltext
|
||||
add_index "threadreplies", ["forumthread_id"], name: "index_threadreplies_on_forumthread_id", using: :btree
|
||||
|
||||
create_table "users", force: :cascade do |t|
|
||||
t.string "uuid", null: false
|
||||
t.string "name", null: false
|
||||
t.string "password_digest", null: false
|
||||
t.string "ign", null: false
|
||||
t.string "email", null: false
|
||||
t.string "uuid", limit: 255, null: false
|
||||
t.string "name", limit: 191
|
||||
t.string "password_digest", limit: 255, null: false
|
||||
t.string "ign", limit: 255, null: false
|
||||
t.string "email", limit: 191
|
||||
t.text "about", limit: 65535
|
||||
t.string "last_ip"
|
||||
t.string "skype"
|
||||
t.boolean "skype_public", default: false
|
||||
t.string "youtube"
|
||||
t.string "youtube_channelname"
|
||||
t.string "twitter"
|
||||
t.boolean "donor", default: false
|
||||
t.string "email_token"
|
||||
t.string "last_ip", limit: 255
|
||||
t.string "skype", limit: 255
|
||||
t.string "youtube", limit: 255
|
||||
t.string "youtube_channelname", limit: 255
|
||||
t.string "twitter", limit: 255
|
||||
t.string "email_token", limit: 255
|
||||
t.boolean "confirmed", default: false
|
||||
t.datetime "last_seen"
|
||||
t.integer "role_id", limit: 4, null: false
|
||||
@@ -134,6 +149,11 @@ ActiveRecord::Schema.define(version: 20160926220738) do
|
||||
t.boolean "mail_own_blogpost_comment", default: true
|
||||
t.boolean "mail_other_blogpost_comment", default: true
|
||||
t.boolean "mail_mention", default: true
|
||||
t.integer "badge_id", limit: 4, default: 0
|
||||
t.boolean "utc_time", default: false
|
||||
t.boolean "header_scroll", default: false
|
||||
t.boolean "dark", default: false
|
||||
t.text "public_key", limit: 65535
|
||||
end
|
||||
|
||||
add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
|
||||
|
||||
24
db/seeds.rb
24
db/seeds.rb
@@ -10,6 +10,14 @@ Role.create!([
|
||||
{name: "superadmin", value: 500, color: "#d22"}
|
||||
])
|
||||
|
||||
Badge.create!([
|
||||
{name: "none", symbol: "", color: "#000"},
|
||||
{name: "donor", symbol: "$", color: "#f60"},
|
||||
{name: "developer", symbol: "D", color: "#a0a"},
|
||||
{name: "retired", symbol: "R", color: "#0aa"},
|
||||
{name: "lead", symbol: "L", color: "#a00"}
|
||||
])
|
||||
|
||||
userpw = SecureRandom.hex(36)
|
||||
|
||||
|
||||
@@ -23,19 +31,13 @@ deleted_user = User.create!(
|
||||
password: userpw,
|
||||
password_confirmation: userpw,
|
||||
role: Role.get(:disabled),
|
||||
badge: Badge.get(:none),
|
||||
skype: "echo123",
|
||||
skype_public: true,
|
||||
last_ip: "0.0.0.0",
|
||||
confirmed: true,
|
||||
last_seen: Time.utc(0).to_datetime
|
||||
last_seen: Time.utc(0).to_datetime,
|
||||
header_scroll: false,
|
||||
utc_time: false,
|
||||
dark: false
|
||||
)
|
||||
deleted_user.update_attribute(:ign, "Steve")
|
||||
|
||||
User.create!(
|
||||
uuid: "ae795aa86327408e92ab25c8a59f3ba1",
|
||||
ign: "jomo",
|
||||
email: "jomo@example.com",
|
||||
password: "123456789", # high seructity!
|
||||
password_confirmation: "123456789",
|
||||
role: Role.get(:superadmin)
|
||||
)
|
||||
18
lib/tasks/create_admin_user.rake
Normal file
18
lib/tasks/create_admin_user.rake
Normal file
@@ -0,0 +1,18 @@
|
||||
desc "Creates a superadmin user. Usage: rake create:create_admin_user[uuid, ign, email, pass]"
|
||||
namespace :create do
|
||||
task :create_admin_user, [:uuid, :ign, :email, :pass] => :environment do |task, args|
|
||||
User.create!(
|
||||
uuid: args.uuid,
|
||||
ign: args.ign,
|
||||
email: args.email,
|
||||
password: args.pass,
|
||||
password_confirmation: args.pass,
|
||||
role: Role.get(:superadmin),
|
||||
header_scroll: false,
|
||||
utc_time: false,
|
||||
dark: false,
|
||||
badge: Badge.get(:none),
|
||||
confirmed: true
|
||||
)
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user