Merge pull request #138 from huxuan/jiepi-header-footer

Jiepi for header/footer.
CAPU-ENG · Apr 17, 2015 · ac9c8be · ac9c8be
2 parents 7ac347a + 3a72c66
commit ac9c8be
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 72 deletions.
diff --git a/application/views/footer.php b/application/views/footer.php
@@ -1,10 +1,17 @@
-<footer class="footer"> 
-    <p>地址：北京市海淀区北京大学24号楼118室（100871）</p>
-    <p><a href="http://www.chexie.net">协会首页</a> | <a href="http://baike.baidu.com/view/1317218.htm" target="_blank">百度百科</a> | <a href="http://weibo.com/beidachexie" target="_blank">新浪微博</a> | <a href="http://www.chexie.net/#about">联系我们</a></p>
-    <p><a href="http://www.pku.edu.cn/" target="_blank">北京大学</a> | <a href="http://capu.bdwm.net/" target="_blank">北大未名BBS</a>
-    <p>浏览器要求： IE9+/chrome/firefox/safari | 最佳屏幕分辨率 1366*768</p>
-    <p>Powered by：<a href="https://github.com/CAPU-ENG/capurace">CAPU-ENG</a> | Copyright&reg;&nbsp; 2001 - <?php date_default_timezone_set("Asia/Shanghai");echo date("Y",time());?></p>
-    <p>京ICP备14031425号</p>
+<footer class="footer">
+  <span>地址：北京市海淀区北京大学24号楼118室（100871）</span><br />
+  <span>
+    <a href="http://www.chexie.net">协会首页</a> |
+    <a href="http://baike.baidu.com/view/1317218.htm" target="_blank">百度百科</a> |
+    <a href="http://weibo.com/beidachexie" target="_blank">新浪微博</a> |
+    <a href="http://capu.bdwm.net/" target="_blank">北大未名BBS</a> |
+    <a href="http://www.pku.edu.cn/" target="_blank">北京大学</a>
+  </span><br />
+  <span>
+    Powered by：<a href="https://github.com/CAPU-ENG/">CAPU-ENG</a> |
+    Copyright &reg;&nbsp;<?php date_default_timezone_set("Asia/Shanghai");echo date("Y",time());?>
+  </span><br />
+  <span>京ICP备14031425号</span>
 </footer>
 </div>
 </body>

diff --git a/application/views/header.php b/application/views/header.php
@@ -42,10 +42,9 @@
           <li role="presentation"><a role="menuitem" tabindex="-1" href="<?=site_url('index/race_info_award')?>">比赛奖品</a></li>
           <li role="presentation"><a role="menuitem" tabindex="-1" href="<?=site_url('index/race_info_racevideo')?>">赛场视频</a></li>
           </ul>
-        </li>      
-          <li><a href="<?=site_url('index/activity')?>">活动通知</a></li>
-          <li id="grade"><a href="#">比赛成绩</a></li>
-
+        </li>
+        <li><a href="<?=site_url('index/activity')?>">活动通知</a></li>
+        <li id="grade"><a href="#">比赛成绩</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <?php if ($this->session->userdata('logged_in')): ?>
@@ -68,28 +67,18 @@
   </div><!-- /.container-fluid -->
 </nav>
 
-  <script type="text/javascript">
-  $('#nav3').hover(function() {
+<script type="text/javascript">
+$('#nav3').hover(function() {
     $('#nav3').addClass("open");
-  });
-
-  $('#nav3').hover(
-  　　function () {
-  　　    $('#nav3').addClass("open");
-  　　},
-  　　function () {
-         $('#nav3').removeClass("open");  　　
-     }
-  );
-
-  $('#grade').click(
-    function() {
-      alert("比赛尚未开始！");
-    }
-  );
+});
 
+$('#nav3').hover(function () {
+    $('#nav3').addClass("open");
+}, function () {
+    $('#nav3').removeClass("open");  　　
+});
 
-
-
-  </script>
-
+$('#grade').click(function() {
+    alert("比赛尚未开始！");
+});
+</script>
diff --git a/application/views/header_homepage.php b/application/views/header_homepage.php
@@ -74,27 +74,18 @@
     </div><!-- /.container-fluid -->
   </nav>
 
-
-  <script type="text/javascript">
-  $('#nav3').hover(function() {
+<script type="text/javascript">
+$('#nav3').hover(function() {
     $('#nav3').addClass("open");
-  });
-
-  $('#nav3').hover(
-  　　function () {
-  　　    $('#nav3').addClass("open");
-  　　},
-  　　function () {
-         $('#nav3').removeClass("open");  　　
-     }
-  );
-
-  $('#grade').click(
-    function() {
-      alert("比赛尚未开始！");
-    }
-  );
+});
 
+$('#nav3').hover(function () {
+    $('#nav3').addClass("open");
+}, function () {
+    $('#nav3').removeClass("open");  　　
+});
 
-  </script>
-
+$('#grade').click(function() {
+    alert("比赛尚未开始！");
+});
+</script>
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -2,22 +2,21 @@
   width: 1000px;
   margin: 0 auto;
   padding: 8px 0 0 0;
- //padding: 20px 15% 20px;
 }
 
 .signcontainer {
-    height: auto;
-    margin-right:30%;
-    margin-top:90px;
-    margin-left:30%;
-    margin-bottom: 40px;
-    padding-top: 30px;
-    padding-left: 40px;
-    padding-right: 40px;
-    padding-bottom: 60px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #CBCBCB;
+  height: auto;
+  margin-right:30%;
+  margin-top:90px;
+  margin-left:30%;
+  margin-bottom: 40px;
+  padding-top: 30px;
+  padding-left: 40px;
+  padding-right: 40px;
+  padding-bottom: 60px;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #CBCBCB;
 }
 
 .indcontainer {
@@ -156,11 +155,8 @@ td {
   text-align: center;
 }
 
-
 .footer {
   color: #777;
+  padding: 20px 0;
   text-align: center;
-  padding: 30px 0;
-  margin-top: 100px;
-  border-top: 1px solid #e0e0e0;
-}
+}