diff --git a/app/views/_controls.html.erb b/app/views/_controls.html.erb index 76645027e3a2c75d555f94ca1e456a1602d02cc1..6784507dec6cc470586909bd98f2790fa2e25095 100755 --- a/app/views/_controls.html.erb +++ b/app/views/_controls.html.erb @@ -5,11 +5,13 @@ <nav class="navbar navbar-default" role="navigation"> <ul class="nav navbar-nav"> <% if current_user %> - <li <%= 'class=active' if request.url.include? 'dashboard' %>><a href="/dashboard/" >DASHBOARD</a></li> + <li <%= 'class=active' if request.url.include? 'dashboard' %>><%= link_to 'Dashboard', '/dashboard/' %></li> <% end %> - <li <%= 'class=active' if current_page?(sufia.about_path) %>><a href="/about/" >ABOUT</a></li> - <li><a href="http://guides.lib.vt.edu/vtechdata/help" >HELP</a></li> - <li <%= 'class=active' if current_page?(sufia.contact_path) %>><a href="<%= sufia.contact_form_index_path %>" >CONTACT</a></li> + <li <%= 'class=active' if current_page?(sufia.about_path) %>><%= link_to 'About', sufia.about_path %></li> + <li <%= 'class=active' if current_page?(user_guides_path) %>><%= link_to 'User Guide', user_guides_path %></li> + <li <%= 'class=active' if current_page?(help_page_path) %>><%= link_to 'Help', help_page_path %></li> + <li <%= 'class=active' if current_page?(policies_path) %>><%= link_to 'Policies', policies_path %></li> + </ul><!-- /.nav --> </nav><!-- /.navbar --> </div> diff --git a/app/views/contact_form/new.html.erb b/app/views/contact_form/new.html.erb index 05ed1118bc6e7050266fd6cc44c8caa7e3c7a29d..f11d65fbdd109167b4a77bf646ffb83d69dd256b 100755 --- a/app/views/contact_form/new.html.erb +++ b/app/views/contact_form/new.html.erb @@ -1,4 +1,4 @@ -<h1>Contact</h1> +<h1>Help</h1> <div class="panel panel-default"> <div class="panel-body"> <%= render 'directions' %> @@ -46,4 +46,4 @@ </div> <%= f.submit value: "Send", class: "btn btn-primary" %> -<% end %> \ No newline at end of file +<% end %> diff --git a/config/routes.rb b/config/routes.rb index e5f89431d8d668f1357fb347f3d8137e2344a8a8..7585036263ef6c3f1b84d16f2281196b3ad18958 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,9 @@ Rails.application.routes.draw do get "collections/import_metadata", to: 'collections#import_metadata', as: 'import_collection' get 'collections/ldap_search', to: 'collections#ldap_search' get 'dashboard/publishables', to: 'publishables#index', as: 'dashboard_publishables' - get 'help', to: 'pages#show', id: 'help_page' + get 'help', to: 'contact_form#new', as: 'help_page' + get 'policies', to: 'pages#show', id: 'policies_page', as: 'policies' + get 'user_guides', to: 'pages#show', id: 'user_guides_page', as: 'user_guides' get 'collections/:id/add-files', to: 'collections#add_files', as: 'collections_add_files' blacklight_for :catalog diff --git a/config/tinymce.yml b/config/tinymce.yml index 31087bb5dd9703b7a7eebd93054c492fecb1df7f..e7c1381beefcbbfd0b705ca72d3aa251f61ba3c3 100644 --- a/config/tinymce.yml +++ b/config/tinymce.yml @@ -1,7 +1,39 @@ menubar: false -toolbar1: styleselect | bold italic | link image | undo redo -toolbar2: table | fullscreen | uploadimage +toolbar1: undo redo | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link anchor image table +toolbar2: print preview media | forecolor backcolor emoticons | codesample fullscreen plugins: - table - fullscreen - uploadimage + - link + - advlist + - autolink + - lists + - image + - charmap + - print + - preview + - hr + - anchor + - pagebreak + - searchreplace + - wordcount + - visualblocks + - visualchars + - code + - fullscreen + - insertdatetime + - media + - nonbreaking + - save + - table + - contextmenu + - directionality + - emoticons + - template + - paste + - textcolor + - colorpicker + - textpattern + - imagetools + - codesample