From 3c72af69ea6ba936028e48839c97375c5e62e446 Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 6 May 2015 17:41:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=97=B6=E2=80=9Cgit=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=87=E5=8D=97=E2=80=9D=E5=B1=95=E5=BC=80=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 2 +- public/javascripts/project.js | 22 ++++++++++++++++++++++ public/stylesheets/project.css | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 96e3b84be..ceb675dcb 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -30,7 +30,7 @@

-
收起Git操作指南
+
展开Git操作指南

diff --git a/public/javascripts/project.js b/public/javascripts/project.js index f85f744e3..6dbb0ff6b 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -71,13 +71,35 @@ function showhelpAndScrollTo(id) { { cookiesave("repositories_visiable", true,'','',''); } + var information = $("#showgithelp"); + var val = information.attr("value"); + if(val=="show_help") + { + $("#showgithelp").text("收起Git操作指南"); + information.attr("value", "hide_help"); + } + else + { + $("#showgithelp").text("展开Git操作指南"); + information.attr("value", "show_help"); + } } + + $(function(){ + var information = $("#showgithelp"); + var val = information.attr("value"); if(cookieget("repositories_visiable") == "true") { $('#repos_git_more').hide(); } + else + { + $('#repos_git_more').show(); + $("#showgithelp").text("收起Git操作指南"); + information.attr("value", "hide_help"); + } }); diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 019ffa57a..a5554fd6b 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -180,6 +180,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col /* 版本库展示Git操作文档 */ .repos_more{height:23px; width:100%; border:1px solid #CCC; background:#F6F6F6; text-align:center; font-size:12px; padding-top:2px;} .lh23{line-height: 23px;} +.repos_git_more{display: none;} /* 弹框 新样式还没设计出来，暂时用的课程那边的样式 */ .alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;} From 700d2985f6331961d2189b3a64784e7968f2729c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:02:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 6 +++++- app/views/issues/index.html.erb | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 80be8c5d5..bd905dec0 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -75,7 +75,11 @@ class IssuesController < ApplicationController else @limit = 10#per_page_option end - + @assign_to_id = params[:assign_to_id] + @author_id = params[:author_id] + @priority_id = params[:priority_id] + @status_id = params[:status_id] + @subject = params[:subject] @issue_count = @query.issue_count @issue_pages = Paginator.new @issue_count, @limit, params['page'] @offset ||= @issue_pages.offset diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 3fb604f06..9445d88cf 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -34,31 +34,31 @@ <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %>
- + " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> 搜索
<%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@assign_to_id.nil? ? @assign_to_id : 0 }, {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"} ) %> <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@priority_id ? @priority_id : 0 }, {:onchange=>"remote_function();",:id=>"priority_id",:name=>"v[priority_id]",:class=>"w90"} ) %> <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@status_id ? @status_id : 0 }, {:onchange=>"remote_function();",:id=>"status_id",:name=>"v[status_id]",:class=>"w90"} ) %> <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@author_id ? @author_id : 0 }, {:onchange=>"remote_function();",:id=>"author_id",:name=>"v[author_id]",:class=>"w90"} ) From 6c7b92558ceea30ce2cb35d84802e3270a379cc4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:08:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9445d88cf..c1c3ab957 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -34,7 +34,7 @@ <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %>
- " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> + " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> 搜索