From d132c08a11fef262818380dc6ee1530c1d872250 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 09:29:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0footer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_footer.html.erb       | 40 ++++++++++++++++++++++++
 app/views/layouts/new_base_user.html.erb |  3 ++
 config/locales/zh.yml                    | 34 ++++++++++----------
 public/stylesheets/new_public.css        |  2 +-
 4 files changed, 61 insertions(+), 18 deletions(-)
 create mode 100644 app/views/layouts/_footer.html.erb

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
new file mode 100644
index 000000000..5aeb0031f
--- /dev/null
+++ b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,40 @@
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/projects/2/member" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a></li>
+
+    </ul>
+  </div>
+
+  <div class="cl"></div>
+  <ul class="departments">
+    <li class="fl mr10">
+      <strong><%= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%= l(:label_hosted_by)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%= l(:label_sponsor)%></a>
+    </li>
+    <li class="fl mr10">
+      <strong><%= l(:label_partners)%></strong><a href="http://eecs.pku.edu.cn" class="ml10 f_grey" target="_blank"><%= l(:label_co_organizer_EECS)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://scse.buaa.edu.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_BHU)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.iscas.ac.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_CAS)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%= l(:label_co_organizer_InforS)%></a>
+    </li>
+  </ul>
+  <div class="cl"></div>
+  <ul class="copyright">
+    <li class="fl"><%= l(:label_rights_reserved)%></li>
+    <span class="fl mw15">|</span>
+    <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
+  </ul>
+</div><!--Footer end-->
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 6f3ed0c67..61ba59dd8 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -137,6 +137,9 @@
   </div>
   <%= render :partial => 'layouts/new_feedback' %>
 </div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
 
 <div id="ajax-modal" style="display:none;"></div>
 <div id="ajax-indicator" style="display:none;">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c2c558cf5..f3d6df6cc 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2061,22 +2061,22 @@ zh:
   lable_unset: 未设置
   label_chose_group: 请选择分班
 
-#  label_hosted_organization: 主办单位
-#  label_hosted_by: 国防科学技术大学并行与分布处理国家重点实验室
-#  label_sponsor: 计算机科学与技术系
-#  label_partners: 合作单位
-#  label_co_organizer_NUDT: 国防科学技术大学计算机学院
-#  label_co_organizer_EECS: 北京大学
-#  label_co_organizer_BHU: 北京航空航天大学
-#  label_co_organizer_CAS: 中国科学院软件研究所
-#  label_co_organizer_InforS: 中创软件
-#  label_rights_reserved: Copyright  2007~2015, All Rights Riserved
-#  label_about_us: 关于我们
-#  label_contact_us: 联系我们
-#  label_recruitment_information: 招聘信息
-#  label_surpport_group: 帮助中心
-#  label_forums: 论坛反馈
-#  label_language: 语言
-#  label_license: 湘ICP备09019772
+  label_hostedz_organization: 主办单位
+  label_hosted_by: 国防科学技术大学并行与分布处理国家重点实验室
+  label_sponsor: 计算机科学与技术系
+  label_partners: 合作单位
+  label_co_organizer_NUDT: 国防科学技术大学计算机学院
+  label_co_organizer_EECS: 北京大学
+  label_co_organizer_BHU: 北京航空航天大学
+  label_co_organizer_CAS: 中国科学院软件研究所
+  label_co_organizer_InforS: 中创软件
+  label_rights_reserved: Copyright  2007~2015, All Rights Riserved
+  label_about_us: 关于我们
+  label_contact_us: 联系我们
+  label_recruitment_information: 招聘信息
+  label_surpport_group: 帮助中心
+  label_forums: 论坛反馈
+  label_language: 语言
+  label_license: 湘ICP备09019772
 
 
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 4ba8c4711..130faa30d 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -618,7 +618,7 @@ a.loginChooseTab {color:#484848; height:30px; display:block;}
 /*底部*/
 #Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:585px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }
+.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }
 .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 67c4561b28a4a55ff0d6070110ec8f983ebce411 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 10:04:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E3=80=81=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 61ba59dd8..3104dd147 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -95,9 +95,7 @@
         </div>
         <div class="homepageLeftMenuBlock">
           <a href="javascript:void(0);" class="homepageMenuText">课程</a>
-          <a href="javascript:void(0);" class="homepageMenuSetting">
-            <img src="../images/menu_setting.png" width="14" height="14" />
-          </a>
+          <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), "javascript:void(0);"%>
         </div>
         <div class="homepageLeftMenuCourses">
           <ul>
@@ -107,9 +105,7 @@
         </div>
         <div class="homepageLeftMenuBlock">
           <a href="javascript:void(0);" class="homepageMenuText">项目</a>
-          <a href="javascript:void(0);" class="homepageMenuSetting">
-            <img src="../images/menu_setting.png" width="14" height="14" />
-          </a>
+          <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), "javascript:void(0);"%>
         </div>
         <div class="homepageLeftMenuCourses">
           <ul>

From 5b99effbc8577c1ca412cae43da5e1b2fe7f343c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 10:30:31 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0css=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=B8=AA=E4=BA=BA=E7=AE=80=E4=BB=8B=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/_user_brief_introduction.html.erb |  4 +-
 app/views/users/user_homeworks.html.erb       | 73 +++++++++----------
 public/stylesheets/new_public.css             | 24 ++++--
 3 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/app/views/layouts/_user_brief_introduction.html.erb b/app/views/layouts/_user_brief_introduction.html.erb
index 58a7bad83..3b0500fed 100644
--- a/app/views/layouts/_user_brief_introduction.html.erb
+++ b/app/views/layouts/_user_brief_introduction.html.erb
@@ -4,7 +4,5 @@
     这位童鞋很懒，什么也没有留下～&nbsp;
 <% end %>
 <% if User.current == user%>
-    <a href="javascript:void(0);" onclick="show_edit_user_introduction();">
-      <img src="../images/signature_edit.png" width="12" height="12" />
-    </a>
+    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
 <% end%>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 6ed40a879..763c87c39 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -1,56 +1,45 @@
-<div class="HomeWork mb10">
+<div class="HomeWork">
   <div class="RightBanner">
     <div class="NewsBannerName">发布作业</div>
   </div>
   <div class="HomeWorkCon">
     <div class="mt15">
-      <textarea class="InputBox fl W350 mr15" placeholder="请输入作业标题"></textarea>
-      <a href="javascript:void(0);" class="BlueCirBtn fl mr15">课程名称</a>
-      <a href="javascript:void(0);" class="BlueCirBtn fl mr15">导入作业</a>
-      <div class="">
-        <textarea class="InputBox fl W120 mr5" placeholder="截止日期"></textarea>
-        <a href="javascript:void(0);" class="pic_date fl mt8"></a>
-      </div>
+      <textarea class="InputBox  W700 " placeholder="请输入作业标题"></textarea>
+    </div>
+    <div class=" mt10">
+      <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
+      <textarea class="InputBox fl W120 " placeholder="截止日期"></textarea>
+      <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date  "></a></div>
+      <textarea class="InputBox fl W120 " placeholder="发布日期"></textarea>
+      <div class="fl DateBorder" ><a href="javascript:void(0);" class="pic_date  "></a></div>
       <div class="cl"></div>
     </div>
-    <div class="mt15">
+    <div class="mt10">
       <textarea class="InputBox  W700" placeholder="请输入作业描述"></textarea>
     </div>
-    <div class="mt15">
+    <div class="mt10">
+      <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程"></textarea>
+    </div>
+    <div class="mt10">
+      <span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称附件名称附件名称附件名称附件附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称附件附件名称附件名附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+      <span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+    </div>
+    <div class="mt5">
       <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
       <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
+      <a href="javascript:void(0);" class="BlueCirBtnMini fr">发送</a>
+      <span class="fr mr10 mt3">或</span><a href="javascript:void(0);" class=" fr mr10 mt3">取消</a>
       <div class="cl"></div>
     </div>
     <div class="mt10">
-      <a href="javascript:void(0);" class=" fl DropBtn">高级配置</a>
+      <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
       <div class="DropLine" ></div>
       <div class="cl"></div>
     </div>
-    <div class="mt15">
-      <select class="InputBox W120">
-        <option value="语言选择">语言选择</option>
-        <option value="C语言">C语言</option>
-        <option value="C++">C++</option>
-      </select>
-    </div>
-    <div class="mt15">
-      <textarea class="InputBox  W315 fl mr15" placeholder="测试输入"></textarea><textarea class="InputBox  W315  fl mr10" placeholder="测试输出"></textarea>
-      <div class="cl"></div>
-    </div>
-    <div class="mt15">
-      <textarea class="InputBox  W315 fl mr15" placeholder="测试输入"></textarea><textarea class="InputBox  W315  fl mr10" placeholder="测试输出"></textarea>
-      <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-      <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-      <div class="cl"></div>
-    </div>
-    <div class="mt15">
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr">确定</a>
-      <span class="fr mr10 mt3">或</span><a href="javascript:void(0);" class=" fr mr10 mt3">取消</a>
-      <div class="cl"></div>
-    </div>
+
   </div>
 </div><!----HomeWork end-->
-<div class="HomeWork mb10">
+<div class="HomeWork mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
     <div class="homepagePostDes">
@@ -61,8 +50,10 @@
         <div class="homepagePostDeadline">时间：2015-08-20</div>
       </div>
       <div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="mt10"><a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span></div>
-      <div><a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span></div>
+      <div class="mt10">
+        <span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName">附件名称附件名称附件名称附件名称附件名附件名称附件名附件附件名称附件名附件附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+        <span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl ">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+      </div>
       <div class="homepagePostSetting">
         <ul>
           <li class="homepagePostSettingIcon">
@@ -78,19 +69,21 @@
     <div class="cl"></div>
   </div>
 </div><!----HomeWork end-->
-<div class="HomeWork mb10">
+<div class="HomeWork mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
     <div class="homepagePostDes">
       <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO <a href="javascript:void(0);" class="newsBlue ml15">Trustie Forge（项目名称）</a></div>
-      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">上传资源未显示在项目动态中（缺陷标题）</a><span class="red_btn_cir">紧急</span></div>
+      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">上传资源未显示在项上传资源未显示在项目动上传资源未显示在项目动上传资源未显示在项目动上传资源未显示在项目动目动态中（缺陷标题）</a><span class="red_btn_cir">紧急</span></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;<a href="javascript:void(0);" class="newsBlue mr15">苏稳</a></div>
         <div class="homepagePostDeadline">时间：2015-08-20</div>
       </div>
       <div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="mt10"><a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span></div>
-      <div><a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span></div>
+      <div class="mt10">
+        <span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName">附件名称附件名称附件名称附件名称附件名附件名称附件名附件附件名称附件名附件附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+        <span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl ">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+      </div>
       <div class="homepagePostSetting">
         <ul>
           <li class="homepagePostSettingIcon">
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 130faa30d..fde65f63d 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -783,11 +783,11 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 /*20150820课程作业 LB*/
 .HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;}
 .RightBanner {width:708px; height:34px;  border-bottom:1px solid #e9e9e9;}
-.InputBox{ border:1px solid #d9d9d9; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
+select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
 a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.BlueCirBtn{ background:#15bccf; color:#fff;}
-.W350{ width:350px;}
-.W120{ width:120px;}
+.W440{ width:440px;}
+.W120{ width:110px;}
 .W700{ width:700px;}
 a.AnnexBtn{  background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#15bccf;}
@@ -799,7 +799,7 @@ a.DropBtn{background: url(../images/homepage_icon.png) -125px -339px no-repeat;
 a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-repeat;}
 .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;}
 /*20150820编程作业 LB*/
-.W315{ width:315px;}
+.W320{ width:320px;}
 .icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
 a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
 .icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
@@ -809,14 +809,22 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 .c_grey{ color:#888888;}
 .HomeWorkP{ width:690px; font-size:14px;}
 .H150{ height:150px;}
-.ProResult{width:748px; background-color:#fff;  border:1px solid #dddddd; border-bottom:none;}
+.ProResult{width:748px; background-color:#fff;  border:1px solid #dddddd;border-bottom:none; }
 .ProResultTop{ height:38px; line-height:38px; border-bottom:1px solid #dddddd; background:#f2f2f2; padding:0 10px;}
-.ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd;}
+.ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
-.W200{ width:210px;}
-.ProResultTable tr td{ height:35px; border-bottom:1px solid #dddddd; }
+.W200{ width:200px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
+.SearchIcon{background:url(../images/homepage_icon.png) 676px -393px no-repeat; }
+.SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; }
+a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
+a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
+.ProResultUl span { display:block; float:left;}
+.ProResultUl li{  line-height:35px;  border-bottom:1px solid #dddddd; }
+.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
 
 
 

From c93bc5be40bd8a812d1a2105d9abdcca5edb1475 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 13:50:42 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb     |   3 +
 app/helpers/application_helper.rb       |  22 ++-
 app/views/users/user_homeworks.html.erb | 192 ++++++++++++------------
 public/stylesheets/new_public.css       |   6 +-
 4 files changed, 123 insertions(+), 100 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ca897fc3d..b396b9c84 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -304,6 +304,9 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
+    user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+    homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc")
+    @homework_commons = paginateHelper homework_commons,10
     respond_to do |format|
       format.html {render :layout => 'new_base_user'}
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7c7f0c63f..709426d41 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2314,7 +2314,27 @@ module ApplicationHelper
       elsif homework.homework_type == 2 #编程作业不能修改作品
         "<span class='fr mr10 pr_join_span ' title='编程作业不可修改作品'>作品已交</span>".html_safe
       else
-        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
+        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit c_blue'
+      end
+    end
+  end
+
+  #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
+  def user_for_homework_common homework,is_teacher
+    if is_teacher #老师显示作品数量
+      link_to "提交（#{homework.student_works.count}）",student_work_index_path(:homework => homework.id),:class => "c_blue"
+    else #学生显示提交作品、修改作品等按钮
+      work = cur_user_works_for_homework homework
+      if work.nil?
+        link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+      else
+        if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+          link_to "修改作品",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+        elsif homework.homework_type == 2 #编程作业不能修改作品
+          link_to "作品已交",  "",:class => 'c_blue',:title => "编程作业不可修改作品"
+        else
+          link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+        end
       end
     end
   end
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 763c87c39..a6032a60b 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -1,101 +1,97 @@
-<div class="HomeWork">
-  <div class="RightBanner">
-    <div class="NewsBannerName">发布作业</div>
-  </div>
-  <div class="HomeWorkCon">
-    <div class="mt15">
-      <textarea class="InputBox  W700 " placeholder="请输入作业标题"></textarea>
-    </div>
-    <div class=" mt10">
-      <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
-      <textarea class="InputBox fl W120 " placeholder="截止日期"></textarea>
-      <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date  "></a></div>
-      <textarea class="InputBox fl W120 " placeholder="发布日期"></textarea>
-      <div class="fl DateBorder" ><a href="javascript:void(0);" class="pic_date  "></a></div>
-      <div class="cl"></div>
-    </div>
-    <div class="mt10">
-      <textarea class="InputBox  W700" placeholder="请输入作业描述"></textarea>
-    </div>
-    <div class="mt10">
-      <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程"></textarea>
-    </div>
-    <div class="mt10">
-      <span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称附件名称附件名称附件名称附件附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称附件附件名称附件名附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
-      <span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
-    </div>
-    <div class="mt5">
-      <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
-      <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr">发送</a>
-      <span class="fr mr10 mt3">或</span><a href="javascript:void(0);" class=" fr mr10 mt3">取消</a>
-      <div class="cl"></div>
-    </div>
-    <div class="mt10">
-      <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
-      <div class="DropLine" ></div>
-      <div class="cl"></div>
-    </div>
-
-  </div>
-</div><!----HomeWork end-->
-<div class="HomeWork mt10">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO <a href="javascript:void(0);" class="newsBlue ml15">Trustie Forge（项目名称）</a></div>
-      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">上传资源未显示在项目动态中（缺陷标题）</a><span class="green_btn_cir">正常</span></div>
-      <div class="homepagePostSubmitContainer">
-        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;<a href="javascript:void(0);" class="newsBlue mr15">苏稳</a></div>
-        <div class="homepagePostDeadline">时间：2015-08-20</div>
-      </div>
-      <div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="mt10">
-        <span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName">附件名称附件名称附件名称附件名称附件名附件名称附件名附件附件名称附件名附件附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
-        <span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl ">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
-      </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-            </ul>
-          </li>
-        </ul>
+<% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+    <!-- 老师身份才可以发布作业 -->
+    <div class="HomeWork mb10">
+      <div class="RightBanner">
+        <div class="NewsBannerName">发布作业</div>
       </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div><!----HomeWork end-->
-<div class="HomeWork mt10">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO <a href="javascript:void(0);" class="newsBlue ml15">Trustie Forge（项目名称）</a></div>
-      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">上传资源未显示在项上传资源未显示在项目动上传资源未显示在项目动上传资源未显示在项目动上传资源未显示在项目动目动态中（缺陷标题）</a><span class="red_btn_cir">紧急</span></div>
-      <div class="homepagePostSubmitContainer">
-        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;<a href="javascript:void(0);" class="newsBlue mr15">苏稳</a></div>
-        <div class="homepagePostDeadline">时间：2015-08-20</div>
+      <div class="HomeWorkCon">
+        <div class="mt15">
+          <textarea class="InputBox  W700 " placeholder="请输入作业标题"></textarea>
+        </div>
+        <div class=" mt10">
+          <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
+          <textarea class="InputBox fl W120 " placeholder="截止日期"></textarea>
+          <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date  "></a></div>
+          <textarea class="InputBox fl W120 " placeholder="发布日期"></textarea>
+          <div class="fl DateBorder" ><a href="javascript:void(0);" class="pic_date  "></a></div>
+          <div class="cl"></div>
+        </div>
+        <div class="mt10">
+          <textarea class="InputBox  W700" placeholder="请输入作业描述"></textarea>
+        </div>
+        <div class="mt10">
+          <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程"></textarea>
+        </div>
+        <div class="mt10">
+          <span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称附件名称附件名称附件名称附件附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称附件附件名称附件名附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+          <span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
+        </div>
+        <div class="mt5">
+          <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
+          <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr">发送</a>
+          <span class="fr mr10 mt3">或</span><a href="javascript:void(0);" class=" fr mr10 mt3">取消</a>
+          <div class="cl"></div>
+        </div>
+        <div class="mt10">
+          <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
+          <div class="DropLine" ></div>
+          <div class="cl"></div>
+        </div>
       </div>
-      <div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="mt10">
-        <span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName">附件名称附件名称附件名称附件名称附件名附件名称附件名附件附件名称附件名附件附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
-        <span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl ">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
-      </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-            </ul>
-          </li>
-        </ul>
+    </div><!----HomeWork end-->
+<% end%>
+
+<% @homework_commons.each do |homework_common|%>
+    <% is_teacher = User.current.allowed_to?(:as_teacher,homework_common.course) %>
+    <div class="HomeWork mb10">
+      <div class="homepagePostBrief">
+        <div class="homepagePostPortrait">
+          <%=link_to image_tag(url_to_avatar(homework_common.user),width:"90px", height: "90px"), user_activities_path(homework_common.user.id)%>
+        </div>
+        <div class="homepagePostDes">
+          <div class="homepagePostTo">
+            <%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%>
+            TO
+            <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
+          </div>
+          <div class="homepagePostTitle">
+            <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+          </div>
+
+          <div class="homepagePostSubmitContainer">
+            <div class="homepagePostSubmit">
+              <%= user_for_homework_common homework_common,is_teacher %>
+            </div>
+            <div class="homepagePostDeadline">
+              <%= l(:label_end_time)%>：<%= homework_common.end_time%>
+            </div>
+          </div>
+          <div class="homepagePostIntro upload_img break_word">
+            <%= homework_common.description.html_safe %>
+          </div>
+          <div class="mt10">
+            <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
+            <div class="cl"></div>
+          </div>
+          <% if is_teacher%>
+              <div class="homepagePostSetting">
+                <ul>
+                  <li class="homepagePostSettingIcon">
+                    <ul class="homepagePostSettiongText">
+                      <li>
+                        <%= link_to l(:button_edit),edit_homework_common_path(homework_common), :class => "postOptionLink"%>
+                      </li>
+                      <li>
+                        <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
+          <% end%>
+        </div>
+        <div class="cl"></div>
       </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div><!----HomeWork end-->
\ No newline at end of file
+    </div><!----HomeWork end-->
+<% end%>
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index fde65f63d..a5f4dd8f4 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -10,6 +10,9 @@ a:hover,a:active{color:#000;}
 
 /*常用*/
 /*#RSide{ background:#fff;}*/
+/*上传图片处理*/
+.upload_img img{max-width: 100%;}
+blockquote img{max-width: 100%;}
 .hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .none{display: none;}
 .rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}
@@ -475,7 +478,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
 .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:20px; float:left;}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;}
 .homepageImageSex {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;}
 .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
@@ -820,6 +823,7 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 .SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; }
 a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}

From bcd12e7e4883cabef286853dccf10eaa12f7c892 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 14:09:37 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=20=20=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=92=8C=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb    |   2 +-
 app/views/layouts/base_courses.html.erb       |  24 ++--
 app/views/layouts/base_projects.html.erb      |  22 +++-
 app/views/layouts/new_base_user.html.erb      |   2 +-
 public/stylesheets/header.css                 | 106 ++++++++++++++++++
 .../{new_public.css => new_user.css}          |   0
 6 files changed, 140 insertions(+), 16 deletions(-)
 create mode 100644 public/stylesheets/header.css
 rename public/stylesheets/{new_public.css => new_user.css} (100%)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index b1483d70c..10d71993d 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -8,7 +8,7 @@
         <%= link_to "首页",user_activities_path(User.current.id), :class => "homepageWhite f16"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>@user.id,:type=>1)%>" class="homepageWhite f16">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="homepageWhite f16">资源库</a></li>
       <li class="navHomepageMenu fl">
         <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "homepageWhite f16"%>
       </li>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 3242d79e9..6e9c98b95 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -1,4 +1,4 @@
-<% course_model %>
+<%# course_model %>
 <% teacher_num = teacherCount(@course) %>
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
@@ -17,17 +17,22 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses'%>
+  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses','header'%>
   <%= javascript_include_tag "course","header","attachments" %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
 <body>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
 <div id="Container">
-  <%= render :partial => 'layouts/new_header' %>
-  <div class="cl"></div>
-
   <div id="TopBar">
     <div class="topbar_info02 fl">
       <h2>
@@ -178,11 +183,12 @@
     <div style="clear:both;"></div>
 
   </div><!--Content end-->
-  <div class="cl"></div>
-
-  <%= render :partial => 'layouts/new_footer' %>
-  <div class="cl"></div>
 </div><!--Container end-->
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
   <span><%= l(:label_loading) %></span>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 74c13cc8e..544a04c3f 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 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2','header' %>
   <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
@@ -22,9 +22,18 @@
 </head>
 <!--add by huang-->
 <body>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="Container">
 
-  <%= render :partial => 'layouts/new_header'%>
+  <%#= render :partial => 'layouts/new_header'%>
   <div class="cl"></div>
 
   <!--TopBar begin-->
@@ -172,10 +181,13 @@
     <div style="clear:both;"></div>
   </div>
   <div style="clear:both;"></div>
-  <div class="cl"></div>
-  <%= render :partial => 'layouts/new_footer'%>
-  <div class="cl"></div>
 </div><!--Container end-->
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+
 <div id="light" class="white_content02">
   <!-- 这里写需弹出框的HTML代码 -->
   <% text = @project.project_new_type == 1 ? "development_group" : (@project.project_new_type == 2 ? "research_group" : "friend_organization")%>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 3104dd147..46203b337 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_public', 'user_leftside', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user"%>
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
new file mode 100644
index 000000000..8389afbb9
--- /dev/null
+++ b/public/stylesheets/header.css
@@ -0,0 +1,106 @@
+/*新个人主页框架css*/
+.navContainer {width:100%; background-color:#15bccf;}
+.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
+.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;}
+.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;}
+.navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
+/*.navHomepageMenu:hover {background-color:#0ea6b7;}*/
+.navHomepageSearchBoxcontainer {margin-top:11px; }
+.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
+.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}
+.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
+a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
+.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
+#navSearchAlert {display:none;}
+.navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;}
+.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:29px; 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;}
+.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;}
+.navHomepageProfile ul li:hover ul {display:block;}
+.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
+.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
+.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
+.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage:hover {border:1px solid #15bccf;}
+.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:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
+.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;}
+.homepageImageSex {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;}
+.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
+.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
+.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
+.homepageImageNumber {font-size:12px; color:#484848;}
+a.homepageImageNumber:hover {color:#15bccf;}
+.homepageImageText {font-size:12px; color:#888888;}
+.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
+.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
+.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
+.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
+.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
+.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
+a.coursesLineGrey {color:#808080; display:block;}
+a.coursesLineGrey:hover {color:#ffffff;}
+.homepageLeftMenuMore {height:18px;}
+.homepageLeftMenuMore:hover {background-color:#b3e0ee;}
+.homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
+.homepageMenuSetting {display:inline-block; margin-left:155px;}
+a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
+.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
+.homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
+.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
+.newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
+.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
+.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
+.homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
+.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
+a.homepageWhite {color:#ffffff;}
+a.homepageWhite:hover {color:#a1ebff}
+a.newsGrey {color:#4b4b4b;}
+a.newsGrey:hover {color:#000000;}
+a.replyGrey {color:#888888; display:inline-block;}
+a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
+a.replyGrey1:hover {color:#4b4b4b;}
+a.newsBlue {color:#15bccf;}
+a.newsBlue:hover {color:#0781b4;}
+a.menuGrey {color:#808080;}
+a.menuGrey:hover {color:#fe7d68;}
+.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
+#navSearchAlert {display:none;}
+
+/*myctrip*/
+.userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
+a.topnav_login_a{color:#fff; display:inline-block;}
+a.topnav_login_a:hover {color:#a1ebff;}
+a.topnav_login_mes{color:#fff; width:10px;height:20px; padding-left:15px; background: url(../images/item.png) -84px -145px no-repeat; display:inline-block; vertical-align:top;}
+a.topnav_login_mes:hover {color:#a1ebff;}
+a.topnav_login_box{ color:#fff; font-size:14px; font-weight:bold; width:90px; display:inline-block;}
+.menuArrow {background:url(../images/item.png) -20px -40px no-repeat;}
+li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
+a.topnav_login_box:hover {color:#a1ebff;}
+.navRow1 {margin:0; padding:0;}
+.navRow2 {margin:0; padding:0;}
+.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -7px;}
+.topnav_login_list a{color:#15bccf;}
+.topnav_login_list li{ }
+
+/*底部*/
+#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}
+.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
+.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }
+.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;}
+a.f_grey {color:#666666;}
+a.f_grey:hover {color:#000000;}
\ No newline at end of file
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_user.css
similarity index 100%
rename from public/stylesheets/new_public.css
rename to public/stylesheets/new_user.css

From 87ee2e744fbc924ed1255fefdd2bca41bfcfe3ba Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 15:09:02 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=95=8C=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=92=8C?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base.html.erb             |  18 +++-
 app/views/layouts/base_forums.html.erb      |  53 ++++++----
 app/views/layouts/base_memos.html.erb       |  25 +++--
 app/views/layouts/users_base.html.erb       |  26 +++--
 app/views/memos/_topic_form.html.erb        |   5 +-
 app/views/welcome/_link_to_another.html.erb |   3 +-
 public/stylesheets/base.css                 | 106 ++++++++++++++++++++
 public/stylesheets/header.css               |   6 +-
 8 files changed, 196 insertions(+), 46 deletions(-)
 create mode 100644 public/stylesheets/base.css

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 483cabac5..6bca696fc 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -17,19 +17,30 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <body class="<%=h body_css_classes %>">
+
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
-<%=render :partial => 'layouts/base_header'%>
 <div id="main" class="nosidebar">
     <div id="content_">
         <%= render_flash_messages %>
         <%= yield %>
         <%= call_hook :view_layouts_base_content %>
         <div style="clear:both;"></div>
-        <%=render :partial => 'layouts/base_footer'%>
+        <%#=render :partial => 'layouts/base_footer'%>
     </div>
 
 </div>
@@ -41,6 +52,9 @@
 
 </div>
 </div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index eae133184..de75f7e2f 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -1,8 +1,3 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -20,14 +15,25 @@
 
 		<%= call_hook :view_layouts_base_html_head %>
 		<%= yield :header_tags -%>
-	</head>	
+      <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+	</head>
 	<body class="<%= h body_css_classes %>">
+
+    <div class="cl"></div>
+    <div class="navContainer mb10">
+      <% if User.current.logged? %>
+          <%= render :partial => 'layouts/logined_header' %>
+      <% else%>
+          <%= render :partial => 'layouts/unlogin_header' %>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+
 		<div id="wrapper">
 			<div id="wrapper2">
-				<div id="wrapper3">					
-					<%=render :partial => 'layouts/base_header'%>					
+				<div id="wrapper3">
 					<div id="main">
-						<div class="top-content">							
+						<div class="top-content">
 							<table>
 								<tr>
 									<td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
@@ -37,7 +43,7 @@
 											<%= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %>
 											<%= text_field_tag 'name', params[:name], :size => 20 %>
 											<%= hidden_field_tag 'forum_id', params[:id] %>
-											<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>	
+											<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 											<% end %>
 										</div>
 									</td>
@@ -46,46 +52,46 @@
 									<td style="padding-left: 8px"><%= link_to request.host()+"/forums", forums_path %></td>
 									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name, forum_path(@forum) %></p></td>
 								</tr>
-							</table>							
-						</div>																													
+							</table>
+						</div>
 						<div id="sidebar">
 							<!--informations-->
 							<div class="sidebar-forums">
-								<div class="forums-line">																																							
+								<div class="forums-line">
 									<div class="forums-title"><%= @forum.name %></div>
 									<div class="forums-description upload_img"><%=  @forum.description.html_safe %></div>
-								</div>																																		
+								</div>
 							<!--informations-->
 								<div class="formus-first-title" >创建人信息</div>
-								<div class="forums-info">								
+								<div class="forums-info">
 									<div style="padding-top: 20px" >
 									<span class="forums-avatar-left"><%= image_tag(url_to_avatar(@forum.creator), :class =>'vatar-size') %></span>
 									<span class="forums-avatar-right">
                                       <% unless @forum.creator.nil? %>
 										<%=link_to @forum.creator.name, user_path(@forum.creator) %>
 										<div>
-											<%= link_to l(:label_user_watcher)+"("+User.watched_by(@forum.creator.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist", :id => @forum.creator.id %>	
+											<%= link_to l(:label_user_watcher)+"("+User.watched_by(@forum.creator.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist", :id => @forum.creator.id %>
 											<%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@forum.creator.watcher_users(@forum.creator.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist", :id => @forum.creator.id %>
 										</div>
                                        <% end %>
 									</span>
-									</div>																																																
+									</div>
 								</div>
-								<!--tags-->	
-						<% if User.current.logged? || User.current.admin? %>								
+								<!--tags-->
+						<% if User.current.logged? || User.current.admin? %>
 								<div class="forums-tags"><%= render :partial => 'tags/tag', :locals => {:obj => @forum,:object_flag => "5"}%></div>
-						<% end %>																							
+						<% end %>
 							</div>
 						</div>
 						<div id="content">
-							
+
 							<%= render_flash_messages %>
 							<%= yield %>
 							<%= call_hook :view_layouts_base_content %>
 							<div style="clear:both;"></div>
 
 						</div>
-						<%= render :partial => 'layouts/base_footer'%>
+						<%#= render :partial => 'layouts/base_footer'%>
 					</div>
 					<div id="ajax-indicator" style="display:none;">
 						<span><%= l(:label_loading) %></span>
@@ -94,6 +100,9 @@
 				</div>
 			</div>
 		</div>
+    <div class="cl"></div>
+    <%= render :partial => 'layouts/footer' %>
+    <div class="cl"></div>
 		<%= call_hook :view_layouts_base_body_bottom %>
 	</body>
 </html>
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index dc2d3f33f..2831d642e 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -1,8 +1,3 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -20,13 +15,24 @@
 	<%= javascript_include_tag "ckeditor/ckeditor.js" %>
 	<!-- page specific tags -->
 	<%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <!--add by huang-->
 <body class="<%= h body_css_classes %>">
+
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 	<div id="wrapper">
 		<div id="wrapper2">
-			<div id="wrapper3">					
-				<%=render :partial => 'layouts/base_header'%>					
+			<div id="wrapper3">
 				<div id="main">
 					<!-- added by bai -->
 
@@ -78,7 +84,7 @@
 						<%= call_hook :view_layouts_base_content %>
 						<div style="clear:both;"></div>
 					</div>
-					<%= render :partial => 'layouts/base_footer'%>
+					<%#= render :partial => 'layouts/base_footer'%>
 				</div>
 
 				<div id="ajax-indicator" style="display:none;">
@@ -87,6 +93,9 @@
 				<div id="ajax-modal" style="display:none;"></div>
 			</div>
 		</div>
+      <div class="cl"></div>
+      <%= render :partial => 'layouts/footer' %>
+      <div class="cl"></div>
 		<%= call_hook :view_layouts_base_body_bottom %>
 	</div>
 </body>
diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb
index 98f4451f5..4048f23e5 100644
--- a/app/views/layouts/users_base.html.erb
+++ b/app/views/layouts/users_base.html.erb
@@ -1,8 +1,3 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_user_label = 1
-   @nav_dispaly_store_all_label = 1
- %>
-<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="<%= current_language %>">
 <head>
@@ -21,19 +16,29 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
-<body class="<%=h body_css_classes %>">
+<body>
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="wrapper">
   <div id="wrapper2">
     <div id="wrapper3">
-      <%=render :partial => 'layouts/base_header'%>
+      <%#=render :partial => 'layouts/base_header'%>
       <div id="main" class="nosidebar">
         <div id="content_">
           <%= render_flash_messages %>
           <%= yield %>
           <%= call_hook :view_layouts_base_content %>
           <div style="clear:both;"></div>
-          <%=render :partial => 'layouts/base_footer'%>
         </div>
 
       </div>
@@ -45,6 +50,11 @@
 
   </div>
 </div>
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>
diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb
index 6ce63bef6..b9495663e 100644
--- a/app/views/memos/_topic_form.html.erb
+++ b/app/views/memos/_topic_form.html.erb
@@ -7,10 +7,11 @@
     <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
     <div class="cl"></div>
 
-    <label class="fl" style="margin-left: -80px;margin-top: 10px;"><%= l(:label_attachment_plural) %></label>
-    <div style="margin-left: 110px;margin-top: 10px;margin-bottom: 10px;" class="fl">
+    <label class="fl" style="margin-left: -80px;margin-top: 5px;"><%= l(:label_attachment_plural) %></label>
+    <div style="margin-left: 10px;" class="fl">
       <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
     </div>
+    <div class="cl"></div>
    <%= f.submit :value => l(:label_memo_create), :style => "margin-left: 100px;"%> <%= link_to l(:button_back), forum_path(@forum) %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/welcome/_link_to_another.html.erb b/app/views/welcome/_link_to_another.html.erb
index 6540409d1..b5940a113 100644
--- a/app/views/welcome/_link_to_another.html.erb
+++ b/app/views/welcome/_link_to_another.html.erb
@@ -1,5 +1,6 @@
 <%hidden_non_project = Setting.find_by_name("hidden_non_project")
-  visiable = hidden_non_project && hidden_non_project.value == "0"%>
+  visiable = true #hidden_non_project && hidden_non_project.value == "0"
+%>
 <% unless visiable%>
 <div class="linkother" style="margin-left: 30%; float: left">
   <a href="http://<%= Setting.host_name%>" class="link_other_item"><%=l(:label_projects_management_platform)%></a>
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
new file mode 100644
index 000000000..54b9c497e
--- /dev/null
+++ b/public/stylesheets/base.css
@@ -0,0 +1,106 @@
+/* CSS Document */
+/* 2015-06-26 */
+body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5;}
+div,img,tr,td,table{ border:0;}
+table,tr,td{border:0;cellspacing:0; cellpadding:0;}
+ol,ul,li{ list-style-type:none}
+a:link,a:visited{text-decoration:none;}
+/*a:hover,a:active{color:#000;}*/
+/*常用*/
+/*#RSide{ background:#fff;}*/
+/*上传图片处理*/
+#navHomepageSearch{margin-top: 11px;background-color: white;}
+.upload_img img{max-width: 100%;}
+blockquote img{max-width: 100%;}
+.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.none{display: none;}
+.rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}
+.break_word{ word-break:break-all; word-wrap: break-word;}
+select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
+.sub_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #707070; color:#000;  border-radius:3px; padding:1px 10px;  background:#dbdbdb;}
+.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;}
+/*table{ background:#fff;}*/
+.more{ font-weight:normal; color:#999; font-size:12px;}
+.no_line{ border-bottom:none;}
+.line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
+.no_border{ border:none;background:none;}
+.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
+.db {display:block;}
+/* font & color */
+.f12{font-size:12px; font-weight:normal;}
+.f14{font-size:14px;}
+.f16{font-size:16px;}
+.f18{font-size:18px;}
+.fb{font-weight:bold;}
+
+/* Float & Clear */
+.cl{ clear:both; overflow:hidden; }
+.fl{float:left;display:inline;}
+.fr{float:right;display:inline;}
+.f_l{ float:left;}
+.f_r{ float:right;}
+.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
+.clearfix{clear:both;zoom:1}
+.break_word{ word-break:break-all; word-wrap: break-word;}
+.white_space{white-space:nowrap;}
+
+/* Spacing */
+.ml2{ margin-left:2px;}
+.ml3{ margin-left:3px;}
+.ml4{ margin-left:4px;}
+.ml5{ margin-left:5px;}
+.ml8{ margin-left:8px;}
+.ml10{ margin-left:10px;}
+.ml15{ margin-left:15px;}
+.ml20{ margin-left:20px;}
+.ml40{ margin-left:40px;}
+.ml45{ margin-left:45px;}
+.ml55{ margin-left:55px;}
+.ml30{ margin-left:30px;}
+.ml60{ margin-left:60px;}
+.ml80{ margin-left:80px;}
+.ml90{ margin-left:90px;}
+.ml100{ margin-left:100px;}
+.ml110{ margin-left:110px;}
+.ml150 { margin-left:150px;}
+.mr5{ margin-right:5px;}
+.mr45 {margin-right:45px;}
+.mr55{ margin-right:55px;}
+.mr10{ margin-right:10px;}
+.mr15 {margin-right:15px;}
+.mr20{ margin-right:20px;}
+.mr30{ margin-right:30px;}
+.mr40{ margin-right:40px;}
+.mw20{ margin: 0 20px;}
+.mt3{ margin-top:3px;}
+.mt5{ margin-top:5px;}
+.mt8{ margin-top:8px;}
+.mt10{ margin-top:10px !important;}
+.mt15 {margin-top:15px;}
+.mb4{ margin-bottom:4px;}
+.mb5{ margin-bottom:5px;}
+.mb8 {margin-bottom:8px;}
+.mb10{ margin-bottom:10px !important;}
+.mb20{ margin-bottom:20px;}
+.pl15{ padding-left:15px;}
+.w20{ width:20px;}
+.w60{ width:60px;}
+.w70{ width:70px;}
+.w90{ width:90px;}
+.w210{ width:210px;}
+.w150{ width:150px;}
+.w280{ width:280px;}
+.w430{ width:470px;}
+.w520{ width:520px;}
+.w543{ width:543px;}
+.w557{ width:557px;}
+.w583{ width:583px;}
+.w350{ width:350px;}
+.w610{ width:610px;}
+.w600{ width:600px;}
+.h22{ height:22px;}
+.h26{ height:26px;}
+.h50{ height:50px;}
+.h70{ height:70px;}
+.h150{ height:150px;}
\ No newline at end of file
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 8389afbb9..248284b11 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -8,7 +8,7 @@
 /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
-.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}
+.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
 .homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
 a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
@@ -64,8 +64,8 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
 .homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
-a.homepageWhite {color:#ffffff;}
-a.homepageWhite:hover {color:#a1ebff}
+a.homepageWhite {color:#ffffff !important;}
+a.homepageWhite:hover {color:#a1ebff !important;}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
 a.replyGrey {color:#888888; display:inline-block;}