From e8506f6fbcdd8a182fd0ef850fadc182b8aaa33f Mon Sep 17 00:00:00 2001 From: Ilya Konanykhin Date: Thu, 22 Dec 2016 23:35:26 +0600 Subject: [PATCH] BS3: top menu. --- app/helpers/application_helper.rb | 10 ++++++++++ app/views/bikes/new.html.haml | 2 +- app/views/bikes/show.html.haml | 8 ++++---- app/views/task_lists/edit.haml | 2 +- app/views/time_entries/index.haml | 2 +- app/views/time_entries/new.haml | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8c93fee..1c1d1a6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -8,6 +8,16 @@ module ApplicationHelper link_to(name, '#', id: "add_#{association.to_s.singularize}" , class: "add_fields", data: {id: id, fields: fields.gsub("\n", "")}) end + def top_menu(left, right = nil) + content_tag :div do + [ + content_tag(:div, left, class: 'pull-left'), + content_tag(:div, right, class: 'pull-right'), + content_tag(:div, nil, class: 'clearfix'), + ].join.html_safe + end + end + def link_to_dashboard content_tag :p do content_tag :a, href: root_path, class: 'btn btn-default', title: 'Back to dashboard' do diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml index 663fb90..e4bc5cd 100644 --- a/app/views/bikes/new.html.haml +++ b/app/views/bikes/new.html.haml @@ -1,4 +1,4 @@ -= link_to_dashboard += top_menu link_to_dashboard %h2 Add Bike diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml index 32dd4ce..941ac5b 100644 --- a/app/views/bikes/show.html.haml +++ b/app/views/bikes/show.html.haml @@ -1,8 +1,8 @@ -- if @show_add_bike - %p - %a{class: "btn btn-lg btn-block btn-info", href: new_bike_path} Add Another Bike? +- btn = if @show_add_bike + - capture do + = link_to 'Add Another Bike?', new_bike_path, class: 'btn btn-default' -= link_to_dashboard += top_menu link_to_dashboard, btn %h2 #{@bike.shop_id}: #{@bike.bike_brand} %h2 #{@bike.model} diff --git a/app/views/task_lists/edit.haml b/app/views/task_lists/edit.haml index a21b8a5..1502f78 100644 --- a/app/views/task_lists/edit.haml +++ b/app/views/task_lists/edit.haml @@ -1,4 +1,4 @@ -= link_to_dashboard += top_menu link_to_dashboard %h1 Task List diff --git a/app/views/time_entries/index.haml b/app/views/time_entries/index.haml index ed91afc..3f810f0 100644 --- a/app/views/time_entries/index.haml +++ b/app/views/time_entries/index.haml @@ -1,4 +1,4 @@ -= link_to_dashboard += top_menu link_to_dashboard %h1 Your Timesheet diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml index bfe6350..d95d0b3 100644 --- a/app/views/time_entries/new.haml +++ b/app/views/time_entries/new.haml @@ -1,4 +1,4 @@ -= link_to_dashboard += top_menu link_to_dashboard %h1 Add Time Entry