From ac419cef871b8fd92e5dcd17d4fb4fb02d8f4b11 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 17:49:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=BE=E7=A8=8B/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/search.html.erb | 8 ++++---- app/views/projects/search.html.erb | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/courses/search.html.erb b/app/views/courses/search.html.erb index c19f9821a..e7f344df2 100644 --- a/app/views/courses/search.html.erb +++ b/app/views/courses/search.html.erb @@ -20,12 +20,12 @@ <% end %> <% end %> - + diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb index c5edc4667..fbb046171 100644 --- a/app/views/projects/search.html.erb +++ b/app/views/projects/search.html.erb @@ -17,13 +17,13 @@ <% end %> <% end %> - + <%= link_to request.host() + "/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> @@ -44,14 +44,14 @@ <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> <% end %> - + - + <%#= text_field_tag 'name', params[:name], :size => 30, :onkeyup => "regexName();" %> + <%#= hidden_field_tag 'project_type', params[:project_type] %> + <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <!–修改项目搜索按钮的样式 –> + <!– + <%#= l(:label_search)%> + –>
- + --> From e128a0e0338736cf5fae946c6df5eb6c5970f171 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 1 Sep 2015 09:22:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BD=93=E9=BC=A0=E6=A0=87=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9B=BE=E6=A0=87=E6=8C=89=E9=92=AE=E4=B8=8A?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=BB=99=E5=87=BA=E7=9B=B8=E5=BA=94=E7=9A=84?= =?UTF-8?q?tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 6b44e278e..dc6ca52d5 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -101,9 +101,9 @@ 课程 <% if is_current_user%> <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), new_course_path%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr",title: "新建课程"), new_course_path%> <% else%> - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), join_private_courses_courses_path ,:remote => true%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr", title:"加入课程"), join_private_courses_courses_path ,:remote => true%> <% end%> <% end%> @@ -117,7 +117,7 @@ 项目 <% if is_current_user%> - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), new_project_path%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr",title:"新建项目"), new_project_path%> <% end%>
From fdfcefd1ed7226186d4d34c172248b4af114324b Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 1 Sep 2015 09:34:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=88=B0?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=9A=84=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BAtip?= =?UTF-8?q?=EF=BC=9A=E8=AF=BE=E7=A8=8B=E5=90=8D=EF=BC=8C=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=AD=A6=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_courses.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 77ca944f1..a71dd099f 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -1,6 +1,6 @@ <% courses.each do |course|%>
  • - <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", :title => course.name%> + <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", :title => course.name+"（"+course.time.to_s+course.term+"）"%>
    • <% end %>