From ac419cef871b8fd92e5dcd17d4fb4fb02d8f4b11 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 17:49:18 +0800 Subject: [PATCH 01/12] =?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 02/12] =?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 03/12] =?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 %> From fe664b5e5cd40e9a1fe8c41c48dbff3090010365 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Tue, 1 Sep 2015 09:42:03 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_message.html.erb | 4 ++-- app/views/users/_course_news.html.erb | 4 ++-- app/views/users/_project_issue.html.erb | 4 ++-- app/views/users/_project_message.html.erb | 4 ++-- public/stylesheets/new_user.css | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 0f3201e64..deaff2207 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -80,11 +80,11 @@ <% activity= activity.parent_id.nil? ? activity:activity.parent%> <% replies_all_i = 0 %> <% unless activity.children.empty? %> -
    +
      <% activity.children.reorder("created_on desc").each do |reply|%> <% replies_all_i=replies_all_i+1 %> -
    • +
    • <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
      diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 78478aee4..4abe9c82c 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -63,11 +63,11 @@
    --> <% replies_all_i = 0 %> <% unless activity.comments.empty? %> -
    +
      <% activity.comments.reorder("created_on desc").each do |comment| %> <% replies_all_i=replies_all_i+1 %> -
    • +
    • <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
      diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index a04f899fd..f628c63d2 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -100,11 +100,11 @@
    --> <% replies_all_i = 0 %> <% unless activity.journals.empty? %> -
    +
      <% activity.journals.reorder("created_on desc").each do |reply| %> <% replies_all_i=replies_all_i+1 %> -
    • +
    • <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %>
      diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index af6233d82..3164ad798 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -79,11 +79,11 @@ <% activity= activity.parent_id.nil? ? activity : activity.parent %> <% replies_all_i = 0 %> <% unless activity.children.empty? %> -
      +
        <% activity.children.reorder("created_on desc").each do |reply| %> <% replies_all_i=replies_all_i+1 %> -
      • +
      • <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
        diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 1e729cce2..04f5be4f9 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -599,7 +599,7 @@ a.postReplyCancel {color:#888888; display:block;} a.postReplyCancel:hover {color:#ffffff;} .homepagePostReplyInputContainer2 {width:595px; margin:0px auto;} .homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;} -.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:670px; margin:0px auto; margin-top:15px; min-height:65px;} +.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:65px;} .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;} .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} From 1e320e63c6ab590e223c7a8b1438006cd69c9cd3 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 1 Sep 2015 10:20:12 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E7=9A=84=E8=AE=BA=E5=9D=9B=E5=8F=8D=E9=A6=88=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=B4=B4=E5=90=A7=E4=BA=A4=E6=B5=81=EF=BC=8C=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=89=88=E6=9D=83=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_footer.html.erb | 2 +- config/locales/zh.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 720ff3e8f..5cd79f6d8 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,4 +1,4 @@ -