From ed3717e577ec7bec1893c656024d029cebd3ccf6 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Sun, 14 Jan 2007 18:26:34 +0000 Subject: [PATCH] Can define elements to display git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@167 9869982d-c50d-0410-be91-f2a2ec7c7c7b --- banana/banana.inc.php.in | 2 ++ banana/page.inc.php | 2 ++ banana/templates/banana-base.tpl | 10 ++++++++++ css/style.css | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in index e260626..0b3c77c 100644 --- a/banana/banana.inc.php.in +++ b/banana/banana.inc.php.in @@ -23,6 +23,7 @@ class Banana 'subscribe' => array(), 'autoup' => 1); static public $boxpattern; + static public $withtabs = true; ### Spool ### static public $spool_max = 3000; @@ -44,6 +45,7 @@ class Banana static public $msgshow_mimeparts = array('multipart/report', 'multipart/mixed', 'text/html', 'text/plain', 'text/enriched', 'text', 'message'); static public $msgshow_xface = true; static public $msgshow_wrap = 78; + static public $msgshow_withthread = true; /** Match an url * Should be included in a regexp delimited using /, !, , or @ (eg: "/$url_regexp/ui") diff --git a/banana/page.inc.php b/banana/page.inc.php index d0d67b6..228c0ed 100644 --- a/banana/page.inc.php +++ b/banana/page.inc.php @@ -140,6 +140,8 @@ class BananaPage extends Smarty $this->assign('spool', Banana::$spool); $this->assign('protocole', Banana::$protocole); $this->assign('showboxlist', Banana::$spool_boxlist); + $this->assign('showthread', Banana::$msgshow_withthread); + $this->assign('withtabs' , Banana::$withtabs); $this->register_function('url', array($this, 'makeUrl')); $this->register_function('link', array($this, 'makeLink')); diff --git a/banana/templates/banana-base.tpl b/banana/templates/banana-base.tpl index d1f9cc6..8f3f82c 100644 --- a/banana/templates/banana-base.tpl +++ b/banana/templates/banana-base.tpl @@ -2,6 +2,7 @@ {* *} {* *} +{if $withtabs}
@@ -24,6 +25,9 @@
+{else} +
+{/if} {foreach from=$errors item=error}

{$error}

{/foreach} @@ -43,7 +47,9 @@ {include file="banana-thread.inc.tpl" withtitle=true} {elseif $page eq 'message'} {include file="banana-message.inc.tpl"} + {if $withthread} {include file="banana-thread.inc.tpl" withtitle=false} + {/if} {elseif $page eq 'new'} {include file="banana-newmessage.inc.tpl"} {elseif $page eq 'cancel'} @@ -58,8 +64,12 @@ {include file=$current_page.template} {/if} {/if} +{if $withtabs}
+{else} + +{/if} {* vim:set et sw=2 sts=2 ts=2 enc=utf-8: *} diff --git a/css/style.css b/css/style.css index 06ccc7c..979f197 100644 --- a/css/style.css +++ b/css/style.css @@ -6,6 +6,10 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ +.banana { + margin-bottom: 1em; +} + /** GROUP LIST **/ .banana .grp { text-align: left; } .banana .dsc { text-align: left; } -- 2.1.4