projects / hmb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed90b86)
Enabled FLIR support. Split logo in two and added more link support. Shrunk logo...
authorRichard Whitehouse <github@richardwhiuk.com>
Sun, 30 Jan 2011 20:29:48 +0000 (20:29 +0000)
committerRichard Whitehouse <github@richardwhiuk.com>
Sun, 30 Jan 2011 20:29:48 +0000 (20:29 +0000)
template/index.php patch | blob | history
theme/hmb.css patch | blob | history
theme/logo170.png [new file with mode: 0644] patch | blob
theme/logo170l.png [new file with mode: 0644] patch | blob
theme/logo170r.png [new file with mode: 0644] patch | blob

diff --git a/template/index.php b/template/index.php
index 5189d8870c99107da90161c95718f2f7d844928d..bae0fe6ff80bd5959323270cd63320a3a8f10752 100644 (file)
--- a/template/index.php
+++ b/template/index.php
@@ -13,6 +13,13 @@ public function Display(){
        <title>Homerton May Ball</title>
        <link rel="stylesheet" href="theme/hmb.css">
        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
+       <script src="flir/flir.js" type="text/javascript"></script>
+       <script type="text/javascript">
+               $(function(){
+                       FLIR.init();
+                       $(".flir").each( function(){ FLIR.replace(this); } );
+               });
+       </script>
        <script src="theme/hmb.js"></script>
        <script>
        hmb_setup(/* current */ <?php echo $this->keys[$this->current]; ?>, /* number */ <?php echo count($this->keys); ?>, {
@@ -28,19 +35,22 @@ public function Display(){
        </script>
 </head>
 <body>
-               <div id="logo">
-                       <a href="/"><img src="theme/logo.png"></a>
+               <div id="logol">
+                       <a href="/" class="link_ents"><img src="theme/logo170l.png"></a>
+               </div>
+               <div id="logor">
+                       <a href="/" class="link_splash"><img src="theme/logo170r.png"></a>
                </div>
                <div id="navbar">
                        <ul>
-                               <li class="l"><a class="link_about" href="/about">About</a></li>
-                               <li class="l"><a class="link_tickets" href="/tickets">Tickets</a></li>
-                               <li class="l"><a class="link_food" href="/food">Food &amp; Drink</a></li>
-                               <li class="l"><a href="/ents">Ents</a></li>
-                               <li class="r"><a href="/workers">Workers</a></li>
-                               <li class="r"><a href="/committee">Committee</a></li>
-                               <li class="r"><a href="/sponsorship">Sponsorship</a></li>
-                               <li class="r"><a href="/charity">Charity</a></li>
+                               <li class="l flir"><a class="link_about" href="/about">About</a></li>
+                               <li class="l flir"><a class="link_tickets" href="/tickets">Tickets</a></li>
+                               <li class="l flir"><a class="link_food" href="/food">Food &amp; Drink</a></li>
+                               <li class="l flir"><a class="link_ents" href="/ents">Ents</a></li>
+                               <li class="r flir"><a class="link_workers" href="/workers">Workers</a></li>
+                               <li class="r flir"><a class="link_committee" href="/committee">Committee</a></li>
+                               <li class="r flir"><a class="link_sponsorship" href="/sponsorship">Sponsorship</a></li>
+                               <li class="r flir"><a class="link_charity" href="/charity">Charity</a></li>
                        </ul>
                </div>
                <div id="main">
@@ -74,7 +84,7 @@ public function Display(){
                                <a href="<?php echo $this->numbers[$this->keys[$this->current] + 1]; ?>"><img src="theme/right.png"></a>
                        </div>
                        <div id="footer">
-                               &copy; 2010 Homerton May Ball Committee. All rights reserved.
+                               <span class="flir">&copy; 2010 Homerton May Ball Committee. All rights reserved.</span>
                        </div>
                </div>
 </body>
diff --git a/theme/hmb.css b/theme/hmb.css
index 1e0becc672a2cafbfde83d69317223d148c3e248..fd77efb185452c16e107dacc94c5f851573fb082 100644 (file)
--- a/theme/hmb.css
+++ b/theme/hmb.css
@@ -15,20 +15,36 @@ div#wrapper {
 }
 
 
-div#logo {
+div#logol {
        z-index: 20;
        position: absolute;
        left: 50%;
-       width: 100px;
+       width: 80px;
        top: 60px;
        height: 40px;
-       margin-top: -64px;
+       margin-top: -44px;
        margin-left: -60px;
 }
 
-div#logo img {
+div#logor {
+       z-index: 5;
+       position: absolute;
+       left: 50%;
+       margin-left: 30px;
+       width: 90px;
+       top: 60px;
+       height: 40px;
+       margin-top: -44px;
+}
+
+div#logo img.l {
        z-index: 30;
-       width: 200px;
+       width: 90px;
+}
+
+div#logo img.r {
+       z-index: 30;
+       width: 80px;
 }
 
 div#navbar {
@@ -43,8 +59,10 @@ div#navbar {
 }
 
 div#navbar ul {
+       z-index: 100;
        margin: 0;
        padding: 0;
+       padding-left: 10px;
        list-style: none;
        height: 40px;
 }
@@ -54,12 +72,16 @@ div#navbar ul li {
        position: relative;
        display: inline-block;
        text-align: center;
-       line-height: 40px;
-       margin: 0 0.2em;
+       padding-top: 10px;
+       margin: 0;
+       font-size: 14px;
+       font-family: carousel, sans-serif;
 }
 
 div#navbar ul li.l {
        float: left;
+       padding-left: 1px;
+       padding-right: 1px;
 }
 
 div#navbar ul li.r {
@@ -67,7 +89,7 @@ div#navbar ul li.r {
 }
 
 div#navbar ul li a:link, div#navbar ul li a:visited {
-       padding: 0.7em;
+       padding: 0.7em 0.4em;
        position: relative;
        z-index: 50;
        text-decoration: none;
@@ -176,10 +198,10 @@ div#footer {
        position: absolute;
        left: 50%;
        margin-left: -350px;
-       bottom: 10px;
-       height: 40px;
-       line-height: 40px;
-       font-size: 14px;
+       bottom: 17px;
+       height: 25px;
+       line-height: 30px;
+       font-size: 12px;
        color: white;
        text-align: center;
        font-weight: black;
diff --git a/theme/logo170.png b/theme/logo170.png
new file mode 100644 (file)
index 0000000..bd466b4
Binary files /dev/null and b/theme/logo170.png differ
diff --git a/theme/logo170l.png b/theme/logo170l.png
new file mode 100644 (file)
index 0000000..43969ac
Binary files /dev/null and b/theme/logo170l.png differ
diff --git a/theme/logo170r.png b/theme/logo170r.png
new file mode 100644 (file)
index 0000000..ed10ca0
Binary files /dev/null and b/theme/logo170r.png differ
Homerton May Ball 2011