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

[svn at argo.es]

Author: alvaro
Date: Mon Jul  2 23:53:09 2007
New Revision: 225

Log:
Commit para quitar el bug de los avatares.


Modified:
   trunk/frontend-web/skins.py
   trunk/frontend-web/skins/default/body_show_thread_anonymous.html
   trunk/frontend-web/skins/default/body_show_thread_entry.html
   trunk/frontend-web/skins/default/body_show_thread_entry_anonymous.html
   trunk/frontend-web/url_hilo.py

Modified: trunk/frontend-web/skins.py
==============================================================================
--- trunk/frontend-web/skins.py	(original)
+++ trunk/frontend-web/skins.py	Mon Jul  2 23:53:09 2007
@@ -109,10 +109,12 @@
 
   def show_thread(self):
     """Format some entries inside a thread"""
+    print "caca"
     first_post, num_msgs, messages = self._dict.pop("messages")
     thread_num = self._dict.get("thread_num")
     metatag = self._dict.get("metatag",None)
-    for msg_num,author,date,text in messages:
+    print messages
+    for msg_num,author,date,text,avatar in messages:
       format = self._style.pop(0)
       self._style.append(format)
       if self._user:
@@ -121,7 +123,8 @@
         aux = available_skins[self._skin]['thread_entry_anonymous']
       aux = aux % {"msg_num":msg_num, "author":author,
           "date":hourdate(date,self._tz),
-          "text":text,"format":format }
+          "text":text,"format":format,
+        }
       self.set_text(aux)
 
     from globales import thread_len

Modified: trunk/frontend-web/skins/default/body_show_thread_anonymous.html
==============================================================================
--- trunk/frontend-web/skins/default/body_show_thread_anonymous.html	(original)
+++ trunk/frontend-web/skins/default/body_show_thread_anonymous.html	Mon Jul  2 23:53:09 2007
@@ -2,6 +2,7 @@
     <h4>Subforo: %(metatag_title)s</h4>
     <h2>T&iacute;tulo: %(thread_title)s</h2>
     <h3>Iniciado por %(thread_author)s</h3>
+    <img src="%(avatar)" alt="%(avatar_alt)" />
     <ul class="nav">
       %(nav)s
     </ul>

Modified: trunk/frontend-web/skins/default/body_show_thread_entry.html
==============================================================================
--- trunk/frontend-web/skins/default/body_show_thread_entry.html	(original)
+++ trunk/frontend-web/skins/default/body_show_thread_entry.html	Mon Jul  2 23:53:09 2007
@@ -1,6 +1,7 @@
 <div class="%(format)s" id="m%(msg_num)s">
   <a name="m%(msg_num)s"></a>
-  <div class="autor">Autor: %(author)s</div>
+  <div class="autor">Autor: %(author)s<br />
+  </div>
   <div class="texto">
     <div class="fecha">
       <a href="#m%(msg_num)s">#</a>

Modified: trunk/frontend-web/skins/default/body_show_thread_entry_anonymous.html
==============================================================================
--- trunk/frontend-web/skins/default/body_show_thread_entry_anonymous.html	(original)
+++ trunk/frontend-web/skins/default/body_show_thread_entry_anonymous.html	Mon Jul  2 23:53:09 2007
@@ -1,6 +1,7 @@
 <div class="%(format)s" id="m%(msg_num)s">
   <a name="m%(msg_num)s"></a>
-  <div class="autor">Autor: %(author)s</div>
+  <div class="autor">Autor: %(author)s<br />
+  </div>
   <div class="texto">
     <div class="fecha">
       <a href="#m%(msg_num)s">#</a>

Modified: trunk/frontend-web/url_hilo.py
==============================================================================
--- trunk/frontend-web/url_hilo.py	(original)
+++ trunk/frontend-web/url_hilo.py	Mon Jul  2 23:53:09 2007
@@ -21,11 +21,8 @@
     except :
       return None
 
-  try :
-    meta,mensajes,num_mensajes,finished,metatags=database.listado_hilo(conn,usuario,hilo_num,first_post)
-    if not meta : return None
-  except :
-    return None
+  meta,mensajes,num_mensajes,finished,metatags=database.listado_hilo(conn,usuario,hilo_num,first_post)
+  if not meta : return None
 
   assert len(metatags)==1 # De momento no permitimos multiples metatags para un hilo
   metatag=metatags[0]