move api methods to api controller + add create_contact api method

pboard/pboard/controllers/api.py

@@ -42,6 +42,18 @@ class PODApiController(BaseController):
       redirect(lurl('/document/%i'%(loNewNode.parent_id)))
 
     @expose()
+    def create_contact(self, parent_id=None, data_label=u'', data_content=u'', **kw):
+
+      loNewNode = pld.createNode()
+      loNewNode.parent_id     = int(parent_id)
+      loNewNode.node_type     = pmd.PBNodeType.Contact
+      loNewNode.data_label    = data_label
+      loNewNode.data_content  = data_content
+
+      pm.DBSession.flush()
+      redirect(lurl('/document/%i'%(loNewNode.parent_id)))
+
+    @expose()
     def set_parent_node(self, node_id, new_parent_id, **kw):
       loNewNode = pld.getNode(node_id)
       if new_parent_id!='':
@@ -71,7 +83,7 @@ class PODApiController(BaseController):
       else:
         loNewNode.parent_id = parent_id
 
-      DBSession.flush()
+      pm.DBSession.flush()
       redirect(lurl('/document/%i'%(loNewNode.node_id)))
 
     @expose()
@@ -97,6 +109,6 @@ class PODApiController(BaseController):
       loNode     = pld.getNode(node_id)
       liParentId = loNode.parent_id
       if loNode.getChildNb()<=0:
-        DBSession.delete(loNode)
+        pm.DBSession.delete(loNode)
       redirect(lurl('/document/%i'%(liParentId or 0)))
 

pboard/pboard/templates/document.mak

@@ -36,8 +36,8 @@
   % else:
     % if len(node_list)>0:
       % for node in node_list:
-        <div class="pod-toolbar-parent" style="padding-left: ${(indentation+2)*0.5}em; position: relative;">
-          <a href="?node=${node.node_id}" title="${node.data_label}">
+        <div class="pod-toolbar-parent ${'pod-status-active' if node.node_id==current_node.node_id else ''}" style="padding-left: ${(indentation+2)*0.5}em; position: relative;">
+          <a href="${tg.url('/document/%s'%(node.node_id))}" title="${node.data_label}">
             % if node.getStatus().status_family=='closed' or node.getStatus().status_family=='invisible':
               <strike>
             % endif
@@ -83,22 +83,6 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
 
   <div class="row">
     <div class="span3">
-      <div class="btn-group">
-        <button class="btn">${_('Documents')}</button>
-        <button class="btn" title="${_('Show current filtering state')}"><i class="  icon-g-eye-open"></i></button>
-        
-        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#" title='${_('Adjust filtering')}'><i class=" icon-g-adjust"></i></a>
-                <ul class="dropdown-menu">
-          % for node_status in node_status_list:
-            <li>
-              <a class="${node_status.css}" href="${tg.url('/edit_status?node_id=%i&node_status=%s'%(current_node.node_id, node_status.status_id))}">
-                <i class="${node_status.icon_id}"></i> ${node_status.label}
-              </a>
-            </li>
-          % endfor
-        </ul>
-      </div>
-      <p></p>
       <div>
         ${node_treeview(root_node_list)}
       </div>
@@ -114,7 +98,7 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
         <ul class="dropdown-menu">
           % for node_status in node_status_list:
             <li>
-              <a class="${node_status.css}" href="${tg.url('/edit_status?node_id=%i&node_status=%s'%(current_node.node_id, node_status.status_id))}">
+              <a class="${node_status.css}" href="${tg.url('/api/edit_status?node_id=%i&node_status=%s'%(current_node.node_id, node_status.status_id))}">
                 <i class="${node_status.icon_id}"></i> ${node_status.label}
               </a>
             </li>
@@ -252,10 +236,34 @@ ${POD.AddButton('current-document-add-event-button', True, _(' Add event'))}
             % endif
             </div>
             <div class="tab-pane" id="contacts">
+            
+              <!-- ADD CONTACT FORM -->
+              ${POD.AddButton('current-document-add-contact-button', True, _(' Add contact'))}
+              <form style='display: none;' id='current-document-add-contact-form' action='${tg.url('/api/create_contact')}' method='post' class="well">
+                <input type="hidden" name='parent_id' value='${current_node.node_id}'/>
+                <fieldset>
+                  <legend>Add an event</legend>
+                  <label>
+                    <input type="text" name='data_label' placeholder="Title"/>
+                  </label>
+                  <label>
+                    <div>
+                      <textarea id="add_contact_data_content_textarea" name='data_content' spellcheck="false" wrap="off" autofocus placeholder="${_('detail...')}"></textarea>
+                    </div>
+                  </label>
+                  ${POD.CancelButton('current-document-add-contact-cancel-button', True)}
+                  ${POD.SaveButton('current-document-add-contact-save-button', True)}
+                </fieldset>
+              </form>
+
+              <!-- LIST OF CONTACT NODES -->
               % for contact in current_node.getContacts():
                 <div class="well">
                   <legend class="text-info">${contact.data_label}</legend>
-                  <div>${contact.data_content|n}</div>
+                  <div>
+                    <a style='float: right;' href="" title='${_('Search on google maps')}'><i class='icon-g-google-maps'></i></a>
+                    ${contact.data_content|n}
+                  </div>
                 </div>
               % endfor
             </div>

pboard/pboard/templates/master.mak

@@ -105,6 +105,7 @@ tr:Hover td div.pod-toolbar {
 .pod-status-grey-light  { background-color: #DDD; }
 .pod-status-grey-middle { background-color: #BBB; }
 .pod-status-grey-dark   { background-color: #AAA; }
+.pod-status-active      { background-color: #FEE; }
 
 </style>
 
@@ -136,6 +137,7 @@ tr:Hover td div.pod-toolbar {
                 $('#current_node_textarea').css("min-height", "12em");
                 $('#current_node_textarea').addClass("span5");
 
+                /* ADD EVENT FORM */
                 $('#add_event_data_content_textarea').wysihtml5({
                   "font-styles": false, //Font styling, e.g. h1, h2, etc. Default true
                   "emphasis": true, //Italics, bold, etc. Default true
@@ -149,6 +151,19 @@ tr:Hover td div.pod-toolbar {
                 $('#add_event_data_content_textarea').css("height", "4em");
                 $('#add_event_data_content_textarea').addClass("span3");
 
+                /* ADD CONTACT FORM */
+                $('#add_contact_data_content_textarea').wysihtml5({
+                  "font-styles": false, //Font styling, e.g. h1, h2, etc. Default true
+                  "emphasis": true, //Italics, bold, etc. Default true
+                  "lists": false, //(Un)ordered lists, e.g. Bullets, Numbers. Default true
+                  "html": true, //Button which allows you to edit the generated HTML. Default false
+                  "link": true, //Button to insert a link. Default true
+                  "image": true, //Button to insert an image. Default true,
+                  // "color": true //Button to change color of font  
+                });
+                $('#add_contact_data_content_textarea').css('margin-bottom', '0');
+                $('#add_contact_data_content_textarea').css("height", "4em");
+                $('#add_contact_data_content_textarea').addClass("span3");
 
 
                 /* Edit title form */
@@ -202,6 +217,19 @@ tr:Hover td div.pod-toolbar {
                   $('#current-document-add-event-form').submit();
                 });
 
+                /* Add contact form hide/show behavior */
+                $("#current-document-add-contact-button" ).click(function() {
+                  $("#current-document-add-contact-form" ).css("display", "block");
+                  $("#current-document-add-contact-button" ).css("display", "none");
+                });
+                $('#current-document-add-contact-cancel-button').on('click', function(e){
+                  $("#current-document-add-contact-form" ).css("display", "none");
+                  $("#current-document-add-contact-button" ).css("display", "block");
+                });
+                $('#current-document-add-contact-save-button').on('click', function(e){
+                  e.preventDefault(); // We don't want this to act as a link so cancel the link action
+                  $('#current-document-add-contact-form').submit();
+                });
 
 
 
@@ -255,9 +283,9 @@ tr:Hover td div.pod-toolbar {
         <div class="nav-collapse">
           <ul class="nav">
             <li class="active"><a href="${tg.url('/dashboard')}"><i class="icon-home icon-white"></i> Dashboard</a></li>
+            <li><a>Link</a></li>
             <li><a href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+
           % if request.identity:
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin <b class="caret"></b></a>