[cpif] r315 - in trunk/frontend-web: . skins/default

[svn at argo.es]

Author: alvaro
Date: Mon Jul 30 20:04:58 2007
New Revision: 315

Log:
Correcciones


Modified:
   trunk/frontend-web/skins.py
   trunk/frontend-web/skins/default/body_threadlist.html

Modified: trunk/frontend-web/skins.py
==============================================================================
--- trunk/frontend-web/skins.py	(original)
+++ trunk/frontend-web/skins.py	Mon Jul 30 20:04:58 2007
@@ -194,7 +194,8 @@
       format = self._style.pop(0)
       self._style.append(format)
       if self._dict["user"]:
-        mon = available_skins[self._skin]['metatag_unmon'] % { "metatag_num": id } if mon else available_skins[self._skin]['metatag_mon'] % { "metatag_num": id }
+        mon = available_skins[self._skin]['metatag_unmon'] if mon else available_skins[self._skin]['metatag_mon']
+        mon = mon % { "metatag_num": id }
         if nr:
           aux = available_skins[self._skin]['metatag_unread'] % {"title":title, "format": format, "link": "/indice/%d" % id, "mon": mon}
         else:
@@ -214,7 +215,8 @@
         format = self._style.pop(0)
         self._style.append(format)
         if self._dict["user"]:
-          mon =  available_skins[self._skin]['thread_unmon'] % { "thread_num": thread } if mon else available_skins[self._skin]['thread_mon'] % { "thread_num": thread }
+          mon =  available_skins[self._skin]['thread_unmon'] if mon else available_skins[self._skin]['thread_mon']
+          mon = mon % { "thread_num": thread }
           if nr:
             page = ((nr[0] - 1) / thread_len)  * thread_len + 1
             aux = available_skins[self._skin]['thread_unread'] % {"title":title,
@@ -241,8 +243,10 @@
               "format": format,
               "t_replies": n_msgs,
               }
-
-
+        # The monitoring of the metatag:
+        mon = available_skins[self._skin]['metatag_unmon'] if self._dict["monitor"] else available_skins[self._skin]['metatag_mon'] 
+        mon = mon % { "metatag_num": metatag }
+        self._dict["mon"] = mon
         self.set_text(aux)
 
   def _header(self):

Modified: trunk/frontend-web/skins/default/body_threadlist.html
==============================================================================
--- trunk/frontend-web/skins/default/body_threadlist.html	(original)
+++ trunk/frontend-web/skins/default/body_threadlist.html	Mon Jul 30 20:04:58 2007
@@ -2,6 +2,7 @@
     <p class="right"><a href="%(link_mark_as_read)s">Marcar todos los hilos como leidos</a></p>
     %(body)s
     <p class="right"><a href="javascript:toggleBox('form', 2);">Iniciar un nuevo hilo</a></p>
+    <p class="right">%(mon)s</p>
   </div>
   <div id="form">
     <form id="fNewthread" action="%(link_form_new_thread)s" method="post" enctype="multipart/form-data">