-
-
+
- <%= image_tag(url_to_avatar(@user),width:"206", height: "206", :id=>'nh_user_tx') %>
+
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 3bdbda412..e60676ac6 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -103,7 +103,7 @@
) if reply.course_destroyable_by?(User.current) %>
+ <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %>
<% if User.current.logged?%>
<% if is_current_user%>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index eb0341607..0ee4f30fb 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -119,7 +119,7 @@
<% end %>
<% else %>
-
+
@@ -46,16 +46,18 @@
<% end %>
<% end%>
-
-
+
-
+
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 5e538c65e..603901ae4 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -83,7 +83,7 @@
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
-
+
diff --git a/public/images/avatars/User/0 b/public/images/avatars/User/0
index a4cc45467b6270c6fecc02e21fe8e8836bbc9f9a..bd2597dd2a623d59dea9b37ed4452281a69496d3 100644
GIT binary patch
literal 2756
zcmbVN3s6&68a~Ml1Tpeh&_zMLhV_96$qh*$DUSdF1qa0-!dm2Ea)lU@8
<%= reply.content.html_safe %>
<%= comment.comments.html_safe %>
<%= reply.notes.html_safe %>
<% end %>
<%= reply.content.html_safe %>
<% name = name%>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
- " class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
+ " id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
<% end %>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index d11fdbfb2..d6c6fbc51 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -19,7 +19,7 @@
$(doc).parent().submit();
}
<% type = type%>
- $(document).ready(function (){
+ $(function (){
if('<%= type %>' != null && '<%= type %>' == 'courses' ){
$('input:radio[value="courses"]').attr('checked','checked');
}
@@ -30,13 +30,22 @@
$('input:radio[value="users"]').attr('checked','checked');
}
});
+
+ $(function(){
+ $("#navHomepageSearchInput").keypress(function(e){
+ if (e.keyCode == '13') {
+ $('#type').val($('input[type=radio]:checked').val());
+ $(this).parent().submit();
+ }
+ })
+ });
- 课程
+ 课程
<% 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"), new_course_path%>
@@ -103,20 +103,20 @@
<% end%>
<% end%>
-
+
-
<% courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
<%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
- 项目
+ 项目
<% if is_current_user%>
<%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_project_path%>
<% end%>
-
+
-
<% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
<%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
From 2b7beaeae8c2b0c9cb732d7a6ab798be7877d9ff Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 11:35:33 +0800
Subject: [PATCH 18/37] =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=9D=80=E7=94=A8=E6=88=B7id=E5=8F=98?=
=?UTF-8?q?=E4=B8=BA=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/application_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 10e5e6f06..698b0de48 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -563,6 +563,7 @@ class ApplicationController < ActionController::Base
uri = URI.parse(back_url)
# do not redirect user to another host or to the login or register page
if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
+ back_url = back_url.gsub(%r{\/users\/(\d+)},"/users/"+default.id.to_s)
redirect_to(back_url)
return
end
From 977f81e0318d3d4da5cd5f87d2096d36706366b3 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 11:41:12 +0800
Subject: [PATCH 19/37] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=92=8C=E5=8F=96?=
=?UTF-8?q?=E6=B6=88=E5=85=B3=E6=B3=A8=EF=BC=8C=E5=AF=BC=E8=88=AA=E5=9C=86?=
=?UTF-8?q?=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/_logined_header.html.erb | 2 +-
public/stylesheets/new_user.css | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index e48864305..70de9fd0b 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -62,7 +62,7 @@
- <%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %> <%# 课程相关消息 %> -
- <%= link_to "作业消息", user_message_path(User.current, :type => 'course_message'), :class => "homework" %> -
- <%= link_to "课程讨论区",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey" %> +
- <%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %> +
- <%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey" %>
- <%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey" %> -
- <%= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %> -
- <%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey" %> -
- <%= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey" %> -
- <%= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey" %> + + + + <%# 项目相关消息 %> -
- <%= link_to "指派问题", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey" %> -
- <%= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey" %> -
- <%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey" %> -
- <%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey" %> -
- <%= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey" %> +
- <%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey" %> + + + + <%# 项目相关消息 %> -
- <%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey" %> + <%# 系统贴吧 %> -
- <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %> +
- <%= link_to '项目资源' ,user_resource_user_path(:id=>@user.id,:type=>3),:remote=>true,:method => 'get',:class=>'homepagePostTypeQuiz postTypeGrey' %> +
- + <%= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %> +
- <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %> @@ -66,7 +69,7 @@
-
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index dcb22ccf3..bb195d4bf 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -2,4 +2,5 @@ $("#search_div").html('<%= escape_javascript( render :partial => 'resource_sear
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
$("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
\ No newline at end of file
+$("#checkboxAll").attr('checked',false);
+$("#res_all_count").html(<%= @atta_count%>);
\ No newline at end of file
From e455f93ee11a818188fb502570b0f7ff806cbf9f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 12:04:35 +0800
Subject: [PATCH 22/37] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=EF=BC=9B=E6=B5=8F=E8=A7=88=E5=9B=BE=E7=89=87=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/new_base_user.html.erb | 6 +++---
public/stylesheets/new_user.css | 2 +-
public/stylesheets/users.css | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 9561cc474..2f9fd4642 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -158,10 +158,10 @@
头像设置
+
<%= file_field_tag 'avatar[image]',
- :id => nil,
- :class => 'uppic_btn',
- :style => 'width:70px;',#added by young
+ :id => "upload_user_image",
+ :style => 'display:none;',#added by young
:size => "1",
:multiple => false,
:onchange => 'addInputAvatar(this);',
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5e5c9517b..062006e56 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -855,7 +855,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
.uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666; text-align:center;}
.showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
.mr15{ margin-right:15px;}
-.uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
+.uppic_btn{background: #64bdd9;color: #fff;width: 80px;height: 25px;margin-top: 105px;}
/*20150820课程作业 LB*/
.HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;}
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index 48d73f86a..849aa1c02 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -116,7 +116,6 @@ a:hover.c_lgrey{ color:#3ca5c6;}
.uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666; text-align:center;}
.showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
.mr15{ margin-right:15px;}
-.uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
/* 新建作品*/
.mr8{ margin-right:8px;}
.mt2{ margin-top:2px;}
From 5f4b879fb78d9052d7a2db30532728389e71e72a Mon Sep 17 00:00:00 2001
From: huang
Date: Sat, 29 Aug 2015 12:06:57 +0800
Subject: [PATCH 23/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/user_messages.html.erb | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index a0d568710..2d23c6dd6 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -6,23 +6,23 @@
-
+
From 5e25b64004c65da508087aa982d673dbcc55c964 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 14:08:38 +0800
Subject: [PATCH 25/37] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/new_base_user.html.erb | 8 ++++----
app/views/users/_course_create.html.erb | 4 ++--
app/views/users/_course_homework.html.erb | 4 ++--
app/views/users/_course_journalsformessage.html.erb | 4 ++--
app/views/users/_project_attachment.html.erb | 4 ++--
app/views/users/_project_create.html.erb | 4 ++--
app/views/users/_project_document.html.erb | 4 ++--
app/views/users/_project_journal.html.erb | 4 ++--
app/views/users/_project_news.html.erb | 4 ++--
app/views/users/show_chen.erb | 8 ++++----
public/stylesheets/new_user.css | 4 ++--
11 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 7b7f4a536..fc3582c40 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -31,7 +31,7 @@
- <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %>
+ <%= image_tag(url_to_avatar(@user),width:"90", height: "90", :id=>'nh_user_tx') %>
<% if User.current.logged?%>
<% if is_current_user%>
@@ -46,15 +46,15 @@
<% end %>
<% end%>
-
-
+
<% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
<% end %>
-
教授
+教授
<%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") if is_current_user%> diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index 19a5d89d2..b86f55385 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -1,11 +1,11 @@
-
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 88a00e8ab..10bbe4bdf 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -4,7 +4,7 @@
<%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %>
<%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
<% else %>
@@ -12,7 +12,7 @@
<% end %> TO
<%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index a72eac345..90d5d05ee 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -3,9 +3,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb
index 54a7b3c17..13e6df408 100644
--- a/app/views/users/_project_attachment.html.erb
+++ b/app/views/users/_project_attachment.html.erb
@@ -3,9 +3,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb
index 1d6943be1..b2487c444 100644
--- a/app/views/users/_project_create.html.erb
+++ b/app/views/users/_project_create.html.erb
@@ -3,9 +3,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb
index 6e58552de..4f5d986d7 100644
--- a/app/views/users/_project_document.html.erb
+++ b/app/views/users/_project_document.html.erb
@@ -3,9 +3,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb
index 7833d8675..3c1f8c61d 100644
--- a/app/views/users/_project_journal.html.erb
+++ b/app/views/users/_project_journal.html.erb
@@ -3,9 +3,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index ea39cbae5..9e4dfaf24 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -3,9 +3,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/app/views/users/show_chen.erb b/app/views/users/show_chen.erb
index 74b303fad..950350202 100644
--- a/app/views/users/show_chen.erb
+++ b/app/views/users/show_chen.erb
@@ -29,9 +29,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
@@ -58,9 +58,9 @@
-
尹教授 TO
+
尹教授 TO
分布式计算环境(课程名称)
-
+
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a56087017..e432a8f48 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -496,13 +496,13 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;}
-.homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;}
+.homepagePortraitImage {width:90px; height:90px; position:relative; border:1px solid #cbcbcb; padding: 2px;}
.homepagePortraitImage:hover {border:1px solid #269ac9;}
.homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
.homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
.homepageEditProfile {width:16px; height:16px; border-radius:2px; background-color:#888888; position:absolute; right:5px; bottom:5px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -14px -37px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-right:5px; height:25px; float:left; font-weight: bold; max-width:78px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;}
+.homepageImageName {font-size:16px; color:#484848; height:25px; float:left; font-weight: bold; max-width:78px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;}
.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;}
From 886a00e18dc4a7e95fb4b0b076c57e26700c6701 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 14:22:29 +0800
Subject: [PATCH 26/37] =?UTF-8?q?footer=E9=97=B4=E8=B7=9D=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/header.css | 2 +-
public/stylesheets/new_user.css | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 2ba6f0bbf..6b7aa209e 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -97,7 +97,7 @@ a.topnav_login_box:hover {color:#a1ebff;}
/*底部*/
#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px;}
+.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 3f3af2785..4933e1c18 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -488,7 +488,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;}
.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
-.portraitRadius {border-radius: 5px;}
+.portraitRadius {border-radius: 3px;}
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
.homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
.navHomepageProfile ul li ul {display:none;}
@@ -610,7 +610,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;}
.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
.homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
-.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;}
+.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9; height:30px; line-height:30px; vertical-align:middle;}
.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
.homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
.postAttSize {color:#888888; font-size:12px;}
@@ -702,7 +702,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
/*底部*/
#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; }
+.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
From 498775b0a87d1a7fe85a383a66aaead01cf70d5a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:24:54 +0800
Subject: [PATCH 27/37] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AA<=20=E6=95=99=E6=8E=88?=
=?UTF-8?q?=E8=81=8C=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/login.html.erb | 1 -
app/views/layouts/new_base_user.html.erb | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index e7810d45a..b5dc9e75a 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -15,7 +15,6 @@
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
-<