diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 052fbc2..eeea9a8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -42,11 +42,20 @@ //accordion project details page when project has more than 1 plan $('.accordion-project').on('show', function() { - var plus = $(this).parent().find(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); + var plus = $(this).parent().children(".accordion-heading").find(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); }).on('hide', function(){ - var minus = $(this).parent().find(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); + var minus = $(this).parent().children(".accordion-heading").find(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); }); + $('.export-format-selection').click(function(e){ + e.preventDefault(); + if($(this).val() == 'pdf'){ + $('#pdf-format-options').show(); + }else{ + $('#pdf-format-options').hide(); + } + }); + //$('#3-or-4-splash').modal(); $('.typeahead').select2({ diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 0ea69dc..f0b730b 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -1573,6 +1573,19 @@ /*******************************/ /********* Exporting **********/ /*******************************/ +.plan-export-settings { + h4 { + background-color: @orange_colour; + color: @white_colour; + font-size: 1.2rem; + padding: 5px 5px 10px 10px; + + small{ + color: @white_colour; + } + } +} + #export_font{ font-family: @text_font; } diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 9a05242..f5125d6 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -134,7 +134,7 @@ format.html { render action: "edit" } else - format.html { render action: "edit" }] + format.html { render action: "edit" } end end else diff --git a/app/views/shared/_export_links.html.erb b/app/views/shared/_export_links.html.erb index 050f08a..28f9fcb 100644 --- a/app/views/shared/_export_links.html.erb +++ b/app/views/shared/_export_links.html.erb @@ -1,22 +1,11 @@ <% javascript("export_configure") %>
-