add tag list tab + manage visible @tags and @@invisible_tags

pboard/pboard/model/data.py

@@ -2,6 +2,7 @@
 """
 """
 import os
+import re
 from datetime import datetime
 from hashlib import sha256
 __all__ = ['User', 'Group', 'Permission']
@@ -195,14 +196,23 @@ class PBNode(object):
       lsTruncatedLabel = self.data_label
     return lsTruncatedLabel
 
+  def getTagList(self):
+    loPattern = re.compile('(^|\s|@)@(\w+)')
+    loResults = re.findall(loPattern, self.data_content)
+    lsResultList = []
+    for loResult in loResults:
+      lsResultList.append(loResult[1].replace('@', '').replace('_', ' '))
+    return lsResultList
+
   @classmethod
   def addTagReplacement(cls, matchobj):
-    if matchobj.group(0) == '-': return ' '
-    else: return "<span class='badge'>%s</span>" %(matchobj.group(0))
+    return " <span class='badge'>%s</span> " %(matchobj.group(0).replace('@', '').replace('_', ' '))
 
   def getContentWithTags(self):
-    import re
-    return re.sub('@(\w+)', PBNode.addTagReplacement, self.data_content)
+    lsTemporaryResult = re.sub('(^|\s)@@(\w+)', '', self.data_content) # tags with @@ are explicitly removed from the body
+    return re.sub('(^|\s)@(\w+)', PBNode.addTagReplacement, lsTemporaryResult) # then, 'normal tags are transformed as labels'
+    # FIXME - D.A. - 2013-09-12
+    # Does not match @@ at end of content.
 
 
 

pboard/pboard/templates/dashboard.mak

@@ -136,11 +136,8 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
             ${POD.SaveButton('current-document-title-save-cancel-button')}
           </div>
         </form>
-
-
-</div>
+      </div>
       <div class="span5">
-      
       <p>
         <div id='current-document-content' class="">
           ${current_node.getContentWithTags()|n}
@@ -158,6 +155,7 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
     <div class="span4">
       <div class="tabbable">
         <ul class="nav nav-tabs">
+            <li class=""><a href="#tags" data-toggle="tab" title="${_('Tags')}"><i class='icon-g-tags'></i></a></li>
             <li class="active">
               <a href="#events" data-toggle="tab" title="History"><i class="icon-g-history"></i></a>
             </li>
@@ -167,6 +165,11 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
             <li><a href="#contacts" data-toggle="tab" title="Users"><i class="icon-g-user""></i> </a></li>
         </ul>
         <div class="tab-content">
+            <div class="tab-pane" id="tags">
+              % for tag in current_node.getTagList():
+                ${POD.Badge(tag)}
+              % endfor
+            </div>
             <div class="tab-pane active" id="events">
 
 ${POD.AddButton('current-document-add-event-button', True, _(' Add event'))}