Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

rails 4 and tons of stuff

Browse Source
This commit is contained in:
jomo
2014-04-14 06:26:37 +02:00
parent b740c4db3a
commit 7135d2690c
41 changed files with 349 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/app.js
View File

@@ -21,4 +21,15 @@ $(function(){
})
});
}, 4000);
var pressed = new Array(10);
var keys = [38,38,40,40,37,39,37,39,66,65];
$(document).keydown(function(e) {
pressed.push(e.keyCode);
pressed.shift();
if ( pressed.toString() == keys.toString() ) {
$('html').css('overflow-x', 'hidden');
$('body').css('animation', '1s alternate-reverse infinite wiggle');
$('img').css('transform', 'rotate(180deg)');
}
});
});

21
app/assets/stylesheets/screen.css.scss
View File

@@ -1,4 +1,12 @@
/* CSS for PCs only */
@keyframes wiggle {
0% {transform: rotate(-3deg);}
100% {transform: rotate(3deg);}
}
@-webkit-keyframes wiggle {
0% {transform: rotate(-3deg);}
100% {transform: rotate(3deg);}
}
@media only screen
and (min-width: 0px) //TODO
@@ -59,7 +67,6 @@ and (min-width: 0px) //TODO
height: 50px;
border-bottom: 1px solid #363636;
position: relative;
text-shadow: 0 1px 1px #222;
#logo {
width: 100px;
height: 100px;
@@ -81,7 +88,7 @@ and (min-width: 0px) //TODO
display: inline-block;
color: #fff;
&:hover {
color: #bbb;
color: #f66;
}
}
li {
@@ -355,7 +362,7 @@ and (min-width: 0px) //TODO
background: #ddd;
border: none;
height: 3em;
margin: 0;
margin: 4px 0 0 0;
padding: 0.5em 1em;
width: 100%;
}
@@ -399,7 +406,7 @@ and (min-width: 0px) //TODO
box-shadow: 0 0 5px #faa inset;
border-bottom: none;
}
.validation-error {
.validation-error, .error {
display: inline-block;
padding: 0 1em;
width: 100%;
@@ -591,6 +598,10 @@ and (min-width: 0px) //TODO
font-weight: bold;
}
del {
background: rgba(255, 200, 200, 0.5);
}
.comment-counter {
float: right;
}

15
app/controllers/blogposts_controller.rb
View File

@@ -29,7 +29,7 @@ class BlogpostsController < ApplicationController
def create
if mod?
@post = Blogpost.new(params[:blogpost].slice(:title, :content))
@post = Blogpost.new(post_params)
@post.user_author = current_user
if @post.save
redirect_to @post, notice: 'Post has been created.'
@@ -47,7 +47,7 @@ class BlogpostsController < ApplicationController
@post = Blogpost.find(params[:id])
if mod? || @comment.author.is?(current_user)
@post.user_editor = current_user
if @post.update_attributes(params[:blogpost].slice(:title, :content, :user_editor))
if @post.update_attributes(post_params([:user_editor]))
redirect_to @post, notice: 'Post has been updated.'
else
flash[:alert] = "There was a problem while updating the post"
@@ -69,4 +69,13 @@ class BlogpostsController < ApplicationController
end
redirect_to blogposts_path
end
end
private
def post_params(add = [])
a = [:title, :content]
a += add
params.require(:blogpost).permit(a)
end
end

16
app/controllers/comments_controller.rb
View File

@@ -11,12 +11,11 @@ class CommentsController < ApplicationController
def create
if confirmed?
params[:comment].slice!("content") if params[:comment]
@comment = Comment.new(params[:comment])
@comment = Comment.new(comment_params)
@comment.user_author = current_user
@comment.blogpost = Blogpost.find(params[:blogpost_id])
if @comment.save
redirect_to @comment.blogpost, notice: 'Comment created!'
redirect_to blogpost_path(@comment.blogpost) + "#comment-#{@comment.id}", notice: 'Comment created!'
else
flash[:alert] = "Could not create comment."
redirect_to Blogpost.find(params[:blogpost_id])
@@ -30,10 +29,9 @@ class CommentsController < ApplicationController
def update
@comment = Comment.find(params[:id])
if mod? || @comment.author.is?(current_user)
params[:comment].slice!("content") if params[:comment]
if @comment.update_attributes(params[:comment])
if @comment.update_attributes(comment_params)
flash[:notice] = "Comment updated!"
redirect_to @comment.blogpost
redirect_to blogpost_path(@comment.blogpost) + "#comment-#{@comment.id}"
else
flash[:alert] = "There was a problem while updating your comment"
render action: "edit"
@@ -57,4 +55,10 @@ class CommentsController < ApplicationController
end
redirect_to @comment.blogpost
end
private
def comment_params
params.require(:comment).permit(:content)
end
end

11
app/controllers/forumgroups_controller.rb
View File

@@ -5,7 +5,7 @@ class ForumgroupsController < ApplicationController
end
def show
redirect_to forums_path + "#forums-#{params[:id]}"
redirect_to forums_path + "#forum-#{params[:id]}"
end
def edit
@@ -19,7 +19,7 @@ class ForumgroupsController < ApplicationController
def update
if admin?
@group = Forumgroup.find(params[:id])
if @group.update_attributes(params[:forumgroup])
if @group.update_attributes(group_params)
flash[:notice] = "Forum group updated"
redirect_to @group
else
@@ -42,7 +42,7 @@ class ForumgroupsController < ApplicationController
def create
if admin?
@group = Forumgroup.new(params[:forumgroup])
@group = Forumgroup.new(group_params)
if @group.save
flash[:notice] = "Forum group created."
redirect_to @group
@@ -56,6 +56,11 @@ class ForumgroupsController < ApplicationController
end
end
private
def group_params(add = [])
a = [:name, :position, :role_read, :role_write] + add
params.require(:forumgroup).permit(a)
end
end

31
app/controllers/forums_controller.rb
View File

@@ -1,9 +1,8 @@
class ForumsController < ApplicationController
before_filter :check_permission, only: [:show]
before_filter :check_permission, only: [:show, :edit, :update]
def index
@groups = Forumgroup.all
@groups.select!{|g| g.can_read?(current_user) }
@groups = Forumgroup.select {|g| g.can_read?(current_user) }
@groups.sort_by!{|g| g[:position]}
end
@@ -11,19 +10,36 @@ class ForumsController < ApplicationController
@threads = @forum.forumthreads.order("sticky desc, updated_at desc")
end
def edit
end
def new
if admin?
@group = Forumgroup.find(params[:forumgroup])
@forum = Forum.new(forumgroup: @group)
@forum.forumgroup = Forumgroup.find(params[:forumgroup])
else
flash[:alert] = "You are not allowed to create a forum."
redirect_to forums_path
end
end
def update
if admin?
if @forum.update_attributes(forum_params)
flash[:notice] = "Forum updated"
redirect_to @forum
else
flash[:alert] = "Something went wrong"
end
else
flash[:alert] = "You are not allowed to change a forum"
redirect_to @forum
end
end
def create
if admin?
@forum = Forum.new(params[:forum])
@forum = Forum.new(forum_params)
@forum.forumgroup = Forumgroup.find(params[:forum][:forumgroup_id])
if @forum.save
flash[:notice] = "Forum created."
@@ -49,5 +65,8 @@ class ForumsController < ApplicationController
end
end
def forum_params(add = [])
a = [:name, :position, :role_read, :role_write] + add
params.require(:forum).permit(a)
end
end

17
app/controllers/forumthreads_controller.rb
View File

@@ -12,7 +12,7 @@ class ForumthreadsController < ApplicationController
def update
if mod? || @thread.author.is?(current_user)
@thread.user_editor = current_user
if @thread.update_attributes(params[:forumthread].slice(:title, :content, :user_editor))
if @thread.update_attributes thread_params([:user_editor])
redirect_to @thread, notice: 'Post has been updated.'
else
flash[:alert] = "There was a problem while updating the post"
@@ -28,16 +28,15 @@ class ForumthreadsController < ApplicationController
end
def new
@forum = Forum.find(params[:forum_id])
unless @forum.can_write?(current_user)
flash[:alert] = "You are not allowed to view this forum"
@thread = Forumthread.new(forum: Forum.find(params[:forum]))
unless @thread.forum.can_write?(current_user)
flash[:alert] = "You are not allowed to write in this forum"
redirect_to forums_path
end
@thread = Forumthread.new(forum: @forum)
end
def create
@thread = Forumthread.new(mod? ? params[:forumthread] : params[:forumthread].slice(:title, :content))
@thread = Forumthread.new(mod? ? thread_params([:sticky, :locked]) : thread_params)
if @thread.can_write?(current_user)
@thread.user_author = current_user
@thread.forum = @thread.forum
@@ -69,5 +68,9 @@ class ForumthreadsController < ApplicationController
end
end
def thread_params(add = [])
a = [:title, :content]
a += add
params.require(:Forumthread).permit(a)
end
end

16
app/controllers/users_controller.rb
View File

@@ -1,6 +1,6 @@
class UsersController < ApplicationController
require 'open-uri'
require 'open-uri'
def index
if params[:role]
@@ -10,10 +10,10 @@ require 'open-uri'
@users = User.find_all_by_role_id(Role.get(params[:role]))
end
else
@users = User.all
@users.shift() #Remove first user
@users = User.all.to_a
@users.shift #Remove first user
end
@users = @users.sort_by{|u| u.role}.reverse!
@users = @users.to_a.sort_by{|u| u.role}.reverse!
end
def show
@@ -80,7 +80,7 @@ require 'open-uri'
flash[:notice] = "You are already signed up!"
redirect_to current_user
else
@user = User.new(params[:user] ? params[:user].slice(:ign, :email, :password, :password_confirmation) : {} )
@user = User.new(user_params)
user_profile = @user.get_profile
if user_profile
@user.uuid = user_profile["id"]
@@ -125,7 +125,7 @@ require 'open-uri'
def update
@user = User.find(params[:id])
if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
userdata = params[:user] ? params[:user].slice(:name, :ign, :role_id, :skype, :skype_public, :youtube, :twitter, :about, :password, :password_confirmation) : {}
userdata = user_params([:name, :role_id, :skype, :skype_public, :youtube, :twitter, :about])
if userdata[:role_id]
role = Role.find(userdata[:role_id])
if (mod? && role <= current_user.role)
@@ -235,4 +235,8 @@ require 'open-uri'
user_token && user_token.token == token
end
def user_params(add = [])
a = [:ign, :email, :password, :password_confirmation] + add
params.require(:user).permit(a)
end
end

49
app/helpers/application_helper.rb
View File

@@ -14,4 +14,53 @@ module ApplicationHelper
end
return isopen
end
def render_md(content)
renderer = Redcarpet::Render::HTML.new({
filter_html: true,
no_styles: true,
safe_links_only: true,
hard_wrap: true,
link_attributes: {target: "_blank", rel: "nofollow"}
})
md = Redcarpet::Markdown.new(renderer, {
no_intra_emphasis: true,
tables: true,
fenced_code_blocks: true,
autolink: true,
strikethrough: true,
lax_spacing: true,
disable_indented_code_blocks: false,
space_after_headers: false,
underline: true,
highlight: true,
footnotes: true
})
md.render(content)
end
def render_mini_md(content)
renderer = Redcarpet::Render::HTML.new({
filter_html: true,
no_images: true,
no_styles: true,
safe_links_only: true,
hard_wrap: false,
link_attributes: {target: "_blank", rel: "nofollow"}
})
md = Redcarpet::Markdown.new(renderer, {
no_intra_emphasis: true,
tables: false,
fenced_code_blocks: false,
autolink: true,
strikethrough: true,
lax_spacing: false,
disable_indented_code_blocks: true,
space_after_headers: true,
underline: true,
highlight: true,
footnotes: false
})
md.render(content)
end
end

2
app/models/blogpost.rb
View File

@@ -1,5 +1,5 @@
class Blogpost < ActiveRecord::Base
attr_accessible :title, :content, :author, :editor
validates_presence_of :title, :content, :author
belongs_to :user_author, class_name: "User", foreign_key: "user_author_id"
belongs_to :user_editor, class_name: "User", foreign_key: "user_editor_id"

2
app/models/comment.rb
View File

@@ -1,5 +1,5 @@
class Comment < ActiveRecord::Base
attr_accessible :content, :author, :blogpost, :post
validates_presence_of :content, :author, :blogpost
validates_length_of :content, in: 4..1000

2
app/models/forum.rb
View File

@@ -4,8 +4,6 @@ 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"
attr_accessible :name, :position, :role_read, :role_write, :role_read_id, :role_write_id, :forumgroup, :forumgroup_id
def to_s
name
end

2
app/models/forumgroup.rb
View File

@@ -4,7 +4,7 @@ class Forumgroup < ActiveRecord::Base
belongs_to :role_write, class_name: "Role", foreign_key: "role_write_id"
accepts_nested_attributes_for :forums
attr_accessible :name, :position, :role_read, :role_write, :role_read_id, :role_write_id
validates_presence_of :name, :position
validates_length_of :name, in: 2..20

2
app/models/forumthread.rb
View File

@@ -4,7 +4,7 @@ class Forumthread < ActiveRecord::Base
belongs_to :user_editor, class_name: "User", foreign_key: "user_editor_id"
has_many :threadreplies
attr_accessible :title, :content, :sticky, :locked, :user_author, :user_editor, :forum
validates_presence_of :title, :author, :forum
validates_presence_of :content

2
app/models/role.rb
View File

@@ -1,7 +1,7 @@
class Role < ActiveRecord::Base
include Comparable
has_many :users
attr_accessible :name, :value
def to_s
self.name

2
app/models/threadreply.rb
View File

@@ -3,7 +3,7 @@ class Threadreply < ActiveRecord::Base
belongs_to :user_author, class_name: "User", foreign_key: "user_author_id"
belongs_to :user_editor, class_name: "User", foreign_key: "user_editor_id"
attr_accessible :title, :content, :sticky, :locked, :user_author, :user_editor, :forumthread
validates_presence_of :content
validates_length_of :content, in: 2..10000

14
app/models/user.rb
View File

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
include Rails.application.routes.url_helpers
belongs_to :role
attr_accessible :uuid, :confirmed, :name, :password, :password_confirmation, :ign, :email, :email_token, :about, :last_ip, :skype, :skype_public, :youtube, :youtube_channelname, :twitter, :last_seen, :role, :role_id
has_secure_password
@@ -17,8 +17,8 @@ class User < ActiveRecord::Base
validates_length_of :about, maximum: 5000
validates_length_of :ign, minimum: 2, maximum: 16
validates :email, uniqueness: {case_sensitive: false}, format: {with: /^.+@.+\..{2,}$/i, message: "That doesn't look like an email adress."}
validates :ign, uniqueness: {case_sensitive: false}, format: {with: /^[a-z\d_]+$/i, message: "That is probably not your username."}
validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@.+\..{2,}\z/i, message: "That doesn't look like an email adress."}
validates :ign, uniqueness: {case_sensitive: false}, format: {with: /\A[a-z\d_]+\z/i, message: "That is probably not your username."}
validate :has_paid, :if => lambda {|user| user.ign_changed? }
@@ -101,12 +101,10 @@ class User < ActiveRecord::Base
response = open("https://sessionserver.mojang.com/session/minecraft/profile/#{CGI.escape(self.uuid)}", read_timeout: 0.5)
if response.status[0] == "200"
session_profile = JSON.load(response.read)
if session_profile["legacy"] == true
return open("https://minecraft.net/haspaid.jsp?#{{user: self.ign}.to_query}", read_timeout: 0.5).read == "true"
else
return true
end
# unpaid accounts are called 'demo' accounts
return session_profile["demo"] == true
elsif response.status[0] == "204"
# user doesn't exist
return false
else
puts "---"

6
app/views/blogposts/edit.html.erb
View File

@@ -2,7 +2,7 @@
<p id="markdown-note">Note: You can use <%= link_to "Markdown", "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet", target: "_blank" %>!</p>
<%= simple_form_for @post do |f|%>
<%= f.input :title, :label => false %>
<%= f.hidden_field :content, :label => false, input_html: {class: "full-width vertical"} %>
<%= f.submit "Update Post", class: "btn blue left" %>
<%= f.text_area :content, :label => false, input_html: {class: "full-width vertical"} %>
<p><%= f.submit "Update Post", class: "btn blue left" %></p>
<% end %>
<%= button_to "Delete post", @post, :method => "delete", :confirm => "Delete post & comments forever?", class: "btn red right" %>
<p><%= button_to "Delete post", @post, :method => "delete", :confirm => "Delete post & comments forever?", class: "btn red right" %></p>

2
app/views/blogposts/index.atom.builder
View File

@@ -11,7 +11,7 @@ atom_feed do |feed|
end
entry.url blogpost_url(post)
entry.title post.title
entry.content Sanitize.clean(GitHub::Markdown.render_gfm(post.content), Sanitize::Config::RELAXED).html_safe, :type => 'html'
entry.content Sanitize.clean(render_md(post.content), Sanitize::Config::RELAXED).html_safe, :type => 'html'
end
end
end

3
app/views/blogposts/index.html.erb
View File

@@ -1,3 +1,4 @@
<h1>News</h1>
<%= link_to 'Make new Post', new_blogpost_path, class: "btn blue" if mod? %>
<div id="posts">
<% @posts.each do |p| %>
@@ -12,7 +13,7 @@
<div class="items">
<div class="item content post">
<h2 class="headline"><%= link_to truncate(p.title, length: 60, omission: " …"), p %></h2>
<%= Sanitize.clean(GitHub::Markdown.render_gfm(p.content), Sanitize::Config::RELAXED).html_safe %>
<%= Sanitize.clean(render_md(p.content), Sanitize::Config::RELAXED).html_safe %>
</div>
</div>
</div>

6
app/views/blogposts/new.html.erb
View File

@@ -1,7 +1,7 @@
<h1>New Post</h1>
<p id="markdown-note">Note: You can use <%= link_to "Markdown", "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet", target: "_blank" %>!</p>
<%= simple_form_for @post do |f|%>
<%= f.input :title, placeholder: "Title" %>
<%= f.hidden_field :content, placeholder: "Text", input_html: {class: "full-width vertical"} %>
<%= f.submit "Create Post", class: "btn blue left" %>
<p id="markdown-note">Note: You can use <%= link_to "Markdown", "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet", target: "_blank" %>!</p>
<%= f.text_area :content, placeholder: "Text", input_html: {class: "full-width vertical"} %>
<p><%= f.submit "Create Post", class: "btn blue left" %></p>
<% end %>

5
app/views/blogposts/show.html.erb
View File

@@ -1,3 +1,4 @@
<%= link_to "News", blogposts_path %> → <%= link_to @post.title %>
<div class="item-group post with-avatar" id="post-<%= @post.id %>">
<%= link_to(image_tag(@post.author.avatar_url(64), class: "avatar"), @post.author, title: @post.author.ign) %>
<div class="header">
@@ -7,14 +8,14 @@
<div class="items">
<div class="item content">
<h2 class="headline"><%= link_to truncate(@post.title, length: 60, omission: " …"), p %></h2>
<%= Sanitize.clean(GitHub::Markdown.render_gfm(@post.content), Sanitize::Config::RELAXED).html_safe %>
<%= Sanitize.clean(render_md(@post.content), Sanitize::Config::RELAXED).html_safe %>
</div>
</div>
</div>
<div id="comments">
<h3><%= "#{pluralize(@post.comments.length, 'comment')}." %></h3>
<% @post.comments.each do |c| %>
<%= render "comments/comment", :c => c %>
<%= render "comments/comment", c: c %>
<% end %>
<%= render "comments/new" %>
</div>

2
app/views/comments/_comment.html.erb
View File

@@ -6,7 +6,7 @@
</div>
<div class="items">
<div class="item content">
<%= h(c.content).gsub(/(\s*?[\r\n]){3,}/, "\n\n").gsub("\n", "<br>").html_safe %>
<%= Sanitize.clean(render_mini_md(c.content.gsub(/([\r\n]+\s*?){3,}/, "\n\n")), Sanitize::Config::BASIC).html_safe %>
</div>
</div>
</div>

1
app/views/comments/_new.html.erb
View File

@@ -1,6 +1,7 @@
<% if current_user %>
<h3>New comment</h3>
<%= simple_form_for [@post, @comment] do |f| %>
<p>> quote | _underline_ | *italic* | **bold** | `code` | [link](https://example.com)
<%= f.input :content, :label => false, :as => "text", :placeholder => "Comment", input_html: {class: "comment"} %>
<%= f.submit class: "btn blue" %>
<% end %>

4
app/views/comments/edit.html.erb
View File

@@ -2,6 +2,6 @@
<%= simple_form_for [@comment.blogpost, @comment] do |f| %>
<%= f.input :content, label: false, as: "text", placeholder: "Comment" %>
<%= f.submit "Update Comment", class: "btn blue left" %>
<p><%= f.submit "Update Comment", class: "btn blue left" %></p>
<% end %>
<%= button_to "Delete comment", [@comment.blogpost, @comment] , method: "delete", confirm: "Delete comment forever?", class: "btn red right" %>
<p><%= button_to "Delete comment", [@comment.blogpost, @comment] , method: "delete", confirm: "Delete comment forever?", class: "btn red right" %></p>

19
app/views/forumgroups/edit.html.erb
View File

@@ -1,4 +1,17 @@
<h1>Edit forum group</h1>
<h1>Manage Forums</h1>
<div class="item-group">
<div class="header">
Forums
</div>
<div class="items bold">
<% @group.forums.each do |forum| %>
<%= link_to forum.name, edit_forum_path(forum), class: "item" %>
<% end %>
<div class="item"><%= link_to "Add Forum", new_forum_path(forumgroup: @group), class: "btn blue" %></div>
</div>
</div>
<hr>
<h1>Edit Forum Group</h1>
<% role_selection = Role.all_from_to(:normal, :admin).collect{|p|[p.name, p.id]} %>
<%= form_for @group do |f|%>
<table>
@@ -19,6 +32,6 @@
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
</tr>
</table>
<%= f.submit "Update group", class: "btn blue" %>
<p><%= f.submit "Update group", class: "btn blue" %></p>
<% end %>
<%= button_to "Delete group", @post, :method => "delete", :confirm => "Delete group?\nForums + Threads will not be accessible!", class: "btn red right" %>
<p><%= button_to "Delete group", @post, :method => "delete", :confirm => "Delete group?\nForums + Threads will not be accessible!", class: "btn red right" %></p>

2
app/views/forumgroups/new.html.erb
View File

@@ -19,5 +19,5 @@
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
</tr>
</table>
<%= f.submit "Create group", class: "btn blue" %>
<p><%= f.submit "Create group", class: "btn blue" %></p>
<% end %>

24
app/views/forums/edit.html.erb Normal file
View File

@@ -0,0 +1,24 @@
<%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum.name, @forum %>
<h1>Edit Forum</h1>
<% role_selection = Role.all_from_to(:normal, :admin).collect{|p|[p.name, p.id]} %>
<%= form_for @forum do |f|%>
<table>
<tr>
<td><%= f.label :name %></td>
<td><%= f.text_field :name, placeholder: "Name" %></td>
</tr>
<tr>
<td><%= f.label :position %></td>
<td><%= f.number_field :position, placeholder: "Position" %></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>
</tr>
<tr>
<td><%= f.label :role_write_id, "Min. write role" %></td>
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
</tr>
</table>
<p><%= f.submit "Update forum", class: "btn blue" %></p>
<% end %>

3
app/views/forums/index.html.erb
View File

@@ -1,10 +1,9 @@
<div id="forum_groups">
<% @groups.each do |group| %>
<div class="item-group" id="forums-<%= group.id %>">
<div class="item-group" id="forum-<%= group.id %>">
<div class="header">
<%= group.name %>
<%= link_to "edit", edit_forumgroup_path(group), class: "editlink" if admin? %>
<%= link_to "+", new_forum_path(forumgroup: group), class: "editlink" if admin? %>
</div>
<div class="items bold">

8
app/views/forums/new.html.erb
View File

@@ -1,5 +1,5 @@
<%= link_to @group, forumgroup_path(@group) %> → New forum
<h1>New forum forum</h1>
<%= 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]} %>
<%= form_for @forum do |f|%>
<table>
@@ -20,6 +20,6 @@
<td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
</tr>
</table>
<%= f.hidden_field :forumgroup_id, value: @group.id %>
<%= f.submit "Create forum", class: "btn blue" %>
<%= f.hidden_field :forumgroup_id, value: @forum.group.id %>
<p><%= f.submit "Create forum", class: "btn blue" %></p>
<% end %>

4
app/views/forums/show.html.erb
View File

@@ -17,4 +17,6 @@
</div>
<% end %>
</div>
<p><%= link_to "New thread", new_forumthread_path(forum_id: @forum), class: "btn blue" %></p>
<% if @forum.can_write?(current_user) %>
<p><%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %></p>
<% end %>

2
app/views/forumthreads/edit.html.erb
View File

@@ -2,7 +2,7 @@
<p id="markdown-note">Note: You can use <%= link_to "Markdown", "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet", target: "_blank" %>!</p>
<%= simple_form_for [@thread.forum, @thread] do |f|%>
<%= f.input :title, label: false %>
<%= f.hidden_field :content, label: false, input_html: {class: "full-width vertical"} %>
<%= f.text_area :content, label: false, input_html: {class: "full-width vertical"} %>
<%= f.submit "Update thread", class: "btn blue left" %>
<% end %>
<%= button_to "Delete thread", [@thread.forum, @thread], :method => "delete", :confirm => "Delete thread & comments forever?", class: "btn red right" %>

6
app/views/forumthreads/new.html.erb
View File

@@ -1,6 +1,6 @@
<%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum, @forum %> → New thread
<%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → New thread
<h1>New thread</h1>
<%= form_for [@forum, @thread] do |f|%>
<%= form_for @thread do |f|%>
<table>
<% if mod? %>
<tr>
@@ -16,6 +16,6 @@
<div id="form_inputs">
<%= f.text_field :title, placeholder: "Title" %>
</div>
<%= f.hidden_field :content, placeholder: "Text" %>
<%= f.text_area :content, placeholder: "Text" %>
<p><%= f.submit "Create thread", class: "btn blue" %></p>
<% end %>

2
app/views/forumthreads/show.html.erb
View File

@@ -8,7 +8,7 @@
<div class="items">
<div class="item content">
<h2 class="headline"><%= link_to truncate(@thread.title, length: 60, omission: " …"), p %></h2>
<%= Sanitize.clean(GitHub::Markdown.render_gfm(@thread.content), Sanitize::Config::RELAXED).html_safe %>
<%= Sanitize.clean(render_md(@thread.content), Sanitize::Config::RELAXED).html_safe %>
</div>
</div>
</div>

2
app/views/redstoner_mailer/register_mail.html.erb
View File

@@ -21,7 +21,7 @@ Hi <%= @user.name %>!
<p>Please click this link to confirm your registration:
<div style="background-color: #eeeeee; padding: 1em; margin: 0; text-align: center;" width="100%">
<%= link_to "confirm my email", confirm_user_path(@user, code: @user.email_token, only_path: false), style: "text-decoration: none; color: #f2f2f2; padding: 0.5em 2em; background-color: #4096EE; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; display: inline-block; text-transform: uppercase;" %>
<%= link_to "confirm registration", confirm_user_path(@user, code: @user.email_token, only_path: false), style: "text-decoration: none; color: #f2f2f2; padding: 0.5em 2em; background-color: #4096EE; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; display: inline-block; text-transform: uppercase;" %>
</div>
</p>