diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 919552cff..93d221abf 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,4 +1,4 @@ - + diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index d64e8672e..eeb6c1519 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -46,8 +46,8 @@ - - 12 + + 12 diff --git a/app/views/layouts/base_edu.html.erb b/app/views/layouts/base_edu.html.erb index 1ceb8fe9f..32dc69186 100644 --- a/app/views/layouts/base_edu.html.erb +++ b/app/views/layouts/base_edu.html.erb @@ -9,24 +9,26 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/structure','css/edu-common', 'css/edu-public','css/taskstyle', 'css/font-awesome', 'css/edu-class', 'css/edu-popup', 'css/ketang', 'css/magic-check', "css/edu-admin" %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/structure','css/edu-common', 'css/edu-public','css/taskstyle', 'css/font-awesome', 'css/edu-class', 'css/edu-popup', 'css/ketang', 'css/magic-check', "css/edu-admin", "bootstrap/bootstrap-min.css" %> <%= javascript_include_tag "edu/application",'edu/base_edu','baiduTemplate','jquery.datetimepicker.js' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> -
<%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
- -<%= render_flash_messages %> -<%= yield %> - -<%= call_hook :view_layouts_base_content %> -
- -
-<%= render :partial => 'layouts/footer' %> -
- +
+
+ <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %> +
+
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+
+
+ <%= render :partial => 'layouts/footer' %> +
+
diff --git a/app/views/layouts/base_edu_user.html.erb b/app/views/layouts/base_edu_user.html.erb index a442ec8e7..7af2d53dc 100644 --- a/app/views/layouts/base_edu_user.html.erb +++ b/app/views/layouts/base_edu_user.html.erb @@ -25,27 +25,31 @@ -
- <% if User.current.logged? %> - <%= render :partial => 'layouts/logined_header' %> - <% else%> - <%= render :partial => 'layouts/unlogin_header' %> - <% end%> -
-
-
- <%= yield %> -
-
-<%= render :partial => 'layouts/footer' %> -
+
+
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
+
+
+ <%= yield %> +
+
+
+ <%= render :partial => 'layouts/footer' %> - - - \ No newline at end of file diff --git a/app/views/layouts/base_new_forum.html.erb b/app/views/layouts/base_new_forum.html.erb index deac42cfc..4a2210042 100644 --- a/app/views/layouts/base_new_forum.html.erb +++ b/app/views/layouts/base_new_forum.html.erb @@ -19,23 +19,29 @@ -
<%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
-
+
+
+ <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %> +
+
-
+
+
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+
+
+
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
+ <%= render :partial => 'layouts/footer' %> +
+ + <% if hidden_unproject_infos %> + <%= render :partial => 'layouts/new_feedback' %> + <% end %>
- -
-<%= render :partial => 'layouts/footer' %> -
-<% if hidden_unproject_infos %> - <%= render :partial => 'layouts/new_feedback' %> -<% end %> diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb index 360e1a8bb..a0d1ddcc6 100644 --- a/app/views/layouts/base_shixun.html.erb +++ b/app/views/layouts/base_shixun.html.erb @@ -16,48 +16,49 @@ -
- <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %> -
-
- <%= render :partial => 'shixuns/shixun_top' %> -
- -
-
    -
  • " >实训
    • -
  • " >预备知识
    • - <% if !@shixun.repository.nil? && (@shixun.owner == User.current || User.current.admin?) %> -
  • - <%= link_to l(:project_module_repository), - ({:controller => 'repositories', - :action => 'shixun_show', - :id => @shixun, - :repository_id => shixun_repository(@shixun).try(:identifier)}), - :class => (params[:controller] == 'repositories' ? 'active' : '') %> -
    • - <% end %> - - <% if User.current.manager_of_shixun?(@shixun) %> -
  • ">合作者
    • -
  • ">配置
    • - <% end %> -
-
- <%#= render_flash_messages %> -
- <%= render_flash_messages %> - <%= yield %> +
+
+ <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %> +
+ <%= render :partial => 'shixuns/shixun_top' %> +
+
+
    +
  • " >实训
    • +
  • " >预备知识
    • + <% if !@shixun.repository.nil? && (@shixun.owner == User.current || User.current.admin?) %> +
  • + <%= link_to l(:project_module_repository), + ({:controller => 'repositories', + :action => 'shixun_show', + :id => @shixun, + :repository_id => shixun_repository(@shixun).try(:identifier)}), + :class => (params[:controller] == 'repositories' ? 'active' : '') %> +
    • + <% end %> + + <% if User.current.manager_of_shixun?(@shixun) %> +
  • ">合作者
    • +
  • ">配置
    • + <% end %> +
+
+ <%#= render_flash_messages %>
- <%= call_hook :view_layouts_base_content %> -
+
+
+ <%= render_flash_messages %> + <%= yield %> +
+ <%= call_hook :view_layouts_base_content %> +
+
+
+ + <%= render :partial => 'layouts/footer' %> +
- -
-<%= render :partial => 'layouts/footer' %> -
- diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb index 455f9669e..1dc33ac43 100644 --- a/app/views/layouts/users_base.html.erb +++ b/app/views/layouts/users_base.html.erb @@ -31,42 +31,29 @@ -
-
- <% if User.current.logged? %> - <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %> - <% else%> - <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %> - <% end%> -
-
- - - - - - - - <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
- - - - - +
+
+
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %> + <% else%> + <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %> + <% end%> +
+
+
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+
+
+ <%= render :partial => 'layouts/footer' %> +
- - - - -
-<%= render :partial => 'layouts/footer' %> -
- -<%= call_hook :view_layouts_base_body_bottom %> + <%= call_hook :view_layouts_base_body_bottom %> +
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 0d63660fc..d7e468ad1 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -1,5 +1,10 @@ @charset "utf-8"; /* CSS Document */ +html,body{ font-size:14px; line-height:2.0; height:100%;} +.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} +.newMain{ margin: 0 auto; padding-bottom: 155px; } +.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both;} +.newHeader{background: #46484c;width:100%; height: 50px} /* 2015-06-26 */ 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:2.0; background:#eaebec;} diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index b98586ec5..186b8d0c3 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -1,4 +1,9 @@ @charset "utf-8"; +html,body{ font-size:14px; line-height:2.0; height:100%;} +.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} +.newMain{ margin: 0 auto; padding-bottom: 155px; } +.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both;} +.newHeader{background: #46484c;width:100%; height: 50px} /* 重置样式 */ 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,span{ margin:0; padding:0;} body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5;; color:#333;} diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 5df176a87..0cf5126e1 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -1,5 +1,9 @@ /************新版公共****************/ -body{ font-size:14px; line-height:2.0;} +html,body{ font-size:14px; line-height:2.0; height:100%;} +.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} +.newMain{ margin: 0 auto; padding-bottom: 155px; } +.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both;} +.newHeader{background: #46484c;width:100%; height: 50px} .task-container{ min-width:1300px; margin:0 auto; background: #f5f9fc; position: relative;} /*左侧导航*/ diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 540f0b0fd..c97001e95 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -1,4 +1,9 @@ /* CSS Document */ +html,body{ font-size:14px; line-height:2.0; height:100%;} +.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} +.newMain{ margin: 0 auto; padding-bottom: 155px; } +.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both;} +.newHeader{background: #46484c;width:100%; height: 50px} /* 2015-06-26 */ 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:#eaebec;}