From a61e20ba07e576c925cfb98359b2400dad5176f7 Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Tue, 23 May 2017 18:59:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9A=84=E6=AD=A5=E9=AA=A4=E6=A0=B7=E5=BC=8F=E4=B8=8D=E5=A4=9F?= =?UTF-8?q?=E7=90=86=E6=83=B3=EF=BC=8C=E8=AF=B7=E5=8F=82=E7=85=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/authentication.html.erb | 5 ++--- public/images/user/shenghe.jpg | Bin 0 -> 10566 bytes public/stylesheets/css/edu-user.css | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 public/images/user/shenghe.jpg diff --git a/app/views/account/authentication.html.erb b/app/views/account/authentication.html.erb index e484ae85c..881fc225a 100644 --- a/app/views/account/authentication.html.erb +++ b/app/views/account/authentication.html.erb @@ -10,9 +10,8 @@
1.上传图片
-
-
2.审核并完成认证
-
+
+
2.审核并完成认证
职业证明： diff --git a/public/images/user/shenghe.jpg b/public/images/user/shenghe.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0b116e011db8b7a056b19d9ccc698e591c6fe70f GIT binary patch literal 10566 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 Gso~#b Date: Tue, 23 May 2017 19:25:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E7=AD=9B=E9=80=89=E5=9D=97=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=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/courses/index.html.erb | 4 ++-- public/stylesheets/css/edu-public.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index f793e0224..583c7a1fe 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -5,13 +5,13 @@ 智能课堂

- -
+
diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css index 40b887ecc..2d3da716c 100644 --- a/public/stylesheets/css/edu-public.css +++ b/public/stylesheets/css/edu-public.css @@ -27,7 +27,7 @@ select.header-search-select{ border:none; font-size:14px; padding:5px; backgroun .task-user-dropdown-nav { padding-top:5px; } .task-user-dropdown-nav li { display: inline-block; text-align: center; width:100%; height: 30px; line-height: 30px;} .task-user-dropdown-nav li:hover{ background:#eee;} -.task-line{ display: block; height: 1px!important; line-height: 1px; border-bottom:1px solid #eee;} +.task-line{ display: block; height: 1px!important; line-height: 1px!important; border-bottom:1px solid #eee; margin:0;} .inner-nav-user:hover .task-user-dropdown{ display:block;} dropdown{display: inline-block; height:30px; line-height:1.9; font-size:12px; } dropdown label, dropdown ul li{ display: block; width:42px; padding:4px 10px; text-align: center;border-radius:3px; color:#666;} @@ -202,7 +202,7 @@ input.task-height-150,textarea.task-height-150,.task-height-100{height:100px;} .my_account_info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); } .my_account_info li{ padding-left: 5px; line-height: 1.5;} .li_bottom_border{ border-bottom:1px solid #eee;} -a.task-index-name{ max-width:80px;} +a.task-index-name{ display: inline-block; max-width:80px;} .task-index-name{ display: inline-block; max-width:80px;} /*滑块验证*/ From 903a23d8e818a36af179b1ef69670a47691e6e35 Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Tue, 23 May 2017 19:32:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84icon=E6=B2=A1=E6=9C=89=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=82=AC=E6=B5=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_courseList.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/courses/_courseList.html.erb b/app/views/courses/_courseList.html.erb index e9c578cd9..c3f958a21 100644 --- a/app/views/courses/_courseList.html.erb +++ b/app/views/courses/_courseList.html.erb @@ -22,10 +22,10 @@

<% syResource = sy_resources sy %> <% syHome = sy_homeworks sy %> - <%= syResource.count %> - <%= syHome.count %> + <%= syResource.count %> + <%= syHome.count %> - +

From 87111960171eb42d94b3826fa0cb37af01a0798a Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Tue, 23 May 2017 19:42:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E5=A4=A7=E7=BA=B2=E7=BC=96=E8=BE=91icon=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/_syllabus_des.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/syllabuses/_syllabus_des.html.erb b/app/views/syllabuses/_syllabus_des.html.erb index 61250b06f..212ffa09e 100644 --- a/app/views/syllabuses/_syllabus_des.html.erb +++ b/app/views/syllabuses/_syllabus_des.html.erb @@ -1,7 +1,7 @@
<% if @syllabus.des_status == 1 %> <% if @is_syllabus_member %> - +
<% end %>
@@ -14,7 +14,7 @@ <% end %>
- + <%= labelled_form_for @syllabus, :url =>update_des_syllabus_path(@syllabus), :html => {:nhname=>'form',:multipart => true, :method => 'post', :id => 'syllabus-des-form'} do |f| %> From fd03f58b1f40fca31192ec1cdd4abd74a559ce8b Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Tue, 23 May 2017 19:46:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E7=9A=84=E9=82=80=E8=AF=B7=E7=A0=81=E5=8F=AF=E4=BB=A5=E7=AA=81?= =?UTF-8?q?=E5=87=BA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_course_base_info.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index 28f5bb773..fedd3a1c1 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -27,7 +27,7 @@
  • <%= @course.name %>
  • - 邀请码： + 邀请码： <% if @course.invite_code_halt == 0 %> <% if User.current.admin? || User.current.member_of_course?(@course) %> <%=@course.generate_invite_code %> @@ -37,6 +37,7 @@ <% else %> 已停用 <% end %> +
    分享 From 322ff780a4d817d309f60eae1873fec3dccf92c2 Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Tue, 23 May 2017 19:53:22 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=A0=8F=E5=92=8C=E5=8F=B3=E4=BE=A7tip=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/code_repeat.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/courses/code_repeat.html.erb b/app/views/courses/code_repeat.html.erb index 47054218b..2a0d620c6 100644 --- a/app/views/courses/code_repeat.html.erb +++ b/app/views/courses/code_repeat.html.erb @@ -1,5 +1,5 @@
    -

    班级首页 > 作业列表 +

    班级首页 > 作业列表 <% if @index %> >#<%= @index %> <% end %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index f8b6d4b9b..33cd6b56c 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -52,7 +52,7 @@

    <% if @show_page %> -

    +

    <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '智能课堂', user_course_community_path(User.current) %> > @@ -60,7 +60,7 @@ <%= link_to @course.name, course_path(@course), :title => '班级' %>

    <% else %> -

    +

    <%= link_to '班级首页', course_path(@course) %> > <%= @curr_page %>

    From 068977c90b0bc084924c1bd907cb88ca575e2ea5 Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Tue, 23 May 2017 20:00:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86=E5=86=85icon=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=B8=8A=E4=B8=8B=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/_homework_search_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb index 28cfe1d69..7dbcc61bf 100644 --- a/app/views/homework_common/_homework_search_form.html.erb +++ b/app/views/homework_common/_homework_search_form.html.erb @@ -1,4 +1,4 @@ <%= form_tag(homework_common_index_path(:course => @course.id, :order => @order), :remote => true , :method => 'get', :id => 'resource_search_form') do %> - + <% end %> \ No newline at end of file