Commit 6c28cc66

@@ -1,6 +1,5 @@
 module Admin
   class AdminController < ApplicationController
-    layout "admin"
     before_action :restrict_access!
 
     private

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render :partial => 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <dl class="dl-horizontal">
       <% @recent_activities.each do |activity| %>
         <%= render "activities/#{activity.subject.class.to_s.downcase}", subject: activity.subject %>

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render partial: 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Blobs <small><%= @objects.count %></small></h1>
     <table class="table table-condensed">
       <thead>

@@ -1,5 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Blob <small><%= @object.key %></small></h1>
     <p><%= link_to "<< Back", admin_blobs_path %></p>
     <table class="table table-condensed">

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render :partial => 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Errors <small><%= Time.now.utc %></small></h1>
 
     <%= button_to "Raise HECK", admin_errors_path, method: :post %>

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render :partial => 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Jobs <small><%= Time.now.utc %></small></h1>
     <table class="table table-condensed">
       <thead>

@@ -1,5 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1><%= @job.handler %></h1>
     <p><%= link_to "<< Back", admin_jobs_path %></p>
     <table class="table table-condensed">

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render :partial => 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Photos <small><%= @photos.count %></small></h1>
     <table class="table table-condensed">
       <thead>

@@ -1,5 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Photo <small><%= @photo.id %></small></h1>
     <p><%= link_to "<< Back", admin_photos_path %></p>
     <table class="table table-condensed">

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render :partial => 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Users Sessions</h1>
     <table class="table table-striped table-condensed">
       <thead>

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render :partial => 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Subscriptions <small>(<%= @total %>)</small></h1>
     <table class="table table-condensed">
       <thead>

@@ -1,6 +1,8 @@
 <div class="row-fluid">
-  <div class="span12">
-    <%= render :partial => 'admin/shared/admin_nav' %>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
     <h1>Users <small>(<%= @users.count %>)</small></h1>
     <%= form_tag admin_users_path, method: :get, name: "search", remote: true do %>
       <%= text_field_tag :q, params[:q], class: "search-query", placeholder: "Search" %>

@@ -13,23 +13,19 @@
 <% end %>
 
 <div class="row-fluid">
-  <div class="span12">
-    <h1><%= @user.name %></h1>
-    <p><%= link_to "<< Back", admin_users_path %></p>
+  <div class="span2">
+    <%= render partial: "my/shared/my_nav" %>
+  </div>
+  <div class="span10">
+      <h1><%= @user.name %></h1>
+      <%= debug @user %>
   </div>
 </div>
-
+<!--
 <div class="row-fluid">
-  <div class="span3">
-    <%= avatar_for(@user) %>
-  </div>
-  <div class="span9">
-    <%= debug @user %>
+  <div style="overflow:hidden;height:500px;width:600px;">
+    <div id="map-canvas" style="height:500px;width:600px;"></div>
+    <style> img{max-width:none!important;background:none!important} </style>
   </div>
 </div>
-
-<div style="overflow:hidden;height:500px;width:600px;">
-  <div id="map-canvas" style="height:500px;width:600px;"></div>
-  <style> img{max-width:none!important;background:none!important} </style>
-</div>
-
+-->

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-<title><%= full_title(yield(:title)) %></title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-<meta name="description" content="<%= yield(:description) %>" />
-<%= stylesheet_link_tag "application", media: "all" %>
-<%= yield :head %>
-<%= csrf_meta_tags %>
-</head>
-<body>
-<div class="container-fluid">
-  <%= render "layouts/header" %>
-  <%= render "layouts/messages" %>
-  <%= yield %>
-</div>
-<%= javascript_include_tag "application" %>
-<%= yield :javascript %>
-</body>
-</html>

@@ -24,10 +24,17 @@
         <i class="fa fa-pencil-square"></i> New Tutorial
       <% end %>
     </li>
-    <li class="nav-header">Other</li>
     <% if current_user.admin? %>
-    <li><%= link_to t('.admin'), admin_root_path %></li>
+      <li class="nav-header">Admin</li>
+      <li><%= link_to "Users", admin_users_path %></li>
+      <li><%= link_to "Jobs", admin_jobs_path %></li>
+      <li><%= link_to "Activity", admin_activities_path %></li>
+      <li><%= link_to "Subscriptions", admin_subscriptions_path %></li>
+      <li><%= link_to "Photos", admin_photos_path %></li>
+      <li><%= link_to "Blobs", admin_blobs_path %></li>
+      <li><%= link_to "Sessions", admin_sessions_path %></li>
     <% end %>
+    <li class="nav-header">Other</li>
     <li><%= link_to t('.logout'), logout_path, method: :delete %></li>
   </ul>
 </div>