several improvments: clean homepage, moved reindex method to api controller, popover for history view, etc

pboard/pboard/controllers/api.py

@@ -170,3 +170,19 @@ class PODApiController(BaseController):
         pm.DBSession.delete(loNode)
       redirect(lurl('/document/%i'%(liParentId or 0)))
 
+    @expose()
+    def reindex_nodes(self, back_to_node_id=0):
+      """show the user dashboard"""
+      loRootNodeList   = pm.DBSession.query(pmd.PBNode).order_by(pmd.PBNode.parent_id).all()
+      for loNode in loRootNodeList:
+        if loNode.parent_id==None:
+          loNode.node_depth = 0
+          loNode.parent_tree_path = '/'
+        else:
+          loNode.node_depth = loNode._oParent.node_depth+1
+          loNode.parent_tree_path = '%s%i/'%(loNode._oParent.parent_tree_path,loNode.parent_id)
+      
+      pm.DBSession.flush()
+      flash(_('Documents re-indexed'), 'info')
+      redirect(lurl('/document/%s'%(back_to_node_id)))
+

pboard/pboard/controllers/root.py

@@ -18,6 +18,8 @@ import pboard.controllers as pbc
 from pboard.lib import dbapi as pld
 from pboard.controllers import api as pbca
 
+import pboard.model.data as pbmd
+
 __all__ = ['RootController']
 
 
@@ -48,7 +50,7 @@ class RootController(BaseController):
     @expose('pboard.templates.index')
     def index(self):
         """Handle the front-page."""
-        return dict(page='index')
+        return dict()
 
     @expose('pboard.templates.about')
     def about(self):
@@ -134,24 +136,3 @@ class RootController(BaseController):
         print "===> DDD"
         return dict(root_node_list=loRootNodeList, current_node=loCurrentNode, node_status_list = loNodeStatusList)
 
-
-    @expose()
-    def fill_treepath(self):
-        """show the user dashboard"""
-        import pboard.model.data as pbmd
-        
-        loRootNodeList   = pbm.DBSession.query(pbmd.PBNode).order_by(pbmd.PBNode.parent_id).all()
-        for loNode in loRootNodeList:
-          if loNode.parent_id==None:
-            loNode.node_depth = 0
-            loNode.parent_tree_path = '/'
-          else:
-            loNode.node_depth = loNode._oParent.node_depth+1
-            loNode.parent_tree_path = '%s%i/'%(loNode._oParent.parent_tree_path,loNode.parent_id)
-        
-        pbm.DBSession.flush()
-        
-        return 
-
-
-

pboard/pboard/lib/dbapi.py

@@ -106,7 +106,5 @@ def buildTreeListForMenu():
         loTmpDict[loNode.parent_id] = getNode(loNode.parent_id)
       loTmpDict[loNode.parent_id].appendStaticChild(loNode)
 
-  print "=================="
-  print loTmpDict[101].getStaticChildList()
   return loTreeList
 

pboard/pboard/model/data.py

@@ -169,7 +169,7 @@ class PBNode(DeclarativeBase):
   node_id          = Column(Integer, Sequence('pb_nodes__node_id__sequence'), primary_key=True)
   parent_id        = Column(Integer, ForeignKey('pb_nodes.node_id'), nullable=True, default=None)
   node_depth       = Column(Integer, unique=False, nullable=False, default=0)
-  parent_tree_path = Column(Unicode(255), unique=False, nullable=False, default=u'data')
+  parent_tree_path = Column(Unicode(255), unique=False, nullable=False, default=u'')
 
   node_order  = Column(Integer, nullable=True, default=1)
   node_type   = Column(Unicode(16), unique=False, nullable=False, default=u'data')

pboard/pboard/templates/document.mak

@@ -118,7 +118,6 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
         <a href='${tg.url('/api/force_delete_node?node_id=%i'%(current_node.node_id))}' id='current-document-force-delete-button' class="btn" onclick="return confirm('${_('Delete current document?')}');"><i class="icon-g-remove"></i> ${_('Delete')}</a>
       </div>
       
-            <!--</div> PAGE HEADER -->
       <h3 id="current-document-title">#${current_node.node_id} - ${current_node.data_label}</h3>
         <form style='display: none; margin-top: 1em;' id="current-document-title-edit-form" method='post' action='${tg.url('/api/edit_label')}'>
           <div class="input-prepend input-append">
@@ -147,8 +146,8 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
     <div id='application-metadata-panel' class="span4">
       <div class="tabbable">
         <ul class="nav nav-tabs">
-            <li class="active"><a href="#tags" data-toggle="tab" title="${_('Tags')}"><i class='icon-g-tags'></i></a></li>
-            <li><a href="#events" data-toggle="tab" title="History"><i class="icon-g-history"></i>${POD.ItemNb(current_node.getEvents())}</a></li>
+            ## DEBUG - D.A. - 2013-11-07 -  <li class="active"><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>${POD.ItemNb(current_node.getEvents())}</a></li>
             <li><a href="#contacts" data-toggle="tab" title="Contacts"><i class="icon-g-user""></i>${POD.ItemNb(current_node.getContacts())}</a></li>
             <li><a href="#comments" data-toggle="tab" title="Comments"><i class="icon-g-conversation"></i>${POD.ItemNb(current_node.getComments())}</a></li>
             <li><a href="#files" data-toggle="tab" title="Files"><i class="icon-g-attach"></i>${POD.ItemNb(current_node.getFiles())}</a></li>
@@ -159,6 +158,7 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
             ## PANEL SHOWING LIST OF TAGS
             ##
             ################################
+            <!-- DEBUG - D.A. - 2013-11-07 - Not using tags for th moment
             <div class="tab-pane" id="tags">
               <div class="well">
                 <p>
@@ -176,6 +176,7 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
                 % endfor
               </div>
             </div>
+            -->
             ################################
             ##
             ## PANEL SHOWING LIST OF EVENTS
@@ -234,7 +235,7 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
                   </tr>
                 </thead>
                 % for event in current_node.getEvents():
-                  <tr title="Last updated: ${event.updated_at}">
+                  <tr class="item-with-data-popoverable" data-content="${event.data_content}" rel="popover" data-placement="left" data-trigger="hover">
                     <td>${event.getFormattedDate(event.data_datetime)}</td>
                     <td>${event.getFormattedTime(event.data_datetime)}</td>
                     <td>${event.data_label}</td>

pboard/pboard/templates/index.mak

@@ -11,75 +11,24 @@
       </div>
 
       <div class="row">
-        <div class="span3">
-          <h3>Store structured data</h3>
-          <ul>
-            <li>contact information,</li>
-            <li>notes, files,</li>
-            <li>todos, events, reminders,</li>
-            <li>...</li>
-          </ul>
+        <div class="span2 alert alert-success">
+          <p><button><i class="icon-g-cardio"></i> <strong>Track</strong> projects</button></p>
+          <p><button><i class="icon-g-edit"></i> <strong>Take</strong> notes</button></p>
+          <p><button><i class="icon-g-attach"></i> <strong>Keep</strong> files</button></p>
+          <span><button><i class="icon-g-ok"></i> <strong>Manage</strong> status</button></span>
         </div>
-
-        <div class="span3">
-          <h3>Share information</h3>
+        <div class="span6 well well-small">
+          <h5>
+            <i class="icon-g-group"></i>
+            Use cases
+          </h5>
           <ul>
-            <li>Data is private, shared or public,</li>
-            <li>Send notification to co-workers,</li>
-            <li>Work together on the same data,</li>
+            <li>Search a job</li>
+            <li>Manage clients</li>
+            <li>Track tasks</li>
             <li>...</li>
           </ul>
         </div>
-
-        <div class="span3">
-          <h3>Manage Lifetime</h3>
-          <ul>
-            <li>Real life and information timelines,</li>
-            <li>Explore the life of information,</li>
-            <li>Create, open and close projects,</li>
-            <li>...</li>
-          </ul>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="span9">
-          <h3>Is it for me ?</h3>
-          <p>
-            You are prospecting clients? Looking for a job? Taking notes for your work? You're not sure ?
-          </p>
-          <p class="alert aler-warning">
-            Hey! What do you risk? Give it a try!
-          </p>
-        </div>
-      </div>
-      <div>
-        <h2>What can I do with pod ?</h2>
-        <ul style="list-style:none;">
-          <li><i class="icon-chevron-right"></i> Manage projects and tasks during their entire life:
-            <ul style="list-style:none;">
-              <li><i class="icon-chevron-right"></i> Create events and reminders</li>
-              <li><i class="icon-chevron-right"></i> Take and keep notes</li>
-              <li><i class="icon-chevron-right"></i> Keep contact information about people</li>
-              <li><i class="icon-chevron-right"></i> Organise data and information</li>
-            </ul>
-          </li>
-          <li>
-            <i class="icon-chevron-right"></i> Share up-to-date information:
-            <ul style="list-style:none;">
-              <li><i class="icon-chevron-right"></i> Organize and update information</li>
-              <li><i class="icon-chevron-right"></i> Send notifications to friends</li>
-              <li><i class="icon-chevron-right"></i> Manage information life</li>
-            </ul>
-          </li>
-        </ul>
-        If you see this page it means your installation was successful!</p>
-        <p>TurboGears 2 is rapid web application development toolkit designed to make your life easier.</p>
-        <p>
-          <a class="btn btn-primary btn-large" href="http://www.turbogears.org" target="_blank">
-            ${h.icon('book', True)} Learn more
-          </a>
-        </p>
       </div>
     </div>
     <div class="span3">
@@ -92,51 +41,7 @@
           <input type="submit" id="submit" value="Sign up" /><br/>
         </fieldset>
       </form>
-      
-      <div class="popover bottom">
-        <div class="arrow"></div>
-        <h3 class="popover-title">
-          Why to sign up ?
-        </h3>
-        <div>
-          <p>
-            blabla
-          </p>
-        </div>
-      </div>
-      <div class="alert alert-info">
-        <strong>Why to sign up ?</strong>
-      </div>
-      <div class="well">
-        <p>
-          <i class="icon-signal"></i> Make information live
-        </p>
-        <p>
-          <i class="icon-refresh"></i> Share up-to-date information
-        </p>
-        <p>
-          <i class="icon-list"></i> Manage tasks and projects
-        </p>
-      </div>
     </div>
   </div>
 
-  <div class="row">
-    <div class="span4">
-      <h3>Code your data model</h3>
-      <p> Design your data <code>model</code>, Create the database, and Add some bootstrap data.</p>
-    </div>
-
-    <div class="span4">
-      <h3>Design your URL architecture</h3>
-      <p> Decide your URLs, Program your <code>controller</code> methods, Design your
-        <code>templates</code>, and place some static files (CSS and/or Javascript). </p>
-    </div>
-
-    <div class="span4">
-      <h3>Distribute your app</h3>
-      <p> Test your source, Generate project documents, Build a distribution.</p>
-    </div>
-  </div>
 
-  <div class="notice"> Thank you for choosing TurboGears.</div>

pboard/pboard/templates/master.mak

@@ -445,6 +445,8 @@ tr:Hover td div.pod-toolbar {
                 });
               });
 
+$('.item-with-data-popoverable').popover({ html: true});
+
             </script>
 </body>
 
@@ -453,9 +455,10 @@ tr:Hover td div.pod-toolbar {
     flash=tg.flash_obj.render('flash', use_js=False)
   %>
   % if flash:
-    <div class="row"><div class="span8 offset2">
+    <div class="row">
+      <button type="button" class="close" data-dismiss="alert">&times;</button>
       ${flash | n}
-    </div></div>
+    </div>
   % endif
   ${self.body()}
 </%def>
@@ -478,25 +481,40 @@ tr:Hover td div.pod-toolbar {
   <div id="pod-navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container">
-        <a class="brand" href="#"><!--img src="${tg.url('/img/turbogears_logo.png')}" alt="TurboGears 2"/--> <strong>pod</strong></a>
         <div class="nav-collapse">
           <ul class="nav">
-            <li class="active"><a href="${tg.url('/document')}"><i class="icon-g-book-open"></i> ${_('Documents')}</a></li>
+            <li>
+              <a href="${tg.url('/')}">
+                <i class="icon-g-home"></i>
+                Home
+              </a>
+            </li>
+            <li>
+              <a href="${tg.url('/document')}"><i class="icon-g-book-open"></i> ${_('Documents')}</a>
+            </li>
             <li>
               <a title="${_('Toggle view mode: narrow')}" id='view-size-toggle-button-small' style="display: none;"><i class='icon-g-eye-open'></i> ${_('View mode')}</a>
               <a title="${_('Toggle view mode: medium')}" id='view-size-toggle-button-medium'><i class='icon-g-eye-open'></i> ${_('View mode')}</a>
               <a title="${_('Toggle view mode: large')}" id='view-size-toggle-button-large' style="display: none;"><i class='icon-g-eye-open'></i> ${_('View mode')}</a>
             </li>
-            <li><a href="${tg.url('/iconset')}"><i class="icon-g-show-thumbnails"></i> ${_('Icons')}</a></li>
+
+            <li>
+            % if current_node is UNDEFINED:
+              <a href="${tg.url('/api/reindex_nodes?back_to_node_id=0')}"><i class="icon-g-refresh"></i> Reindex documents</a>
+            % else:
+              <a href="${tg.url('/api/reindex_nodes?back_to_node_id=%i'%(current_node.node_id))}"><i class="icon-g-refresh"></i> Reindex documents</a>
+            % endif
+            </li>
 
           % if request.identity:
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin <b class="caret"></b></a>
               <ul class="dropdown-menu">
-                <li class="${('', 'active')[page=='admin']}"><a href="${tg.url('/admin')}">Manage</a></li>
-                <li class="${('', 'active')[page=='about']}"><a href="${tg.url('/about')}">About</a></li>
-                <li class="${('', 'active')[page=='data']}"><a href="${tg.url('/data')}">Serving Data</a></li>
-                <li class="${('', 'active')[page=='environ']}"><a href="${tg.url('/environ')}">WSGI Environment</a></li>
+                <li><a href="${tg.url('/admin')}">Manage</a></li>
+                <li><a href="${tg.url('/about')}">About</a></li>
+                <li><a href="${tg.url('/data')}">Serving Data</a></li>
+                <li><a href="${tg.url('/environ')}">WSGI Environment</a></li>
+                <li><a href="${tg.url('/iconset')}"><i class="icon-g-show-thumbnails"></i> ${_('Icons')}</a></li>
               </ul>
             </li>
           % endif