diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb index 2d0f8b0d1..1c2939071 100644 --- a/app/views/layouts/base_org_newstyle.html.erb +++ b/app/views/layouts/base_org_newstyle.html.erb @@ -29,85 +29,102 @@ -
+
+
+ + <%# 登录 %> + <% if User.current.logged? %> + + + <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %> + <%#= link_to User.current, user_url_in_org(User.current.id),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %> + <%#= link_to "退出",logout_url_without_domain, :class =>"menuGrey", :method => 'post', :rel => "nofollow" %> + + + <% else %> +
    • +
    • + <% end %> + +
    +
    +
    + +
    +
    + <% @subfield_content.each do |field| %> + <% if is_default_field?(field) %> + <% case field.name %> + <% when 'activity' %> + <%= link_to "首页", organization_path(@organization), :class => "fl navact" %> + <% when 'course' %> + 课程动态 + <% when 'project' %> + 项目动态 + <% end %> + <% else %> + <% if field.field_type == "Post" && field.hide == 0 %> + <%= field.name %> + <% elsif field.field_type == "Resource" && field.hide == 0%> + <%= field.name %> + <% end %> + <% end %> + <% end %> +
    +
    + + + + + + +
    <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %> diff --git a/public/images/org_new_style/banner.jpg b/public/images/org_new_style/banner.jpg new file mode 100644 index 000000000..385b24c9e Binary files /dev/null and b/public/images/org_new_style/banner.jpg differ diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css index 4833e8966..e23d3f28d 100644 --- a/public/stylesheets/org_new_style.css +++ b/public/stylesheets/org_new_style.css @@ -1,6 +1,5 @@ @charset "utf-8"; /* CSS Document */ - body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;} body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#fff;} div,img,tr,td,table{ border:0;} @@ -18,15 +17,16 @@ a:hover{color:#29156f;} .mb70{ margin-bottom:70px;} /** header **/ -.header{ width:100%; height:72px; background:#29146f; padding:38px 0 40px;} +.header{ width:100%; height:60px; background:#29146f; padding:5px 0 0px; } .header-con{ width:1200px; margin:0 auto;} +.logo,.logo img{ display:block; height:52px; } a.login{ background:url(../images/org_new_style/icons.png) -7px -11px no-repeat; width:146px; height:55px; margin-right:40px; margin-top:11px;} a:hover.login{ background:url(../images/org_new_style/icons.png) -7px -88px no-repeat; } a.register{ background:url(../images/org_new_style/icons.png) -190px -11px no-repeat; width:158px; height:55px; ;margin-top:11px;} a:hover.register{ background:url(../images/org_new_style/icons.png) -190px -88px no-repeat; } /** nav **/ -.nav-box{ width:1200px; height:79px; margin:0 auto;} -.nav a{ display:block; padding:25px 10px; font-size:18px; color:#000; margin-right:20px; } +.nav-box{ width:1200px; height:60px; margin:0 auto;} +.nav a{ display:block; padding:15px 10px; font-size:18px; color:#000; margin-right:20px; } .navact{border-bottom:3px solid #ffbd18;} .nav a:hover{border-bottom:3px solid #ffbd18;} .searchbox{ width:338px; height:57px; border:1px solid #ccc; -moz-border-radius: 35px; -webkit-border-radius: 35px; margin:10px 0px 0 0;} @@ -37,40 +37,10 @@ a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -8 .searchbox:hover{ background:#999999; color:#fff;} /* Header text */ -.header-content { background: url(../images/org_new_style/header-background.jpg) no-repeat 50% 0px #070317;margin: 0;padding: 0;float: left;width: 100%;line-height: 22px;position: relative;z-index: 1;} -.header-content.home {height: 609px;} -.home .header-content { background: #070317 ; } -.header-content img {float: left; margin: 0 0 0 15px;} -.header-content .text {width:800px; text-align:center; margin-top:20%; } -.header-content .copy {font-size: 24px; line-height: 70px; } -.header-content .button { margin:0 auto;} -.header-content .dimmed { background: rgba(255, 255, 255, 0.4);} -.header-content .dimmed:hover { background: rgba(255, 255, 255, 1); } -.header-content .align-bottom {position: absolute; bottom: 0px;} -/* => SLIDE PREV AND NEXT ARROWS <= */ -.slider-prev, -.slider-next {text-indent:-9999px; width:60px;height:60px;background:url("../images/org_new_style/icons.png") -306px -264px no-repeat; position:absolute;top:50%; margin-top:-19px; z-index:999; opacity:.5; --webkit-transition: all 0.3s ease-out; /* Saf3.2+, Chrome */-moz-transition: all 0.3s ease-out; /* FF4+ */ -ms-transition: all 0.3s ease-out; /* IE10? */ -o-transition: all 0.3s ease-out; /* Opera 10.5+ */ transition: all 0.3s ease-out;display: none} -.slider-prev{ left:50px; } -.slider-next { right:50px;background-position:-382px -264px;} -.slider-prev:hover,.slider-next:hover{opacity:1;} -/* => SLIDER NAV o o o <= */ -.slider-nav {position:absolute;bottom:5px;left:50%;list-style:none; overflow:hidden; padding:2px; z-index:10;margin: 0; } -.slider-nav li{ float:left; } -.slider-nav li a{ display:block;width:13px;height:13px;overflow:hidden; padding:0px; margin:5px; background:url("../images/org_new_style/icons.png") no-repeat -419px -219px; text-decoration:none; text-indent:-999px;} -.slider-nav li a:hover,.slider-nav li a.selected{background-position:-402px -219px;} -/* => HOLY SLIDES <= */ -.slider section {display: none;} -.slider section.first {display: block;} -.slider-sections, .slider-sections section {width: 806px; height: 600px; } -.slider-sections {margin: 0 auto; position: relative;} -.slider-sections section {position: absolute; top: 0; left: 0px; } -.header-content h2 {font:400 62px/1.2 "microsoft yahei", Tahoma, arial, sans-serif;color: #fff;margin: 0 0 26px; } -.header-content p {margin: 0 0 30px; font-size:28px; color:#fff;} -.header-content .centered-content{padding-top: 30px;padding-bottom: 10px;} -.button {float: left;width:800px;list-style: none; } -.button a { font-size: 15px;line-height: 18px; text-decoration: none;color:#FFF; padding: 12px 56px;display: block;width: auto;z-index: 2;border: none; -moz-border-radius: 25px;border-radius: 25px;cursor: pointer; margin:0 auto; width:35px;} -.button a:hover{color:#29156f;} +.banner{ width:100%; height:234px; background:#070317 url(../images/org_new_style/banner.jpg) 0 0 no-repeat; color:#fff; text-align:center; padding-top:80px; line-height:2.4;} +.banner h2{ font-size:42px; } +.banner p{ font-size:18px;} +.banner span{ font-size:16px;} /** box1 **/ .box1{ width:100%; padding:70px 0;} @@ -176,6 +146,13 @@ a.download-btn{ display:block; border:1px solid #ccc; margin-top:10px; font-siz a:hover.download-btn{ background:#29146f; color:#fff; border:none;} .user-img img{ border:2px solid #e6473b; margin-right:10px; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:40px; height:40px;} .ml60{ margin-left:60px;} +/*用户图像*/ +.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;} +.topnav_login_list a{color:#269ac9;} +.topnav_login_list li{ } +.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;} +.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;} +.none {display: none;}