changes wrt new banana

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-217

diff --git a/htdocs/banana/.arch-inventory b/htdocs/banana/.arch-inventory
index a19da22..3e2b070 100644 (file)
--- a/htdocs/banana/.arch-inventory
+++ b/htdocs/banana/.arch-inventory
@@ -1 +1 @@
-precious ^(img|spool|xface.php)
+precious ^(img|spool|xface.php|banana.css)

diff --git a/htdocs/banana/banana.css b/htdocs/banana/banana.css
deleted file mode 100644 (file)
index 2af59a5..0000000
--- a/htdocs/banana/banana.css
+++ /dev/null
@@ -1,95 +0,0 @@
-img { border: 0px; margin: 0; }
-
-table.bicol div, table.bananaoverview div { height: 21px; }
-
-
-table.bicol { width: 100%; }
-
-table.bicol td {
-    padding-left: 0.5em;
-    padding-right: 0.5em;
-    white-space: nowrap;
-    overflow: hidden;
-}
-table.bicol td.bicolvpadd, td.bouton {
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-table.bicol td.bouton {
-    text-align: center;
-}
-
-/*******************************************
-*             FORUMS                       *
-*******************************************/
-
-.new { font-weight: bold; }
-
-div.bananashortcuts {
-    text-align: left;
-    padding-bottom: 1em;
-    padding-top: 1em;
-}
-
-div.bananatree {
-    float: left;
-    padding-right: 0.3em;
-}
-
-span.bananaisref {
-    font-style: italic;
-}
-
-table.bicol td.banananopadd {
-    padding-left: 0em;
-    padding-right: 0em;
-}
-
-table.bicol td.bananatotal,td.bananaunread,td.bananadate {
-    text-align: center;
-    padding-left: 0.1em;
-    padding-right: 0.1em;
-}
-
-table.bicol td.bananasubject,td.bananagroup,td.bananafrom,td.bananadescription {
-    text-align: left;
-}
-
-table.bananaoverview {
-    /*  background-color: #eeeeee;*/
-    background-color: inherit;
-    color: inherit;
-    width: 100%;
-    font-size: 95%;
-}
-
-table.bananaoverview tr.impair {}
-
-table.bananaoverview tr.pair {
-    background-color: #eeeed0;
-    color: inherit;
-}
-
-table.bananaoverview th {
-    /*  background-color: #336699;*/
-    background-color: inherit;
-    color: #FFFFFF;
-    font-weight: bold;
-    text-align: center;
-    vertical-align: middle;
-}
-
-table.bananaoverview td {
-    color: #000000;
-    background-color: inherit;
-    padding: 0px 0.4em 0px 0.4em;
-}
-
-table.bananaoverview td.bananasubject,td.bananagroup,td.bananafrom,td.bananadescription {
-    text-align: left;
-}
-
-table.bananaoverview span.isref {
-    font-style: italic;
-}
-

diff --git a/htdocs/banana/include/hack.inc.php b/htdocs/banana/include/hack.inc.php
index e5f59b8..f2089b3 100644 (file)
--- a/htdocs/banana/include/hack.inc.php
+++ b/htdocs/banana/include/hack.inc.php
@@ -42,18 +42,18 @@ function hook_displayshortcuts($sname, $first = -1) {
     
     switch ($sname) {
         case 'subscribe.php' :
-            echo '[<a href="index.php">Liste des forums</a>] ';
-            echo '[<a href="'.url("confbanana.php").'">Profil</a>] ';
+            return '[<a href="index.php">Liste des forums</a>] [<a href="'.url("confbanana.php").'">Profil</a>] ';
             break;
 
         case 'index.php' :
         case 'thread.php' :
         case 'article.php' :
         case 'post.php' :
+            $res = '';
             if (!$banana->profile['autoup']) { 
-                echo '[<a href="index.php?banana=updateall">Mettre à jour</a>] ';
+                $res .= '[<a href="index.php?banana=updateall">Mettre à jour</a>] ';
             }
-            echo '[<a href="'.url("confbanana.php").'">Profil</a>] ';
+            return $res . '[<a href="'.url("confbanana.php").'">Profil</a>] ';
             break;
     }
 }

diff --git a/htdocs/banana/install.sh b/htdocs/banana/install.sh
index f4bffc9..f7007ed 100755 (executable)
--- a/htdocs/banana/install.sh
+++ b/htdocs/banana/install.sh
@@ -6,3 +6,4 @@ ln -sf ../../../../banana/include/{groups,NetNNTP,post,spool,banana}.inc.php .
 popd &> /dev/null
 
 ln -sf ../../../banana/xface.php .
+ln -sf ../../../banana/css/style.css banana.css