From 7a4e5afba0fdf28904f5cee20612c72f4f454d19 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Sat, 24 May 2014 12:11:14 +0800
Subject: [PATCH] test

---
 app/controllers/test_controller.rb            |   2 +
 app/helpers/application_helper.rb             |  15 +++
 .../layouts/_bootstrap_base_footer.html.erb   |  20 ++++
 .../layouts/_bootstrap_base_header.html.erb   |  14 +--
 app/views/layouts/bootstrap_base.html.erb     |  56 ++++-----
 app/views/test/bootstrap.html.erb             |   1 +
 public/javascripts/gas.js                     |   7 ++
 public/stylesheets/bootstrap_custom.css       | 107 ++++++++++++++++++
 public/stylesheets/nyan.css                   |   8 +-
 9 files changed, 190 insertions(+), 40 deletions(-)
 create mode 100644 app/views/layouts/_bootstrap_base_footer.html.erb
 create mode 100644 app/views/test/bootstrap.html.erb
 create mode 100644 public/javascripts/gas.js
 create mode 100644 public/stylesheets/bootstrap_custom.css

diff --git a/app/controllers/test_controller.rb b/app/controllers/test_controller.rb
index ddb47a8b7..ec3e5cbdb 100644
--- a/app/controllers/test_controller.rb
+++ b/app/controllers/test_controller.rb
@@ -3,6 +3,8 @@ class TestController < ApplicationController
   helper :UserScore
   layout 'bootstrap_base'
 
+  def bootstrap; end
+
   def zip
     homeworks_attach_path = []
     homework_id = params[:homework_id]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 10d599c31..58d31ce8b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1666,5 +1666,20 @@ module ApplicationHelper
       # end
     # end
   # end
+
+  def footer_logo(ul_class=nil, li_class=nil)
+    logos = []
+    logos.push(link_to image_tag('/images/footer_logo/nudt.png',:alt=>"nudt"),"http://www.nudt.edu.cn/special.asp?classid=12" )
+    logos.push(link_to image_tag('/images/footer_logo/peking_eecs.png', :alt=>"peking_eecs"), "http://eecs.pku.edu.cn" )
+    logos.push(link_to image_tag('/images/footer_logo/buaa_scse.png', :alt=>"buaa_scse"), "http://scse.buaa.edu.cn/" )
+    logos.push(link_to image_tag('/images/footer_logo/iscas.png', :alt=>"iscas"), "http://www.iscas.ac.cn" )
+    logos.push(link_to image_tag('/images/footer_logo/inforbus.png', :alt=>"inforbus"), "http://www.inforbus.com" )
+
+    logos.collect! { |logo| 
+      content_tag(:li, logo.html_safe, :class => li_class.to_s)
+    }
+
+    content_tag(:ul, logos.join("").html_safe, :class => ul_class.to_s).html_safe
+  end
   
 end
diff --git a/app/views/layouts/_bootstrap_base_footer.html.erb b/app/views/layouts/_bootstrap_base_footer.html.erb
new file mode 100644
index 000000000..2bda28bdd
--- /dev/null
+++ b/app/views/layouts/_bootstrap_base_footer.html.erb
@@ -0,0 +1,20 @@
+<div class="clearfix"></div>
+<div id="footer" class="muted ">
+  <div style="border-top:solid 1px #C6E9F1;"></div>
+  <div class="desc center block-inline">
+    主办单位:
+    <%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47"%>
+    <%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41"%>
+    <%= link_to "联系我们","http://forge.trustie.net/projects/2/member"%>
+    <%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/"%>
+  </div>
+  <div class="center">
+    2007~2014
+  </div>
+
+  <%= footer_logo("center ul-style-none", "float-left") %>
+
+  <div class="debug">
+    <%= debug(params) if Rails.env.development? %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/_bootstrap_base_header.html.erb b/app/views/layouts/_bootstrap_base_header.html.erb
index 2c55ff2cc..fc7897b27 100644
--- a/app/views/layouts/_bootstrap_base_header.html.erb
+++ b/app/views/layouts/_bootstrap_base_header.html.erb
@@ -33,12 +33,11 @@
   <div class="navbar-header">
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
       <span class="sr-only">Toggle navigation</span>
-      <span class="icon-bar">1</span>
-      <span class="icon-bar">2</span>
-      <span class="icon-bar">3</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
     </button>
     <%=link_to image_tag("/images/logo5.png", class: 'navbar-brand', style:"width: 50px; height: 50px; padding:4px"), '/' %>
-    <a class="navbar-brand hidden" href="#">Trustie</a>
   </div>
 
   <!-- Collect the nav links, forms, and other content for toggling -->
@@ -64,10 +63,8 @@
       </div>
       <button type="submit" class="btn btn-default">Submit</button>
     </form>
-    <ul class="nav navbar-nav navbar-right <%= "hidden" unless User.current.logged? %>">
-    	<%= bootstrap_render_menu :account_menu -%>
-
-      <li class="dropdown">
+    <ul class="nav navbar-nav navbar-right">
+      <li class="dropdown <%= "hidden" unless User.current.logged? %>">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=User.current%> <b class="caret"></b></a>
         <ul class="dropdown-menu">
         	<li>
@@ -78,6 +75,7 @@
         	<li><%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%></li>
         </ul>
       </li>
+      <%= bootstrap_render_menu :account_menu -%>
     </ul>
   </div>
 </nav>
diff --git a/app/views/layouts/bootstrap_base.html.erb b/app/views/layouts/bootstrap_base.html.erb
index f485d5c4a..e0dc457da 100644
--- a/app/views/layouts/bootstrap_base.html.erb
+++ b/app/views/layouts/bootstrap_base.html.erb
@@ -5,43 +5,43 @@
   <title><%= h html_title %></title>
   <meta name="description" content="<%= Redmine::Info.app_name %>"/>
   <meta name="keywords" content="issue,bug,tracker"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
-  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'bootstrap_custom.css', :media => 'all' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
-  <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable' %>
-  <%= heads_for_theme %>
+  <%#= javascript_include_tag "jquery.leanModal.min" %>
   <%= bootstrap_head %>
-  <%= call_hook :view_layouts_base_html_head %>
-  <!-- page specific tags -->
+  <%= javascript_include_tag 'gas' %>
   <%= yield :header_tags -%>
 </head>
-<body class="<%= h body_css_classes %>">
-
-<div id="wrapper">
-  <div id="wrapper2">
-    <div id="wrapper3">
-      <%= render :partial => 'layouts/bootstrap_base_header' %>
-      <div id="main" class="nosidebar">
-        <div id="content_">
-          <%= render_flash_messages %>
-          <%= yield %>
-          <%= call_hook :view_layouts_base_content %>
-          <div style="clear:both;"></div>
-          <%= render :partial => 'layouts/base_footer' %>
-        </div>
-
-      </div>
-    </div>
+<body>
+
+  <%= render :partial => 'layouts/bootstrap_base_header' %>
+  <div class="container">
+    <div class="row">
+      <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
+      <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
 
-    <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
-    <div id="ajax-modal" style="display:none;"></div>
+      <!-- Add the extra clearfix for only the required viewport -->
+      <div class="clearfix visible-xs"></div>
 
+      <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
+      <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
+    </div>
 
+
+    <%= render_flash_messages %>
+    <%= yield %>
   </div>
-</div>
-<%= call_hook :view_layouts_base_body_bottom %>
+  
+
+
+
+
+
+  <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+  <div id="ajax-modal" style="display:none;"></div>
+  <%= render :partial => 'layouts/bootstrap_base_footer' %>
 </body>
 </html>
diff --git a/app/views/test/bootstrap.html.erb b/app/views/test/bootstrap.html.erb
new file mode 100644
index 000000000..56c1d11bf
--- /dev/null
+++ b/app/views/test/bootstrap.html.erb
@@ -0,0 +1 @@
+<%= image_tag "http://image227.poco.cn/mypoco/myphoto/20140516/17/5527437020140516173219035.png", class: "img-responsive" %>
\ No newline at end of file
diff --git a/public/javascripts/gas.js b/public/javascripts/gas.js
new file mode 100644
index 000000000..969cbf051
--- /dev/null
+++ b/public/javascripts/gas.js
@@ -0,0 +1,7 @@
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-46523987-1', 'trustie.net');
+ga('send', 'pageview');
diff --git a/public/stylesheets/bootstrap_custom.css b/public/stylesheets/bootstrap_custom.css
new file mode 100644
index 000000000..49eb2c166
--- /dev/null
+++ b/public/stylesheets/bootstrap_custom.css
@@ -0,0 +1,107 @@
+/* 应用bootstrap之后，定制化的css, less是个问题
+*******************************************************************************/
+* {
+    font-family: Helvetica, Tahoma, Arial, "Microsoft YaHei", "微软雅黑", SimSun, "宋体", STXihei, "华文细黑", Heiti, "黑体", sans-serif;
+}
+
+.float-left{ float: left; }
+.float-right{ float: right; }
+.clearfix {
+    width: 100%;
+    height: 0px;
+    clear: both;
+    display: block;
+}
+.ul-style-none{
+    list-style-type: none;
+}
+
+.block-inline{
+    display: inline-block;
+}
+
+.border-box {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -box-sizing: border-box;
+}
+
+.div-inline {
+    display: inline-block;
+}
+
+/*文字不换行*/
+.text_nowrap {
+    word-break: keep-all;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+/*字体 斜体*/
+.font-italic {
+    font-style: italic;
+}
+
+/*字体加粗*/
+.font-bolder {
+    font-weight: bolder;
+}
+
+.text-center {
+    text-align: center;
+}
+
+.clear-both {
+    clear: both;
+}
+
+.full-width-layouts{
+    padding: 0 15px;
+}
+/* block 未定义宽度时候 居中 */
+.center {
+  width: auto;
+  display: table;
+  margin-left: auto;
+  margin-right: auto;
+}
+.text-center {
+  text-align: center;
+}
+
+/*颜色*/
+.muted{
+    color: #999999;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* footer */
+#footer{
+    margin-top: 50px;
+}
+#footer .desc a{
+    margin: 0px 5px;
+}
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 7910c2a64..458f3dee2 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -1,5 +1,9 @@
 /* TODO: base/common/page 准备封装一些基本样式组合调用 参考YUI
 *******************************************************************************/
+* {
+    font-family: Helvetica, Tahoma, Arial, "Microsoft YaHei", "微软雅黑", SimSun, "宋体", STXihei, "华文细黑", Heiti, "黑体", sans-serif;
+}
+
 span[id^=valid_user] {
     padding-left: 10px;
 }
@@ -90,10 +94,6 @@ span[id^=valid_user] {
     color: #E8770D;
 }
 
-* {
-    font-family: Helvetica, Tahoma, Arial, "Microsoft YaHei", "微软雅黑", SimSun, "宋体", STXihei, "华文细黑", Heiti, "黑体", sans-serif;
-}
-
 /* 模态窗口
 *******************************************************************************/
 /** jRating CSS **/