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

fixes & forums started

Browse Source
This commit is contained in:
jomo
2013-08-02 07:55:32 +02:00
parent 45ebd0bd05
commit e052ad8859
39 changed files with 358 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,8 @@
<h1>Blog</h1>
<div id="posts">
<% @posts.each do |p| %>
<div id="post">
<div id="post-title">
<h2><%= link_to p.title, p %></h2>
<div class="post">
<div class="post-title">
<h2><%= link_to truncate(p.title, length: 60, omission: " …"), p %></h2>
<span class="comment-counter">
<%= link_to pluralize(p.comments.count, "Comment"), p %>
</span>
@@ -11,7 +10,7 @@
<span class="post-info">
by <%= link_to p.user.name, p.user %> on <%= p.created_at.strftime("%e. %b %Y") %>
</span>
<div id="post-content">
<div class="post-content">
<%= RbbCode.new.convert(p.text).html_safe %>
</div>
</div>

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

@@ -1,15 +1,19 @@
<h1><%= @post.title %></h1>
<span class="post-info"><%= link_to @post.author.name, @post.author %> on <%= @post.created_at.strftime("%e. %b %Y") %>
<% if current_user && current_user.rank >= rank_to_int("mod") %>
- <%= link_to "edit", edit_blogpost_path(@post.id) %>
<% end %>
</span>
<div id="post-content">
<%= RbbCode.new.convert(@post.text).html_safe %>
</div>
<div id="comments">
<% @post.comments.each do |c| %>
<%= render "comments/comment", :c => c %>
<% end %>
<%= render "comments/new" %>
<div class="post">
<div class="post-title">
<h1><%= @post.title %></h1>
</div>
<span class="post-info"><%= link_to @post.author.name, @post.author %> on <%= @post.created_at.strftime("%e. %b %Y") %>
<% if current_user && current_user.rank >= rank_to_int("mod") %>
- <%= link_to "edit", edit_blogpost_path(@post.id) %>
<% end %>
</span>
<div class="post-content">
<%= RbbCode.new.convert(@post.text).html_safe %>
</div>
<div id="comments">
<% @post.comments.each do |c| %>
<%= render "comments/comment", :c => c %>
<% end %>
<%= render "comments/new" %>
</div>
</div>

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

@@ -4,5 +4,5 @@
<div class="editlink"><%= link_to "edit", edit_blogpost_comment_path(c.blogpost, c) %></div>
<% end %>
</span>
<div class="comment-content"><%= h(c.text).gsub("\n", "<br>").html_safe %></div>
<div class="comment-content"><%= h(c.text).gsub(/(\w*[\r\n]){3,}/, "\n\n").gsub("\n", "<br>").html_safe %></div>
</div>

18
app/views/forumgroups/index.html.erb Normal file
View File

@@ -0,0 +1,18 @@
<div id="forum_groups">
<% @groups.each do |g| %>
<div class="group">
<div class="header">
<%= g.name %>
</div>
<div class="forums">
<% g.forums.sort{|s| s[:position]}.each do |f| %>
<div class="forum">
<%= f.name %>
</div>
<% end %>
</div>
</div>
<% end %>
</div>

26
app/views/layouts/_head.html.erb
View File

@@ -1,7 +1,5 @@
<div id="head">
<%= link_to(root_path) do %>
<div id="logo"><%= image_tag "logo" %></div>
<% end %>
<div id="logo"><%= image_tag "logo.png" %></div>
<div id="userinfo" <%= "class=\"logged-out\"".html_safe if !current_user %>>
<% if !current_user.nil? %>
<span id="userinfo-box">
@@ -10,16 +8,24 @@
</span>
<%= link_to image_tag(avatar_url(current_user.id, 32), :class => "avatar"), current_user %>
<% else %>
<%= link_to "Log in", login_path, :action => "new" %><br/>
<%= link_to "Register", register_path %>
<%= link_to "Log in", login_path, :action => "new" %> | <%= link_to "Sign up", signup_path %>
<% end %>
</div>
<div class="clear"></div>
<div id="menu">
<ul>
<li><%= link_to "BLOG", root_path, :class => "arrow" %></li>
<li><%= link_to "FORUM", nil, :class => "arrow" %></li>
<li><%= link_to "INFO", nil, :class => "arrow" %></li>
<li><%= link_to "DONATE", nil, :class => "arrow" %></li>
<li><%= link_to image_tag('icons/home.png'), root_path %></li>
<li>Info</li>
<%= link_to forums_path do %>
<li>Forums</li>
<% end %>
<li>Donate</li>
<li>
<%= simple_form_for "asdf", method: "get", action: users_path do |f| %>
<%= f.input :rank %>
<% end %>
</li>
</ul>
<div class="clear"></div>
</div>
</div>
</div>

4
app/views/layouts/application.html.erb
View File

@@ -9,8 +9,8 @@
</head>
<body>
<%= render "/layouts/head" %>
<%= "<div id='alert'>#{alert}</div>".html_safe if alert %>
<%= "<div id='notice'>#{notice}</div>".html_safe if notice %>
<%= "<div id='flash' class='alert'>#{alert}</div>".html_safe if alert %>
<%= "<div id='flash' class='notice'>#{notice}</div>".html_safe if notice %>
<div id="main-content">
<%= yield %>
</div>

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

@@ -3,6 +3,10 @@
<%= simple_form_for @user do |f| %>
<table>
<tbody>
<tr>
<td></td>
<td><%= image_tag avatar_url(@user.id, 128), :class => "user-avatar avatar", :alt => "avatar" %></td>
</tr>
<tr>
<td>Display name</td>
<td><%= f.input :name, :label => false %></td>

78
app/views/users/show.html.erb
View File

@@ -12,33 +12,63 @@
</div>
<% end %>
<%= image_tag avatar_url(@user.id, 128), :class => "user-avatar avatar", :alt => "avatar" %><br>
<% if @user.banned %>
<% if @user.rank.to_i == rank_to_int("banned") %>
<span class="user-banned">This user is banned!</span>
<% end %>
IGN: <%= @user.ign %><br>
Rank: <%= link_to int_to_rank(@user.rank), users_path(:rank => int_to_rank(@user.rank)) %><br>
<% if current_user && @user.skype && (@user.skype_public || current_user == @user || mod?) %>
YouTube: <%= link_to @user.youtube_channelname, "https://youtube.com/user/#{CGI::escape(@user.youtube)}", :target => "_blank" if !@user.youtube.blank? %><br>
Twitter: <%= link_to @user.twitter, "https://twitter.com/#{CGI::escape(@user.twitter)}", :target => "_blank" if !@user.twitter.blank? %><br>
Skype: <a href="skype:<%= @user.skype %>?chat" target="_blank"><%= @user.skype %></a><br>
<% if @user.rank.to_i == rank_to_int("unconfirmed") %>
<span class="user-unconfirmed">This user hasn't confirmed his email yet!</span>
<% end %>
Joined: <%= @user.created_at.strftime("%e. %b %Y") %><br>
<% if mod? %>
<hr>
Last IP: <%= @user.last_ip %><br>
Email: <a href="mailto:<%= @user.email %>"><%= @user.email %></a><br>
Last login: <%= @user.last_login.strftime("%e. %b %Y, %H:%M") %>
<% end %>
<hr>
<%= @user.about.blank? ? "<span class=\"no-about\">nothing</span>".html_safe : @user.about.gsub("\n", "<br>").html_safe %>
<%= image_tag avatar_url(@user.id, 128), :class => "user-avatar avatar", :alt => "avatar" %>
<table>
<tbody>
<tr>
<td>IGN</td>
<td><%= @user.ign %></td>
</tr>
<tr>
<td>Rank</td>
<td><%= link_to int_to_rank(@user.rank), users_path(:rank => int_to_rank(@user.rank)) %></td>
</tr>
<% if current_user && !@user.skype.blank? && (@user.skype_public || current_user == @user || mod?) %>
<tr>
<td>Skype</td>
<td><a href="skype:<%= @user.skype %>?chat" target="_blank"><%= @user.skype %></a></td>
</tr>
<% end %>
<% if !@user.youtube.blank? && @user.youtube_channelname.blank? %>
<tr>
<td>YouTube</td>
<td><%= link_to @user.youtube_channelname, "https://youtube.com/user/#{CGI::escape(@user.youtube)}", :target => "_blank" %></td>
</tr>
<% end %>
<% if !@user.twitter.blank? %>
<tr>
<td>Twitter</td>
<td><%= link_to @user.twitter, "https://twitter.com/#{CGI::escape(@user.twitter)}", :target => "_blank" %></td>
</tr>
<% end %>
<tr>
<td>Joined</td>
<td><%= @user.created_at.strftime("%e. %b %Y") %></td>
</tr>
<% if mod? || current_user == @user %>
<tr>
<td>Last IP</td>
<td><%= @user.last_ip %></td>
</tr>
<tr>
<td>Email</td>
<td><%= mail_to @user.email, @user.email, :subject => "Redstoner" %></td>
</tr>
<tr>
<td>Last login</td>
<td><%= @user.last_login.strftime("%e. %b %Y, %H:%M") %></td>
</tr>
<% end %>
</tbody>
</table>
<hr>
<%= @user.about.blank? ? "<span class=\"no-about\">nothing</span>".html_safe : h(@user.about).gsub("\n", "<br>").html_safe %>
</div>