Merge branch 'master' of github.com:nitinzd/brails

tekvision · Aug 28, 2013 · 9981414 · 9981414
2 parents bf1c3d6 + e5ed7e7
commit 9981414
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/app/views/home/_nominate_form.html.haml b/app/views/home/_nominate_form.html.haml
@@ -9,5 +9,5 @@
     = f.input :description, as: :text, :input_html => {:cols => 20, :rows => 5}, required: false 
 
   .form-actions
-    = f.submit "Nominate", class: 'btn-success'
-
+    = f.submit "Nominate", class: 'btn btn-large btn-success'
+    = link_to "Cancel", root_path, class: 'btn btn-large btn-success'
diff --git a/app/views/home/nominate_list.html.haml b/app/views/home/nominate_list.html.haml
@@ -14,4 +14,5 @@
       %td= nominate.phone_number
       %td= nominate.address
 
-
+
+= link_to "Back", root_path, class: 'btn btn-large'    
diff --git a/app/views/levels/_form.html.haml b/app/views/levels/_form.html.haml
@@ -18,4 +18,5 @@
       = question.link_to_add "Add an option", :options
 
   .form-actions
-    = f.button :submit, class: 'btn-success'
+    = f.button :submit, class: 'btn btn-large btn-success'
+    = link_to "Cancel", levels_list_path, class: 'btn btn-large btn-success'
diff --git a/app/views/levels/levels_list.html.haml b/app/views/levels/levels_list.html.haml
@@ -13,4 +13,5 @@
       %td= link_to "Edit", edit_level_path(level)
       %td= link_to "Destroy", level, method: :delete, data: { confirm: 'Are you sure?' }
 
-= link_to "New level", new_level_path, class: "btn btn-large"
+= link_to "New level", new_level_path, class: "btn btn-large"
+= link_to "Cancel", levels_path, class: "btn btn-large"
diff --git a/app/views/levels/show.html.haml b/app/views/levels/show.html.haml
@@ -72,3 +72,5 @@
                     - question.options.each do |option|
                       = f.label option.label
   = render_shareable :url => request.url
+  .pull-right
+    = link_to "Back", levels_path, class: 'btn btn-large'
diff --git a/app/views/topics/_form.html.haml b/app/views/topics/_form.html.haml
@@ -46,4 +46,5 @@
         = f.link_to_add f.object.contents.count > 0 ?  "Add More Content" : "Add Content", :contents, :class => 'btn btn-info more_content'
 
   .form-actions
-    = f.button :submit, class: 'btn-success'
+    = f.button :submit, class: 'btn btn-large btn-success'
+    = link_to "Cancel", level_topics_path(@level), class: 'btn btn-large btn-success'