From b447ba1fadc579d64c99dc938927f5767951cbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gonz=C3=A1lez?= Date: Tue, 17 Jan 2017 12:43:11 +0100 Subject: [PATCH 1/6] Basic index styles --- .../stylesheets/legislation_process.scss | 67 ++++++------------- 1 file changed, 21 insertions(+), 46 deletions(-) diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index dc837a619..b5061f0b0 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -642,52 +642,27 @@ $epigraph-line-height: rem-calc(22); } .draft-index { - table { - tbody { - border: none; - - tr { - background: white; - - td { - padding: 0.25rem 1rem; - - .icon-plus-square, - .icon-minus-square { - color: $text-medium; - cursor: pointer; - vertical-align: sub; - } - - a { - color: $brand; - text-decoration: underline; - font-size: $small-font-size; - } - } - - .collapse-all { - padding: 1rem; - - a { - color: $text-medium; - } - - .icon-plus-square, - .icon-minus-square { - color: $text-medium; - } - } - } - - .child_group { - td { - padding: 0 1rem; - - table { - margin-bottom: 0.5rem; - } - } + ul:first-child { + font-size: 1rem; + text-decoration: underline; + margin-left: 2.25rem; + margin-top: 1.5rem; + } + + ul { + list-style: none; + + li { + margin-bottom: 1rem; + + &::before { + cursor: pointer; + position: absolute; + margin-left: -1.25rem; + font-family: "icons"; + content: "\5a"; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } } } From 4c5fde956f432c8f4fe10223c6276254465536b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gonz=C3=A1lez?= Date: Tue, 17 Jan 2017 16:38:25 +0100 Subject: [PATCH 2/6] Add open and closing classes --- .../stylesheets/legislation_process.scss | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index b5061f0b0..5b23736d7 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -654,16 +654,24 @@ $epigraph-line-height: rem-calc(22); li { margin-bottom: 1rem; - - &::before { - cursor: pointer; - position: absolute; - margin-left: -1.25rem; - font-family: "icons"; - content: "\5a"; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } + } + .open::before { + cursor: pointer; + position: absolute; + margin-left: -1.25rem; + font-family: "icons"; + content: "\58"; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + .closed::before { + cursor: pointer; + position: absolute; + margin-left: -1.25rem; + font-family: "icons"; + content: "\5a"; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } } } From cba1f8bd9df785603f4cb2542bf4f3fa54b255d8 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Thu, 19 Jan 2017 11:02:45 +0100 Subject: [PATCH 3/6] Draft text index tree navigator --- app/assets/javascripts/application.js | 2 ++ .../javascripts/tree_navigator.js.coffee | 32 +++++++++++++++++++ .../legislation/draft_versions/show.html.erb | 4 +-- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/tree_navigator.js.coffee diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1a0a733ce..3c6feb6b3 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -56,6 +56,7 @@ //= require legislation_allegations //= require legislation_annotatable //= require watch_form_changes +//= require tree_navigator //= require custom var initialize_modules = function() { @@ -87,6 +88,7 @@ var initialize_modules = function() { if ( $(".legislation-annotatable").length ) App.LegislationAnnotatable.initialize(); App.WatchFormChanges.initialize(); + App.TreeNavigator.initialize(); }; $(function(){ diff --git a/app/assets/javascripts/tree_navigator.js.coffee b/app/assets/javascripts/tree_navigator.js.coffee new file mode 100644 index 000000000..fc3dae26d --- /dev/null +++ b/app/assets/javascripts/tree_navigator.js.coffee @@ -0,0 +1,32 @@ +App.TreeNavigator = + closeNodes: (nodes) -> + children = nodes.children('ul') + + if(children.length == 0) + return + + children.each -> + link = $(this).prev('a') + $('').insertBefore(link) + $(this).hide() + App.TreeNavigator.closeNodes($(this).children()) + + initialize: -> + elem = $('[data-tree-navigator]') + if(elem.length == 0) + return + + ul = elem.find('ul:eq(0)') + if(ul.length && ul.children().length) + App.TreeNavigator.closeNodes(ul.children()) + + $('[data-tree-navigator] span').on + click: (e) -> + elem = $(this) + if(elem.hasClass('open')) + elem.removeClass('open').addClass('closed') + elem.siblings('ul').hide() + else if(elem.hasClass('closed')) + elem.removeClass('closed').addClass('open') + elem.siblings('ul').show() + diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb index df3d49047..5d7d7aee1 100644 --- a/app/views/legislation/draft_versions/show.html.erb +++ b/app/views/legislation/draft_versions/show.html.erb @@ -38,9 +38,9 @@
<%= t('.text_toc') %>
- +
-
+
<%= @draft_version.toc_html.html_safe %>
From 6f698ec9a6db464119e8f15469acd6115c8629b8 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Thu, 19 Jan 2017 11:03:03 +0100 Subject: [PATCH 4/6] Remove console log --- app/assets/javascripts/watch_form_changes.js.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/watch_form_changes.js.coffee b/app/assets/javascripts/watch_form_changes.js.coffee index b5ef381a9..eaf125ded 100644 --- a/app/assets/javascripts/watch_form_changes.js.coffee +++ b/app/assets/javascripts/watch_form_changes.js.coffee @@ -7,7 +7,6 @@ App.WatchFormChanges = return $('[data-watch-form-message]').data('watch-form-message') checkChanges: (event) -> - console.log(event) changes = false App.WatchFormChanges.forms().each -> form = $(this) From 3bb77b75364e3f7e04eaa860c6b18ad9b57200d8 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Thu, 19 Jan 2017 11:06:41 +0100 Subject: [PATCH 5/6] Only open annotations if the anchor is for an annotation --- app/assets/javascripts/legislation_annotatable.js.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/legislation_annotatable.js.coffee b/app/assets/javascripts/legislation_annotatable.js.coffee index 5a9481e64..0e7f1b4e1 100644 --- a/app/assets/javascripts/legislation_annotatable.js.coffee +++ b/app/assets/javascripts/legislation_annotatable.js.coffee @@ -100,7 +100,8 @@ App.LegislationAnnotatable = scrollToAnchor: -> annotationsLoaded: (annotations) -> - if anchor = $(location).attr('hash') + anchor = $(location).attr('hash') + if anchor && anchor.startsWith('#annotation') ann_id = anchor.split("-")[-1..] el = $("span[data-annotation-id='" + ann_id + "']") App.LegislationAllegations.show_comments() From 6970a8f72ca8d91f00546e7c314ba62c8223f095 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Thu, 19 Jan 2017 11:15:42 +0100 Subject: [PATCH 6/6] Open tree when there's an anchor --- app/assets/javascripts/tree_navigator.js.coffee | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/javascripts/tree_navigator.js.coffee b/app/assets/javascripts/tree_navigator.js.coffee index fc3dae26d..d9b51ca58 100644 --- a/app/assets/javascripts/tree_navigator.js.coffee +++ b/app/assets/javascripts/tree_navigator.js.coffee @@ -30,3 +30,9 @@ App.TreeNavigator = elem.removeClass('closed').addClass('open') elem.siblings('ul').show() + if anchor = $(location).attr('hash') + if link = elem.find('a[href="'+anchor+'"]') + link.parents('ul').each -> + $(this).show() + $(this).siblings('span').removeClass('closed').addClass('open') +