From fa57a6c8893718b827cfecab7cc9ed5227e3a692 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 15:33:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 6 +++--- app/views/users/_course_message.html.erb | 10 +++++----- app/views/users/_course_news.html.erb | 6 +++--- app/views/users/_course_poll.html.erb | 4 ++-- app/views/users/_project_issue.html.erb | 6 +++--- app/views/users/_project_message.html.erb | 10 ++++++---- public/stylesheets/new_user.css | 1 - 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index c7d06b825..f411aa98e 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -10,10 +10,10 @@ <% else %> <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id), :class => "newsBlue ml15"%>
- <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey"%>
@@ -21,7 +21,7 @@
截止时间：<%= format_date(activity.end_time) %>
-
+
作业描述：<%= activity.description.html_safe %>
- <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"%> <% end %>
@@ -26,7 +26,7 @@
-
帖子描述： +
帖子描述： <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index b39a5bcb1..78478aee4 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -10,15 +10,15 @@ <% else %> <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %> + <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
- <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %> + <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
发布时间：<%= format_date(activity.created_on) %>
-
通知描述：<%= activity.description.html_safe %>
+
通知描述：<%= activity.description.html_safe %>
@@ -28,7 +28,7 @@
发布时间：<%= format_date(activity.published_at) %>
-
问卷描述：<%=activity.polls_description.html_safe.to_s%>
+
问卷描述：<%=activity.polls_description.html_safe.to_s%>
- <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %> <%= get_issue_priority(activity.priority_id)[1] %>
@@ -28,7 +28,7 @@
时间：<%=format_date(activity.created_on) %>
-
缺陷描述： +
缺陷描述： <% if activity.description? %> <%= textAreailizable activity, :description, :attachments => activity.attachments %> <% end %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 24d26a5b0..af6233d82 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -11,20 +11,22 @@ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> + <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
<% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" + %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey" + %> <% end %>
时间：<%= format_date(activity.created_on) %>
-
帖子描述： +
帖子描述： <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2adf15822..58c1e8ba8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -954,7 +954,6 @@ img.ui-datepicker-trigger { .is_public_checkbox{display: none !important;} .is_public{display: none !important;} .ui-corner-left{background: #64bdd9;} -.homepagePostIntro img{max-width: 100%;} From 1113a7938cdb3b172fbd42584789bd0fd880ed4a Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 16:53:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E5=A4=84=E8=BF=94=E5=9B=9E=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= 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/header.css | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index c1065415f..6b44e278e 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -101,9 +101,9 @@ 课程 <% if is_current_user%> <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_course_path%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), new_course_path%> <% else%> - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), join_private_courses_courses_path ,:remote => true%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), join_private_courses_courses_path ,:remote => true%> <% end%> <% end%>
@@ -117,7 +117,7 @@ 项目 <% if is_current_user%> - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_project_path%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), new_project_path%> <% end%>
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 6b7aa209e..5c0c1ddb9 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -49,7 +49,7 @@ 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;} +.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;} 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;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index f28e6442b..e8ee83095 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -528,7 +528,7 @@ a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#269ac9;} .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;} -.homepageMenuSetting {display:inline-block; margin-left:155px;} +.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;} 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;} From 90b8d254246ea2b01d492de7968bbac30954989b Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 17:35:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=82=B9=E5=85=A5?= =?UTF-8?q?=E2=80=9C=E8=AF=B7=E8=BE=93=E5=85=A5=E4=BD=9C=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E2=80=9D=E5=90=8E=EF=BC=8C=E6=89=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?kindeditor=E5=8F=8A=E5=85=B6=E4=B8=8B=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E5=8F=8A=E5=AF=BC=E5=85=A5=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=8F=B3=E4=BE=A7=E7=9A=84=E6=97=B6=E9=97=B4=E6=A1=86?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E2=80=9C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E2=80=9D=E7=9A=84?= =?UTF-8?q?tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 52 ++++++++++---------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 8340306e0..a61219637 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -1,44 +1,46 @@ <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
- +

<%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%> + 截止日期：
<%= calendar_for('homework_end_time')%>
+ -
\ No newline at end of file +
+
\ No newline at end of file