diff --git a/app/models/project.rb b/app/models/project.rb index 07a38ae77..1d380582d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -86,6 +86,10 @@ def tags Tag.all end + def team + nil + end + def testers_for_mentions User.all end diff --git a/app/views/boards/modals/_new_board_form.html.erb b/app/views/boards/modals/_new_board_form.html.erb index dc8c81b9c..500a2797b 100644 --- a/app/views/boards/modals/_new_board_form.html.erb +++ b/app/views/boards/modals/_new_board_form.html.erb @@ -41,7 +41,7 @@ Log in as admin: Templates > Methodologies
<% end %> - Download more templates diff --git a/app/views/issues/_send_to_menu.html.erb b/app/views/issues/_send_to_menu.html.erb index bd20f7cce..5dd63622f 100644 --- a/app/views/issues/_send_to_menu.html.erb +++ b/app/views/issues/_send_to_menu.html.erb @@ -1,25 +1,22 @@ Send to... <% sync_plugins = Dradis::Plugins::with_feature(:issue_sync) %> -<% cache ['send-to', sync_plugins.map(&:plugin_name)] do %> - <% if sync_plugins.any? %> - <% sync_plugins.each do |plugin| %> - <%= - plugin_path = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.deconstantize(plugin.name)) - render partial: "#{plugin_path}/issues/send_to_menu" - %> - <% end %> - <% end %> - <% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Issuelib) %> - <% if sync_plugins.any? %> - - <% end %> - Built-in IssueLibrary +<% if sync_plugins.any? %> + <% sync_plugins.each do |plugin| %> + <%= + plugin_path = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.deconstantize(plugin.name)) + render partial: "#{plugin_path}/issues/send_to_menu" + %> <% end %> - <% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Remediationtracker) %> - <% if sync_plugins.any? %> - - <% end %> - Built-in Remediation Tracker +<% end %> + +<% unless defined?(Dradis::Pro) %> + <% if sync_plugins.any? %> + <% end %> + + + Built-in IssueLibrary + + Built-in Remediation Tracker <% end %> diff --git a/app/views/issues/merge/new.html.erb b/app/views/issues/merge/new.html.erb index e02e4176b..91bb92011 100644 --- a/app/views/issues/merge/new.html.erb +++ b/app/views/issues/merge/new.html.erb @@ -13,9 +13,8 @@ <% end %> -- <%= link_to 'Manage your Dradis email preferences', edit_user_preferences_notifications_url, style: 'color: #298DCC;' %> - | -
+ <%= link_to 'Manage your Dradis email preferences', edit_user_preferences_notifications_url, style: "color: #{css_color};" %> + | +
- Privacy | <%= link_to 'Login to Dradis', login_url, style: 'color: #378137;' %> <%# color: #298DCC in pro %> + Privacy | <%= link_to 'Login to Dradis', login_url, style: "color: #{css_color};" %> |
- © 2012-<%= Time.now.year %> Dradis Framework — Security Roots Ltd + © 2010-<%= Time.now.year %> Dradis Framework — Security Roots Ltd 10 Portfleet Place, De Beauvoir Road London, N1 5SZ |
diff --git a/app/views/layouts/tylium/_navbar.html.erb b/app/views/layouts/tylium/_navbar.html.erb
index 6b6e88c5f..71c3ce3e2 100644
--- a/app/views/layouts/tylium/_navbar.html.erb
+++ b/app/views/layouts/tylium/_navbar.html.erb
@@ -1,69 +1,83 @@