From 86751e31fb48b758d62dcfd52d42e4c12cb6db0c Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 26 Apr 2016 15:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=8A=A0=E5=85=A5=E7=A7=81?= =?UTF-8?q?=E6=9C=89=E8=AF=BE=E7=A8=8B=E9=A2=98=E7=9B=AE=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_homework_repository.html.erb | 8 +++++--- app/views/users/_homework_repository_list.html.erb | 3 +++ app/views/users/user_homeworks.html.erb | 5 ++++- public/stylesheets/new_user.css | 9 ++++++--- public/stylesheets/public.css | 1 + 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/views/users/_homework_repository.html.erb b/app/views/users/_homework_repository.html.erb index a30e21a3f..1ed8ae688 100644 --- a/app/views/users/_homework_repository.html.erb +++ b/app/views/users/_homework_repository.html.erb @@ -14,11 +14,12 @@
<% homeworks.each do |homework| %> <% end %>
\ No newline at end of file diff --git a/app/views/users/_homework_repository_list.html.erb b/app/views/users/_homework_repository_list.html.erb index 678bf65d7..2e483b3b3 100644 --- a/app/views/users/_homework_repository_list.html.erb +++ b/app/views/users/_homework_repository_list.html.erb @@ -30,6 +30,9 @@ <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%> <% end%> +
  • + 操作 +
    • <%=render :partial => 'homework_repository', :locals => {:homeworks => homeworks} %> diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 2cd1f5b21..5eaf61569 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -41,7 +41,10 @@
  • 我的题库
    • -
  •  
    • +
  • + 申请题库 +
    • +
  •  
    • diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4558437a2..e9eb16c20 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -704,7 +704,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;} .homepagePostReplyDes {float:left; width:642px; margin-left:15px;} .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} -.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: 微软雅黑, 宋体;} +.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";} .table_maxWidth table {max-width: 642px;} .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;} @@ -714,7 +714,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} a.postGrey {color:#484848;} a.postGrey:hover {color:#000000;} a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;} -a:hover.gz_btn{ color:#ff5722;} +a:hover .gz_btn{color:#ff5722;} .homepagePostReplyjournal{margin-left: 15px; float: left;} .lh18 {line-height: 18px;} /*该高度会写入配置文件*/ @@ -1469,9 +1469,10 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} /*20160301新题库样式*/ .subject-list-banner {width:685px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;} .subject-list-banner li {height:40px; line-height:40px; vertical-align:middle;} -.subject-list-name {width:260px; padding-left:10px; padding-right:10px;} +.subject-list-name {width:190px; padding-left:10px; padding-right:10px;} .subject-list-publisher {width:80px; text-align:center;} .subject-list-date {width:70px; text-align:center;} +.subject-list-option {width:70px; text-align:center;} .subject-list-row {width:685px; height:40px; color:#7a7a7a; font-size:12px;} .subject-list-row li {height:40px; line-height:40px; vertical-align:middle;} .subject-list-search {border:1px solid #dddddd; height:32px; width:250px;} @@ -1481,6 +1482,8 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} .subject-list-type {width:50px; text-align:center;} .subject-list-count {width:60px; text-align:center;} .subject-list-from {width:145px; text-align:center;} +.subject-name-middle {display:inline-block; line-height:40px; vertical-align:middle;} +.subject-name-hidden {max-width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} /*视频播放默认图标*/ .mediaIco{margin: 30px 0 30px 20px;width: 200px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index f3403aa78..ac6425b94 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -172,6 +172,7 @@ h4{ font-size:14px; color:#3b3b3b;} .w600{ width:600px !important;} .w606{ width:606px } .w705{ width:705px;} +.w680{ width: 680px;} .w770{ width:770px;} .h20{height: 20px;} .h22{ height:22px;}