Fixes for launch night

diff --git a/index.php b/index.php
index af6d53e213c698f8a8587038edae20be50916862..28d23ae7b51d615811fd9fa398c280012a41efca 100644 (file)
--- a/index.php
+++ b/index.php
@@ -22,16 +22,27 @@ foreach($files as $page){
        }
 }
 
-foreach($pages as $name => $page){
-       $page->execute($templates[$name]);
+if(isset($_GET['page'])){
+       $args = explode('/', $_GET['page']);
 }
 
-if(isset($_GET['page']) && isset($templates[$_GET['page']])){
-       $current = $_GET['page'];
+if(isset($args) && isset($templates[$args[0]])){
+       $current = $args[0];
+       array_shift($args);
 } elseif(isset($templates['splash'])){
        $current = 'splash';
+       $args = array();
 } elseif(count($templates) > 0) {
        $current = array_shift(array_keys($templates));
+       $args = array();
+}
+
+foreach($pages as $name => $page){
+       if($current == $name){
+               $page->execute($templates[$name], $args);
+       } else {
+               $page->execute($templates[$name], array());
+       }
 }
 
 $index = new Template_Index();

diff --git a/page/tickets.php b/page/tickets.php
index 66b4b3e694a9699ef567f2281bb491714822c2fe..ac9bc31fedf4ea36c38b1739934a82dc3b000a97 100644 (file)
--- a/page/tickets.php
+++ b/page/tickets.php
@@ -1,8 +1,16 @@
 <?php
 
+/**
+ This class has magic.
+**/
+
 class Page_Tickets extends Page {
 
- public function execute($template){
+ public function execute($template, $args){
+
+       $template->args = $args;
+
+
 
  }
 

diff --git a/template/committee.php b/template/committee.php
index d4d6969c2185c0432eeae613b023fc148377064c..1368f51bc69bbc27525de9ca03612831785b2f87 100644 (file)
--- a/template/committee.php
+++ b/template/committee.php
@@ -2,8 +2,171 @@
 
 class Template_Committee extends Template {
 
-public function display(){
-        ?><img src="/theme/committee.png"><?
-}
+       public function display(){
+               ?><div style="background: url(/theme/committee.png); width: 850px;
+               height: 500px; position: relative; overflow: hidden; padding-top: 140px;" id="comm1">
+                       <div id="president"> 
+                       <h2>President</h2> 
+                       <p> 
+                       <a href="mailto:president@homertonball.com"> 
+                       Fiona Holman
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:president@homertonball.com"> 
+                       <em>president@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div>  
+                       <div id="vice"> 
+                       <h2>Vice President</h2> 
+                       <p> 
+                       <a href="mailto:vicepresident@homertonball.com"> 
+                       Jessica Labhart
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:vicepresident@homertonball.com"> 
+                       <em>vicepresident@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="treasurer"> 
+                       <h2>Treasurer</h2> 
+                       <p> 
+                       <a href="mailto:treasurer@homertonball.com"> 
+                       Alistair Fraser
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:treasurer@homertonball.com"> 
+                       <em>treasurer@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="secretary"> 
+                       <h2>Secretary</h2> 
+                       <p> 
+                       <a href="mailto:secretary@homertonball.com"> 
+                       Vicki Chia
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:secretary@homertonball.com"> 
+                       <em>secretary@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="security"> 
+                       <h2>Security</h2> 
+                       <p> 
+                       <a href="mailto:security@homertonball.com"> 
+                       Oscar Hausman
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:security@homertonball.com"> 
+                       <em>security@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="marketing"> 
+                       <h2>Marketing</h2> 
+                       <p> 
+                       <a href="mailto:marketing@homertonball.com"> 
+                       Emily McCallum
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:marketing@homertonball.com"> 
+                       <em>marketing@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="designer"> 
+                       <h2>Designer</h2> 
+                       <p> 
+                       <a href="mailto:designer@homertonball.com"> 
+                       Ben Wheawell
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:designer@homertonball.com"> 
+                       <em>designer@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div>  
+                       <div id="food"> 
+                       <h2>Food and Drinks</h2> 
+                       <p> 
+                       <a href="mailto:food@homertonball.com"> 
+                       Sophia Sibthorpe
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:food@homertonball.com"> 
+                       <em>food@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="person"> 
+                       <h2>Personnel</h2> 
+                       <p> 
+                       <a href="mailto:personnel@hometonball.com"> 
+                       Douglas Thomson
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:personnel@homertonball.com"> 
+                       <em>personnel@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="sponsor"> 
+                       <h2>Sponsorship</h2> 
+                       <p> 
+                       <a href="mailto:sponsorship@homertonball.com"> 
+                       Asmita Singh
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="sponsorship.pdf"> 
+                       <strong>Sponsorship Brochure</strong> 
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:sponsorship@homertonball.com"> 
+                       <em>sponsorship@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="safety"> 
+                       <h2>Health and Safety</h2> 
+                       <p> 
+                       <a href="mailto:safety@homertonball.com"> 
+                       Pete Teverson
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:safety@homertonball.com"> 
+                       <em>safety@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       <div id="web"> 
+                       <h2>Website</h2> 
+                       <p> 
+                       <a href="mailto:web@homertonball.com"> 
+                       Richard Whitehouse
+                       </a> 
+                       </p> 
+                       <p> 
+                       <a href="mailto:web@homertonball.com"> 
+                       <em>web@homertonball.com</em> 
+                       </a> 
+                       </p> 
+                       </div> 
+                       </div><?
+       }
 
 }

diff --git a/template/index.php b/template/index.php
index 8d5f956d957dec34bf8f968adcc0793a26a84b99..7ef4a3720a1785d6cd346fcfd87bdee7dec29cfe 100644 (file)
--- a/template/index.php
+++ b/template/index.php
@@ -11,12 +11,12 @@ public function Display(){
 <html>
 <head>
        <title>Homerton May Ball</title>
-       <link rel="stylesheet" href="theme/hmb.css">
+       <link rel="stylesheet" href="/theme/hmb.css">
        <!--[if IE]>
-               <link rel="stylesheet" href="theme/ie.css">
+               <link rel="stylesheet" href="/theme/ie.css">
        <![endif]-->
        <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 src="/flir/flir.js" type="text/javascript"></script>
        <script type="text/javascript">
                $(function(){
                        FLIR.init();
@@ -39,7 +39,7 @@ public function Display(){
 </head>
 <body>
                <div id="logol">
-                       <a href="/" class="link_splash"><img src="theme/logopen.png"></a>
+                       <a href="/" class="link_splash"><img src="/theme/logopen.png"></a>
                </div>
                <div id="navbar">
                        <ul>
@@ -55,7 +55,7 @@ public function Display(){
                </div>
                <div id="main">
                        <div class="arrow" id="arrow-l" <?php if(!($this->keys[$this->current] > 0)){ ?> style="display: none;" <?php } ?>>
-                               <a href="<?php echo $this->numbers[$this->keys[$this->current] - 1]; ?>"><img src="theme/left.png"></a>
+                               <a href="<?php echo $this->numbers[$this->keys[$this->current] - 1]; ?>"><img src="/theme/left.png"></a>
                        </div>
                        <div id="paneshow" style="left: <?php echo -1 * $this->keys[$this->current] * 850; ?>px;">
                        <div id="panebar">
@@ -82,7 +82,7 @@ public function Display(){
                        </div>
                        <?php if($this->keys[$this->current] <= count($this->keys)){ ?>
                        <div class="arrow" id="arrow-r">
-                               <a href="<?php echo $this->numbers[$this->keys[$this->current] + 1]; ?>"><img src="theme/right.png"></a>
+                               <a href="<?php echo $this->numbers[$this->keys[$this->current] + 1]; ?>"><img src="/theme/right.png"></a>
                        </div>
                        <?php } ?>
                        <div id="footer">

diff --git a/template/tickets.php b/template/tickets.php
index 30e4d5bd438b8c55e44440379fbb14a1822b560b..683d41fc2a48252752bfd9fad6345b86b62fab4b 100644 (file)
--- a/template/tickets.php
+++ b/template/tickets.php
@@ -3,7 +3,7 @@
 class Template_Tickets extends Template {
 
 public function display(){
-        ?><img src="/theme/tickets.png"><?
+        ?><a href="https://www.srcf.ucam.org/hmb/secure/"><img src="/theme/tickets.png"></a><?
 }
 
 }

diff --git a/theme/about.png b/theme/about.png
index 6d353fde057037c28dda2b0cb3b99e2d80cd0b74..34ff4f5330044a923a3bce4d7fe68390e87bec7e 100644 (file)
Binary files a/theme/about.png and b/theme/about.png differ

diff --git a/theme/charity.png b/theme/charity.png
index e7f473a919e2aca882d4457a90f51e0c3bc1b31e..6971d21ed75e45e9a68d14faf576372848e7243b 100644 (file)
Binary files a/theme/charity.png and b/theme/charity.png differ

diff --git a/theme/food.png b/theme/food.png
index df20431866287174554770fe224cf5ad8f3957ef..2229d6d26386e0a5183df0ecae695053572dffae 100644 (file)
Binary files a/theme/food.png and b/theme/food.png differ

diff --git a/theme/hmb.css b/theme/hmb.css
index 5ad6458e6bf8c0d1c6b2cbecd4dd729ad5d807bb..eefa86694aa4ee194ee69064913e4d7b1c4111dc 100644 (file)
--- a/theme/hmb.css
+++ b/theme/hmb.css
@@ -181,8 +181,7 @@ ul#panes li.pane-inactive {
 }
 
 ul#panes li.pane-r {
-       background: #4a0d0e;
-       background: rgba(74,13,14,0.75);
+       background: #781416;
 }
 
 
@@ -215,3 +214,30 @@ div#footer {
        font-family: Verdana, Arial, sans-serif;
 }
 
+div#comm1 div {
+       float: left;
+       width: 220px;
+       text-align: center;
+       padding: 0px 20px;
+}
+
+div#comm1 div em, div#comm1 div strong {
+       display: none;
+}
+
+div#comm1 div h2 {
+       margin-bottom: 10px;
+}
+
+div#comm1 div p {
+       margin: 0;
+}
+
+div#comm1 div a:link, div#comm1 a:visited {
+       text-decoration: none;
+       color: white;
+}
+
+div#comm1 div a:hover, div#comm1 a:active {
+       text-decoration: underline;
+}