From a19692a0c6367871726f1dfa23686a9967fcf753 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 14:50:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- public/stylesheets/new_user.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index bafeb8d5e..434e8847f 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -62,7 +62,7 @@ <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>

- +
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 3f11329b0..b24e19b02 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -690,7 +690,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; border-bottom:1px solid #efefef; } +.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px;} .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 4392ecdcd7494cb7837152060ede3c25f02ada0d Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 15:41:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 20 ++++++++------------ public/stylesheets/new_user.css | 7 ++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index f4c68b12a..73c1d2a72 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -1,5 +1,4 @@ - -
+
消息
    @@ -29,6 +28,8 @@
+
+
<% if @new_message_count >0 %> <%# 课程消息 %> @@ -38,8 +39,7 @@ <% if ma.course_message_type == "News" %>
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %>
    • -
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %>
    • -
  • ">发布了通知
    • +
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">发布了通知
  • <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", @@ -50,8 +50,7 @@ <% if ma.course_message_type == "Comment" %>
    • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
      • -
    • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %>
      • -
    • ">评论了通知
      • +
    • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">评论了通知
    • <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", @@ -62,8 +61,7 @@ <% if ma.course_message_type == "HomeworkCommon" %>
      • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
        • -
      • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
        • -
      • ">发布了作业
        • +
      • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">发布了作业
      • <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %>
      • <%= time_tag(ma.course_message.created_at).html_safe %>
        • @@ -72,8 +70,7 @@ <% if ma.course_message_type == "Poll" %>
        • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
          • -
        • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
          • -
        • ">发布了问卷
          • +
        • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">发布了问卷
        • <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id), :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", @@ -117,8 +114,7 @@ <% if ma.course_message_type == "JournalsForMessage" %>
          • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
            • -
          • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
            • -
          • ">回复了作品评论
            • +
          • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">回复了作品评论
          • <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %>
          • <%= time_tag(ma.course_message.created_on).html_safe %>
            • diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2e560468f..b9b24dcd8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -11,7 +11,7 @@ a:hover,a:active{color:#000;} /*常用*/ /*#RSide{ background:#fff;}*/ -#users_setting{clear:both;width:730px;background: #fff;padding: 10px;/*滑动门的宽度*/} +#users_setting{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/} /*上传图片处理*/ .upload_img img{max-width: 100%;} blockquote img{max-width: 100%;} @@ -527,8 +527,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .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;} +.homepageNewsPublisher {width:80px; max-width:80px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } +.homepageNewsType {width:90px; padding-left: 5px; font-size:12px; color:#888888; display:block;} +.homepageNewsPubType {width:175px; 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;} From 18e2d05f4152fb537817f09f1b433d4d2c9294fa Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 28 Aug 2015 15:49:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 2 +- config/locales/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index f532f5cbc..2071529f0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -51,7 +51,7 @@ en: error_session_expired: "Your session has expired. Please login again." warning_attachments_not_saved: "%{count} file(s) could not be saved." - mail_subject_lost_password: "Your %{value} password" + mail_subject_lost_password: "%{value} Your password" mail_body_lost_password: 'To change your password, click on the following link:' mail_subject_register: "Your %{value} account activation" mail_body_register: 'To activate your account, click on the following link:' diff --git a/config/locales/zh.yml b/config/locales/zh.yml index f3d6df6cc..48502f014 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -85,7 +85,7 @@ zh: error_unable_to_connect: "无法连接 (%{value})" warning_attachments_not_saved: "%{count} 个文件保存失败" - mail_subject_lost_password: "您的 %{value} 密码" + mail_subject_lost_password: "%{value} 您的密码" mail_body_lost_password: '请点击以下链接来修改您的密码：' mail_subject_register: "%{value}帐号激活" mail_body_register: '请点击以下链接来激活您的帐号：'