Merge branch '0.3.x' of github.com:relaxdiego/redmine_backlogs into 0.3.x

pull/6827/head
friflaj 14 years ago
commit ea9c43f38f
  1. 10
      app/helpers/rb_common_helper.rb
  2. 3
      app/views/layouts/rb.html.erb
  3. 3
      app/views/rb_master_backlogs/show.html.erb
  4. 3
      app/views/rb_taskboards/show.html.erb
  5. 3
      assets/stylesheets/rb_default/global_print.css
  6. 0
      assets/stylesheets/rb_default/master_backlog_print.css
  7. 0
      assets/stylesheets/rb_default/taskboard_print.css

@ -85,10 +85,12 @@ module RbCommonHelper
'rb_default'
end
def theme_stylesheet_link_tag(*sources)
theme_sources = sources.map{ |s| "#{theme_name}/#{s}"}
theme_sources << {:plugin => 'redmine_backlogs'}
stylesheet_link_tag *theme_sources
def theme_stylesheet_link_tag(*args)
themed_args = args.select{ |a| a.class!=Hash }.map{ |s| "#{theme_name}/#{s.to_s}"}
options = args.select{ |a| a.class==Hash}.first || { }
options[:plugin] = 'redmine_backlogs'
themed_args << options
stylesheet_link_tag *themed_args
end
def tracker_id_or_empty(story)

@ -5,7 +5,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description" content="Redmine Backlogs" />
<meta name="keywords" content="issue,bug,tracker,scrum,agile,plugin" />
<%= theme_stylesheet_link_tag 'global.css', 'jquery-ui.css' %>
<%= theme_stylesheet_link_tag 'global.css', 'jquery-ui.css', :media => 'print,screen' %>
<%= theme_stylesheet_link_tag 'global_print.css', :media => 'print' %>
<%= javascript_include_tag 'jquery-1.4.2.min.js', 'jquery-ui-1.8rc3.custom.min.js', 'jquery.jeditable.mini.js', 'jquery.cookie.js', 'common.js', :plugin => 'redmine_backlogs' %>
<!-- looks like we don't need this anymore -->

@ -3,7 +3,8 @@
<script type="text/javascript" src="<%= url_for(:controller => 'rb_server_variables', :action => 'show', :id => @project.id, :format => :js) %>"></script>
<%= javascript_include_tag 'master_backlog', 'backlog', 'model', 'editable_inplace', 'sprint', 'issue', 'story', 'board_updater', 'master_backlog_updater', :plugin => 'redmine_backlogs' %>
<%= stylesheet_link_tag 'jqplot.css', :plugin => 'redmine_backlogs' %>
<%= theme_stylesheet_link_tag 'master_backlog.css' %>
<%= theme_stylesheet_link_tag 'master_backlog.css', :media => 'print,screen' %>
<%= theme_stylesheet_link_tag 'master_backlog_print.css', :media => 'print' %>
<%- end %>
<%- content_for :breadcrumbs do %>

@ -2,7 +2,8 @@
<% content_for :head_tags do %>
<%= javascript_include_tag 'show_main', 'board_updater', 'taskboard_updater', 'taskboard', 'model', 'issue', 'task', 'impediment', :plugin => 'redmine_backlogs' %>
<%= stylesheet_link_tag 'jqplot.css', :plugin => 'redmine_backlogs' %>
<%= theme_stylesheet_link_tag 'taskboard.css' %>
<%= theme_stylesheet_link_tag 'taskboard.css', :media => 'print,screen' %>
<%= theme_stylesheet_link_tag 'taskboard_print.css', :media => 'print' %>
<script type="text/javascript" src="<%= url_for(:controller => 'rb_server_variables', :action => 'show', :project_id => @project.id, :sprint_id => @sprint.id) %>"></script>
<% end %>

@ -0,0 +1,3 @@
#toolbar .links{
display:none !important;
}
Loading…
Cancel
Save