From 910b0500217b860ac41e14fe65f13fbe574054ba Mon Sep 17 00:00:00 2001 From: Robert Pavlovskyi Date: Sun, 15 Feb 2015 16:05:42 +0200 Subject: [PATCH 1/5] first version of breadcrumbs, where folders are statick --- Gemfile | 2 +- Gemfile.lock | 2 ++ app/controllers/folders_controller.rb | 15 +++++++++++---- app/views/folders/index.html.slim | 3 +++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 11e9d38..fcf90fc 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem 'execjs' gem 'therubyracer' gem 'omniauth-facebook' gem 'ancestry' - +gem "breadcrumbs_on_rails" group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 65fc7a4..3fffdbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,7 @@ GEM debug_inspector (>= 0.0.1) bootstrap-sass (3.3.1.0) sass (~> 3.2) + breadcrumbs_on_rails (2.3.0) builder (3.2.2) byebug (3.5.1) columnize (~> 0.8) @@ -227,6 +228,7 @@ PLATFORMS DEPENDENCIES ancestry bootstrap-sass (~> 3.3.1.0) + breadcrumbs_on_rails byebug coffee-rails (~> 4.1.0) devise (~> 3.4.1) diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb index 57695f5..181a0fa 100644 --- a/app/controllers/folders_controller.rb +++ b/app/controllers/folders_controller.rb @@ -1,7 +1,10 @@ class FoldersController < ApplicationController before_action :authenticate_user! - + + add_breadcrumb "home", :root_path + add_breadcrumb "folders", :folders_path + def new @folder = Folder.new(parent_id: params[:parent_id], user_id: current_user.id) end @@ -19,10 +22,14 @@ def create def destroy @folder = Folder.find params[:id] @folder.delete - redirect_to folders_path + redirect_to folders_path end - - private + +def show + add_breadcrumb "index", index_path, :title => "Back to the Index" +end + + private def folder_params params.require(:folder).permit(:name, :parent_id, :user_id) diff --git a/app/views/folders/index.html.slim b/app/views/folders/index.html.slim index 433ca6a..5493fd9 100644 --- a/app/views/folders/index.html.slim +++ b/app/views/folders/index.html.slim @@ -1,5 +1,8 @@ h1 Folders +ol.breadcrumb + = render_breadcrumbs :tag => :li, :separator => " " + = nested_folders @folders.arrange(:order => :created_at) = render "form" From d24fad11eeb6c7d68d5e7152ad3b759c665c40ca Mon Sep 17 00:00:00 2001 From: Robert Pavlovskyi Date: Fri, 27 Feb 2015 16:48:17 +0200 Subject: [PATCH 2/5] second version, where the number of breadcrumbs should depend from the number of opened folders --- app/controllers/folders_controller.rb | 2 +- app/views/folders/index.html.slim | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb index 181a0fa..6ed5e46 100644 --- a/app/controllers/folders_controller.rb +++ b/app/controllers/folders_controller.rb @@ -26,7 +26,7 @@ def destroy end def show - add_breadcrumb "index", index_path, :title => "Back to the Index" + @folders = Folder.all end private diff --git a/app/views/folders/index.html.slim b/app/views/folders/index.html.slim index 5493fd9..04608c2 100644 --- a/app/views/folders/index.html.slim +++ b/app/views/folders/index.html.slim @@ -1,7 +1,19 @@ h1 Folders -ol.breadcrumb - = render_breadcrumbs :tag => :li, :separator => " " +ol.nav-path + span + | You are here: / + = link_to "Folders", folders_path + - if @folder && @folder.ancestors + | / + - @folder.ancestors.each do |folder| + = link_to folder.name, folder + | / + = @folder.name if @folder + + + /! + = render_breadcrumbs :tag => :li, :separator => " " = nested_folders @folders.arrange(:order => :created_at) From 5b7cce689b0bfb657237b1bc4efaae368c0fa610 Mon Sep 17 00:00:00 2001 From: Robert Pavlovskyi Date: Fri, 27 Feb 2015 16:52:59 +0200 Subject: [PATCH 3/5] delete commened row in index.html.slim --- app/views/folders/index.html.slim | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/folders/index.html.slim b/app/views/folders/index.html.slim index 04608c2..3b5d335 100644 --- a/app/views/folders/index.html.slim +++ b/app/views/folders/index.html.slim @@ -12,9 +12,6 @@ ol.nav-path = @folder.name if @folder - /! - = render_breadcrumbs :tag => :li, :separator => " " - = nested_folders @folders.arrange(:order => :created_at) = render "form" From 8f2d1eca88b8fff37c8c33a76ec6eb47487af3f3 Mon Sep 17 00:00:00 2001 From: Robert Pavlovskyi Date: Sun, 1 Mar 2015 14:02:46 +0200 Subject: [PATCH 4/5] Fixes for pullrequest --- Gemfile | 1 - app/controllers/folders_controller.rb | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index fcf90fc..fec4acc 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,6 @@ gem 'execjs' gem 'therubyracer' gem 'omniauth-facebook' gem 'ancestry' -gem "breadcrumbs_on_rails" group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb index 6ed5e46..01bba12 100644 --- a/app/controllers/folders_controller.rb +++ b/app/controllers/folders_controller.rb @@ -25,14 +25,14 @@ def destroy redirect_to folders_path end -def show - @folders = Folder.all -end + def show + @folders = Folder.all + end private - def folder_params - params.require(:folder).permit(:name, :parent_id, :user_id) - end + def folder_params + params.require(:folder).permit(:name, :parent_id, :user_id) + end end From ced07dc0b5385fa10fd5655129640dd241885028 Mon Sep 17 00:00:00 2001 From: Robert Pavlovskyi Date: Sun, 1 Mar 2015 14:07:45 +0200 Subject: [PATCH 5/5] Fixes in folders_controller for pullrequest --- app/controllers/folders_controller.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb index 01bba12..40b9a31 100644 --- a/app/controllers/folders_controller.rb +++ b/app/controllers/folders_controller.rb @@ -2,9 +2,6 @@ class FoldersController < ApplicationController before_action :authenticate_user! - add_breadcrumb "home", :root_path - add_breadcrumb "folders", :folders_path - def new @folder = Folder.new(parent_id: params[:parent_id], user_id: current_user.id) end