From dc175b2676f16e9477872a6be3525c6938e4231a Mon Sep 17 00:00:00 2001
From: Luke Barratt <luke@barratt.me>
Date: Sat, 26 Apr 2014 22:50:58 +0100
Subject: [PATCH] Cleanup admin issues styling

---
 app/assets/stylesheets/application.css.scss |  1 +
 app/assets/stylesheets/pages/_issues.scss   | 32 ++++++++++++++++++
 app/views/issues/_list.html.erb             | 29 +++++++---------
 app/views/issues/edit.html.erb              |  7 ++--
 app/views/issues/index.html.erb             | 20 ++++++-----
 app/views/issues/show.html.erb              | 37 +++++++++------------
 6 files changed, 73 insertions(+), 53 deletions(-)
 create mode 100644 app/assets/stylesheets/pages/_issues.scss

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 53b1a84..287616a 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -55,5 +55,6 @@
 @import "pages/matches";
 @import "pages/files";
 @import "pages/bans";
+@import "pages/issues";
 @import "pages/servers";
 
diff --git a/app/assets/stylesheets/pages/_issues.scss b/app/assets/stylesheets/pages/_issues.scss
new file mode 100644
index 0000000..902a4c7
--- /dev/null
+++ b/app/assets/stylesheets/pages/_issues.scss
@@ -0,0 +1,32 @@
+/*
+  Issues List
+*/
+
+table.issues {
+
+  .date {
+    width: 25%;
+  }
+
+  .title {
+    width: 35%;
+  }
+
+  .assigned,
+  .author {
+    width: 15%;
+  }
+
+  .actions {
+    width: 10%;
+    text-align: right;
+  }
+}
+
+/*
+  Issues Page
+*/
+
+#issue {
+  
+}
\ No newline at end of file
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 01938c8..b9bc075 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -1,29 +1,24 @@
-<table class="data">
+<table class="issues striped">
   <tr>
-    <th>Created</th>
-    <th>Title</th>
-    <th>Status</th>
-    <th>Assigned</th>
-    <th>Category</th>
-    <th>Author</th>
-    <th>Actions</th>
+    <th class="date">Created</th>
+    <th class="title">Title</th>
+    <th class="assinged">Assigned</th>
+    <th class="author">Author</th>
+    <th class="actions"></th>
   </tr>
 
   <% issues.each do |issue| %>
-    <tr class="<%= cycle('even', 'odd') %>">
+    <tr>
       <td><%= issue.created_at.strftime("%Y-%m-%d %H:%M:%S") %></td>
       <td><%= namelink issue %></td>
-      <td class="<%= issue.color %>">
-        <%= issue.statuses[issue.status] %>
-      </td>
       <td><%= namelink issue.assigned %></td>
-      <td><%= h issue.category %></td>
       <td><%= namelink issue.author %></td>
-      <td>
+      <td class="actions">
         <% if issue.can_update? cuser %>
-          <%= link_to 'Edit', edit_issue_path(issue) %>
-          <% end; if issue.can_destroy? cuser %>
-          <%= link_to 'Destroy', issue, :confirm => 'Are you sure?', :method => :delete %>
+          <%= link_to icon('pencil'), edit_issue_path(issue) %>
+        <% end %>
+        <% if issue.can_destroy? cuser %>
+          <%= link_to icon('times'), issue, confirm: 'Are you sure?', method: :delete %>
         <% end %>
       </td>
     </tr>
diff --git a/app/views/issues/edit.html.erb b/app/views/issues/edit.html.erb
index 2eae0ec..f9ecbaa 100644
--- a/app/views/issues/edit.html.erb
+++ b/app/views/issues/edit.html.erb
@@ -1,6 +1,3 @@
-<h1>Editing issue</h1>
+<h1>Editing Issue</h1>
 
-<%= render :partial => "form" %>
-
-<%= link_to 'Show', @issue %> |
-<%= link_to 'Back', issues_path %>
\ No newline at end of file
+<%= render partial: 'form' %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index c7a4229..7d3b2b8 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,29 +1,31 @@
-<h1>Listing issues</h1>
+<h1 class="title">Listing Issues</h1>
 
-<div id="issueTabs">
-  <ul id="issueTabs-nav" class="tabs">
+<div id="issues" class="tabbed">
+  <ul id="issues-nav" class="tabs">
     <li><a href="#open">Open</a></li>
     <li><a href="#solved">Solved</a></li>
     <li><a href="#rejected">Rejected</a></li>
   </ul>
 
-  <div class="box wide tabs">
+  <div class="tabbed-contents">
     <div class="tab" id="open">
-      <%= render :partial => "list", :locals => {:issues => @open} %>
+      <%= render partial: "list", locals: { issues: @open } %>
     </div>
 
     <div class="tab" id="solved">
-      <%= render :partial => "list", :locals => {:issues => @solved} %>
+      <%= render partial: "list", locals: { issues: @solved } %>
     </div>
 
     <div class="tab" id="rejected">
-      <%= render :partial => "list", :locals => {:issues => @rejected} %>
+      <%= render partial: "list", locals: { issues: @rejected } %>
     </div>
   </div>
 </div>
 
-<%= link_to 'New issue', new_issue_path %>
+<%= link_to 'New Issue', new_issue_path, class: 'button' %>
 
 <script type="text/javascript">
-  var tabber1 = new Yetii({id: 'issueTabs'});
+  new Yetii({
+    id: 'issues'
+  });
 </script>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index bde2c26..c54ee56 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,30 +1,23 @@
-<h1>
-  Issue: <%= h @issue %> (created <%= @issue.created_at.strftime("%Y-%m-%d %H:%M:%S") %>)
-</h1>
-
-<h3><%= link_to "Back to the list of issues", issues_path %></h3>
-
-<div class="wide box">
+<div id="issue">
+  <h1>Issue: <%= h @issue %></h1>
+  <h2 class="title">Created: <%= @issue.created_at.strftime("%Y-%m-%d %H:%M:%S") %></h2>
+  
   <%= cascade @issue, [:author, :assigned, :category, "status_s"] %>
 
+  <h3>Issue details:</h3>
+  <p><%= @issue.text_parsed.html_safe %></p>
+
+  <% if @issue.solution and !@issue.solution.empty? %>
+    <h3>Solution:</h3>
+    <p><%= @issue.solution_formatted.html_safe %></p>
+  <% end %>
+
   <p>
     <% if @issue.can_update? cuser%>
-      <%= link_to 'Edit', edit_issue_path(@issue) %> |
+      <%= link_to 'Edit Issue', edit_issue_path(@issue), class: 'button' %>
     <% end %>
-    <%= link_to 'Back', issues_path %>
   </p>
 
-  <h3>
-    Issue details:
-  </h3>
-  <%= raw @issue.text_parsed %>
-
-  <% if @issue.solution and !@issue.solution.empty? %>
-    <h3>
-      Solution:
-    </h3>
-    <%= raw @issue.solution_formatted %>
-  <% end %>
+  <%= add_comments @issue %>
 </div>
-
-<%= add_comments @issue %>
+  
\ No newline at end of file