diff --git a/app/assets/javascripts/resources.js b/app/assets/javascripts/resources.js index 6e95670..639ad4b 100644 --- a/app/assets/javascripts/resources.js +++ b/app/assets/javascripts/resources.js @@ -8,9 +8,29 @@ function initializeSelectedCategory(currentUrl, container) { var queryString = '*[data-category="' + newSelectedCategory + '"]'; toggleSelectedClasses(queryString); container.isotope({filter: newSelectedCategory}); + var categoryName = $(queryString + ' > a').text(); + updateCategoryBreadCrumb(categoryName); } } +function initializeSelectedTagBreadcrumb(currentUrl) { + var indexOfTag = currentUrl.indexOf('resources/tags'); + if (indexOfTag > -1) { + tagNameIndex = indexOfTag + 'resources/tags'.length + 1; + var encodedTagName = currentUrl.slice(tagNameIndex); + var decodedTagName = decodeURIComponent(encodedTagName); + $('#breadcrumb-type').text('Tag'); + $('#breadcrumb-value').text(decodedTagName); + $('.panel-tags li .' + decodedTagName + '-tag-link').addClass('active-tag'); + } + +} + +function updateCategoryBreadCrumb(categoryName) { + $('#breadcrumb-type').text('Category'); + $('#breadcrumb-value').text(categoryName); +} + function toggleSelectedClasses(target) { $('.selected').toggleClass('selected'); $(target).toggleClass('selected'); @@ -20,6 +40,7 @@ function filterSelectedCategory(event, currentUrl, target, container) { if (currentUrl.indexOf('resources/tags') < 0) { event.preventDefault(); toggleSelectedClasses(target); + updateCategoryBreadCrumb(target.innerText); container.isotope({filter: target.dataset.category}); } } @@ -45,4 +66,4 @@ function incrementLike(event, target) { $.ajax(form.attr("action"), { type: "POST" }); -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/resources.css.scss b/app/assets/stylesheets/resources.css.scss index 89e9e44..515ed40 100644 --- a/app/assets/stylesheets/resources.css.scss +++ b/app/assets/stylesheets/resources.css.scss @@ -27,6 +27,15 @@ color: $black; } + ul.breadcrumb { + margin-left: -75px; + width: 130%; + } + + ul.breadcrumb li:first-child { + margin-left: 40px; + } + li.selected { position: relative; background-color: $yellow; @@ -125,7 +134,7 @@ color: $tag_grey; } - li a:hover, li a:focus { + li a:hover, li a:focus, li .active-tag { background-color: $yellow; text-decoration: none; } @@ -183,6 +192,16 @@ @media (min-width: 1090px) and (max-width: 1200px) { .resources-sidebar { + + ul.breadcrumb { + width: 160%; + margin-left: -132px; + } + + ul.breadcrumb li:first-child { + margin-left: 60px; + } + li.selected { width: 132%; margin-left: -132px; @@ -201,6 +220,28 @@ display: none; } + li.breadcrumbs { + display: block; + padding: 0; + } + + li.breadcrumbs, + ul.breadcrumb > li { + margin: 0; + border: 0; + } + + ul.breadcrumb, + ul.breadcrumb li:first-child { + margin-left: 0; + width: unset; + } + + li.selected a { + margin: 0; + width: inherit; + } + .dropdown { display:block; margin: 0 auto; diff --git a/app/views/resources/index.html.erb b/app/views/resources/index.html.erb index b64f348..85ad898 100644 --- a/app/views/resources/index.html.erb +++ b/app/views/resources/index.html.erb @@ -4,11 +4,17 @@