Commit eafc38fc

mo khan <mo@mokhan.ca>
2014-09-07 02:24:16
upgrade font awesome and add spinner when signing in.
master
1 parent 8a6828d
Changed files (3)
app
views
layouts
_header.html.erb
application.html.erb
my
shared
_my_nav.html.erb
app/views/layouts/_header.html.erb
@@ -31,24 +31,29 @@
           </li>
           <li class="dropdown">
             <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-              <i class="icon-plus"></i> <b class="caret"></b>
+              <i class="fa fa-plus"></i> <b class="caret"></b>
             </a>
             <ul class="dropdown-menu">
               <li>
                 <%= link_to my_root_path(anchor: 'cakes/new') do %>
-                  <i class="icon-camera"></i> New Cake
+                  <i class="fa fa-upload"></i> New Cake
                 <% end %>
               </li>
               <li>
                 <%= link_to my_root_path(anchor: 'tutorials/new') do %>
-                  <i class="icon-edit"></i> New Tutorial
+                  <i class="fa fa-pencil-square"></i> New Tutorial
                 <% end %>
               </li>
             </ul>
           </li>
+          <li>
+            <%= link_to my_settings_path do %>
+              <i class="fa fa-cog"></i>
+            <% end %>
+          </li>
           <li>
             <%= link_to logout_path, method: :delete, title: 'Sign Out', data: { toggle: 'tooltip', placement: 'left', animation: 'true' }, class: 'tooltip-item' do %>
-              <i class="icon-off"></i>
+              <i class="fa fa-sign-out"></i>
             <% end %>
           </li>
         </ul>
@@ -56,7 +61,7 @@
           <%= form_for(UserSession.new, url: sessions_path(UserSession.new), html: { class: "navbar-form pull-right" }) do |f| %>
             <%= email_field_tag 'session[username]', '', placeholder: 'Email', class: 'input-medium' %>
             <%= password_field_tag 'session[password]', '', placeholder: 'Password', class: 'input-medium' %>
-            <%= f.submit "Log In", class: 'btn' %>
+            <%= f.button "Log In", class: 'btn btn-primary', data: { disable_with: "<i class='fa fa-spinner fa-spin'></i> Signing in..." } %>
           <% end %>
         <% end %>
       </div><!--/.nav-collapse -->
app/views/layouts/application.html.erb
@@ -9,7 +9,7 @@
 <meta name="description" content="<%= yield(:description) %>" />
 <%= stylesheet_link_tag "application", media: "all" %>
 <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
-<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
+<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 <%= favicon_link_tag 'favicon.ico' %>
 <%= favicon_link_tag 'apple-touch-icon-57x57.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "57x57" %>
 <%= favicon_link_tag 'apple-touch-icon-72x72.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "72x72" %>
app/views/my/shared/_my_nav.html.erb
@@ -13,12 +13,12 @@
     <li class="nav-header">Actions</li>
     <li>
       <%= link_to my_root_path(anchor: 'cakes/new') do %>
-        <i class="icon-camera"></i> New Cake
+        <i class="fa fa-upload"></i> New Cake
       <% end %>
     </li>
     <li>
       <%= link_to my_root_path(anchor: 'tutorials/new') do %>
-        <i class="icon-edit"></i> New Tutorial
+        <i class="fa fa-pencil-square"></i> New Tutorial
       <% end %>
     </li>
     <li class="nav-header">Other</li>