Adding menu and cool buttons

tscolari · Sep 15, 2011 · 0fb95be · 0fb95be
1 parent 4c8af70
commit 0fb95be
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -2,10 +2,4 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   respond_to_mobile_requests :skip_xhr_requests => false
 
-  private
-
-  def is_mobile_request?
-    true
-  end
-
 end
diff --git a/app/views/layouts/application.mobile.erb b/app/views/layouts/application.mobile.erb
@@ -11,6 +11,22 @@
 <body>
 <div data-role="page">
   <%= yield %>
+  <div data-role="footer" data-position="fixed">
+    <div data-role="navbar">
+      <ul>
+        <li>
+          <%= link_to notes_path, :class => ("ui-btn-active" if action_name == 'index'), :"data-icon" => "home", :"data-iconpos" => "top" do %>
+            Home
+          <% end %>
+        </li>
+        <li>
+          <%= link_to new_note_path, :class => ("ui-btn-active" if action_name == 'new'), :"data-icon" => "plus", :"data-iconpos" => "top" do %>
+            New Note
+          <% end %>
+          </li>
+        </ul>
+    </div>
+  </div>
 </div>
 </body>
 </html>
diff --git a/app/views/notes/edit.mobile.erb b/app/views/notes/edit.mobile.erb
@@ -1,10 +1,6 @@
 <div data-role="header">
   <h1>Editing note</h1>
+  <%= link_to "Cancel", note_path(@note), :"data-icon" => "delete", :class => "ui-btn-right" %>
 </div>
 
 <%= render 'form' %>
-
-<div data-role="footer">
-  <%= link_to 'Show', @note %>
-  <%= link_to 'Back', notes_path %>
-</div>
diff --git a/app/views/notes/index.mobile.erb b/app/views/notes/index.mobile.erb
@@ -14,7 +14,3 @@
   <% end %>
   </ul>
 </div>
-
-<div data-role="footer">
-  <%= link_to 'New Note', new_note_path %>
-</div>
diff --git a/app/views/notes/new.mobile.erb b/app/views/notes/new.mobile.erb
@@ -1,9 +1,6 @@
 <div data-role="header">
   <h1>New note</h1>
+  <%= link_to "Cancel", notes_path, :"data-icon" => "delete", :class => "ui-btn-right" %>
 </div>
 
 <%= render 'form' %>
-
-<div data-role="footer">
-  <%= link_to 'Back', notes_path %>
-</div>
diff --git a/app/views/notes/show.mobile.erb b/app/views/notes/show.mobile.erb
@@ -1,16 +1,23 @@
 <div data-role="header">
+  <%= link_to "Back", notes_path, :"data-icon" => "arrow-l", :class => "ui-btn-left" %>
   <h1><%= @note.title %></h1>
+  <%= link_to "Edit", edit_note_path(@note), :"data-icon" => "gear", :class => "ui-btn-right" %>
+
+  <div data-role="navbar">
+    <ul>
+      <li>
+        <%= link_to @note, :confirm => 'Are you sure?', :method => :delete, :"data-icon" => "delete", :"data-iconpos" => "top" do %>
+          Delete
+        <% end %>
+      </li>
+    </ul>
+  </div>
 </div>
 
+
 <div data-role="content">
   <p id="notice"><%= notice %></p>
   <p>
     <%= @note.body %>
   </p>
 </div>
-
-<div data-role="footer">
-  <%= link_to 'Edit', edit_note_path(@note) %>
-  <%= link_to 'Destroy', @note, confirm: 'Are you sure?', method: :delete %>
-  <%= link_to 'Back', notes_path %>
-</div>