idk, lots

app/views/blogposts/index.html.erb

@@ -1,4 +1,4 @@
-<%= button_to 'Make new Post', new_blogpost_path, method: "get", class: "btn blue" if mod? %>
+<%= link_to 'Make new Post', new_blogpost_path, class: "btn blue" if mod? %>
 <div id="posts">
   <% @posts.each do |p| %>
   <div class="post" id="post-<%= p.id %>">

app/views/forums/index.html.erb

@@ -8,9 +8,7 @@
 
       <div class="forums">
         <% group.forums.each do |f| %>
-          <div class="forum">
-            <%= link_to f.name, f %>
-          </div>
+          <%= link_to f.name, f, class: "forum" %>
         <% end %>
       </div>
 

app/views/forums/show.html.erb

@@ -1,11 +1,11 @@
-<%= link_to "Forums", forums_path %> → <%= link_to @forum.group, @forum.group %> → <%= link_to @forum %>
+<%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum %>
 <h1><%= @forum.name %></h1>
 <%= link_to "New thread", new_forumthread_path, class: "btn blue" %>
 <div id="forum_threads">
   <% @threads.each do |thread| %>
     <div class="group" id="thread-<%= thread.id %>">
       <div class="header">
-        <%= thread.name %>
+        <%= link_to thread.title, forumthread_path(thread) %>
       </div>
     </div>
   <% end %>

app/views/forumthreads/new.html.erb

@@ -1,18 +1,17 @@
-<%= link_to @forum.group, @forum.group %> → <%= link_to @forum, @forum %> →  New thread
+<%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum, @forum %> →  New thread
 <h1>New thread</h1>
 <%= simple_form_for @thread do |f|%>
   <div id="form_labels">
     <%= f.label :title %>
-    <%= f.label :sticky if mod? %>
-    <%= f.label :locked if mod? %>
     <%= f.label :content, "Text" %>
   </div>
   <div id="form_inputs">
     <%= f.input :title, placeholder: "Title" %>
-    <%= f.input :sticky, as: :select, collection: [["No", false], ["Yes", true]], include_blank: false if mod? %>
-    <%= f.input :locked, as: :select, collection: [["No", false], ["Yes", true]], include_blank: false if mod? %>
     <%= f.input :content, placeholder: "Text" %>
   </div>
+  <% if mod? %>
+    <%= f.input :sticky %> <%= f.label :sticky %>
+    <%= f.input :locked %> <%= f.label :locked %>
+  <% end %>
   <%= f.submit "Create forum", class: "btn blue" %><br>
-  Yea i know this is ugly :D
 <% end %>

app/views/layouts/_head.html.erb

@@ -17,6 +17,7 @@
   <div id="menu">
     <ul>
       <%= link_to root_path do %><li>Home</li><% end %>
+      <%= link_to blogposts_path do %><li>Blog</li><% end %>
       <%= link_to users_path do %><li>Users</li><% end %>
       <%= link_to root_path do %><li>Info</li><% end %>
       <%= link_to forums_path do %><li>Forums</li><% end %>

app/views/sessions/new.html.erb

@@ -7,8 +7,8 @@
   </div>
 
   <div id="form_inputs">
-    <%= text_field_tag :email, nil, placeholder: "email@example.com" %>
-    <%= password_field_tag :password, nil, placeholder: "••••••" %>
+    <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" %>

app/views/statics/donate.html.erb

@@ -0,0 +1,41 @@
+<h1>Donate</h1>
+<h3>via PayPal</h3>
+
+<p>Donating keeps us motivated to do all the hard work and pay our bills for new hardware, etc.</p>
+<p>We appreciate every amount of donation but we do have two special ranks:</p>
+<ul>
+  <li>$5 or more: Donator
+  <li>$20 or more: Donator+
+</ul>
+</p>
+<h3>Perks for you</h3>
+<p>For <i>Donator</i> and <i>Donator+</i></p>
+<ul>
+  <li>The warm feeling of donating and a big thank you!
+  <li>commands <i>/speed</i> and <i>/enchant</i>
+  <li>A $ suffix in chat (bold for Donor+)
+  <li>The name over your head gets a special color
+  <li>A sign with your name &amp; head at <i>/warp donors</i>
+</ul>
+<div class="donations">
+  <div class="donation">
+    <h1>Donate to Redstone Sheep</h1>
+    <h4>Sheep is our admin. He fixes everything &amp; keeps the server running.</h4>
+    <form target="_top" method="post" action="https://www.paypal.com/cgi-bin/webscr">
+      <input name="custom" type="text" placeholder="Your Minecraft name" value="<%= current_user.try(:ign) %>">
+      <input value="_s-xclick" name="cmd" type="hidden">
+      <input value="HPWLQLL87GTHC" name="hosted_button_id" type="hidden">
+      <input value="Donate" name="Donate" type="submit">
+    </form>
+  </div>
+  <div class="donation">
+    <h1>Donate to PanFritz</h1>
+    <h4>Pan hosts the Server.</h4>
+    <form target="_top" method="post" action="https://www.paypal.com/cgi-bin/webscr">
+      <input name="custom" type="text" placeholder="Your Minecraft name" value="<%= current_user.try(:ign) %>">
+      <input value="_s-xclick" name="cmd" type="hidden">
+      <input value="SW8TJLDK9FX3W" name="hosted_button_id" type="hidden">
+      <input value="Donate" name="Donate" type="submit">
+    </form>
+  </div>
+</div>

app/views/statics/index.html.erb

@@ -0,0 +1,4 @@
+<div id="delete_me" class="delete_me"> <!-- delete this div -->
+  <h1>The loneliest page in the world</h1>
+  <iframe width="420" height="315" src="//www.youtube.com/embed/N3O20EOE-p4?theme=light&color=red" frameborder="0" allowfullscreen></iframe>
+</div>

app/views/users/show.html.erb

@@ -56,7 +56,7 @@
           <% if !@user.twitter.blank? %>
           <tr>
             <td>Twitter</td>
-            <td><%= link_to @user.twitter, "https://twitter.com/#{CGI.escape(@user.twitter)}", :target => "_blank" %></td>
+            <td><%= link_to "@#{@user.twitter}", "https://twitter.com/#{CGI.escape(@user.twitter)}", :target => "_blank" %></td>
           </tr>
           <% end %>
           <tr>