[Devel] r472 - in branches/generic: . adl-specific adl-specific/css css includes

[svn AT agendadulibre.org]

Author: ploc
Date: Thu Jul 22 23:12:42 2010
New Revision: 472

Log:
minor improvments

Added:
   branches/generic/adl-specific/css/
      - copied from r468, branches/generic/css/
Deleted:
   branches/generic/adl-specific/css/calendar-old.css
   branches/generic/css/
Modified:
   branches/generic/adl-specific/config.inc.php
   branches/generic/adl-specific/special.inc.php
   branches/generic/includes/funcs.inc.php
   branches/generic/infos.php
   branches/generic/moderation-howto.php
   branches/generic/stats.php

Modified: branches/generic/adl-specific/config.inc.php
==============================================================================
--- branches/generic/adl-specific/config.inc.php        Thu Jul 22 22:54:37 
2010        (r471)
+++ branches/generic/adl-specific/config.inc.php        Thu Jul 22 23:12:42 
2010        (r472)
@@ -4,7 +4,7 @@
 $websiteName = "agenda du libre";                 /* title displayed on each 
page */
 $websiteSlogan = "l'agenda des évènements du logiciel libre en France"; /* 
slogan displayed on some pages */
 $mailDomain = "agendadulibre.org";                /* domain used for sending 
mails */
-$rootUrl = "http://www.${mailDomain}";;            /* root url, without 
trailing slash */
+$rootUrl = "http://www.$mailDomain";;              /* root url, without 
trailing slash */
 
 $developerMail = "devel AT agendadulibre.org";       /* mail of developers */
 $moderatorMail = "moderateurs AT agendadulibre.org"; /* mail of moderators */

Modified: branches/generic/adl-specific/special.inc.php
==============================================================================
--- branches/generic/adl-specific/special.inc.php       Thu Jul 22 22:54:37 
2010        (r471)
+++ branches/generic/adl-specific/special.inc.php       Thu Jul 22 23:12:42 
2010        (r472)
@@ -7,10 +7,10 @@
   echo <<<END
 <div id="important">
  <p>
- <a href="http://www.agendadulibre.org";><img style="vertical-align: middle; 
margin-right: 1em; border: 0;" src="${specificContent}/images/france.png" 
title="Agenda du Libre France"/>France</a><br/>
- <a href="http://www.agendadulibre.qc.ca";><img style="vertical-align: 
middle; margin-right: 1em; border: 0;" 
src="${specificContent}/images/quebec.png" title="Agenda du Libre 
Québec"/>Québec</a><br/>
- <a href="http://www.agendadulibre.be";><img style="vertical-align: middle; 
margin-right: 1em; border: 0;" src="${specificContent}/images/belgique.png" 
title="Agenda du Libre Belgique"/>Belgique</a><br/>
- <a href="createyourown.php"><img style="vertical-align: middle; 
margin-right: 1em; border: 0;" src="${specificContent}/images/suisse.png" 
title="Agenda du Libre Suisse"/>Suisse</a><br/>
+ <a href="http://www.agendadulibre.org";><img style="vertical-align: middle; 
margin-right: 1em; border: 0;" src="$specificContent/images/france.png" 
title="Agenda du Libre France"/>France</a><br/>
+ <a href="http://www.agendadulibre.qc.ca";><img style="vertical-align: 
middle; margin-right: 1em; border: 0;" 
src="$specificContent/images/quebec.png" title="Agenda du Libre 
Québec"/>Québec</a><br/>
+ <a href="http://www.agendadulibre.be";><img style="vertical-align: middle; 
margin-right: 1em; border: 0;" src="$specificContent/images/belgique.png" 
title="Agenda du Libre Belgique"/>Belgique</a><br/>
+ <a href="createyourown.php"><img style="vertical-align: middle; 
margin-right: 1em; border: 0;" src="$specificContent/images/suisse.png" 
title="Agenda du Libre Suisse"/>Suisse</a><br/>
 </p>
 </div>
 END;
@@ -20,7 +20,7 @@
 {
   global $specificContent;
 
-  $image = "${specificContent}/images/libre-en-fete.png";
+  $image = "$specificContent/images/libre-en-fete.png";
 
   if ($year == 2007 && $month == 3 && $day >= 17 && $day <= 25)
     {

Modified: branches/generic/includes/funcs.inc.php
==============================================================================
--- branches/generic/includes/funcs.inc.php     Thu Jul 22 22:54:37 2010      
  (r471)
+++ branches/generic/includes/funcs.inc.php     Thu Jul 22 23:12:42 2010      
  (r472)
@@ -47,6 +47,7 @@
 
 function put_header ($title, $jscriptcode = "", $onloadfunc = "")
 {
+  global $specificContent;
   global $websiteName;
   global $websiteSlogan;
 
@@ -72,7 +73,7 @@
 <head>
        <title><?php echo $websiteName;?> - <?php echo $title;?></title>
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-       <link rel="stylesheet" type="text/css" media="screen" 
href="css/calendar.css" />
+       <link rel="stylesheet" type="text/css" media="screen" href="<?php 
echo $specificContent; ?>/css/calendar.css" />
   <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
 <?php
 

Modified: branches/generic/infos.php
==============================================================================
--- branches/generic/infos.php  Thu Jul 22 22:54:37 2010        (r471)
+++ branches/generic/infos.php  Thu Jul 22 23:12:42 2010        (r472)
@@ -31,6 +31,6 @@
 <h2 style="text-align: center">Informations</h2>
 
 <?php
- echo ${infosExplanations};
+ echo $infosExplanations;
  put_footer();
 ?>

Modified: branches/generic/moderation-howto.php
==============================================================================
--- branches/generic/moderation-howto.php       Thu Jul 22 22:54:37 2010      
  (r471)
+++ branches/generic/moderation-howto.php       Thu Jul 22 23:12:42 2010      
  (r472)
@@ -26,7 +26,7 @@
 
 put_header("Recommandations sur la modération");
 
-echo ${moderationExplanations};
+echo $moderationExplanations;
 
 put_footer();
 ?>

Modified: branches/generic/stats.php
==============================================================================
--- branches/generic/stats.php  Thu Jul 22 22:54:37 2010        (r471)
+++ branches/generic/stats.php  Thu Jul 22 23:12:42 2010        (r472)
@@ -128,6 +128,6 @@
 
 ?>
 
-<?php echo ${statsExplanations}; ?>
+<?php echo $statsExplanations; ?>
 
 <?php put_footer(); ?>