diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 3bf0188a8..3fe002539 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -90,7 +90,7 @@ <% end %> <% if User.current.admin_of_org?(@organization) %> - + <% end %> diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb index 6d4b5e514..5f9a0566e 100644 --- a/app/views/layouts/base_sub_domain.html.erb +++ b/app/views/layouts/base_sub_domain.html.erb @@ -32,11 +32,17 @@ @@ -92,15 +98,15 @@ <% if is_default_field?(field) %> <% case field.name %> <% when 'activity' %> -
  • +
  • <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
    • <% when 'course' %> -
  • +
  • 课程动态
    • <% when 'project' %> -
  • +
  • 项目动态
    • <% end %> @@ -109,8 +115,20 @@
  • <%= field.name %>
    • - 6666666666666 - + + <% elsif field.field_type == "Resource" && field.hide == 0 %>
  • <%= field.name %> @@ -125,20 +143,6 @@ <% end %> - -
    banner image diff --git a/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb index 15d7c81af..ad8f9ba8c 100644 --- a/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb +++ b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb @@ -1,26 +1,26 @@ -
    -
    -
    -
    您的位置：首页 > 数据资源 > 仿真数据
    -
    -
    -

    最新资讯

    -
      - <% documents.each do |document| %> -
    • -
      <%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %> - <%= format_date(document.created_at) %>>回复（100）（100） -
      -
      • - <% end %> -
    - -
    -
      - <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %> -
      -
    -
    -
    -
    +
    +
    +
    +
    您的位置：首页 > 数据资源 > 仿真数据
    +
    +
    +

    最新资讯

    +
      + <% documents.each do |document| %> +
    • +
      <%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %> + <%= format_date(document.created_at) %>>回复（100）（100） +
      +
      • + <% end %> +
    + +
    +
      + <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %> +
      +
    +
    +
    +
    \ No newline at end of file diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index bcd110adb..9de2bf56f 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -61,13 +61,15 @@ a.sn-link-select {color:#809df9;} .sn-bg-blue {background-color:#24366e;} .sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} .sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} -.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;} +.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;} +.sn-logo-add{ display:block; top:10px; left:0px; position:absolute; width:20px; height:20px;background:url(../images/default_blank/icons-add.png) -0px -3px no-repeat;} .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;} a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;} .sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;} -.sn-nav li {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;} -.sn-nav li a {display:inline-block; padding:8px 6px; border-radius:5px;} -.sn-nav li a:hover {background-color:#809df9;} +.nav-element-default, .nav-element {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;} +.nav-element-default a, .nav-element a {display:inline-block; padding:8px 6px; border-radius:5px;} +.nav-element-default a:hover, .nav-element a:hover {background-color:#809df9;} +.sn-subnav-position {position:fixed; left:0; top:199px; z-index:99;} .sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;} .sn-sub-nav li {color:#999; float:left;} .sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;} @@ -171,7 +173,7 @@ a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;} /* 内页新闻展示 */ .sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; } -.sn-inner-pcon{text-indent:2em;} +.sn-inner-pcon{text-indent:2em; overflow:hidden;} .sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;} .sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;} .sn-inner-imgp{ color:#000; text-align:center; margin-bottom:30px;}