ENH: refs #0339. Use callback to add item action menu link for statistics

Author: zachmullen

CMakeLists.txt

@@ -23,7 +23,7 @@ endif()
 #-----------------------------------------------------------------------------
 #  Drop all tables from the testing DB
 #  Then re-install the DB, set a Default assetstore, and install all modules
-
+message(STATUS "Setting up database for module testing, please wait...")
 execute_process(
   COMMAND ${PHP} ${CMAKE_CURRENT_SOURCE_DIR}/tests/DatabaseSetup.php
   RESULT_VARIABLE databaseSetup_RESULT
@@ -35,6 +35,7 @@ if(${databaseSetup_RESULT})
   message(FATAL_ERROR "DatabaseSetup error: ${databaseSetup_ERR}")
 endif()
 
+message(STATUS "Database setup is complete")
 
 #-----------------------------------------------------------------------------
 #  This should be at the top level for warning suppression

core/views/item/view.phtml

@@ -111,9 +111,9 @@ if($this->preview) // module visualize
   <table style='display:block;'  id="metadataTable" class="midasTree">
     <thead>
       <tr>
-        <th ><?php echo $this->t('Element');?></th>
-        <th ><?php echo $this->t('Qualifier');?></th>
-        <th ><?php echo $this->t('Value');?></th>
+        <th class='elementHeader'><?php echo $this->t('Element');?></th>
+        <th class='qualifierHeader'><?php echo $this->t('Qualifier');?></th>
+        <th class='valueHeader'><?php echo $this->t('Value');?></th>
       </tr>
     </thead>
     <tbody>
@@ -174,9 +174,7 @@ if($this->preview) // module visualize
 </div>
 <div class="viewSideBar">
   <?php
-  $modules = Zend_Registry::get('modulesEnable');
-  $statisticsEnabled = in_array('statistics', $modules);
-  if($this->preview || $this->isModerator ||$this->isAdmin || $statisticsEnabled)
+  if($this->preview || $this->isModerator || $this->isAdmin)
     {?>
   <div class="sideElementFirst viewAction">
 
@@ -204,7 +202,7 @@ if($this->preview) // module visualize
           <a href='javascript:;' class='addMetadataLink' ><img alt='' src='{$this->coreWebroot}/public/images/icons/metadata.png'/> {$this->t('Add Metadata')}</a>
         </li>
         <li>
-          <a href='javascript:;' type='item' element='{$this->itemDao->getKey()}' class='sharingLink' ><img alt='' src='{$this->coreWebroot}/public/images/icons/share.png'/> {$this->t('Share')}</a>
+          <a href='javascript:;' type='item' element='{$this->itemDao->getKey()}' class='sharingLink' ><img alt='' src='{$this->coreWebroot}/public/images/icons/share.png'/> {$this->t('Permissions')}</a>
         </li>
         <li>
           <a href='javascript:;' type='item' element='{$this->itemDao->getKey()}' class='uploadRevisionLink' ><img alt='' src='{$this->coreWebroot}/public/images/icons/upload.png'/> {$this->t('Upload new revision')}</a>
@@ -220,10 +218,14 @@ if($this->preview) // module visualize
         </li>
           ";
         }
-      echo
-        "<li>
-          <a href='".$this->webroot."/statistics/item?id=".$this->itemDao->getKey()."'><img alt='' src='{$this->coreWebroot}/public/images/icons/metadata.png'/> {$this->t('Statistics')}</a>
-        </li>";
+      $htmltArray = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_ITEM_VIEW_ACTIONMENU", array('item' => $this->itemDao, 'isModerator' => $this->isModerator, 'isAdmin' => $this->isAdmin));
+      foreach($htmltArray as $html)
+        {
+        if(!empty($html))
+          {
+          echo $html;
+          }
+        }
       ?>
     </ul>
   </div>
@@ -262,7 +264,15 @@ if($this->preview) // module visualize
       }
       ?>
   </div>
-    <?php
+  <?php
+  $htmltArray = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_ITEM_VIEW_INFO", array('item' => $this->itemDao, 'isModerator' => $this->isModerator, 'isAdmin' => $this->isAdmin));
+  foreach($htmltArray as $html)
+    {
+    if(!empty($html))
+      {
+      echo $html;
+      }
+    }
   if(count($this->sameLocation) > 1)
     {?>
   <div class='sideElementLast viewSameLocation'>
@@ -282,7 +292,3 @@ if($this->preview) // module visualize
     }
     ?>
 </div>
-
-
-
-

modules/statistics/Notification.php

@@ -11,6 +11,7 @@ public function init()
     {
     $this->addCallBack('CALLBACK_CORE_GET_FOOTER_LAYOUT', 'getFooter');
     $this->addCallBack('CALLBACK_CORE_GET_USER_MENU', 'getUserMenu');
+    $this->addCallBack('CALLBACK_CORE_ITEM_VIEW_ACTIONMENU', 'getItemMenuLink');
     $this->addCallBack('CALLBACK_CORE_PLUS_ONE_DOWNLOAD', 'addDownload');
 
     $this->addTask('TASK_STATISTICS_SEND_REPORT', 'sendReport', 'Send a daily report');
@@ -46,6 +47,17 @@ public function getUserMenu()
       }
     }
 
+  /** Get the link to place in the item action menu */
+  public function getItemMenuLink($params)
+    {
+    $fc = Zend_Controller_Front::getInstance();
+    $coreWebroot = $fc->getBaseUrl().'/core';
+    $moduleWebroot = $fc->getBaseUrl().'/'.$this->moduleName;
+    return '<li><a href="'.$moduleWebroot.'/item?id='.$params['item']->getKey().
+           '"><img alt="" src="'.$coreWebroot.'/public/images/icons/metadata.png" /> '.
+           $this->t('Statistics').'</a></li>';
+    }
+
   /** get layout footer */
   public function getFooter()
     {