rajout du body_prop pour la gestion rtl/ltr mais suppression de l'ima…

…ge background dans body_prop qui est géré par le css
geneweb · Sep 8, 2011 · 0b9b79c · 0b9b79c
1 parent b78e81d
commit 0b9b79c
Show file tree

Hide file tree

Showing 20 changed files with 72 additions and 85 deletions.
diff --git a/etc/MacOSX/GeneWeb.command b/etc/MacOSX/GeneWeb.command
@@ -9,7 +9,10 @@ case "$LANG" in
   sv*) LANG=sv;;
   *) LANG=en;;
 esac
-DIR=`dirname $0`/distrib
+
+DIR=`dirname $0`/
+BASE=`dirname $0`/bases
+
 cd $DIR
 DIR=$PWD
 export LANG
@@ -23,17 +26,20 @@ trap 'kill $pids' 1 2
 if [ -f gwsetup.log ]; then
   mv gwsetup.log gwseup.log.old
 fi
-mkdir -p "$DIR/../../GeneWebBases"
-cd "$DIR/../../GeneWebBases"
+
+mkdir -p "$BASE"
+cd "$BASE"
+
 if [ -f gwd.log ]; then
   mv gwd.log gwd.log.old
 fi
 
 if test "$LANG" = "fr"; then
   echo "Demarrage de gwsetup..."
 else
-  echo Starting gwsetup...
+  echo "Starting gwsetup..."
 fi
+
 "$DIR/gw/gwsetup" -gd "$DIR/gw" -lang $LANG > gwsetup.log 2>&1 &
 pid=$!
 sleep 1

diff --git a/hd/etc/anclist.txt b/hd/etc/anclist.txt
@@ -21,7 +21,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">%nn;

diff --git a/hd/etc/ancmenu.txt b/hd/etc/ancmenu.txt
@@ -18,7 +18,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">%nn;

diff --git a/hd/etc/ancsosa.txt b/hd/etc/ancsosa.txt
@@ -24,7 +24,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">%nn;

diff --git a/hd/etc/anctree.txt b/hd/etc/anctree.txt
@@ -18,7 +18,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 %define;a_tree_line()

diff --git a/hd/etc/calendar.txt b/hd/etc/calendar.txt
@@ -10,7 +10,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 %if;not cancel_links;

diff --git a/hd/etc/cousmenu.txt b/hd/etc/cousmenu.txt
@@ -18,7 +18,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">%nn;

diff --git a/hd/etc/dag.txt b/hd/etc/dag.txt
@@ -14,7 +14,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <a href="%prefix;" accesskey="T"></a>

diff --git a/hd/etc/deslist.txt b/hd/etc/deslist.txt
@@ -18,7 +18,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">%nn;

diff --git a/hd/etc/desmenu.txt b/hd/etc/desmenu.txt
@@ -18,7 +18,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">%nn;

diff --git a/hd/etc/forum.txt b/hd/etc/forum.txt
@@ -23,7 +23,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 %if;not cancel_links;

diff --git a/hd/etc/perso.txt b/hd/etc/perso.txt
@@ -18,7 +18,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 

diff --git a/hd/etc/relmenu.txt b/hd/etc/relmenu.txt
@@ -13,7 +13,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">[*link between]%sp;

diff --git a/hd/etc/stats.txt b/hd/etc/stats.txt
@@ -10,7 +10,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 %if;not cancel_links;

diff --git a/hd/etc/updfam.txt b/hd/etc/updfam.txt
@@ -20,7 +20,7 @@
   </title>
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <script type="text/javascript">

diff --git a/hd/etc/updhist.txt b/hd/etc/updhist.txt
@@ -10,7 +10,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 %define;search_form(xxx)

diff --git a/hd/etc/updind.txt b/hd/etc/updind.txt
@@ -16,7 +16,7 @@
   </title>
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <script type="text/javascript">

diff --git a/hd/etc/updmenu.txt b/hd/etc/updmenu.txt
@@ -10,7 +10,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 %message_to_wizard;
 
 <h1 style="text-align:center" class="highlight">%nn;

diff --git a/hd/etc/welcome.txt b/hd/etc/welcome.txt
@@ -11,7 +11,7 @@
   <link rel="stylesheet" type="text/css" href="css/%css_prop" />
 %base_header;
 </head>
-<body>
+<body %body_prop;>
 
 
 <script type="text/javascript"><!--
@@ -369,38 +369,36 @@ sv: <span class="highlight"; style="margin-left:10px">genom</span>
 
 <br/>
 <div id="options">
-  <h3><img src="%image_prefix;/picto_molette.png"/> Autres options</h3>
-%(  <div style="text-align: center">
-    [
-  af: Jy kan ook kyk na
-  bg: Можете също да се насочите към
-  br: Gellout a rit ivez gweladenniñ
-  ca: També podeu consultar
-  cs: Lze také zobrazit
-  da: Du kan også fremkalde:
-  de: Du kannst zugreifen auf
-  en: You can consult
-  eo: Vi povas ankaù konsulti
-  es: Puede consultar
-  et: Vaata lisaks:
-  fi: Voit myös katsoa
-  fr: Autres options
-  he: אפשר גם להראות
-  is: Þú getur einnig athugað
-  it: Si può anche consultare
-  lv: Informācija par:
-  nl: U kunt de volgende zaken bekijken:
-  no: Du kan også slå opp
-  pl: Możesz także obejrzeć:
-  pt: Também pode consultar
-  ro: poti consulta
-  ru: Вы можете также обратиться к
-  sl: Lahko pregledate:
-  sv: Du kan också konsultera
-  zh:
-  ]
-  </div>
-  %)
+  <h3><img src="%image_prefix;/picto_molette.png"/>
+[
+af: Other options
+bg: Other options
+br: Other options
+ca: Other options
+cs: Other options
+da: Other options
+de: Other options
+en: Other options
+eo: Other options
+es: Other options
+et: Other options
+fi: Other options
+fr: Autres options
+he: Other options
+is: Other options
+it: Other options
+lv: Other options
+nl: Other options
+no: Other options
+pl: Other options
+pt: Other options
+ro: Other options
+ru: Other options
+sl: Other options
+sv: Other options
+zh: Other options
+]
+  </h3>
   <div id="list_left">
   <ul>
     <li>
@@ -621,8 +619,7 @@ sv: Om din webbläsare inte automatiskt uppdaterar de modifierade sidorna
 %copyright;
 
 %define;language_link(xx,yy)%sq;
-  %let;zz;%if;("yy" = "")xx%else;yy-xx%end;%in;%sq;
-  <a title="%zz; : %apply;language_name(zz)%sp;" href="%prefix_base;lang=%zz;">xx</a>
+  <a title="%apply;language_name(yy)" href="%prefix_base;lang=yy;">xx</a>
 %end;
 
 <div id="lang">
@@ -653,33 +650,15 @@ sl: Lahko izberete drug jezik:
 sv: Du kan välja ett annat språk bland de följande:
 ]</em>
   <div class="list">
-    %apply;language_link("af", "")
-    %apply;language_link("bg", "")
-    %apply;language_link("br", "")
-    %apply;language_link("ca", "")
-    %apply;language_link("cs", "")
-    %apply;language_link("da", "")
-    %apply;language_link("de", "")
-    %apply;language_link("en", "")
-    %apply;language_link("eo", "")
-    %apply;language_link("es", "")
-    %apply;language_link("et", "")
-    %apply;language_link("fi", "")
-    %apply;language_link("fr", "")
-    %apply;language_link("he", "")
-    %apply;language_link("is", "")
-    %apply;language_link("it", "")
-    %apply;language_link("lv", "")
-    %apply;language_link("nl", "")
-    %apply;language_link("no", "")
-    %apply;language_link("pl", "")
-    %apply;language_link("pt", "")
-    %apply;language_link("pt", "br")
-    %apply;language_link("ro", "")
-    %apply;language_link("ru", "")
-    %apply;language_link("sl", "")
-    %apply;language_link("sv", "")
-    %apply;language_link("zh", "")
+    %apply;language_link("Deutsch", "de")
+    %apply;language_link("English", "en")
+    %apply;language_link("Español", "es")
+    %apply;language_link("Français", "fr")
+    %apply;language_link("Italiano", "it")
+    %apply;language_link("Nederlands", "nl")
+    %apply;language_link("Norsk", "no")
+    %apply;language_link("Suomi", "sv")
+    %apply;language_link("Svenska", "sl")
   </div>
 </div>
 

diff --git a/src/util.ml b/src/util.ml
@@ -1003,10 +1003,12 @@ value image_prefix conf =
   else "images"
 ;
 
+(* Code mort. Géré par le css *)
 value default_background conf =
   sprintf "background:url('%s/gwback.jpg')" (image_prefix conf)
 ;
 
+(* Code mort. Géré par le css *)
 value default_body_prop conf =
   let style =
     match p_getenv conf.env "size" with
@@ -1020,10 +1022,10 @@ value default_body_prop conf =
 value body_prop conf =
   try
     match List.assoc "body_prop" conf.base_env with
-    [ "" -> default_body_prop conf
+    [ "" -> ""
     | s -> " " ^ s ]
   with
-  [ Not_found -> default_body_prop conf ]
+  [ Not_found -> "" ]
 ;
 
 value css_prop conf =