5 files changed, 109 insertions, 71 deletions

diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index 31dae59..4301fee 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -2,11 +2,16 @@
   <%= link_to 'New asset', new_asset_path %>
 <% end %>
 
-
 <%= will_paginate @assets %>
 
 <table class="assets_table">
-  <tr>
+  <tr class="header">
+    <th>Preview</th>
+    <th>Name</th>
+    <th>Type</th>
+    <th></th>
+    <th></th>
+    <th></th>
   </tr>
 <% @assets.each do |asset| %>
   <tr>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 3143a7b..c3e0e5a 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -1,7 +1,7 @@
 <h1>Listing events</h1>
 
 <table class="events_table">
-  <tr>
+  <tr class="header">
     <th>Title</th>
     <th>Start time</th>
     <th>End time</th>
@@ -9,23 +9,21 @@
     <th>Allday</th>
     <th>Url</th>
     <th>Node</th>
-    <th>Action</th>
+    <th></th>
   </tr>
 
 <% @events.each do |event| %>
   <tr>
-    <td><%=h event.display_title %></td>
+    <td><%= link_to event.display_title, event %></td>
     <td><%=h event.start_time %></td>
     <td><%=h event.end_time %></td>
     <td><%=h event.rrule %></td>
     <td><%=h event.allday %></td>
     <td><%=h event.url %></td>
     <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
-    <td><%= link_to 'show', event %> | <%= link_to 'edit', edit_event_path(event) %> | <%= button_to 'destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } %></td>
+    <td><%= link_to 'edit', edit_event_path(event) %></td>
   </tr>
 <% end %>
 </table>
 
-<br />
-
-<%= link_to 'New event', new_event_path %>
+<%= link_to 'New event', new_event_path, class: 'action_button' %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index e206bc4..5812228 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,52 +1,51 @@
-<% content_for :subnavigation do %>
-  <% if @event.node %>
-    <%= link_to 'node', node_path(@event.node) %>
-  <% end %>
-  <%= link_to 'edit', edit_event_path(@event, return_to: request.path) %>
-  <%= button_to 'destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
-<% end %>
+<div id="page_editor" class="show_node">
+  <h1><%= @event.node ? "Event for node #{@event.node.unique_name}" : "Event" %></h1>
 
-<h2>Event for node <%= @event.node.unique_name %></h2>
+  <div id="content">
+    <div class="node_description">Actions</div>
+    <div class="node_content node_info_group">
+      <div class="node_info_group_items">
+        <% if @event.node %>
+          <div class="node_info_item">
+            <%= link_to 'Node', node_path(@event.node) %>
+          </div>
+        <% end %>
+        <div class="node_info_item">
+          <%= link_to 'Edit', edit_event_path(@event, return_to: request.path), class: 'action_button' %>
+        </div>
+        <div class="node_info_item">
+          <%= button_to 'Destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
+        </div>
+      </div>
+    </div>
 
-<p>
-  <b>Start time:</b>
-  <%=h @event.start_time %>
-</p>
+    <div class="node_description">Start time</div>
+    <div class="node_content"><%=h @event.start_time %></div>
 
-<p>
-  <b>End time:</b>
-  <%=h @event.end_time %>
-</p>
+    <div class="node_description">End time</div>
+    <div class="node_content"><%=h @event.end_time %></div>
 
-<p>
-  <b>Rrule:</b>
-  <%=h @event.rrule %>
-  <% if (human = @event.humanize_rrule(I18n.locale)) %>
-    <br/><small><em>( <%= human %></em> )</small>
-  <% end %>
-</p>
+    <div class="node_description">Rrule</div>
+    <div class="node_content"><%=h @event.rrule %></div>
 
-<p>
-  <b>Tags:</b>
-  <%=h @event.tag_list %>
-</p>
+    <% if (human = @event.humanize_rrule(I18n.locale)) %>
+      <div class="node_description">Recurrence</div>
+      <div class="node_content"><em><%= human %></em></div>
+    <% end %>
 
-<p>
-  <b>Allday:</b>
-  <%=h @event.allday %>
-</p>
+    <div class="node_description">Tags</div>
+    <div class="node_content"><%=h @event.tag_list %></div>
 
-<p>
-  <b>Url:</b>
-  <%=h @event.url %>
-</p>
+    <div class="node_description">Allday</div>
+    <div class="node_content"><%=h @event.allday %></div>
 
-<p>
-  <b>Latitude:</b>
-  <%=h @event.latitude %>
-</p>
+    <div class="node_description">Url</div>
+    <div class="node_content"><%=h @event.url %></div>
 
-<p>
-  <b>Longitude:</b>
-  <%=h @event.longitude %>
-</p>
+    <div class="node_description">Latitude</div>
+    <div class="node_content"><%=h @event.latitude %></div>
+
+    <div class="node_description">Longitude</div>
+    <div class="node_content"><%=h @event.longitude %></div>
+  </div>
+</div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index cf00ef6..88868f5 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -2,13 +2,25 @@
   <tr>
     <td><h1>Admins</h1></td>
   </tr>
+  <tr class="header">
+    <th>Login</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
   <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %>
   <tr>
     <td><h1>Users</h1></td>
   </tr>
+  <tr class="header">
+    <th>Login</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
   <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %>
 </table>
 
 <% content_for :subnavigation do %>
   <%= link_to "create", new_user_path %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 3607166..66f13b8 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -274,8 +274,6 @@ form.button_to.state_changing input[type="submit"],
 form.button_to.state_changing button[type="submit"] {
   color: #0d47a1;
   background-color: #e3f2fd;
-  border-radius: 2px;
-  padding: 2px 8px;
 }
 
 form.button_to.state_changing input[type="submit"]:hover,
@@ -288,8 +286,6 @@ form.button_to.destructive input[type="submit"],
 form.button_to.destructive button[type="submit"] {
   color: #cc0000;
   background-color: #fdecea;
-  border-radius: 2px;
-  padding: 2px 8px;
 }
 
 form.button_to.destructive input[type="submit"]:hover,
@@ -302,8 +298,6 @@ form.button_to.computation input[type="submit"],
 form.button_to.computation button[type="submit"] {
   color: #00838f;
   background-color: #e0f2f1;
-  border-radius: 2px;
-  padding: 2px 8px;
 }
 
 form.button_to.computation input[type="submit"]:hover,
@@ -385,15 +379,23 @@ table tr.header {
   text-align: left;
 }
 
-table.node_table {
+table.node_table ,
+table.assets_table,
+table.user_table,
+table.events_table {
   border-collapse: collapse;
 }
 
 table.node_table tr {
-  min-height: 2rem;
   border-bottom: 1px solid #000000;
 }
 
+table.assets_table tr,
+table.user_table tr,
+table.events_table tr {
+  border-bottom: 1px solid #e8e8e8;
+}
+
 table.node_table th.node_id,
 table.node_table th.revision,
 table.node_table th.title {
@@ -408,7 +410,10 @@ table.node_table th.title {
   min-width: 12rem;
 }
 
-table.node_table tr.header {
+table.node_table tr.header,
+table.assets_table tr.header,
+table.user_table tr.header,
+table.events_table tr.header {
   height: 2rem;
   text-align: left;
 }
@@ -421,6 +426,16 @@ table.node_table td {
   min-width: 2rem;
 }
 
+table.assets_table td,
+table.user_table td,
+table.events_table td {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  padding-right: 25px;
+  padding-left: 0px;
+  min-width: 2rem;
+}
+
 table.node_table .node_id {
   padding-left: 10px;
   padding-right: 15px;
@@ -430,11 +445,17 @@ table.node_table .actions {
   text-transform: lowercase;
 }
 
-table.node_table tr.header:hover {
+table.node_table tr.header:hover,
+table.assets_table tr.header:hover,
+table.user_table tr.header:hover,
+table.events_table tr.header:hover {
   background-color: #ffffff;
 }
 
-table.node_table tr:hover {
+table.node_table tr:hover,
+table.assets_table tr:hover,
+table.user_table tr:hover,
+table.events_table tr:hover {
   background-color: #f1f1f1;
 }
 
@@ -598,17 +619,18 @@ table.user_table td.user_login {
   display: block;
 }
 
-#page_editor a.action_button,
-.node_status form.button_to input[type="submit"],
-.node_status form.button_to button[type="submit"] {
+a.action_button,
+form.button_to input[type="submit"],
+form.button_to button[type="submit"] {
   padding: 4px 12px;
   line-height: 1.2;
   box-sizing: border-box;
 }
 
-.node_status form.button_to input[type="submit"],
-.node_status form.button_to button[type="submit"] {
+form.button_to input[type="submit"],
+form.button_to button[type="submit"] {
   border: 1px solid transparent;
+  border-radius: 2px;
 }
 
 .field_hint {
@@ -659,7 +681,8 @@ div#page_editor {
   margin-left: 10px;
 }
 
-#page_editor a.action_button {
+#page_editor a.action_button,
+a.action_button {
   display: inline-block;
   -webkit-appearance: none;
   appearance: none;
@@ -671,7 +694,8 @@ div#page_editor {
   color: #000000;
 }
 
-#page_editor a.action_button:hover {
+#page_editor a.action_button:hover,
+a.action_button:hover {
   color: #ffffff;
   background-color: #000000;
 }