qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改了top——mune

This commit is contained in:
huangjingquan 2013-11-04 15:20:22 +08:00
parent 2a6171ca52
commit 27299586c2
8 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/layouts/_base_header.html.erb
View File

@ -6,17 +6,8 @@
<%= render_menu :account_menu -%> <%= render_menu :account_menu -%>
</div> </div>
<%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
<%if User.current.logged?%> <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
<%if [2,3].include?(User.current.user_extensions.identity) %>
<%= render_menu :top_enterprise_menu -%>
<% else %>
<%= render_menu :top_college_menu -%>
<% end %>
<% else %>
<%= content_tag('li', "#{link_to(l(:label_enter_college), :controller =>'projects', :action => 'course_enterprise', :project_type => 1 )}".html_safe, :id=> 'account-enterprise') %>
<%= content_tag('li', "#{link_to(l(:lable_enter_enterprise), :controller => 'projects', :action =>'enterprise_course', :project_type => 0)}".html_safe, :id=> 'account-college') %>
<% end %>
<!-- <div style="float: right; margin-top: 13px;"> <!-- <div style="float: right; margin-top: 13px;">
<%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %> <%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
</div> --> </div> -->

6
app/views/layouts/base.html.erb
View File

@ -19,13 +19,7 @@
<div id="wrapper"> <div id="wrapper">
<div id="wrapper2"> <div id="wrapper2">
<div id="wrapper3"> <div id="wrapper3">
<% if session[:enterprise_college] == 2 %>
<%=render :partial => 'layouts/base_enterprise_header'%>
<% elsif session[:enterprise_college] == 1 %>
<%=render :partial => 'layouts/base_college_header'%>
<% else %>
<%=render :partial => 'layouts/base_header'%> <%=render :partial => 'layouts/base_header'%>
<% end %>
<div id="main" class="nosidebar"> <div id="main" class="nosidebar">
<div id="content_"> <div id="content_">
<%= render_flash_messages %> <%= render_flash_messages %>

10
app/views/layouts/base_courses.html.erb
View File

@ -20,13 +20,9 @@
<div id="wrapper"> <div id="wrapper">
<div id="wrapper2"> <div id="wrapper2">
<div id="wrapper3"> <div id="wrapper3">
<% if session[:enterprise_college] == 2 %>
<%= render :partial => 'layouts/base_enterprise_header'%> <%= render :partial => 'layouts/baseheader'%>
<% elsif session[:enterprise_college] == 1 %>
<%= render :partial => 'layouts/base_college_header'%>
<% else %>
<%= render :partial => 'layouts/base_header'%>
<% end %>
<div id="main"> <div id="main">
<!--project page--> <!--project page-->

12
app/views/layouts/base_homework.html.erb
View File

@ -17,16 +17,8 @@
<body class="<%= h body_css_classes %>"> <body class="<%= h body_css_classes %>">
<div id="wrapper"> <div id="wrapper">
<div id="wrapper2"> <div id="wrapper2">
<div id="wrapper3"> <div id="wrapper3">
<%= render :partial => 'layouts/base_header'%>
<% if session[:enterprise_college] == 2 %>
<%= render :partial => 'layouts/base_enterprise_header'%>
<% elsif session[:enterprise_college] == 1 %>
<%= render :partial => 'layouts/base_college_header'%>
<% else %>
<%= render :partial => 'layouts/base_header'%>
<% end %>
<div id="main" class=""> <div id="main" class="">
<div id="sidebar"> <div id="sidebar">
<div class="main_context"> <div class="main_context">

15
app/views/layouts/base_users.html.erb
View File

@ -19,15 +19,14 @@
<body class="<%= h body_css_classes %>"> <body class="<%= h body_css_classes %>">
<div id="wrapper"> <div id="wrapper">
<div id="wrapper2"> <div id="wrapper2">
<div id="wrapper3"> <div id="wrapper3">
<% if session[:enterprise_college] == 2 %> <%=render :partial => 'layouts/base_header'%>
<%=render :partial => 'layouts/base_enterprise_header'%>
<% elsif session[:enterprise_college] == 1 %>
<%=render :partial => 'layouts/base_college_header'%>
<% else %>
<%=render :partial => 'layouts/base_header'%>
<% end %>
<div id="main"> <div id="main">
<div class="top-content">
<span></span>
<span></span>
<span></span>
</div>
<!--user page, add by huang--> <!--user page, add by huang-->
<div id="sidebar"> <div id="sidebar">
<div class="main_context"> <div class="main_context">

5
config/locales/zh.yml
View File

@ -504,6 +504,11 @@ zh:
#by young #by young
label_requirement: 需求 label_requirement: 需求
label_new_course: 课程 label_new_course: 课程
label_course_practice: 实践课程
label_project_deposit: 项目托管
label_software_user: 软件创客
label_contest_innovate: 创新竞赛
label_requirement_enterprise: 企业众包
label_new_homework: 作业 label_new_homework: 作业
label_new_contest: 竞赛 label_new_contest: 竞赛
label_requirement_focus: 关注需求 label_requirement_focus: 关注需求

9
lib/redmine.rb
View File

@ -198,9 +198,12 @@ end
#by young #by young
Redmine::MenuManager.map :top_menu do |menu| Redmine::MenuManager.map :top_menu do |menu|
menu.push :home, :home_path menu.push :home, :home_path
menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural menu.push :course_practice, {:controller => 'projects', :action => 'course', :project_type => 1}
menu.push :requirement, {:controller => 'bids', :action => 'index'} menu.push :project_deposit, { :controller => 'projects', :action => 'index' }, :caption => :label_project_deposit
menu.push :developer, {:controller => 'users', :action => 'index'} menu.push :software_user, {:controller => 'users', :action => 'index'}
menu.push :contest_innovate, {:controller => 'bids', :action => 'contest', :project_type => 1}
menu.push :requirement_enterprise, {:controller => 'bids', :action => 'index'}
# menu.push :investor, :home_path # menu.push :investor, :home_path
# menu.push :theme, :home_path # menu.push :theme, :home_path
# menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }

6
public/stylesheets/application.css
View File

@ -11,6 +11,12 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/ /*new by huang*/
/**/ /**/
.top-content{
background-color: rgb(226, 244, 255);
height: 40px;
width: 940px;
}
.enterprise{ .enterprise{
padding-left: 400px; padding-left: 400px;
padding-top: 10px; padding-top: 10px;