Changeset 99

Timestamp:

04/06/08 13:59:47 (8 months ago)

Author:

pragma

Message:

• Fixed display for message synopsis and forum synopsis
  
• Forum latest-post synopsis still (mysteriously) broken
  
• Added synopsis_length to tracforums ini settings
  

Files:

• trunk/tracforums/model.py (modified) (2 diffs)
• trunk/tracforums/models/forum.py (modified) (1 diff)
• trunk/tracforums/models/main.py (modified) (2 diffs)
• trunk/tracforums/models/message.py (modified) (4 diffs)
• trunk/tracforums/models/topic.py (modified) (1 diff)
• trunk/tracforums/orm.py (modified) (1 diff)
• trunk/tracforums/templates/tracforums/forum/_defs.cs (modified) (2 diffs)
• trunk/tracforums/templates/tracforums/forum/edit.cs (modified) (2 diffs)
• trunk/tracforums/templates/tracforums/message/_defs.cs (modified) (2 diffs)
• trunk/tracforums/templates/tracforums/profile/_defs.cs (modified) (1 diff)
• trunk/tracforums/templates/tracforums/topic/_defs.cs (modified) (1 diff)
• trunk/tracforums/templates/tracforums/topic/view.cs (modified) (1 diff)

trunk/tracforums/model.py

@@ -171 +171 @@
-        self.req.session[name] = value
-       
-Tru
+Fals
-        return wiki_to_oneliner(text,self.env,self.env.get_db_cnx(),shorten,absurls)
-                     
@@ -220 +220 @@
-        return self.env.config.get("tracforums","profilepath",'/')
-        
+    def getSynopsisLength(self):
+        return int(self.env.config.get("tracforums","synopsis_length",'100'))        
+        
-    def getAvatarMetrics(self):
-        return {
-self.env.config.get("tracforums","max_avatars",10
-self.env.config.get("tracforums","max_avatar_bytes",15000
-self.env.config.get("tracforums","max_avatar_width",100
-self.env.config.get("tracforums","max_avatar_height",100
+int(self.env.config.get("tracforums","max_avatars",10)
+int(self.env.config.get("tracforums","max_avatar_bytes",15000)
+int(self.env.config.get("tracforums","max_avatar_width",100)
+int(self.env.config.get("tracforums","max_avatar_height",100)
-        }
-        

trunk/tracforums/models/forum.py

@@ -64 +64 @@
-        self.moderatorsList = ", ".join(map(lambda x: x.username,self.moderators))
-        self.userIsModerator = self.formatContext.getAuthname() in self.moderators
+        
+        synopsisLength = self.formatContext.getSynopsisLength()
+        self.synopsis = self.description
+        if self.synopsis and len(self.synopsis) > synopsisLength:
+            self.synopsis = self.synopsis[:synopsisLength] + "..."
+        self.synopsishtml = self.formatContext.wikiToOneLiner(self.synopsis)
-                
-    def _canView(self):

trunk/tracforums/models/main.py

@@ -54 +54 @@
-        for forum in ForumModelWithRecentPost(self.db,self).getMany({"projectid": self.getProjectId(),"categoryid":0}):
-            if forum.canView: plainForums.append(forum)
-
-
+
-        return ("main/index.cs",{
-            "returnto": self.req.abs_href.forums() + "main/index",
@@ -64 +63 @@
-            "canWatch": self.isForumUser(),
-            "watching": ProjectWatchModelWithProfile(self.db,self).getMany({"projectid": self.getProjectId()}),
-                   
+
-                
-    def doManage(self):

trunk/tracforums/models/message.py

@@ -22 +22 @@
-            "avatarid":   ORMColumn(type="int"),
-            "modifiedby": ORMColumn(type="str"),
-, default=-1
+
-            
-            # synthetic columns
@@ -47 +47 @@
-    def format(self):
-        #TODO: replace with a smarter, wiki 'null formatter'
-
-
+
+
+
+
-        self.synopsishtml = self.formatContext.wikiToOneLiner(self.synopsis)
-        if self.modcount == None:
@@ -72 +74 @@
-            # set the author as an editor
-            self.modifiedby = profileModel.username;
-            self.modcount = self.modcount + 1
-        self.modified = self.formatContext.epochNow()
-                
@@ -161 +162 @@
-                        if x.id == message.avatarid:
-                            message.avatar = x
-
-
+
-                    preview = True
-                elif action == "save":
+                    message.modcount = message.modcount + 1
-                    authorProfile.save()
-                    message.save()

trunk/tracforums/models/topic.py

@@ -245 +245 @@
-        if args.get("viewid",0) != 0:
-            topic.load({"topicid": args["viewid"]})
-
+,debug=True
-            messageAuthor = topic.leadmessage.author
-        else:

trunk/tracforums/orm.py

@@ -130 +130 @@
-    @staticmethod
-    def wiki(formatContext,value):
-wiki_to_html(value, formatContext.env, formatContext.req
+formatContext.wikiToHTML(value
-        
-    @staticmethod
-    def oneliner(formatContext,value):
-wiki_to_oneliner(value,formatContext.env
+formatContext.wikiToOneLiner(value
-        
-    @staticmethod

trunk/tracforums/templates/tracforums/forum/_defs.cs

@@ -21 +21 @@
-        </a>
-        <div class='description'>
-description
+synopsis
-            <?cs if:len(forum.moderators) > 0?>
-                <div class="moderators">
@@ -39 +39 @@
-    </td>
-    <td class="forum-listing-lastpost">
+    [<?cs var:forum.recentpostid?>]
-        <?cs if: forum.recentPostId != 0?>
-            <?cs call:displayMessagePreview(forum.recentpost)?>             

trunk/tracforums/templates/tracforums/forum/edit.cs

@@ -52 +52 @@
-        <input type="hidden" id="returnto" name="returnto" value="<?cs var:forums.returnto?>">
-        <input type="hidden" id="action" name="action" value="preview">
-
-
-
-
+
+
+
+
+
-            <label for="name">Forum Name:</label>
-            <input type="text" name="name" id="name" value="<?cs var:forums.forum.name?>">
-            
-
+/
-            <label for="hidden">Hidden:</label>
-            <select name="hidden" id="hidden">
@@ -103 +104 @@
-        <fieldset id="edit">
-            <legend>Forum Description</legend>
-
+
+
-        </fieldset>
-        <br>

trunk/tracforums/templates/tracforums/message/_defs.cs

@@ -3 +3 @@
-<?cs def:displayMessagePreview(message)?>
-    <div class="description">   
-
+html
-        <br>
-        <?cs call:displayMiniPortrait(message.profile,message.avatar)?>
@@ -60 +60 @@
-            <legend>Message Properties</legend>
-            <div class="field">
-Default 
+
-                <select id="avatarid" name="avatarid" onchange="
-                    value = this.options[this.selectedIndex].value;

trunk/tracforums/templates/tracforums/profile/_defs.cs

@@ -23 +23 @@
-    <div class="portrait">  
-        <a href="<?cs var:trac.href.forums ?>/profile/view/<?cs var:profile.username?>">
-!avatar
+len(avatar) == 0
-                <?cs call:displayAvatar(profile,profile.defaultAvatar,"portrait")?>
-            <?cs /if?>
-avatar
+len(avatar) != 0
-                <?cs call:displayAvatar(profile,avatar,"portrait")?>
-            <?cs /if?>

trunk/tracforums/templates/tracforums/topic/_defs.cs

@@ -29 +29 @@
-    <td class="forum-listing-lastpost">
-        <?cs if: topic.recentPostId != 0 && topic.recentPostId != topic.leadmessageid?>
-leadmessage
+recentpost
-        <?cs /if?>
-    </td>

trunk/tracforums/templates/tracforums/topic/view.cs

@@ -21 +21 @@
-    </div>
-    <br/>   
-          
+
-        <div class="moderators">
-            <?cs if:len(forums.forum.moderators) > 0?>