From: Greg Burri <greg.burri@gmail.com>
Date: Fri, 11 Sep 2009 06:30:14 +0000 (+0200)
Subject: FIX Some syntax error
X-Git-Url: https://git.euphorik.ch/?a=commitdiff_plain;h=c1d939c263d7748af8a126f4fba72972c263561d;p=cl7.git

FIX Some syntax error
ADD New background and new font
---

diff --git a/css/Borgnine.ttf b/css/Borgnine.ttf
new file mode 100644
index 0000000..18e1983
Binary files /dev/null and b/css/Borgnine.ttf differ
diff --git a/css/style.css b/css/style.css
index 907ffd0..ac9933a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,5 +1,10 @@
 /* coding:utf-8 */
 
+@font-face { 
+   font-family: "Borgnine";
+   src: url("http://cl8.euphorik.ch/css/Borgnine.ttf")
+}
+
 html {
    min-height: 100%;
    margin-bottom: 1px;
@@ -53,18 +58,20 @@ em {
    background-repeat: repeat-y;
    background-position: 0px -75px;
 
-}
-
+}
+	
 #titre {
-   width: 590px;
-   padding: 5px;
+   width: 580px;
+   padding: 5px 10px 5px 10px;
    font-size: 20px;
    background-image: url(../images/fond1.png);
-   background-repeat: repeat;
+   background-repeat: repeat;
+   color: #FFFF00;
+   font-family: "Borgnine",  monospace;
 }
 
 #titre #nbPlacesRestantes {
-	font-size: 11px;
+   font-size: 11px;
    float: right;
 }
 
diff --git a/images/bieres_fond1.jpg b/images/bieres_fond1.jpg
index 48f70f1..8d1e37a 100644
Binary files a/images/bieres_fond1.jpg and b/images/bieres_fond1.jpg differ
diff --git a/index.php b/index.php
index 4aa606b..f7136c5 100644
--- a/index.php
+++ b/index.php
@@ -16,7 +16,7 @@ include_once("php/config.php");
 include_once("php/controller.php");
 
 $MENU = array(
-   'acceuil' => 'Acceuil',
+   'accueil' => 'Accueil',
    'jeux_joues' => 'Jeux joués',
    'inscription' => 'Inscription',
    'inscrits' => 'Inscrits',
@@ -42,7 +42,8 @@ echo '<?xml version="1.0" encoding="UTF-8"?>';
       # Des constantes stockées en BD accessible par le javascript.
       echo '<meta name="cout_periode" content="'.$config->get('cout_periode').'" />';
       echo '<meta name="cout_total" content="'.$config->get('cout_total').'" />';
-      echo '<meta name="nb_periodes" content="'.mysql_fetch_array(mysql_query("SELECT COUNT(*) FROM periodes"))[0].'" />';
+      $nbPeriodes = mysql_fetch_array(mysql_query("SELECT COUNT(*) FROM periodes"));
+      echo '<meta name="nb_periodes" content="'. $nbPeriodes[0] .'" />';
    ?>
    <title>Corcelles-Lan 7</title>
    <link rel="stylesheet" href="css/style.css" type="text/css" media="screen" ></link>
@@ -97,7 +98,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>';
                switch ($page)
                {
                   case 'accueil':
-                     include("php/tx_informations.php");
+                     include("php/pages/informations.php");
                      break;
                   case 'jeux_joues' :
                      include("php/pages/jeux_joues.php");
diff --git a/js/cl7.js b/js/cl7.js
index 6197569..57766d1 100644
--- a/js/cl7.js
+++ b/js/cl7.js
@@ -81,7 +81,7 @@ $(document).ready(
       
       // inscrit les emails codés (page contacts)
       $('a#contactPifou').attr('href', util.rot13('znvygb:tert.oheev@tznvy.pbz'));
-      $('a#contactLePiaf').attr('href', util.rot13('znvygb:tyrcvns695@zfa.pbz'));
+      $('a#contactLePiaf').attr('href', util.rot13('znvygb:yrcvns695@zfa.pbz'));
       
       $('#formulaireInscription input[name="periodes[]"]').change(function() {
          cl7.maj_prix_inscription();         
diff --git a/php/pages/inscrits.php b/php/pages/inscrits.php
index b5df9b2..ad26645 100644
--- a/php/pages/inscrits.php
+++ b/php/pages/inscrits.php
@@ -1,6 +1,6 @@
 <?php # coding:utf-8
 
-include_once("traitement_pre_affichage.php");
+include_once("php/traitement_pre_affichage.php");
 
 $participants = mysql_query("
    SELECT id, pseudo, nom, prenom, clan_nom, clan_tag, remarques
diff --git a/php/pages/jeux_joues.php b/php/pages/jeux_joues.php
index 304c34b..135f57d 100644
--- a/php/pages/jeux_joues.php
+++ b/php/pages/jeux_joues.php
@@ -1,6 +1,6 @@
 <?php # coding: utf-8
 
-include_once("traitement_pre_affichage.php");
+include_once("php/traitement_pre_affichage.php");
 
 if (!$le_participant->valide)
 {
diff --git a/tools/yaws.conf b/tools/yaws.conf
index 8da122c..efa1e9c 100644
--- a/tools/yaws.conf
+++ b/tools/yaws.conf
@@ -10,7 +10,7 @@ ebin_dir = ../urlrewrite
 <server localhost>
    port = 8090
    listen = 0.0.0.0
-   docroot = /home/gburri/code/projets/cl7/trunk
+   docroot = /home/gburri/code/projects/cl7/
    allowed_scripts = php
    arg_rewrite_mod = cl7_urlrewrite    
    # dir_listings = true