Commit `9a13e219`

mo <mokha@cisco.com>

2017-09-01 01:48:39

update dashboard index.

master

1 parent e5e38f1

Changed files (2)

app

views

dashboard

index.html.erb

shared

_my_nav.html.erb

@@ -1,17 +1,17 @@
 <% provide(:title, "Dashboard") -%>
 <div class="row">
-  <div class="span2">
+  <div class="col-3">
     <%= render partial: "my/shared/my_nav" %>
   </div>
-  <div class="span10" data-no-turbolink>
+  <div class="col-9" data-no-turbolink>
     <div class="row">
-      <div class="span5">
+      <div class="col-5">
         <h5>My Cakes</h5>
         <% @cakes.each do |item| %>
           <%= render item.class.to_s.downcase, item: item %>
         <% end %>
       </div>
-      <div class="span5">
+      <div class="col-5">
         <div class="well">
           <h5>My Notifications</h5>
           <% if @activities.empty? %>

@@ -1,38 +1,34 @@
-<div class="well sidebar-nav">
-  <%= link_to new_my_avatar_path, title: 'Change your avatar', data: { toggle: 'tooltip', placement: 'bottom', animation: 'true' }, class: 'tooltip-item' do %>
-    <%= avatar_for(current_user) %>
+<%= link_to new_my_avatar_path do %>
+  <%= avatar_for(current_user) %>
+<% end %>
+<div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist">
+  <%= link_to "Dashboard", my_dashboard_path, class: "nav-link #{"active" if controller?(:dashboard)}" %>
+  <%= link_to my_root_path(anchor: 'cakes/new'), class: "nav-link" do %>
+    <i class="fa fa-upload"></i> Cake
   <% end %>
-  <ul class="nav nav-list" data-no-turbolink>
-    <li class="nav-header"><%= current_user.name %></li>
-    <li class="<%= "active" if controller?(:dashboard) %>"><%= link_to "Dashboard", my_dashboard_path %></li>
-    <li id='profile-tab'><%= link_to "Profile", my_root_path(anchor: 'profile/me') %></li>
-    <li class="<%= 'active' if controller?(:passwords) %>"><%= link_to "Account", my_passwords_path %></li>
-    <li class="<%= "active" if controller?(:favorites) %>"><%= link_to "Favorites", my_favorites_path %></li>
-    <li class="<%= 'active' if controller?(:avatars) %>"><%= link_to "Picture", new_my_avatar_path %></li>
-    <li class="nav-header">New</li>
-    <li>
-      <%= link_to my_root_path(anchor: 'cakes/new') do %>
-        <i class="fa fa-upload"></i> Cake
-      <% end %>
-    </li>
-    <li>
-      <%= link_to my_root_path(anchor: 'tutorials/new') do %>
-        <i class="fa fa-pencil-square"></i> Tutorial
-      <% end %>
-    </li>
-    <% if current_user.admin? %>
-      <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>
-      <li><%= link_to "Products", admin_products_path %></li>
-      <li><%= link_to "Charts", admin_charts_path %></li>
-    <% end %>
-    <li class="nav-header">Other</li>
-    <li><%= link_to t('.logout'), logout_path, method: :delete %></li>
-  </ul>
+  <%= link_to my_root_path(anchor: 'tutorials/new'), class: "nav-link" do %>
+    <i class="fa fa-pencil-square"></i> Tutorial
+  <% end %>
+  <%= link_to "Profile", my_root_path(anchor: 'profile/me'), class: "nav-link" %>
+  <%= link_to "Account", my_passwords_path, class: "nav-link #{"active" if controller?(:passwords)}" %>
+  <%= link_to "Favorites", my_favorites_path, class: "nav-link #{"active" if controller?(:favorites)}" %>
+  <%= link_to "Picture", new_my_avatar_path, class: "nav-link #{"active" if controller?(:avatars)}" %>
+  <% if current_user.admin? %>
+    <%= 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>
+<div class="tab-content" id="v-pills-tabContent">
+  <div class="tab-pane fade show active" id="v-pills-home" role="tabpanel" aria-labelledby="v-pills-home-tab">...</div>
+  <div class="tab-pane fade" id="v-pills-profile" role="tabpanel" aria-labelledby="v-pills-profile-tab">...</div>
+  <div class="tab-pane fade" id="v-pills-messages" role="tabpanel" aria-labelledby="v-pills-messages-tab">...</div>
+  <div class="tab-pane fade" id="v-pills-settings" role="tabpanel" aria-labelledby="v-pills-settings-tab">...</div>
 </div>

Commit 9a13e219

Commit `9a13e219`