From 19dfd77cad95768ece4a6e0a88a733f2869effbc Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 31 Aug 2015 15:06:07 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=B0=86=E8=B5=84=E6=BA=90=E5=8F=91?= =?UTF-8?q?=E9=80=81=E8=87=B3=20=E4=BC=9A=E6=8D=A2=E8=A1=8C=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 357cfff6b..2cdb848a0 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -429,7 +429,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/ /*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/ .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;} -.sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight: bold;} +.sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:110px; display:inline-block; font-weight: bold;} .resourcesSendTo {float:left; height:20px; margin-top:15px;} .boxContainer {height:33px; line-height:33px; position:relative} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} From 118b731dc40f77f3fbe1bd37ceae26105298f4f0 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 15:12:46 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=9B=E5=85=A5=E7=9B=B8=E5=85=B3=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 2 +- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 2 +- app/views/users/_course_poll.html.erb | 2 +- app/views/users/_project_issue.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index a3d4992c5..5e54add8e 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -10,7 +10,7 @@ <% 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+" | 课程作业", course_path(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", :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_message.html.erb b/app/views/users/_course_message.html.erb index 05caa1f91..c135715a7 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -11,7 +11,7 @@ <%= 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_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> + <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index dbeb8d450..4b8191499 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -10,7 +10,7 @@ <% 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_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", :style => "word-break:break-all" %>
<%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %> diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 97b3b759d..691747c4a 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -14,7 +14,7 @@ <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 8c374d2d7..9b5ee9013 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -10,7 +10,7 @@ <% else %> <%= 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_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <%= link_to activity.project.name.to_s+" | 项目缺陷", project_issues_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
<%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index e9fdb87e1..4135875cd 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -11,7 +11,7 @@ <%= 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_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", :style=>"word-break:break-all"%>
From d3869b03cd8a34f6c3396bfa2403b5f0ccaaefcb Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Mon, 31 Aug 2015 15:21:09 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E7=89=88?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- app/views/users/user_resource.html.erb | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index a9a204e0c..c1065415f 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -51,7 +51,7 @@ <% end %>
<% if @user.user_extensions && @user.user_extensions.identity %> -

+

<%= get_user_roll @user %>

<% end%> diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 819bec04d..2ecda7758 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -93,7 +93,7 @@
-
+
<%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 45172501d..e32284115 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -434,7 +434,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .boxContainer {height:33px; line-height:33px; position:relative} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;} -.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;} +.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;} .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;} .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;} .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;} From fa57a6c8893718b827cfecab7cc9ed5227e3a692 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 15:33:20 +0800 Subject: [PATCH 4/9] =?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 2804d7d7303c2d0063798e41b1234d1c8c9ab8a9 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Mon, 31 Aug 2015 15:42:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?resource=E5=9B=BE=E7=89=87=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylesheets/images/resource_icon_list.png | Bin 2476 -> 2654 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/stylesheets/images/resource_icon_list.png b/public/stylesheets/images/resource_icon_list.png index 1b5bc6f58c73e58545a57fc4e29463d4ef7a0e9b..d1fdc2610048ca14f12af220fad73d18f6e91c93 100644 GIT binary patch delta 1989 zcmZ`(X*3&%7LF~nJh9ayEw$BNYwS{z5KU{TDlv%KT3ZNXOPXp@v?;B9d#H%DwzjmG zk_Oejk|1MHTP(4pRlG8mcGTeMoSFB|{OCR3uY2!zzjMBO&ux^Rm1#oq`ye3}NTi9K z5d>yzXlQ6}0)rzAUFC%A)z*(eH>ho z6k@9yHkx)*!i0YqD3z|SL_QAGN^!VKHy%IyIGqzcIiqLpJu!KRI$)F*(VtJwQH?)L zTg9MB|Cw%gqdy7f1!OFGChmQ1)z;R|bC>f7oNC`SCpeOq!iLdx@cA+ENM}E*n`Ez5 z&3a^6sEL19W{!nKR}M&Fwra})xBc#ETTba>hCa9sV*JctF*MIN%bm`Q6F%6xVk zz~bb!3vzX|inZuRb(F+GY0z3g)Q1K8ay-dbM(Qm=l;fFKsXd32;IxLL^N?~FFw#}g zU&gmb(-x<*5@Rc+gt00`1 zdN3p3cFvryS#m{aUvG%3MHj$y-tnj`OW6d62(|!M?VX&`zA!cXO!Q z5?nWgT%_d=Nsu{Z)$5fZ1u&EiSO+9SoR|%t%Af3(Cn{L_RfPNa_QZdw%03|^h^q~? z8muChq@W{Sb$x-2KVxr^`X!qeEk3XJwan;Eq!@F!BHf`t7JT`P8b$i{Vlv68Mj`h-&!)t+cdX(R zRsN}$@JwJlQxnn2P`z{_wsd!M>DCG`1kTc``cx83(@2ZP>J*k}(1L0AM`AGwTd*gU$N;WXySTV;*VO+pc4FLhvg0{0auVZgtTReHtOY_f@eN>YFaCPztoh$*A4t>I~vO;oarrzixduSkA8>!IN~;+ z@*%%=C-q0-U5-=frCP5Ar&*I`k9~Qie+c(Yc|K2IkpKN_O;C|nT2mHxEA*cu{imE)J zSPN*T{Q5#V^;1}C{HW-g{PHV&-KG)V;ZYdQ$u)A~qn5{Gtmp+60K}X(#d~8K-<_0u z8JC;RJF3_-kzqnGq3ehR`o`Re zsT`>vS85Q?+4BV?82u2S4|vg>YD5PzRg}kVM+vG!>w(*K>ZSre$M4M4uGd#NO1dCC zF!z=WyY|7$o)@!pWeFKMR?f03j0?OKhkK7J*)gLU8*Q(dQgLdoHL}VLotl&5YNTvg ztWB9FdaIh9t0K=_L<&;4p;roM*%N%;4Fu zyx6IHbAl<>Y&{pZNXjkaJ)Y#dDY1=fukJPO)azfzgWyl$jKQ{nkI;x+9b8c8b?bft z$on9shms~q#b*p~s?QO1OG!MSYi~0BN4N7-rRAdcr}Pooo$f^+i_JzZbR{_mbu%p~ zd*yUm4J1+322&Q;VXnRr;H9#@l&?Q{R5M$wdlrdDzt6f8{KJ7%wRmo$)hm1; zWnU;R6T;}$cTPwyfJa!;896+3g9bd3hBMw4f~co;2`Wx|(yV?Woyb~QssbT=S*u>< zRuy9FQ5xLYI}cB}SQ`(nu2ur|UkuZO3zp-ZP|vKJ)??h*o;6w2oSHE@qzMWMD}3q6 z>Qfr&(b;t$V`}Yz1vb8VAAl#YV{$w!UF+xdRuk67`y#$uookOZUvq+Y!_g$MT_||a zAR@7Ouztu~{sQsaQ-vIP{SB3W*ggNtk==g)`M;0*|KgwP5Xt;o@$b7jBHttbHGlKu;IB%_!B delta 1810 zcmZ`$c{JOJ7B;rDT8u3XY1L9pwZvXaY>_BZj0{Z?bZTo5O9?^vSrSW^ph`OLRJ|6Vud9VHFo#USGkNe$ozx$o@-Dy>}O0%mZ!NSJM z)x{EZ&cf8j#MBgHX@kL_t!>OqEHI{)W;W+sbhId>cu!ATbX+Kz6ds%8j<(m?pBRS` z!)(83tq;?D_-N??2)PrkyatllP^;k*!fj)H9Yf4Bz5nvN zA@iGyA59vXANKz?d?wJZ?#DS@WbZzz4i$lhct5+5k7BW-D$@q+2kSxWExRov3i*d0 z#@{Pfnt#x&ys>dq$`M>>XVbmED<;_s|GMj8#FO7GE~T-X!WDN*U|bBUzxZd3QnE67O$*V1bK6$QvsOY{fN&Sq>u zC_2dgNwU1ZcgA7XLhA3|P+Cy`KEp^1B*w<(iF1lp25;xZ3MtJ@Bp*+)=3;BEO8hzdu0%Mj%O9hxL#Uk2%3Eq&?VL`h2z}7hA+D?5ev4Vs z*fzaEgxP8YFI-p!2=2A!aL`rk0#ww4)Tjilio;5kNQtTB#?;c$e#La+x32 zA|$y^11?fgG)}H~qKP1T7ok$o*fwQpW~$jaF*%+suL1n@ZTzF|RSN)tET2^9Eq#`I z7TP6MG?p-01-5`B+l~5h>W!o<_tRW z67N2r1?fBvEBQ6pJ|Qo~a?gZXJ&mP!TuHyS;>w6%7=naCtLF~Fpagas?%GAW8MLyv z)NMrrBFLNt6xf=b+D#-@Ob0mi(1<8y$I^2$ESXyszR6grd3(qknpOiqx9?4mdH&%2 zmLu#g-ZIMg}R!3<8RQRlYpHWu!5Lgx`)MS1w{-9&n8b$3W3OD6Ij zcX#HMkm$3Aomn1!KuEAxFu0CP(!94$UG}E9-Vut7C6{H|+kS^2z-_Ac#7u|5lYwJ( zuV0i8+BBAV@uR^rJ3xT!i$v1fa5qYNK>XP~-iVvTg zZZm%;USybY`)zv^v7@f))A*;Xpw}8;iW~XKz+^>D%k_rukLD?B?#GJxJKwJnA4K=l u|1aFWZ2ymcc@FLT|553$7wPOS8JGn9eVVi`tx-i{zuYli=qA+Voc{pzrcAj2 From 1113a7938cdb3b172fbd42584789bd0fd880ed4a Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Aug 2015 16:53:41 +0800 Subject: [PATCH 6/9] =?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 7/9] =?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 From acf5db70674d8e6bfa70cdcab6306bb706d6143e Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Mon, 31 Aug 2015 17:50:50 +0800 Subject: [PATCH 8/9] =?UTF-8?q?placeholder=E6=98=BE=E7=A4=BA=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/lost_password.html.erb | 2 +- app/views/users/_user_homework_form.html.erb | 2 +- public/stylesheets/new_user.css | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb index 0e4ddd1ff..9881dd186 100644 --- a/app/views/account/lost_password.html.erb +++ b/app/views/account/lost_password.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag 'new_user'%> -
+

忘记密码

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 8340306e0..ef3cbca3e 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -9,7 +9,7 @@
<%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%>
- + <%= calendar_for('homework_end_time')%>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 13cff4a66..19cfafd0d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -405,7 +405,7 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep /*.resourcesUploadBox:hover {background-color:#0781b4;}*/ /* 个人主页右边部分*/ .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;} -input.homepageSearchIcon:hover {cursor: pointer;} +input.homepageSearchIcon:hover {cursor: pointer;background:url(../images/nav_icon.png) -49px 3px no-repeat;} a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;} a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;} a.replyGrey {color:#888888; display:inline-block;} @@ -532,8 +532,8 @@ a.coursesLineGrey:hover {color:#ffffff;} 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:30px; margin:0px auto;} -.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;} +.homepageRightBanner {width:720px; margin:0px auto;} +.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;} .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;} @@ -611,7 +611,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .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:#269ac9; height:30px; line-height:30px; vertical-align:middle;} +.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} .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;} @@ -689,9 +689,9 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;} /*20150826忘记密码 LB*/ -.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 20px auto} +.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 10px auto 20px auto;} .BgBox_h2{ font-size:16px; color:#484848; width:968px;border-bottom:1px solid #e3e3e3; padding-bottom:5px;} -.NomalInput{width:308px; height:38px; border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;} +.NomalInput{width:308px; height:38px; border:1px solid #98a1a6 !important; outline:none; color:#888888; font-size:14px;} .BgBoxCon{ width:310px; margin:80px auto;} .BgBoxConP{ font-size:14px; color:#484848;} .LoginButton {width:315px; height:40px; background-color:#269ac9; font-size:14px; text-align:center; line-height:40px; vertical-align:middle;} @@ -870,7 +870,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} .uppic_btn:hover {background-color: #329cbd;} /*20150820课程作业 LB*/ -.HomeWork {width:708px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;} +.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;} .RightBanner {width:708px; height:34px; border-bottom:1px solid #e9e9e9;} 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;} From e917a68bd3eb4d5f946bd481e3ac98a153c8b192 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Tue, 1 Sep 2015 09:13:34 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2li?= =?UTF-8?q?=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4=EF=BC=8C=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=9D=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e719e557b..1e729cce2 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -539,9 +539,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .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 { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; } -.homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;} -.homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;} -.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } +.homepageNewsType {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;} +.homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;} +.homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} a.homepageWhite {color:#ffffff;} a.homepageWhite:hover {color:#a1ebff} @@ -608,7 +608,7 @@ a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:45px;} .homepagePostReplyDes {float:left; width:595px; margin-left:15px;} -.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;} +.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;} .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:#269ac9;}