From: x2000habouzit Date: Mon, 18 Oct 2004 12:20:05 +0000 (+0000) Subject: no more br's, better css X-Git-Tag: xorg/old~1231 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=55e23777368a8db4b5f3c3e106ec74c36148824b;p=platal.git no more br's, better css --- diff --git a/htdocs/css/nl.css b/htdocs/css/nl.css index acf7e34..9f26f42 100644 --- a/htdocs/css/nl.css +++ b/htdocs/css/nl.css @@ -22,12 +22,12 @@ div.nl { margin: auto; font-family: "Georgia","times new roman",serif; - width: 58ex; + width: 60ex; text-align: justify; } div.nl div.title { - margin: 2ex 0ex 4ex 0ex; + margin: 2ex 0ex 2ex 0ex; padding: 1ex; width: 100%; border: 1px black solid; @@ -35,6 +35,10 @@ div.nl div.title { text-align: center; } +div.nl div.lnk { margin: 2ex 0ex 2ex 0ex; } + +div.nl div.lnk a { display: block; } + div.nl h1 { margin: 3ex 0ex 2ex 0ex; padding: 2px 1ex 2px 1ex; @@ -53,12 +57,14 @@ div.nl h2 { } div.nl div.art { - padding-left: 1ex; + padding-left: 2ex; margin: 0ex 0ex 4ex 0ex; + width: 58ex; } div.nl div.app { padding-left: 4ex; + width: 54ex; margin: 2ex 0ex 2ex 0ex; text-align: left; } diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 9350563..118dd47 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter.inc.php,v 1.14 2004-10-18 09:19:50 x2000habouzit Exp $ + $Id: newsletter.inc.php,v 1.15 2004-10-18 12:20:06 x2000habouzit Exp $ ***************************************************************************/ @@ -144,16 +144,16 @@ class NewsLetter { $i = 1; foreach($this->_arts as $cid=>$arts) { - $res .= "$i. {$this->_cats[$cid]}
"; + $res .= "

$i. {$this->_cats[$cid]}"; foreach($arts as $art) { - $res .= '- '.htmlentities($art->title())."
\n"; + $res .= " - ".htmlentities($art->title()).""; } - $res .= '
'; + $res .= '

'; $i ++; } foreach($this->_arts as $cid=>$arts) { - $res .= '

'.$this->_cats[$cid].'

'; + $res .= "

".$this->_cats[$cid].'

'; foreach($arts as $art) { $res .= $art->toHtml(); } @@ -164,12 +164,14 @@ class NewsLetter { @@ -229,7 +231,7 @@ class NLArticle { } function toHtml() { - $title = '

'.htmlentities($this->title()).'

'; + $title = "

".htmlentities($this->title()).'

'; $body = enriched_to_text($this->_body,true); $app = enriched_to_text($this->_append,true);