From 714deebe21630db97fcc6e3ef4545478a2488018 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 4 May 2016 14:08:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_sub_domain.html.erb | 52 ++++++++++++---------- public/stylesheets/org2.css | 9 ++-- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb index bf4d70e32..445999e97 100644 --- a/app/views/layouts/base_sub_domain.html.erb +++ b/app/views/layouts/base_sub_domain.html.erb @@ -32,11 +32,17 @@ @@ -83,15 +89,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 %> @@ -100,8 +106,20 @@
  • <%= field.name %>
    • - 6666666666666 - + + <% elsif field.field_type == "Resource" && field.hide == 0 %>
  • <%= field.name %> @@ -116,20 +134,6 @@ <% end %> - -
    banner image
    diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index ad9169670..0debbe405 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -65,9 +65,10 @@ a.sn-link-select {color:#809df9;} .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;} @@ -169,7 +170,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;} From 0fc142d822a9fecaccc5c55ad78283bc2ec00856 Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Wed, 4 May 2016 14:40:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AElogo?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 2 +- app/views/layouts/base_sub_domain.html.erb | 368 +++++++++--------- .../_show_sub_document_newstyle.html.erb | 50 +-- public/images/default_blank/icons-add.png | Bin 0 -> 18580 bytes public/stylesheets/org2.css | 3 +- 5 files changed, 212 insertions(+), 211 deletions(-) create mode 100644 public/images/default_blank/icons-add.png 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 3ab589111..32396a7c5 100644 --- a/app/views/layouts/base_sub_domain.html.erb +++ b/app/views/layouts/base_sub_domain.html.erb @@ -1,184 +1,184 @@ - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %> - <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%> - <%= javascript_include_tag 'attachments' %> - <%#= call_hook :view_layouts_base_html_head %> - - <%#= yield :header_tags -%> - - - - - - - - - - - - - - - -
    -
    -
    - <%= render :partial => 'organizations/org_logined_header' %> -
    - -
    - -
    -
      - <% @subfield_content.each do |field| %> - <% if is_default_field?(field) %> - <% case field.name %> - <% when 'activity' %> -
    • - <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> -
      • - <% when 'course' %> -
    • - 课程动态 -
      • - <% when 'project' %> -
    • - 项目动态 -
      • - <% end %> - <% else %> - <% if field.field_type == "Post" && field.hide == 0 %> -
    • - <%= field.name %> -
      • - 6666666666666 - - <% elsif field.field_type == "Resource" && field.hide == 0 %> -
    • - <%= field.name %> -
      • - <% end %> - <% end %> - <% end %> - <% if User.current.admin_of_org?(@organization) %> -
    • - 配置 -
      • - <% end %> -
    -
    - - -
    -
    banner image
    -
    -
    -
    -<%# 更新访问数,刷新的时候更新访问次数 %> - <% update_visiti_count @organization %> -<%# over %> - - - - <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
    - -
    - -
    -
    - -
    联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
    -
    地 址：湖南省长沙市开福区东风路89号观园大厦23层
    - 卫星导航仿真与测试开放实验室
    -
    -
    -
    -
    - - -<%#= call_hook :view_layouts_base_body_bottom %> - - - - - + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %> + <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%> + <%= javascript_include_tag 'attachments' %> + <%#= call_hook :view_layouts_base_html_head %> + + <%#= yield :header_tags -%> + + + + + + + + + + + + + + + +
    +
    +
    + <%= render :partial => 'organizations/org_logined_header' %> +
    + +
    + +
    +
      + <% @subfield_content.each do |field| %> + <% if is_default_field?(field) %> + <% case field.name %> + <% when 'activity' %> +
    • + <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> +
      • + <% when 'course' %> +
    • + 课程动态 +
      • + <% when 'project' %> +
    • + 项目动态 +
      • + <% end %> + <% else %> + <% if field.field_type == "Post" && field.hide == 0 %> +
    • + <%= field.name %> +
      • + 6666666666666 + + <% elsif field.field_type == "Resource" && field.hide == 0 %> +
    • + <%= field.name %> +
      • + <% end %> + <% end %> + <% end %> + <% if User.current.admin_of_org?(@organization) %> +
    • + 配置 +
      • + <% end %> +
    +
    + + +
    +
    banner image
    +
    +
    +
    +<%# 更新访问数,刷新的时候更新访问次数 %> + <% update_visiti_count @organization %> +<%# over %> + + + + <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
    + +
    + +
    +
    + +
    联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
    +
    地 址：湖南省长沙市开福区东风路89号观园大厦23层
    + 卫星导航仿真与测试开放实验室
    +
    +
    +
    +
    + + +<%#= call_hook :view_layouts_base_body_bottom %> + + + + + 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/images/default_blank/icons-add.png b/public/images/default_blank/icons-add.png new file mode 100644 index 0000000000000000000000000000000000000000..059585a0d59d1f712e6c6315a6be8622daf9ca51 GIT binary patch literal 18580 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 a1B5LXY{QBaDdV?yTbZvj%Qe}&^Zx)hHPUqe literal 0 HcmV?d00001 diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index ad9169670..4b59713f5 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -61,7 +61,8 @@ 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;}