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/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 %> - +

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/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/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 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 %> +
    分享 diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index ebcf9410d..0f0ff3cf2 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 %>

    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| %> diff --git a/public/images/user/shenghe.jpg b/public/images/user/shenghe.jpg new file mode 100644 index 000000000..0b116e011 Binary files /dev/null and b/public/images/user/shenghe.jpg differ diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css index 584db19d0..76d986455 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;} @@ -203,7 +203,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;} /*滑块验证*/ diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css index 2c88940a0..de132c6eb 100644 --- a/public/stylesheets/css/edu-user.css +++ b/public/stylesheets/css/edu-user.css @@ -159,8 +159,8 @@ input.input-width43{ width:43%;} .panel-user-headimg-show{ width: 50%; border-right:1px solid #eee;} .panel-user-headimg-show img{ width:200px; margin:100px auto; } -.user-liucheng{ padding:10px 110px; text-align: center; background:#3498db; color:#fff; font-size:12px;} -.user-liucheng-grey{ background:#ccc; color:#666;} +.user-liucheng{ padding:10px 0px; width: 300px; text-align: center; background:#3498db; color:#fff; font-size:12px; border-radius:3px 0 0 3px;} +.user-liucheng-grey{ border-radius:0 3px 3px 0;} .user-renzheng-box li{ float: left; width:200px; margin-right:25px;} .user-renzheng-img{ width: 200px;} a.user-renzheng-upload{ display: block; width: 200px; height: 100px; background:#ccc; text-align: center; padding-top:50px; color:#888;} @@ -169,7 +169,7 @@ a:hover.user-renzheng-upload{ color:#666;} .panel-user-setting-ul li.t_l{ text-align: left;} .panel-user-setting-ul{ padding:20px 0; border-bottom:1px solid #eee; } .panel-span-name{ display:inline-block; max-width:80px; overflow: hidden; line-height:12px;} -.task-arrow-right {width:0; height:0; border-top:21px solid transparent; border-bottom: 21px solid transparent; border-left:21px solid #3498db;} +.task-arrow-right {display: block;background: url(/images/user/shenghe.jpg) no-repeat 0px 0; width:41px; height:42px;} .task-arrow-right-grey {border-left:21px solid #ccc;} .select_box{font-family: "宋体"; font-size: 12px;color: #999999;width: 178px;line-height: 20px;margin: 50px auto;}