From 6d44bafa3140d5bef6963cb3334a402fe6f07cf4 Mon Sep 17 00:00:00 2001 From: Miles Gould Date: Fri, 16 Nov 2012 00:07:27 +0000 Subject: [PATCH] Change markup of buttons to Bootstrap format. --- app/views/crops/edit.html.haml | 8 +++----- app/views/crops/index.html.haml | 2 +- app/views/crops/new.html.haml | 8 +++----- app/views/crops/show.html.haml | 6 +++--- app/views/scientific_names/edit.html.haml | 8 +++----- app/views/scientific_names/new.html.haml | 8 +++----- 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/app/views/crops/edit.html.haml b/app/views/crops/edit.html.haml index b97b2a155..fce5397f0 100644 --- a/app/views/crops/edit.html.haml +++ b/app/views/crops/edit.html.haml @@ -2,10 +2,8 @@ - if user_signed_in? = render 'form' - %ul.link-list - %li - = link_to 'Show', @crop, { :class => 'button' } - %li - = link_to 'Back', crops_path, { :class => 'button' } + %p + = link_to 'Show', @crop, { :class => 'btn' } + = link_to 'Back', crops_path, { :class => 'btn' } - else %div.alert You're not logged in. Only logged in users can do this. diff --git a/app/views/crops/index.html.haml b/app/views/crops/index.html.haml index 3665d3940..ec27aa129 100644 --- a/app/views/crops/index.html.haml +++ b/app/views/crops/index.html.haml @@ -19,4 +19,4 @@ - if user_signed_in? %div - = link_to 'New Crop', new_crop_path, {:class => 'button'} + = link_to 'New Crop', new_crop_path, {:class => 'btn'} diff --git a/app/views/crops/new.html.haml b/app/views/crops/new.html.haml index 46cd7a30b..b10c5b876 100644 --- a/app/views/crops/new.html.haml +++ b/app/views/crops/new.html.haml @@ -2,11 +2,9 @@ - if user_signed_in? = render 'form' - %ul.link-list - %li - = link_to 'Show', @crop, { :class => 'button' } - %li - = link_to 'Back', crops_path, { :class => 'button' } + %p + = link_to 'Show', @crop, { :class => 'btn' } + = link_to 'Back', crops_path, { :class => 'btn' } - else %div.alert You're not logged in. Only logged in users can do this. diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml index 1465a5b52..fc7c7b14a 100644 --- a/app/views/crops/show.html.haml +++ b/app/views/crops/show.html.haml @@ -22,7 +22,7 @@ %h3 More information: %ul %li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url - %ul.link-list + %p - if user_signed_in? - %li= link_to 'Edit', edit_crop_path(@crop), { :class => 'button' } - %li= link_to 'Destroy', @crop, method: :delete, data: { confirm: 'Are you sure?', :class => 'button' } + = link_to 'Edit', edit_crop_path(@crop), { :class => 'btn' } + = link_to 'Destroy', @crop, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn' diff --git a/app/views/scientific_names/edit.html.haml b/app/views/scientific_names/edit.html.haml index f037450c3..2a5d6b2ab 100644 --- a/app/views/scientific_names/edit.html.haml +++ b/app/views/scientific_names/edit.html.haml @@ -2,10 +2,8 @@ - if user_signed_in? = render 'form' - %ul.link-list - %li - = link_to 'Show', @scientific_name, { :class => 'button' } - %li - = link_to 'Back', scientific_names_path, { :class => 'button' } + %p + = link_to 'Show', @scientific_name, { :class => 'btn' } + = link_to 'Back', scientific_names_path, { :class => 'btn' } - else %div.alert You're not logged in. Only logged in users can do this. diff --git a/app/views/scientific_names/new.html.haml b/app/views/scientific_names/new.html.haml index 1eafa3b7a..6cf47c4be 100644 --- a/app/views/scientific_names/new.html.haml +++ b/app/views/scientific_names/new.html.haml @@ -2,10 +2,8 @@ - if user_signed_in? = render 'form' - %ul.link-list - %li - = link_to 'Show', @scientific_name, { :class => 'button' } - %li - = link_to 'Back', scientific_names_path, { :class => 'button' } + %p + = link_to 'Show', @scientific_name, { :class => 'btn' } + = link_to 'Back', scientific_names_path, { :class => 'btn' } - else %div.alert You're not logged in. Only logged in users can do this.