solve confict after merge dev_homepage

This commit is contained in:
SylorHuang 2019-10-18 14:57:23 +08:00
commit c245ffb8d6
39 changed files with 905 additions and 129 deletions

View File

@ -1,3 +1,4 @@
<% if false %>
<div id="Footer" class="f12">
<div class="footerAboutContainer">
<ul class="footerAbout">
@ -43,3 +44,18 @@
</div>
</ul>
</div><!--Footer end-->
<% end %>
<div class="tac tac_footer">
<div>
<p class="mb20 tac_f_link">
<a href="<%= agreement_path %>" class="mr20 ml20 fontGrey8" target="_blank">服务协议</a>
<% memo = Memo.where(:id => 1168).first %>
<% if hidden_unproject_infos && !memo.nil? %>
<%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "mr20 ml20 fontGrey8", :target=>"_blank" %>
<% end %>
<a href="<%= forums_path %>" class="mr20 ml20 fontGrey8" target="_blank" ><%= l(:label_forums)%></a>
<%= link_to "合作伙伴", "#{Setting.protocol}://#{Setting.host_name}/cooperation", :class => "mr20 ml20 fontGrey8", :target=>"_blank" %>
</p>
<%= l(:label_rights_reserved)%><span class="mr10"></span><a href="http://beian.miit.gov.cn/" class="colorWhite" target="_blank"><%= l(:label_license)%></a>
</div>
</div>

View File

@ -1,38 +1,38 @@
<div class="navHomepage">
<div class="navHomepageLogo fl">
<%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), homes_path()%>
<%=link_to image_tag("../images/logo_blue.png",width:"51px", height: "45px",class: "mt3"), home_path()%>
</div>
<div class="fl">
<ul>
<li class="navHomepageMenu fl">
<%= link_to "首页", user_activities_path(User.current), :class => "c_white f16 db p10", :title => "回到个人首页" %>
<%= link_to "首页", user_activities_path(User.current), :class => "color-grey3 f16 db p10", :title => "回到个人首页" %>
</li>
<% if !hidden_unproject_infos %>
<li class="navHomepageMenu fl">
<%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "c_white f16 db p10", :target => "_blank" %>
<%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "color-grey3 f16 db p10", :target => "_blank" %>
</li>
<% end %>
<% if hidden_unproject_infos %>
<li class="navHomepageMenu fl">
<%= link_to "课程", user_course_community_path(User.current), :class => "c_white f16 db p10", :target => "_blank" %>
<%= link_to "课程", user_course_community_path(User.current), :class => "color-grey3 f16 db p10", :target => "_blank" %>
</li>
<% end %>
<li class="navHomepageMenu fl">
<%= link_to "项目", user_project_community_path(User.current), :class => "c_white f16 db p10", :target => "_blank" %>
<%= link_to "项目", user_project_community_path(User.current), :class => "color-grey3 f16 db p10", :target => "_blank" %>
</li>
<li class="navHomepageMenu fl">
<%= link_to "数据", statistics_path, :class => "c_white f16 db p10", :target => "_blank" %>
<%= link_to "数据", statistics_path, :class => "color-grey3 f16 db p10", :target => "_blank" %>
</li>
<% if hidden_unproject_infos %>
<li class="navHomepageMenu fl">
<%= link_to "竞赛", user_contest_community_path(User.current), :class => "c_white f16 db p10", :target => "_blank" %>
<%= link_to "竞赛", user_contest_community_path(User.current), :class => "color-grey3 f16 db p10", :target => "_blank" %>
</li>
<% end %>
<li class="navHomepageMenu fl mr20">
<%= link_to "问吧", forums_path, :class =>"c_white f16 db p10", :target => "_blank" %>
<%= link_to "问吧", forums_path, :class =>"color-grey3 f16 db p10", :target => "_blank" %>
</li>
</ul>
@ -56,17 +56,6 @@
}
}
</script>
<div class="fl" id="navHomepageSearch">
<!--<form class="navHomepageSearchBox">-->
<% name = name%>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
<input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索" style="width: 300px" />
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
<% end %>
</div>
<div class="navHomepageProfile" id="navHomepageProfile">
<ul>
@ -97,16 +86,30 @@
</div>
<div class="navHomepageNews" id="user_messages">
<%= link_to "", user_path(User.current, :click_user_message => true), :class => "homepageNewsIcon", :target => "_Blank", :title => "您的所有消息" %>
<a href="<%= user_path(User.current, :click_user_message => true) %>" class="fl"><i class="iconfont icon-xiaoxilingdang fontGrey4 f22 fl mt7"></i></a>
<% new_message_count = User.current.count_new_message.to_i %>
<% if new_message_count > 0 %>
<div ><%= link_to new_message_count, user_path(User.current, :click_user_message => true), :class => "newsActive", :target => "_Blank" %></div>
<%#= link_to new_message_count, user_path(User.current, :click_user_message => true), :class => "newsActive", :target => "_Blank" %>
<span class="haveNews"></span>
<% end %>
<%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
<div class="shadowbox_news undis" id="user_messages_list">
<%= render :partial => 'layouts/message_loading' %>
</div>
</div>
<div class="fr mr20" id="navHomepageSearch">
<!--<form class="navHomepageSearchBox">-->
<% name = name%>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
<input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索" style="width: 300px" />
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));">
<i class="iconfont icon-sousuo f20 ml5 mt4 fl"></i>
</a>
<% end %>
</div>
</div>
<script type="text/javascript">

View File

@ -1,6 +1,6 @@
<div class="navHomepage">
<div class="navHomepageLogo fl">
<%= link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), homes_path %>
<%= link_to image_tag("../images/logo_blue.png",width:"51px", height: "45px",class: "mt3"), home_path %>
</div>
<div class="fl">
<ul>
@ -11,12 +11,12 @@
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="navHomepageMenu fl mr40">
<a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="c_white f16 db p10" >帮助中心</a>
<a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="color-grey3 f16 db p10" >帮助中心</a>
</li>
<% end %>
<% else %>
<li class="navHomepageMenu fl mr40">
<%= link_to "问吧", forums_path, :class =>"c_white f16 db p10", :target => "_blank" %>
<%= link_to "问吧", forums_path, :class =>"color-grey3 f16 db p10", :target => "_blank" %>
</li>
<% end %>
</ul>
@ -59,7 +59,13 @@
}
}
</script>
<div class="fl" id="navHomepageSearch" >
<div id="loginInButton" class="fr ml20">
<a href="<%= signin_url_without_domain %>" class="color-grey3 db">登录</a>
</div>
<div id="loginSignButton" class="fr">
<a href="<%= register_url_without_domain %>" class="color-grey3 db">注册</a>
</div>
<div class="fr mr20" id="navHomepageSearch" >
<!--<form class="navHomepageSearchBox">-->
<% name = name%>
@ -67,7 +73,9 @@
<input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的班级、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/>
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));">
<i class="iconfont icon-sousuo f20 ml5 mt4 fl"></i>
</a>
<% end %>
<!--<div class="navSearchTypeBox" id="navHomepageSearchType">-->
<!--<div class="fl mr15 mt8">-->
@ -88,12 +96,6 @@
<!--</div>-->
</div>
<div id="loginInButton" class="fr ml20">
<a href="<%= signin_url_without_domain %>" class="c_white db">登录</a>
</div>
<div id="loginSignButton" class="fr">
<a href="<%= register_url_without_domain %>" class="c_white db">注册</a>
</div>
</div>
<script type="text/javascript">

View File

@ -32,7 +32,7 @@
</script>
</head>
<body class="<%=h body_css_classes %>" onload="prettyPrint();">
<div class="pageContainer">
<div class="cl"></div>
<div class="navContainer mb10">
<% if User.current.logged? %>
@ -66,6 +66,7 @@
</div>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
</div>
<div class="cl"></div>
<%= call_hook :view_layouts_base_body_bottom %>
</body>

View File

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user','css/iconfont/iconfont', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify','contest'%>
@ -30,6 +30,7 @@
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer">
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
@ -80,7 +81,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -12,7 +12,7 @@
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup','css/sy_public','css/syllabus', 'css/moduel','css/contest'%>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify','css/iconfont/iconfont', 'css/courses','css/popup','css/sy_public','css/syllabus', 'css/moduel','css/contest'%>
<%= javascript_include_tag "course","avatars","header","attachments",'prettify','contest' %>
<!-- page specific tags -->
<%= yield :header_tags -%>
@ -31,6 +31,7 @@
<!--add by huang-->
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer mb10"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
<div class="cl"></div>
@ -97,6 +98,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<% if hidden_unproject_infos %>
<%= render :partial => 'layouts/new_feedback' %>
<% end %>

View File

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public','css/iconfont/iconfont', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@ -30,6 +30,7 @@
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer">
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
@ -104,7 +105,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -42,6 +42,7 @@
</head>
<!--add by huang-->
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer">
<% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %>
@ -168,7 +169,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<%= render :partial => 'layouts/new_feedback' %>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -162,7 +162,7 @@
</script>
</head>
<body class="<%= h body_css_classes %>" onload="prettyPrint();">
<div class="pageContainer">
<div class="cl"></div>
<div class="navContainer">
<% if User.current.logged? %>
@ -241,12 +241,13 @@
<%#= call_hook :view_layouts_base_content %>
</div>
</div>
</div>
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
<div id="ajax-modal" style="display:none;"></div>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<%#= call_hook :view_layouts_base_body_bottom %>
</body>
</html>

View File

@ -23,7 +23,7 @@
<!-- 配置 在生成的公式图片上去掉Math定义的右键菜单$$ $$ \( \) \[ \] 中的公式给予显示-->
</head>
<body class="<%=h body_css_classes %>" onload="prettyPrint();">
<div class="pageContainer">
<div class="cl"></div>
<div class="navContainer mb10">
<% if User.current.logged? %>
@ -54,6 +54,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
</body>
</html>

View File

@ -31,7 +31,7 @@
</head>
<!--add by huang-->
<body class="<%= h body_css_classes %>">
<div class="pageContainer">
<div class="cl"></div>
<div class="navContainer mb10">
<% if User.current.logged? %>
@ -108,6 +108,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
</div>
</body>

View File

@ -19,6 +19,7 @@
<!--add by huang-->
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer mb10"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
<div class="cl"></div>
@ -33,6 +34,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<% if hidden_unproject_infos %>
<%= render :partial => 'layouts/new_feedback' %>
<% end %>

View File

@ -12,7 +12,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'prettify','jquery/jquery-ui-1.9.2','css/common','css/structure','css/public','repository','css/courses','css/org','css/project', 'css/popup', 'css/moduel' %>
<%= stylesheet_link_tag 'prettify','jquery/jquery-ui-1.9.2','css/common','css/structure','css/public','repository','css/iconfont/iconfont','css/courses','css/org','css/project', 'css/popup', 'css/moduel' %>
<%= javascript_include_tag 'cookie','project',"avatars", 'organization','header','prettify','select_list_move','org'%>
<%= javascript_include_tag 'attachments' %>
<%= call_hook :view_layouts_base_html_head %>

View File

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user','css/magic-check', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user','css/iconfont/iconfont', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@ -30,6 +30,7 @@
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer">
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
@ -83,7 +84,7 @@
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -9,7 +9,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','css/iconfont/iconfont','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->
<%= yield :header_tags -%>
@ -17,10 +17,11 @@
<!--add by huang-->
<body onload="prettyPrint();">
<div class="navContainer mb10"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
<div class="cl"></div>
<div class="pageContainer">
<div class="navContainer mb10"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
<div class="cl"></div>
<div id="Container">
<div id="Container">
<div id="content" class="sy_contanier" style=" width:1000px; margin:0 auto;">
<%= render :partial => 'layouts/base_project_top' %>
</div>
@ -29,11 +30,12 @@
<%= yield %>
<%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div>
</div>
</div>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<% if hidden_unproject_infos %>
<%= render :partial => 'layouts/new_feedback' %>
<% end %>

View File

@ -9,7 +9,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/iconfont/iconfont','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->
<%= yield :header_tags -%>

View File

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','css/syllabus','css/sy_public','css/moduel',:media => 'all'%>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','css/syllabus','css/sy_public','css/moduel','css/iconfont/iconfont',:media => 'all'%>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%>
@ -29,6 +29,7 @@
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<% is_current_user = User.current.logged?%>
<div class="navContainer">
<% if User.current.logged? %>
@ -75,7 +76,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -14,7 +14,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/structure','prettify','css/public', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common','css/iconfont/iconfont', 'css/structure','prettify','css/public','css/iconfont/iconfont', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "avatars",'prettify'%>

View File

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/structure', 'css/font-awesome','//at.alicdn.com/t/font_930423_4z0tgi8hlb9.css', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/structure','css/iconfont/iconfont', 'css/font-awesome','//at.alicdn.com/t/font_930423_4z0tgi8hlb9.css', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user"%>
@ -16,18 +16,20 @@
<%= yield :header_tags -%>
</head>
<body style="background-color: #fff">
<div class="navContainer">
<div class="pageContainer">
<div class="navContainer">
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %>
<% else%>
<%= render :partial => 'layouts/unlogin_header' %>
<% end%>
</div>
</div>
<%= yield %>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<%= yield %>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
</div>
<div class="cl"></div>
<%= call_hook :view_layouts_base_body_bottom %>
</body>

View File

@ -32,7 +32,7 @@
</head>
<!--add by huang-->
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer mb10">
<% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %>
@ -59,6 +59,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<% if hidden_unproject_infos %>
<%= render :partial => 'layouts/new_feedback' %>
<% end %>

View File

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome.css', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome.css','css/iconfont/iconfont', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@ -65,6 +65,7 @@
</script>
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer">
<% is_current_user = User.current.logged? && User.current == @user %>
<% if User.current.logged? %>
@ -280,7 +281,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus',:media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/iconfont/iconfont',:media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@ -87,6 +87,7 @@
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="navContainer">
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
@ -238,7 +239,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer_show' %>
<div class="cl"></div>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -31,6 +31,7 @@
</script>
</head>
<body>
<div class="pageContainer">
<div class="cl"></div>
<div class="navContainer mb10">
<% if User.current.logged? %>
@ -47,6 +48,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>

View File

@ -31,6 +31,7 @@
</script>
</head>
<body onload="prettyPrint();">
<div class="pageContainer">
<div class="cl"></div>
<div class="navContainer mb10">
<% if User.current.logged? %>
@ -66,7 +67,7 @@
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
</body>
</html>

View File

@ -0,0 +1,96 @@
<div class="mt20">
<div class="df middlePanel">
<div class="fl pagePanel_left">
<div class="mb15 l_headPhoto">
<div class="l_img">
<% if User.current.logged? && User.current == @user %>
<%= link_to image_tag(url_to_avatar(@user),width:"238", height: "238", :id => 'nh_source_tx'),
my_clear_user_avatar_temp_path, :remote => true %>
<% else %>
<%=image_tag(url_to_avatar(@user),width:"238", height: "238", :id=>'nh_source_tx') %>
<% end %>
</div>
<p><%= link_to @user.show_name, user_path(@user), :class => "f22 color-grey3" %></p>
<p>
<% if @user.user_extensions && @user.user_extensions.identity %>
<span class="f18"><%= get_user_roll @user %></span>
<% end%>
</p>
</div>
<div class="l_InfoNav mb20">
<li class="clearfix active">
<a href="javascript:void(0)" class="ml30">消息</a>
<span class="readingNum">20</span>
</li>
<li class="clearfix">
<a href="javascript:void(0)" class="ml30">私信</a>
</li>
</div>
</div>
<div class="fl pagePanel_right mb20">
<div class="r_infos_menu">
<li class="active"><a href="javascript:void(0)">全部</a></li>
<li><a href="javascript:void(0)">课堂提醒</a></li>
<li><a href="javascript:void(0)">项目提醒</a></li>
<li><a href="javascript:void(0)">互动提醒</a></li>
<li><a href="javascript:void(0)">审核</a></li>
<li><a href="javascript:void(0)">通知</a></li>
</div>
<ul class="p_list_ul">
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span><span class="infoTips tips_high ml15">高</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
<span class="infoTips tips_rightNow ml15">立刻</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10">
<span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
<span class="infoTips tips_normal ml15">正常</span>
</p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
<span class="infoTips tips_urgent ml15">紧急</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span><span class="infoTips tips_low ml15">低</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
</ul>
</div>
</div>
</div>
<script>
$(function () {
$(".l_InfoNav").on("click","li",function () {
$(".l_InfoNav li").removeClass("active");
$(this).addClass("active");
})
$(".r_infos_menu").on("click","li",function () {
$(".r_infos_menu li").removeClass("active");
$(this).addClass("active");
})
})
</script>

View File

@ -0,0 +1,120 @@
<p class="t_project_banner"></p>
<div class="middlePanel">
<div class="clearfix mt15 mb15">
<div class="t_search">
<input type="text" placeholder="请输入您要搜索的内容" />
<a href="javascript:void(0)">搜索</a>
</div>
<span class="fr">
<a href="javascript:void(0)" class="btn_big_default mr30">+加入项目</a>
<a href="javascript:void(0)" class="btn_big_default btn_big_blue">+新建项目</a>
</span>
</div>
<div class="df mb20">
<div class="pagePanel_left">
<div class="l_project_status mb15">
<li class="active">
<a href="javascript:void(0)" class="clearfix">
<span class="fl">全部</span>
<span class="fr">78</span>
</a>
</li>
<li>
<a href="javascript:void(0)" class="clearfix">
<span class="fl">公开</span>
<span class="fr">78</span>
</a>
</li>
<li>
<a href="javascript:void(0)" class="clearfix">
<span class="fl">私有</span>
<span class="fr">78</span>
</a>
</li>
</div>
<div class="l_project_type">
<li class="clearfix active">
<span class="fl">visual</span>
<span class="fr">29</span>
</li>
<li class="clearfix">
<span class="fl">javascript</span>
<span class="fr">29</span>
</li>
<li class="clearfix">
<span class="fl">python</span>
<span class="fr">29</span>
</li>
</div>
</div>
<div class="pagePanel_right">
<div class="clearfix r_list_search">
<span class="fl r_list_action">
<a href="javascript:void(0)" class="active">最新</a>
<a href="javascript:void(0)">最热</a>
</span>
<p class="ml30 fl c_grey02 mt8">共<span class="c_blue">291</span>个项目结果</p>
</div>
<ul class="p_list_ul">
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10 clearfix">
<span class="mr20 f16 color-grey3">阿黄</span>
<span class="fontGrey4 f12">1个月前</span>
<span class="fr">
<span class="mr30 fontGrey4 fl mt7">浏览量7211</span>
<span class="typeTag">Pyhon</span>
</span>
</p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10 clearfix">
<span class="mr20 f16 color-grey3">阿黄</span>
<span class="fontGrey4 f12">1个月前</span>
<span class="fr">
<span class="mr30 fontGrey4 fl mt7">浏览量7211</span>
<span class="typeTag">Pyhon</span>
</span>
</p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10 clearfix">
<span class="mr20 f16 color-grey3">阿黄</span>
<span class="fontGrey4 f12">1个月前</span>
<span class="fr">
<span class="mr30 fontGrey4 fl mt7">浏览量7211</span>
<span class="typeTag">Pyhon</span>
</span>
</p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10 clearfix">
<span class="mr20 f16 color-grey3">阿黄</span>
<span class="fontGrey4 f12">1个月前</span>
<span class="fr">
<span class="mr30 fontGrey4 fl mt7">浏览量7211</span>
<span class="typeTag">Pyhon</span>
</span>
</p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
</ul>
</div>
</div>
</div>

View File

@ -0,0 +1,108 @@
<div class="mt20">
<div class="df middlePanel">
<div class="fl pagePanel_left">
<div class="mb15 l_headPhoto">
<div class="l_img">
<% if User.current.logged? && User.current == @user %>
<%= link_to image_tag(url_to_avatar(@user),width:"238", height: "238", :id => 'nh_source_tx'),
my_clear_user_avatar_temp_path, :remote => true %>
<% else %>
<%=image_tag(url_to_avatar(@user),width:"238", height: "238", :id=>'nh_source_tx') %>
<% end %>
</div>
<p><%= link_to @user.show_name, user_path(@user), :class => "f22 color-grey3" %></p>
<p>
<% if @user.user_extensions && @user.user_extensions.identity %>
<span class="f18"><%= get_user_roll @user %></span>
<% end%>
</p>
</div>
<div class="l_backlog">
<li class="l_backlog_title">
<p class="color-grey3 f28">57</p>
<p class="f18 fontGrey4">待办事项</p>
</li>
<ul class="l_backlog_list">
<li>我的项目</li>
<li class="l_backlog_list_item active">启智Visual</li>
<li class="l_backlog_list_item">Openi珊瑚</li>
<li class="l_backlog_list_item">eduCoder</li>
<li class="l_backlog_list_item">Openi珊瑚</li>
<li class="l_backlog_list_item">eduCoder</li>
<li class="l_backlog_list_item">Openi珊瑚</li>
<li class="l_backlog_list_item">Openi珊瑚</li>
</ul>
</div>
<div class="l_issues">
<li><a href="javascript:void(0)">我发布的issue</a></li>
<li><a href="javascript:void(0)">我收到的issue</a></li>
</div>
</div>
<div class="fl pagePanel_right mb20">
<ul class="p_list_ul">
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span><span class="infoTips tips_high ml15">高</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
<span class="infoTips tips_rightNow ml15">立刻</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10">
<span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
<span class="infoTips tips_normal ml15">正常</span>
</p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
<span class="infoTips tips_urgent ml15">紧急</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
<li>
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
<div>
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span><span class="infoTips tips_low ml15">低</span></p>
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
</div>
</li>
</ul>
</div>
</div>
</div>
<script>
$(function () {
$(".l_backlog_list").on("click",".l_backlog_list_item",function () {
$(".l_backlog_list .l_backlog_list_item").removeClass("active");
$(this).addClass("active");
})
})
$(window).load(function () {
if($(".l_backlog_list li").length > 7){
$(".l_backlog_list").after('<a href="javascript:void(0)" class="l_all_backlog">查看全部<i class="iconfont icon-xiajiantou"></i></a>');
$(".l_all_backlog").on("click",function () {
if($(".l_backlog_list").hasClass('active')){
$(".l_backlog_list").removeClass("active");
}else{
$(".l_backlog_list").addClass("active");
$(this).remove();
}
})
}
})
</script>

View File

@ -2,7 +2,7 @@
<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
<div class="homepageRightBanner">
<div class="NewsBannerName">最新动态</div>
<div class="NewsBannerName">最新动态1</div>
<ul class="resourcesSelect">
<li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
<ul class="homepagePostType" style="margin-left:95px; width:80px" >

BIN
public/images/logo_blue.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
public/images/project.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/project.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -55,10 +55,10 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.f16{font-size:16px;}
.f18{font-size:18px;}
.f20{font-size:20px!important;}
.f22{font-size:22px;}
.f22{font-size:22px!important;}
.f26{font-size:26px;}
.f28{font-size:28px;}
.f32{font-size:32px;}
.f32{font-size:32px!important;}
.f40{font-size:40px!important;}
.f50{font-size:50px!important;}
.fw400{
@ -115,7 +115,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.mw15{margin:0 15px;}.mr90 {margin-right:90px;}.mr95{margin-right: 95px;}.mr140 {margin-right: 140px;}.mw20{ margin: 0 20px;}
.mw380 {max-width: 380px !important;}.mw400 {max-width: 400px !important;}.mw450 {max-width: 450px !important;}.mw550 {max-width: 550px !important;}
.mt-20 {margin-top:-20px;}.mt-10 {margin-top:-10px;}.mt-4 {margin-top:-4px;}.mt-5 {margin-top:-5px;}.mt-2 {margin-top:-2px;}.mt0 {margin-top: 0px !important;}
.mt1{margin-top: 1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt4{ margin-top:4px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7 {margin-top:7px;}
.mt1{margin-top: 1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px!important;}.mt4{ margin-top:4px!important;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7 {margin-top:7px!important;}
.mt8{ margin-top:8px !important;}.mt9{ margin-top:9px !important;}.mt10{ margin-top:10px !important;}.mt12 { margin-top:12px !important;}.mt14 {margin-top:14px;}
.mt15 {margin-top:15px;}.mt16{ margin-top:16px !important;}.mt18{ margin-top:18px !important;}.mt19 {margin-top:19px !important;}.mt20{margin-top: 20px;}.mt28 {margin-top:28px;}.mt30{ margin-top: 30px;}
.mt35 {margin-top:35px;}.mt40{ margin-top: 40px;}.mt45{ margin-top: 45px;}.mt50{ margin-top:50px;}.mt60{ margin-top:60px;}.mt100{ margin-top:100px;}.mb0 {margin-bottom: 0px !important;}.mb4{ margin-bottom:4px;}
@ -232,7 +232,7 @@ a:hover.c_grey{ color:#333;}
.fontGrey4{color:#999999;}
.fontGrey5 {color:#ddd;}
.fontGrey6 {color:#7a7a7a;}
.fontGrey7 {color:#555;
.fontGrey7 {color:#555;}
.fontGrey8 {color:#f1f1f1}
.fontBlue {color:#3498db;}
span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}

View File

@ -558,6 +558,12 @@
<div class="code-name">&amp;#xe685;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6bf;</span>
<div class="name">搜索</div>
<div class="code-name">&amp;#xe6bf;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe610;</span>
<div class="name">分支</div>
@ -2174,6 +2180,15 @@
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-sousuo_bold"></span>
<div class="name">
搜索
</div>
<div class="code-name">.icon-sousuo_bold
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-fenzhi"></span>
<div class="name">
@ -4068,6 +4083,14 @@
<div class="code-name">#icon-itsm-liuchengguanli</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-sousuo_bold"></use>
</svg>
<div class="name">搜索</div>
<div class="code-name">#icon-sousuo_bold</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fenzhi"></use>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -621,6 +621,13 @@
"unicode": "e685",
"unicode_decimal": 59013
},
{
"icon_id": "4572509",
"name": "搜索",
"font_class": "sousuo_bold",
"unicode": "e6bf",
"unicode_decimal": 59071
},
{
"icon_id": "4734937",
"name": "分支",

View File

@ -284,6 +284,9 @@ Created by iconfont
<glyph glyph-name="itsm-liuchengguanli" unicode="&#59013;" d="M1091.162219 257.181734h-110.040446v168.30333H630.152877v86.120894h99.564154a90.059349 90.059349 0 0 1 90.400682 89.271657V806.727555A90.059349 90.059349 0 0 1 729.717031 895.999212h-286.194431a90.033092 90.033092 0 0 1-90.374425-89.271657v-205.84994a90.033092 90.033092 0 0 1 90.374425-89.271657h104.132763v-86.120894H192.669242v-168.30333H90.505707a90.059349 90.059349 0 0 1-90.400682-89.271658v-206.637631A90.059349 90.059349 0 0 1 90.505707-127.999212h286.194431a90.059349 90.059349 0 0 1 90.374425 89.271657v206.637631a90.059349 90.059349 0 0 1-90.374425 89.271658H267.814973v93.73524h638.029787v-93.73524h-100.850716a90.059349 90.059349 0 0 1-90.400682-89.271658v-206.637631a90.059349 90.059349 0 0 1 90.400682-89.271657h286.194431a90.033092 90.033092 0 0 1 90.374425 89.271657v206.637631a90.033092 90.033092 0 0 1-90.374425 89.271658z m-714.567106-74.568091a14.572285 14.572285 0 0 0 15.0449-14.703567v-206.637631a14.572285 14.572285 0 0 0-15.0449-14.703567h-286.194432a14.598542 14.598542 0 0 0-15.071156 14.703567v206.637631a14.598542 14.598542 0 0 0 15.071156 14.703567h286.194432z m67.452614 403.297841a14.808593 14.808593 0 0 0-15.071156 14.966131V806.727555a14.808593 14.808593 0 0 0 15.071156 14.966131h286.194432a14.808593 14.808593 0 0 0 15.071156-14.966131v-205.84994a14.808593 14.808593 0 0 0-15.071156-14.966131h-286.194432z m662.185648-624.639039a14.598542 14.598542 0 0 0-15.071156-14.703567h-286.194432a14.598542 14.598542 0 0 0-15.071156 14.703567v206.637631a14.598542 14.598542 0 0 0 15.071156 14.703567h286.194432a14.598542 14.598542 0 0 0 15.071156-14.703567v-206.637631z" horiz-adv-x="1181" />
<glyph glyph-name="sousuo_bold" unicode="&#59071;" d="M356.511 246.73000000000002c-171.9 0-311.735 139.449-311.735 310.85S184.611 868.43 356.511 868.43c171.891 0 311.735-139.449 311.735-310.85S528.401 246.73000000000002 356.511 246.73000000000002z m0 534.177c-123.496 0-223.977-100.179-223.977-223.327 0-123.147 100.48-223.327 223.977-223.327s223.978 100.18 223.978 223.327c-0.001 123.148-100.482 223.327-223.978 223.327zM968.841-77.68100000000004c-25.662-25.425-66.42-26.057-91.026-1.393l-334.11 334.629c-24.626 24.653-23.77 65.232 1.883 90.658 25.672 25.426 66.409 26.057 91.036 1.403l334.109-334.638c24.616-24.653 23.76-65.241-1.892-90.659z" horiz-adv-x="1024" />
<glyph glyph-name="fenzhi" unicode="&#58896;" d="M739.9 616.8c58.3 0 105.6 47.2 105.6 105.3 0 58.2-47.3 105.3-105.7 105.3-35.8 0-69.1-18.2-88.5-48.3-19.4-30.1-22.1-68-7.3-100.6L474.4 524.8c-29.8 17.6-63.8 26.9-98.4 26.8-51.2 0.1-100.4-20.2-136.7-56.4-36.3-36.2-56.7-85.3-56.8-136.6 0.2-106.7 86.7-193.1 193.4-193 37.3 0 72.3 10.6 101.8 28.9l111.1-100.7c-15-32.6-12.3-70.6 7.2-100.8 19.4-30.2 53-48.4 88.9-48.2 58.3 0 105.6 47.2 105.6 105.3 0 58.2-47.3 105.3-105.6 105.3-22.6 0-43.5-7-60.7-19.1l-103.7 94.1c31.6 35.3 49 81 49 128.3 0 50.6-19.5 96.7-51.4 131.1L679.4 636c17-12.1 38.1-19.1 60.5-19.2z m0 155.4c27.7 0 50.3-22.5 50.3-50.2 0-27.8-22.5-50.3-50.3-50.3-27.8 0-50.3 22.5-50.3 50.3 0.1 27.8 22.7 50.2 50.3 50.2zM278.3 261.1c-26 25.8-40.5 60.9-40.4 97.5 0 36.8 14.3 71.4 40.4 97.5 25.9 25.9 61.1 40.5 97.7 40.3 36.7 0.1 71.8-14.4 97.7-40.3 26.1-26 40.4-60.6 40.4-97.5 0.1-36.6-14.5-71.7-40.4-97.5-25.9-25.9-61.1-40.5-97.7-40.3-36.7-0.2-71.9 14.4-97.7 40.3z m406.6-160.9c26.7-1.3 47.7-23.4 47.7-50.1 0-26.7-21-48.8-47.7-50.1-26.7 1.3-47.7 23.4-47.7 50.1 0 26.7 21 48.7 47.7 50.1z m0 0" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 293 KiB

View File

@ -131,8 +131,6 @@ a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
#signUpBox {display:none;}
#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
#loginSignButton:hover {background-color:#297fb8;}
#loginInButton:hover {background-color:#297fb8;}
.loginContentContainer {width:100%; background-color:#3b94d6; margin-top:1px; height:580px;}
.loginContent {width:1000px; margin:0px auto;}
.loginLeft {width:595px; float:left;}

View File

@ -1,6 +1,13 @@
@charset "utf-8";
/* CSS Document */
/*框架主内容*/
.pageContainer{
min-height: 100%;
height: auto !important;
height: 100%;
position: relative;
padding-bottom: 120px;
}
#Container{ width:1000px; margin:0 auto; }
/*主内容*/
#Main{ background:#fff; margin-bottom:10px;}
@ -246,9 +253,9 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#3b94d6;}
.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(/images/public_icon.png) -27px -577px no-repeat; padding-left:25px; font-size:14px;}
.homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
.postAttSize {color:#888888; font-size:12px; margin-left: 5px;}
.homepageSearchIcon {width:30px; height:32px; background:url(/images/nav_icon.png) -8px 3px no-repeat; float:left; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
.homepageSearchIcon {width:30px; height:32px; float:left;}
input.homepageSearchIcon:hover {cursor: pointer;background:url(/images/nav_icon.png) -49px 3px no-repeat; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
a.homepageSearchIcon:hover {background:url(/images/nav_icon.png) -49px 3px no-repeat; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
a.homepageSearchIcon:hover > i{color: #317DFF!important;}
a.postGrey {color:#484848;}
a.postGrey:hover {color:#000000;}
.homepagePostReplyjournal{margin-left: 15px; float: left;}
@ -264,23 +271,23 @@ a:hover.qx_btn{color:#3b94d6;}
.topnav_course_menu{display: none; 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: 20px;}
.topnav_course_menu a{color:#3b94d6;}
/*新个人主页框架css*/
.navContainer {width:100%; background-color:#3b94d6;}
.navContainer {width:100%; background-color:#fff;}
.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
.navHomepage {width:1000px; height:54px; background-color:#3b94d6; margin:0 auto;}
.navHomepage {width:1200px; height:54px; background-color:#fff; margin:0px auto;padding:10px 0px}
.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:5px;}
.navHomepageMenu { display:inline-block; height:54px; padding:0 10px; line-height:54px; vertical-align:middle;}
.navHomepageMenu:hover {background-color:#2182ca;}
.navHomepageSearchBoxcontainer {margin-top:11px;}
.navHomepageSearchBox {width:340px; border:none; outline:none; height:32px; background-color:#ffffff;}
#navHomepageSearch{margin-top: 11px;background-color: white; }
.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left; padding-left:5px !important; margin:0;}
.navHomepageSearchBox {width:340px; border:none; outline:none; height:32px; background-color:#ffffff;border-radius: 6px}
#navHomepageSearch{margin-top: 11px;background-color: rgba(247,248,249,1); border-radius:6px;border:1px solid rgba(211,211,211,1);}
.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left; padding-left:5px !important; margin:0;border-radius: 6px 0px 0px 6px;}
#navSearchAlert {display:none;}
.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
.homepageNewsIcon {background:url(/images/nav_icon.png) -5px -85px no-repeat; width:31px; height:35px; display:block;}
.newsActive { border-radius:50%; background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 2px;padding-right: 1px;font-weight: bold;display: inline-block;padding: 0 5px;border-radius: 15px}
.navHomepageProfile {width:65px; display:block; float:right; margin-left:20px;}
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
.haveNews{border-radius:50%;background-color:#ff0000;position:absolute;left:12px;top:8px;width:5px;height:5px;}
.navHomepageProfile {width:40px; display:block; float:right; margin-left:20px;}
.homepageProfileMenuIcon { width:40px; height:54px; position:relative; display:inline-block; line-height:0;}
.homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
.homepageLeft-new {width:240px; margin-bottom:10px;}
@ -421,7 +428,8 @@ li.menuArrow:hover {background:url(/images/item.png) -20px -70px no-repeat;}
a.topnav_login_box:hover {color:#a1ebff;}
.navRow1 {margin:0; padding:0;}
.navRow2 {margin:0; padding:0;}
.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:7px;}
.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-bottom:10px; padding-top:8px; width:100px; right:-20px; position:absolute; z-index:9999;
line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top:7px;font-size: 14px;text-align: center}
.topnav_login_list a{color:#3b94d6;}
.topnav_login_list a:hover{color:#2182ca;}
.topnav_login_list li{ }
@ -436,8 +444,37 @@ a.topnav_login_box:hover {color:#a1ebff;}
.copyright{ width:100%; text-align: center; }
a.f_grey {color:#666666;}
a.f_grey:hover {color:#000000;}
/*----------------------tac_footer*/
.tac_footer{
background: #000;
color: #fff!important;
height: 120px;
justify-content: center;
align-items: center;
display: -webkit-flex;
position: absolute;
width: 100%;
bottom: 0px;
left: 0px;
}
.tac_f_link a{
position: relative;
}
.tac_f_link a:after{
position: absolute;
right: -19px;
top:2px;
width: 1px;
height: 13px;
background: #969696;
content: '';
}
.tac_f_link a:last-child:after{
display: none;
}
/*消息弹框*/
.shadowbox_news{ width:305px; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
.shadowbox_news{ width:305px; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -137px; top: 50px; z-index: 9999;}
.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
.shadowbox_news 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); }
@ -668,6 +705,338 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.partnerInfo a span.name{font-size: 20px;color: #4D4D4D;float: left;}
.partnerInfo a{margin-right: 0px;}
.middlePanel{width: 1200px;margin:0px auto;}
.btn_big_default{
width: 100px;
height: 40px;
line-height: 40px;
text-align: center;
border:1px solid rgba(211,211,211,1);
background: #fff;
color: #666!important;
font-size:16px;
float: left;
display: block;
}
.btn_big_blue{
background: #5091FF;
boder:1px solid #5091FF;
color: #fff!important;
}
/*-----------个人主页新版-cs-20191015*/
.pagePanel_left{
width: 25%;
padding-right: 15px;
box-sizing: border-box;
}
.pagePanel_right{
width: 75%;
}
/*左侧-1头像部分*/
.l_headPhoto{
width: 100%;
background:rgba(255,255,255,1);
box-shadow:3px 3px 6px 0px rgba(0,0,0,0.05);
padding: 30px;
box-sizing: border-box;
text-align: center;
}
.l_img{
margin-bottom: 25px;
}
.l_img > a > img,.l_img > img{
width: 134px;
height: 134px;
border-radius: 50%;
}
/*左侧-2待办事项*/
.l_backlog{
width: 100%;
background:rgba(255,255,255,1);
box-shadow:3px 3px 6px 0px rgba(0,0,0,0.05);
margin-bottom: 15px;
}
.l_backlog_title{
padding:20px;
text-align: center;
}
.l_backlog_list{
border-top:1px solid rgba(224,224,224,1);
box-sizing: border-box;
max-height: 422px;
overflow: hidden;
}
.l_backlog_list.active{
max-height: initial;
}
.l_backlog_list li{
height: 60px;
line-height: 60px;
color:#666;
font-size: 16px;
padding:0px 20px;
cursor: pointer;
}
.l_backlog_list li:first-child{
font-size: 20px;
border-bottom:1px solid rgba(224,224,224,1);
padding:0px;
margin:0px 20px;
cursor: default;
}
.l_backlog_list_item.active{
color: #317DFF;
background:rgba(247,248,249,1);
position:relative;
}
.l_backlog_list_item.active:before{
content: '';
width: 4px;
background: #317DFF;
height: 30px;
position: absolute;
left: 0px;
top:15px;
}
.l_all_backlog{
position: relative;
width: 100%;
height: 20px;
line-height: 20px;
color: #666!important;
padding:30px 0px 40px;
display: block;
text-align: center;
font-size: 14px;
}
.l_all_backlog > i{
position: absolute;
bottom: 13px;
left: 50%;
width: 20px;
float: left;
height: 20px;
margin-left: -10px;
}
/*issue*/
.l_issues{
width: 100%;
background:rgba(255,255,255,1);
box-shadow:3px 3px 6px 0px rgba(0,0,0,0.05);
margin-bottom: 15px;
}
.l_issues li{
height: 50px;
line-height: 50px;
padding:0px 30px;
box-sizing: border-box;
color: #666;
font-size: 16px;
border-bottom: 1px solid rgba(0,0,0,0.05);
cursor: pointer;
}
.l_issues li:last-child{
border:none;
}
/*-----------------个人主页右侧------------*/
.pagePanel_right{
background:rgba(255,255,255,1);
box-shadow:3px 3px 6px 0px rgba(0,0,0,0.05);
}
.pagePanel_right .p_list_ul{
padding:0px 30px;
}
.pagePanel_right .p_list_ul > li{
display: flex;
padding:15px 0px;
border-bottom: 1px solid rgba(0,0,0,0.05);
}
.r_list_img{
width: 50px;
height: 50px;
border-radius: 50%;
margin-right:18px;
}
.pagePanel_right li:last-child{
border:none;
}
.pagePanel_right li > div{
flex: 1;
}
/*右侧标签*/
.infoTips{
display: inline-block;
height: 20px;
line-height: 20px;
padding:0px 6px;
color: white;
border-radius:2px;
}
.tips_normal{background: #60B25E}
.tips_urgent{background:#E74C3B }
.tips_high{background:#E67E23 }
.tips_low{background:#1ABC9C }
.tips_rightNow{background:#E74C3B }
/*---------------------------------------项目主页改版-cs--20191016*/
.t_project_banner{
background: url("/images/project.jpg") no-repeat top center;
height: 192px;
}
.t_search{
display: flex;
}
.t_search{
float: left;
}
.t_search > input{
height: 40px;
line-height: 40px;
padding:0px 0px 0px 20px;
width: 390px;
border:1px solid #D3D3D3;
font-size: 14px;
outline: none;
}
.t_search > a{
display: block;
width: 75px;
height: 40px;
line-height: 40px;
text-align: center;
background: #5091FF;
color: #fff;
font-size: 16px;
border:1px solid #5091ff;
}
.l_project_status,.l_project_type{
background: #fff;
border:1px solid rgba(214,214,214,1);
}
.l_project_status li,.l_project_type li{
height: 60px;
line-height: 60px;
position: relative;
font-size: 16px;
padding:0px 30px;
box-sizing: border-box;
}
.l_project_status li.active{
color: #317DFF;
background:rgba(247,248,249,1);
position:relative;
}
.l_project_status li.active:before{
content: '';
width: 4px;
background: #317DFF;
height: 30px;
position: absolute;
left: 0px;
top:15px;
}
.l_project_status li.active > a span{
color:#317DFF ;
}
.l_project_status li a{
display: block;
}
.l_project_type li.active{
background:rgba(247,248,249,1);
}
.r_list_search{
padding:20px 40px;
border-bottom: 1px solid rgba(224,224,224,1);;
}
.r_list_action a{
width: 50px;
float: left;
height: 30px;
line-height: 30px;
text-align: center;
background: #fff;
border:1px solid #bfbfbf;
color: #666!important;
font-size: 16px;
}
.r_list_action a.active{
border:1px solid #5091FF;
background: #5091FF;
color: #fff!important;
}
.typeTag{
font-size: 12px;
background: #EBF3FF;
padding: 0px 10px;
height: 28px;
line-height: 28px;
color: #666;
float: left;
border-radius:4px;
border:1px solid rgba(219,219,219,1);
}
/*-----------------------消息主页----------------------*/
.l_InfoNav{
background: #fff;
border:1px solid rgba(214,214,214,1);
}
.l_InfoNav li{
height: 60px;
line-height: 60px;
position: relative;
font-size: 16px;
cursor: pointer;
}
.l_InfoNav li.active{
background:#F7F8F9 ;
}
.l_InfoNav li.active >a{
color: #2A79FF!important;
}
.l_InfoNav li.active:before{
content: '';
position: absolute;
top:15px;
width: 4px;
height: 30px;
background: #2A79FF;
}
.readingNum{
background: #E96E1A;
padding:0px 4px;
height: 20px;
line-height: 20px;
font-size: 11px;
color: #fff;
border-radius: 50%;
float: right;
margin:20px 30px 20px 10px;
}
/*右侧菜单栏*/
.r_infos_menu{
display: flex;
border:1px solid rgba(224,224,224,1);
height: 68px;
line-height: 68px;
padding:0px 20px;
}
.r_infos_menu li{
margin:0px 20px;
font-size: 16px;
color: #333;
position: relative;
}
.r_infos_menu li.active a{
color: #2A79FF;
}
.r_infos_menu li.active:after{
width: 100%;
content: '';
background: #2A79FF;
height: 2px;
position: absolute;
left: 0px;
bottom: 0px;
}