mostly styles

This commit is contained in:
jomo
2014-04-08 00:49:17 +02:00
parent f290258f26
commit b0504467e1
12 changed files with 177 additions and 152 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
</span>
</div>
<div class="items">
<div class="item content">
<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 %>
</div>
-5
View File
@@ -1,9 +1,4 @@
<%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %><%= link_to @thread.forum, @thread.forum %><%= link_to @thread %>
<div>
<%= params.inspect %><br>
<%= @forum.inspect %><br>
<%= @thread.forum.inspect %>
</div>
<div class="item-group thread with-avatar" id="thread-<%= @thread.id %>">
<%= link_to(image_tag(@thread.author.avatar_url(64), class: "avatar"), @thread.author, title: @thread.author.ign) %>
<div class="header">
+15 -17
View File
@@ -1,28 +1,26 @@
<div id="head">
<div id="logo"><%= link_to root_path do %>
<%= image_tag "logo.png" %>
<% end %></div>
<div id="userinfo" <%= "class=\"logged-out\"".html_safe unless current_user %>>
<% if current_user %>
<span id="userinfo-box">
<%= link_to current_user.name, current_user %><br/>
<%= link_to "Logout", logout_path %>
</span>
<%= link_to image_tag(current_user.avatar_url(32), :class => "avatar"), current_user %>
<% else %>
<%= link_to "Log in", login_path(return_path: request.env['PATH_INFO']), action: "new" %> | <%= link_to "Sign up", signup_path %>
<% end %>
</div>
<div class="clear"></div>
<div id="menu">
<%= link_to "", root_path, id: "logo" %>
<ul>
<%= link_to statics_path do %><li>Home</li><% end %>
<%= link_to blogposts_path do %><li>Blog</li><% end %>
<%= link_to blogposts_path do %><li>News</li><% end %>
<%= link_to root_path do %><li>Info</li><% end %>
<%= link_to forums_path do %><li>Forums</li><% end %>
<%= link_to users_path do %><li>Users</li><% end %>
<%= link_to donate_statics_path do %><li>Donate</li><% end %>
</ul>
<div class="clear"></div>
</div>
<div id="userbar">
<div id="userinfo" <%= "class=\"logged-out\"".html_safe unless current_user %>>
<% if current_user %>
<span id="userinfo-box">
<%= link_to current_user.name, current_user %><br/>
<%= link_to "Logout", logout_path %>
</span>
<%= link_to image_tag(current_user.avatar_url(32), :class => "avatar"), current_user %>
<% else %>
<%= link_to "Log in", login_path(return_path: request.env['PATH_INFO']), action: "new" %> | <%= link_to "Sign up", signup_path %>
<% end %>
</div>
</div>
</div>
+1
View File
@@ -7,6 +7,7 @@
<%= csrf_meta_tags %>
<%= favicon_link_tag "favicon.ico" %>
<%= javascript_include_tag "application" %>
<link type="application/atom+xml" rel="alternate" href="<%= blogposts_path(:atom) %>">
</head>
<body>
<div id="mobile-info">We don't have a mobile style yet. It might look shitty.<br>Tip: Hold your device in landscape mode.</div>
+11 -11
View File
@@ -1,15 +1,15 @@
<h1>Log in</h1>
<p>Not a member? <%= link_to "Join us", signup_path %>!</p>
<%= form_tag login_path do |f| %>
<div id="form_labels">
<%= label_tag :email %>
<%= label_tag :password %>
</div>
<div id="form_inputs">
<div><%= text_field_tag :email, nil, placeholder: "email@example.com" %></div>
<div><%= password_field_tag :password, nil, placeholder: "••••••" %></div>
</div>
<%= submit_tag "Log in", class: "btn blue" %>
<table>
<tr>
<td><%= label_tag :email %></td>
<td><%= text_field_tag :email, nil, placeholder: "email@example.com" %></td>
</tr>
<tr>
<td><%= label_tag :password %></td>
<td><%= password_field_tag :password, nil, placeholder: "******" %></td>
</tr>
</table>
<p><%= submit_tag "Log in", class: "btn blue" %></p>
<% end %>
+3 -3
View File
@@ -2,8 +2,8 @@
<p>Running a server is really stressful and expensive.<br>
Donating keeps us motivated to do all the work and allows us to pay our bills, etc.</p>
<p>Donations are made via <a href="https://www.paypal.com" target="_blank">PayPal</a>
<p>We appreciate every amount of donation but we decided to create two special ranks:</p>
<p>Donations are made via <a href="https://www.paypal.com" target="_blank">PayPal</a>.
<p>We do appreciate every amount of donation but we have decided to create two special ranks:</p>
<ul>
<li>Donator ($5 or more)
<li>Donator+ ($20 or more)
@@ -15,7 +15,7 @@
<li>The warm feeling of donating and a big thank you!
<li>Commands <i>/speed</i> and <i>/enchant</i>
<li>You can have a nickname. See <i>/nick</i>
<li>A "$" next to your name
<li>A "$" next to your name <i>(Including website)</i>
<li>The name above your head gets a special color
<li>Your head + a sign with your name at <i>/warp donors</i>
</ul>
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="user">
<%= link_to user.name, user_path(user.id), class: "role #{user.role.name}", title: user.ign %>
<%= link_to user.name, user_path(user.id), class: "role #{user.role.name} #{"banned" if user.banned?} #{"disabled" if user.disabled?}", title: user.ign %>
<% link_to_if "$", donate_statics_path, class: "donor", title: "Donator" if user.donor? %>
</div>
+8 -8
View File
@@ -15,6 +15,7 @@
<% if @user.banned? %>
<span class="user-banned">This user is banned!</span>
<% end %>
<% if !@user.confirmed? %>
<% if @user.is?(current_user) %>
<span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>
@@ -31,6 +32,7 @@
<%= image_tag @user.avatar_url(128), :class => "user-avatar avatar", :alt => "avatar" %>
<%= render partial: "users/username", locals: {user: @user} %>
<table>
<tbody>
<tr>
@@ -63,13 +65,11 @@
<td>Joined</td>
<td><%= @user.created_at.strftime("%e. %b %Y, %H:%m") %></td>
</tr>
<% if mod? || current_user == @user %>
<% if mod? %>
<tr>
<td>Last IP</td>
<td><%= @user.last_ip %></td>
</tr>
<% end %>
<% if mod? || @user.is?(current_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>
@@ -81,6 +81,6 @@
<% end %>
</tbody>
</table>
<hr>
About:<br>
<%= @user.about.blank? ? "<span class=\"no-about\">nothing</span>".html_safe : @user.about %>
</div>