From 1baf6e6a5879d900f1c73caf69aa9e7c62b50ebc Mon Sep 17 00:00:00 2001 From: gdetrez Date: Mon, 17 Apr 2006 12:00:07 +0200 Subject: [PATCH] ajout d'une couleur random pour les boites darcs-hash:20060417100007-f46e9-e8c3cdaf10a7c03ef4a56457dcee55e1d1c03b56.gz --- wiki/parser/Box.py | 18 ++++++++++++++---- wiki/parser/Portail.py | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/wiki/parser/Box.py b/wiki/parser/Box.py index e269d318..e3772b4b 100644 --- a/wiki/parser/Box.py +++ b/wiki/parser/Box.py @@ -18,6 +18,9 @@ from MoinMoin.parser import wiki import os,string,re,StringIO from MoinMoin.action import AttachFile +color_list = ['orange', 'black', 'red', 'green', 'blue', 'gray'] + + ##################################################################### # Fonctions # ##################################################################### @@ -81,14 +84,22 @@ class Parser: self.settings={'title': u'|'.join([u" ".join(kw.keys()), u" ".join(kw.values())])} self.settings = self.parseArgs(kw["format_args"]) - + def getRandomColor(self): + nb_of_colors = color_list.__len__() + from random import randint + colorNum = randint(0, nb_of_colors - 1) + return color_list[colorNum] + def parseArgs(self, argsString): argList = argsString.split(u',') settings = {} for anArg in argList: anArg = anArg.strip(u' ') if anArg.find(u'color=')!=-1: - settings['color'] = anArg.split(u'=')[1] + theColor = anArg.split(u'=')[1] + if theColor == 'random': + theColor = self.getRandomColor() + settings['color'] = theColor else: settings['title'] = anArg return settings @@ -104,7 +115,6 @@ class Parser: color = self.settings['color'] except: color=None - boite.make( title,content, color) + boite.make(title, content, color) return - diff --git a/wiki/parser/Portail.py b/wiki/parser/Portail.py index d2955bc5..38deed01 100644 --- a/wiki/parser/Portail.py +++ b/wiki/parser/Portail.py @@ -59,7 +59,7 @@ class PortailFormatter: def cell(self, title, description, image): if self.counter==0: self.request.write(self.formatter.table_row(1)) - self.request.write(self.formatter.table_cell(1,{'style':'width:50%;border:none;padding:20px 20px 20px 50px;background:transparent url(\'' + image.replace("\'","\\\'") + '\') center left no-repeat; vertical-align:center;'})) + self.request.write(self.formatter.table_cell(1,{'style':'width:50%;border:none;padding:20px 20px 20px 50px;background:transparent url(\'' + image.replace("\'","\\\'") + '\') center left no-repeat; vertical-align:middle;'})) self.request.write(title) self.request.write(description) self.request.write(self.formatter.table_cell(0))