Commit 09f1f234

mo <mokha@cisco.com>
2017-09-02 03:46:30
upgrade users admin page.
master
1 parent efec5e4
Changed files (6)
app
controllers
admin
blobs_controller.rb
views
admin
users
_edit_modal.html.erb
_index.html.erb
index.html.erb
my
shared
_my_nav.html.erb
config
routes.rb
app/controllers/admin/blobs_controller.rb
@@ -1,22 +0,0 @@
-module Admin
-  class BlobsController < AdminController
-    def index
-      @objects = bucket.objects
-    end
-
-    def show
-      @object = bucket.objects[params[:id]]
-    end
-
-    private
-
-    def connection
-      @connection ||= AWS::S3.new
-    end
-
-    def bucket
-      bucket_name = ENV['FOG_DIRECTORY']
-      connection.buckets[bucket_name]
-    end
-  end
-end
app/views/admin/users/_edit_modal.html.erb
@@ -1,63 +1,55 @@
-<div id="edit-user-modal-<%= user.id %>" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="myModalLabel">Edit <%= user.name %></h3>
-  </div>
-  <%= form_for user, url: admin_user_path(user), method: :put, html: { class: 'form-horizontal' } do |f| %>
-  <div class="modal-body">
-    <div class="control-group">
-      <%= f.label :name, class: 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :name %>
-        <span class="help-inline"></span>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :email, class: 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :email %>
-        <span class="help-inline"></span>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :full_address, class: 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :full_address %>
-        <span class="help-inline"></span>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :city, class: 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :city %>
-        <span class="help-inline"></span>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :website, class: 'control-label' %>
-      <div class="controls">
-        <%= f.url_field :website %>
-        <span class="help-inline"></span>
+<div id="edit-user-modal-<%= user.id %>" class="modal">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+    <%= form_for user, url: admin_user_path(user), method: :put, html: { class: 'form-horizontal' } do |f| %>
+      <div class="modal-header">
+        <h5 class="modal-title">Edit <%= user.name %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
       </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :twitter, class: 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :twitter %>
-        <span class="help-inline"></span>
+      <div class="modal-body">
+        <div class="form-group">
+          <%= f.label :name %>
+          <%= f.text_field :name, class: 'form-control' %>
+          <span class="help-inline"></span>
+        </div>
+        <div class="form-group">
+          <%= f.label :email %>
+          <%= f.email_field :email, class: 'form-control' %>
+          <span class="help-inline"></span>
+        </div>
+        <div class="form-group">
+          <%= f.label :full_address %>
+          <%= f.text_field :full_address, class: 'form-control' %>
+          <span class="help-inline"></span>
+        </div>
+        <div class="form-group">
+          <%= f.label :city %>
+          <%= f.text_field :city, class: 'form-control' %>
+          <span class="help-inline"></span>
+        </div>
+        <div class="form-group">
+          <%= f.label :website %>
+          <%= f.url_field :website, class: 'form-control' %>
+          <span class="help-inline"></span>
+        </div>
+        <div class="form-group">
+          <%= f.label :twitter %>
+          <%= f.text_field :twitter, class: 'form-control' %>
+          <span class="help-inline"></span>
+        </div>
+        <div class="form-group">
+          <%= f.label :facebook %>
+          <%= f.url_field :facebook, class: 'form-control' %>
+          <span class="help-inline"></span>
+        </div>
       </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :facebook, class: 'control-label' %>
-      <div class="controls">
-        <%= f.url_field :facebook %>
-        <span class="help-inline"></span>
+      <div class="modal-footer">
+        <%= f.submit "Save Changes", class: 'btn btn-primary', disable_with: "Saving..." %>
+        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
       </div>
+    <% end %>
     </div>
   </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-    <%= f.submit "Save Changes", class: 'btn btn-primary', disable_with: "Saving..." %>
-  </div>
-  <% end %>
 </div>
app/views/admin/users/_index.html.erb
@@ -4,7 +4,6 @@
       <td></td>
       <td>name</td>
       <td>email</td>
-      <td>urls</td>
       <td>
         created at
         <%= link_to url_for(params.merge(sort: "newest")), remote: true do %>
@@ -17,21 +16,14 @@
     </tr>
   </thead>
   <tbody>
-  <%- @users.each do |user| %>
+  <% @users.find_each do |user| %>
     <tr>
     <td>
       <a href="#edit-user-modal-<%= user.id %>" role="button" data-toggle="modal">edit</a>
       <%= render partial: 'edit_modal', locals: { user: user } %>
     </td>
-    <td><%= link_to "#{user.name} (#{user.creations_count})", admin_user_path(user) %></td>
+    <td><%= link_to user.name, admin_user_path(user) %></td>
     <td><%= mail_to user.email %></td>
-    <td>
-      <ul>
-        <%= "<li>#{user.website}</li>".html_safe unless user.website.blank? %>
-        <%= "<li>#{user.twitter}</li>".html_safe unless user.twitter.blank? %>
-        <%= "<li>#{user.facebook}</li>".html_safe unless user.facebook.blank? %>
-      </ul>
-    </td>
     <td><%= user.created_at.to_formatted_s(:short) %></td>
     </tr>
   <% end %>
app/views/admin/users/index.html.erb
@@ -1,9 +1,9 @@
 <%= provide(:search_path, admin_users_path) %>
-<div class="row-fluid">
-  <div class="span2">
+<div class="row">
+  <div class="col-3">
     <%= render partial: "my/shared/my_nav" %>
   </div>
-  <div class="span10">
+  <div class="col-9">
     <h1>Users <small>(<%= @users.count %>)</small></h1>
     <div id="results-container">
       <%= render partial: "index" %>
app/views/my/shared/_my_nav.html.erb
@@ -17,12 +17,9 @@
     <%= link_to "Users", admin_users_path, class: "nav-link" %>
     <%= link_to "Jobs", admin_jobs_path, class: "nav-link" %>
     <%= link_to "Activity", admin_activities_path, class: "nav-link" %>
-    <%= link_to "Subscriptions", admin_subscriptions_path, class: "nav-link" %>
     <%= link_to "Photos", admin_photos_path, class: "nav-link" %>
-    <%= link_to "Blobs", admin_blobs_path, class: "nav-link" %>
     <%= link_to "Sessions", admin_sessions_path, class: "nav-link" %>
     <%= link_to "Products", admin_products_path, class: "nav-link" %>
-    <%= link_to "Charts", admin_charts_path, class: "nav-link" %>
   <% end %>
   <%= link_to t('.logout'), logout_path, method: :delete, class: "nav-link" %>
 </div>
config/routes.rb
@@ -83,7 +83,6 @@ Cake::Application.routes.draw do
     resources :activities, only: [:index]
     resources :subscriptions, only: [:index]
     resources :photos, only: [:index, :show, :update]
-    resources :blobs, only: [:index, :show]
     resources :errors, only: [:index, :create]
     resources :sessions, only: [:index, :destroy]
     resources :products, only: [:index, :show, :create]