From 7ed7129acee603f4550f221060352c616bda190b Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 19 Sep 2016 14:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E6=98=BE=E7=A4=BA=E5=8F=8ACSS=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 2 +- app/views/projects/_tools_expand.html.erb | 20 ++++++++++---------- public/stylesheets/css/calendar.css | 0 public/stylesheets/css/gantt.css | 0 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 public/stylesheets/css/calendar.css create mode 100644 public/stylesheets/css/gantt.css diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index d3e72cc5a..11cc8aada 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -12,7 +12,7 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','prettify','repository' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','prettify','repository','css/gantt', 'css/calendar' %> <%= javascript_include_tag 'cookie','project',"avatars", 'header','prettify','select_list_move','attachments' %> <%= call_hook :view_layouts_base_html_head %> diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index 72f095609..414eb16fc 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -18,16 +18,16 @@ - - - - - - - - - - +
  • + <% unless @project.enabled_modules.where("name = 'calendar'").empty? %> + <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> + <% end %> +
  • +
  • + <% unless @project.enabled_modules.where("name = 'gantt'").empty? %> + <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> + <% end %> +
  • diff --git a/public/stylesheets/css/calendar.css b/public/stylesheets/css/calendar.css new file mode 100644 index 000000000..e69de29bb diff --git a/public/stylesheets/css/gantt.css b/public/stylesheets/css/gantt.css new file mode 100644 index 000000000..e69de29bb