From 98496cee665b606e62c95c1de14c2efb6efcd3bf Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 25 Sep 2014 08:04:28 +0200
Subject: [PATCH] Streamline of screens.

---
 .../app/views/generic/admin/index.jst.eco     | 57 +++++--------------
 .../javascripts/app/views/package.jst.eco     | 23 ++++----
 .../javascripts/app/views/scheduler.jst.eco   | 22 +++----
 .../javascripts/app/views/session.jst.eco     | 57 ++++++++++---------
 app/assets/javascripts/app/views/user.jst.eco | 38 +++++++------
 5 files changed, 85 insertions(+), 112 deletions(-)

diff --git a/app/assets/javascripts/app/views/generic/admin/index.jst.eco b/app/assets/javascripts/app/views/generic/admin/index.jst.eco
index d0db84cce..d5a626078 100644
--- a/app/assets/javascripts/app/views/generic/admin/index.jst.eco
+++ b/app/assets/javascripts/app/views/generic/admin/index.jst.eco
@@ -1,48 +1,17 @@
-<div class="page-header horizontal">
-  <div class="page-header-title">
-    <h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1>
+<div class="flex scrollable">
+  <div class="horizontal">
+    <div class="page-header-title">
+      <h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1>
+    </div>
+    <div class="page-header-meta">
+      <% if @buttons: %>
+      <% for button in @buttons: %>
+        <a data-type="<%= button['data-type'] %>" class="btn btn-default <%= button['class'] %>"><%- @T( button.name ) %></a>
+      <% end %>
+      <% end %>
+    </div>
   </div>
-  <div class="page-header-meta">
-    <% if @buttons: %>
-    <% for button in @buttons: %>
-      <a data-type="<%= button['data-type'] %>" class="btn btn-default <%= button['class'] %>"><%- @T( button.name ) %></a>
-    <% end %>
-    <% end %>
-  </div>
-</div>
 
-<!--
-<div class="row">
-  <div class="span3">
-    <ul class="nav nav-tabs nav-stacked">
-    <% if @menus: %>
-    <% for menu in @menus: %>
-      <li class="<%= menu['class'] %>"><a data-type="<%= menu['data-type'] %>" ><%= menu.name %></a></li>
--->
-<!--
-      <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= menu.name %><b class="caret"></b></a>
-        <ul class="dropdown-menu">
-          <li><a href="#">List</a></li>
-          <li><a href="#">Settings</a></li>
-          <li><a href="#">New</a></li>
-        </ul>
-      </li>
--->
-<!--
-    <% end %>
-    <% end %>
-    </ul>
-
-    <% for note in @notes: %>
-      <p><%- @T( note ) %></p>
-    <% end %>
--->
-<!--
-  </div>
--->
   <div class="table-overview"></div>
 
-<!--
-</div>
--->
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco
index 054a0bf89..53c8741f9 100644
--- a/app/assets/javascripts/app/views/package.jst.eco
+++ b/app/assets/javascripts/app/views/package.jst.eco
@@ -1,22 +1,21 @@
-<div class="page-header">
-  <h1><%- @T( 'Package' ) %> <small><%- @T( 'Management' ) %></small></h1>
-</div>
+<div class="flex scrollable">
+  <div>
+    <div class="page-header-title">
+    <h1><%- @T( 'Package' ) %> <small><%- @T( 'Management' ) %></small></h1>
+  </div>
 
-<div class="row">
-  <div class="span3">
 <!--
     <ul class="nav nav-tabs nav-stacked">
       <li class=""><a data-type="" ><%- @T( 'Installed' ) %></a></li>
       <li class=""><a data-type="" ><%- @T( 'Store' ) %></a></li>
     </ul>
 -->
-    <p>
-      <form action="<%= App.Config.get('api_path') %>/packages" method="post" enctype="multipart/form-data">
-        <input type="file" name="file_upload"/>
-        <button class="btn btn--primary" type="submit"><%- @T('Install Package') %></button>
-      </form>
-    </p>
-  </div>
+  <p>
+    <form action="<%= App.Config.get('api_path') %>/packages" method="post" enctype="multipart/form-data">
+      <input type="file" name="file_upload"/>
+      <button class="btn btn--primary" type="submit"><%- @T('Install Package') %></button>
+    </form>
+  </p>
 
   <table class="table table-striped table-hover">
     <thead>
diff --git a/app/assets/javascripts/app/views/scheduler.jst.eco b/app/assets/javascripts/app/views/scheduler.jst.eco
index c2a4cd6d7..7424e48d5 100644
--- a/app/assets/javascripts/app/views/scheduler.jst.eco
+++ b/app/assets/javascripts/app/views/scheduler.jst.eco
@@ -1,15 +1,15 @@
-<div class="page-header">
-  <h1>Scheduler <small>Management</small></h1>
-</div>
-
-<div class="row">
-  <div class="span3">
-    <ul class="nav nav-tabs nav-stacked">
-      <li><a href="#">Jobs</a></li>
-    </ul>
+<div class="flex scrollable">
+  <div class="horizontal">
+    <div class="page-header-title">
+      <h1>Scheduler <small>Management</small></h1>
+    </div>
   </div>
+
+  <ul class="nav nav-tabs nav-stacked">
+    <li><a href="#">Jobs</a></li>
+  </ul>
+
   <div class="table-overview">
-  
     <div class="tabbable">
       <ul class="nav nav-tabs">
         <li class="active"><a href="#channel-inbound" data-toggle="tab">Times</a></li>
@@ -93,6 +93,6 @@
         </div>
       </div>
     </div>
-  
+
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/session.jst.eco b/app/assets/javascripts/app/views/session.jst.eco
index 76064811f..a0f8145e1 100644
--- a/app/assets/javascripts/app/views/session.jst.eco
+++ b/app/assets/javascripts/app/views/session.jst.eco
@@ -1,27 +1,30 @@
-<div class="page-header">
-  <h1><%- @T('Sessions') %><small></small></h1>
-</div>
-<table class="table table-striped table-hover">
-  <thead>
-    <tr>
-      <th class="span4"><%- @T('User') %></th>
-      <th class="span3"><%- @T('Browser') %></th>
-      <th class="span3"><%- @T('Location') %></th>
-      <th class="span1"><%- @T('Age') %></th>
-      <th class="span1"><%- @T('Update') %></th>
-      <th class="span1"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% for session in @sessions: %>
-    <tr>
-      <td><% if session.data.user: %><%= session.data.user.displayName() %><% end %></td>
-      <td><% if session.data.user_agent: %><%= session.data.user_agent %><% end %></td>
-      <td><% if session.data.geo: %><%= session.data.geo.country_code %> <%= session.data.geo.city %><% end %></td>
-      <td><span class="humanTimeFromNow" data-time="<%- session.created_at %>">?</span></td>
-      <td><span class="humanTimeFromNow" data-time="<%- session.updated_at %>">?</span></td>
-      <td><a href="#" data-session-id="<%- session.id %>" data-type="delete" class="glyphicon glyphicon-trash" title="<%- @T('Delete') %>"></a></td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
+<div class="flex scrollable">
+  <div>
+    <div class="page-header-title">
+    <h1><%- @T('Sessions') %><small></small></h1>
+  </div>
+  <table class="table table-striped table-hover">
+    <thead>
+      <tr>
+        <th class="span4"><%- @T('User') %></th>
+        <th class="span3"><%- @T('Browser') %></th>
+        <th class="span3"><%- @T('Location') %></th>
+        <th class="span1"><%- @T('Age') %></th>
+        <th class="span1"><%- @T('Update') %></th>
+        <th class="span1"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% for session in @sessions: %>
+      <tr>
+        <td><% if session.data.user: %><%= session.data.user.displayName() %><% end %></td>
+        <td><% if session.data.user_agent: %><%= session.data.user_agent %><% end %></td>
+        <td><% if session.data.geo: %><%= session.data.geo.country_code %> <%= session.data.geo.city %><% end %></td>
+        <td><span class="humanTimeFromNow" data-time="<%- session.created_at %>">?</span></td>
+        <td><span class="humanTimeFromNow" data-time="<%- session.updated_at %>">?</span></td>
+        <td><a href="#" data-session-id="<%- session.id %>" data-type="delete" class="glyphicon glyphicon-trash" title="<%- @T('Delete') %>"></a></td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/user.jst.eco b/app/assets/javascripts/app/views/user.jst.eco
index 4007b1114..a04fedf87 100644
--- a/app/assets/javascripts/app/views/user.jst.eco
+++ b/app/assets/javascripts/app/views/user.jst.eco
@@ -1,22 +1,24 @@
-<div class="page-header horizontal">
-  <div class="page-header-title">
-    <h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1>
+<div class="flex scrollable">
+  <div class="horizontal">
+    <div class="page-header-title">
+      <h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1>
+    </div>
+    <div class="page-header-meta">
+      <% if @buttons: %>
+      <% for button in @buttons: %>
+        <a data-type="<%= button['data-type'] %>" class="btn btn-default <%= button['class'] %>"><%- @T( button.name ) %></a>
+      <% end %>
+      <% end %>
+    </div>
   </div>
-  <div class="page-header-meta">
-    <% if @buttons: %>
-    <% for button in @buttons: %>
-      <a data-type="<%= button['data-type'] %>" class="btn btn-default <%= button['class'] %>"><%- @T( button.name ) %></a>
-    <% end %>
+
+  <input class="search" name="search" placeholder="<%- @T('Search for users') %>">
+
+  <div class="tabs wide-tabs horizontal" style="width: 100%;">
+    <% for role in @roles: %>
+      <div class="tab" data-id="<%= role.id %>"><%- @T(role.displayName() ) %></div>
     <% end %>
   </div>
-</div>
 
-<input class="search" name="search" placeholder="<%- @T('Search for users') %>">
-
-<div class="tabs wide-tabs horizontal" style="width: 100%;">
-  <% for role in @roles: %>
-    <div class="tab" data-id="<%= role.id %>"><%- @T(role.displayName() ) %></div>
-  <% end %>
-</div>
-
-<div class="table-overview"></div>
+  <div class="table-overview"></div>
+</div>
\ No newline at end of file