ENH: refs #0460. Improve the item view page

*Add history view
*Add License view (stub currently)
*Add description view
*Remove "in the same folder" section
*Add "in folders" section if more than one parent folder
*Add smart breadcrumb navigation and remove the Back button

Author: zachmullen

core/controllers/FolderController.php

@@ -136,15 +136,14 @@ public function viewAction()
           {
           $user = $this->Folder->getUser($parent);
           $header = " <li class = 'pathUser'><img alt = '' src = '".$this->view->coreWebroot."/public/images/icons/unknownUser-small.png' /><span><a href = '".$this->view->webroot."/user/".$user->getKey()."'>".$this->Component->Utility->sliceName($user->getFullName(), 25)."</a></span></li>".$header;
-
           }
         else
           {
           $header = " <li class = 'pathFolder'><img alt = '' src = '".$this->view->coreWebroot."/public/images/FileTree/directory.png' /><span><a href = '".$this->view->webroot."/folder/".$parent->getKey()."'>".$this->Component->Utility->sliceName($parent->getName(), 15)."</a></span></li>".$header;
           }
         $parent = $parent->getParent();
         }
-      $header = "<ul class = 'pathBrowser'>".$header;
+      $header = "<ul class='pathBrowser'>".$header;
       $header .= "</ul>";
       }
 
@@ -169,6 +168,7 @@ public function viewAction()
 
     $this->view->title .= ' - '.$folder->getName();
     $this->view->metaDescription = substr($folder->getDescription(), 0, 160);
+    $folder->setDescription(htmlentities($folder->getDescription()));
     $this->view->json['folder'] = $folder;
     }// end View Action
 

core/controllers/ItemController.php

@@ -95,7 +95,7 @@ function editmetadataAction()
   */
   function viewAction()
     {
-    $this->view->header = $this->t("Item");
+
     $this->view->Date = $this->Component->Date;
     $this->view->Utility = $this->Component->Utility;
     $itemId = $this->_getParam("itemId");
@@ -108,9 +108,9 @@ function viewAction()
       {
       throw new Zend_Exception("This item doesn't exist.");
       }
-    if(!$this->Item->policyCheck($itemDao, $this->userSession->Dao))
+    if(!$this->Item->policyCheck($itemDao, $this->userSession->Dao, MIDAS_POLICY_READ))
       {
-      throw new Zend_Exception("Problem policies.");
+      throw new Zend_Exception('Invalid policy: no read permission');
       }
 
     $this->view->isAdmin = $this->Item->policyCheck($itemDao, $this->userSession->Dao, MIDAS_POLICY_ADMIN);
@@ -186,7 +186,6 @@ function viewAction()
     // Display the good link if the item is pointing to a website
     $this->view->itemIsLink = false;
 
-
     if(isset($itemRevision) && $itemRevision !== false)
       {
       $bitstreams = $itemRevision->getBitstreams();
@@ -199,7 +198,12 @@ function viewAction()
           }
         }
       $itemDao->creation = $this->Component->Date->formatDate(strtotime($itemRevision->getDate()));
-      $this->view->metadatavalues = $this->ItemRevision->getMetadata($itemRevision);
+      }
+
+    // Add the metadata for each revision
+    foreach($itemDao->getRevisions() as $revision)
+      {
+      $revision->metadatavalues = $this->ItemRevision->getMetadata($revision);
       }
 
     $this->Component->Sortdao->field = 'revision';
@@ -213,9 +217,7 @@ function viewAction()
     $this->view->title .= ' - '.$itemDao->getName();
     $this->view->metaDescription = substr($itemDao->getDescription(), 0, 160);
 
-
-
-    $tmp = Zend_Registry::get('notifier')->callback("CALLBACK_VISUALIZE_CAN_VISUALIZE", array('item' => $itemDao));
+    $tmp = Zend_Registry::get('notifier')->callback('CALLBACK_VISUALIZE_CAN_VISUALIZE', array('item' => $itemDao));
     if(isset($tmp['visualize']) && $tmp['visualize'] == true)
       {
       $this->view->preview = true;
@@ -225,55 +227,72 @@ function viewAction()
       $this->view->preview = false;
       }
 
-    $items = array();
-    $this->view->backUploaded = false;
-    $this->view->currentFolder = false;
-    if(isset($this->userSession->uploaded) && in_array($itemDao->getKey(), $this->userSession->uploaded))
+    $currentFolder = false;
+    $parents = $itemDao->getFolders();
+    if(count($parents) == 1)
       {
-      $this->view->backUploaded = true;
-      $items = $this->Item->load($this->userSession->uploaded);
+      $currentFolder = $parents[0];
       }
-    else
+    elseif(isset($this->userSession->recentFolders))
       {
-      $parents = $itemDao->getFolders();
-      if(count($parents) == 1)
-        {
-        $currentFolder = $parents[0];
-        }
-      elseif(isset($this->userSession->recentFolders))
+      foreach($this->userSession->recentFolders as $recent)
         {
-        foreach($parents as $p)
+        foreach($parents as $parent)
           {
-          if(in_array($p->getKey(), $this->userSession->recentFolders))
+          if($parent->getKey() == $recent)
             {
-            $currentFolder = $p;
+            $currentFolder = $parent;
             break;
             }
           }
-
         }
-      if(isset($currentFolder))
+      if($currentFolder === false && count($parents) > 0)
         {
-        $items = $this->Folder->getItemsFiltered($currentFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
-        $this->view->currentFolder = $currentFolder;
+        $currentFolder = $parents[0];
         }
       }
+    else if(count($parents) > 0)
+      {
+      $currentFolder = $parents[0];
+      }
+    $this->view->currentFolder = $currentFolder;
+    $parent = $currentFolder;
 
-    foreach($items as $key => $item)
+    $header = '';
+    while($parent !== false)
       {
-      $tmp = Zend_Registry::get('notifier')->callback("CALLBACK_VISUALIZE_CAN_VISUALIZE", array('item' => $item));
-      if(isset($tmp['visualize']) && $tmp['visualize'] == true)
+      if(strpos($parent->getName(), 'community') !== false && $this->Folder->getCommunity($parent) !== false)
         {
-        $items[$key]->preview = 'true';
+        $community = $this->Folder->getCommunity($parent);
+        $header = " <li class = 'pathCommunity'><img alt = '' src = '".$this->view->coreWebroot."/public/images/icons/community.png' /><span><a href = '".$this->view->webroot."/community/".$community->getKey()."#tabs-3'>".$this->Component->Utility->sliceName($community->getName(), 25)."</a></span></li>".$header;
+        }
+      elseif(strpos($parent->getName(), 'user') !== false && $this->Folder->getUser($parent) !== false)
+        {
+        $user = $this->Folder->getUser($parent);
+        $header = " <li class = 'pathUser'><img alt = '' src = '".$this->view->coreWebroot."/public/images/icons/unknownUser-small.png' /><span><a href = '".$this->view->webroot."/user/".$user->getKey()."'>".$this->Component->Utility->sliceName($user->getFullName(), 25)."</a></span></li>".$header;
         }
       else
         {
-        $items[$key]->preview = 'false';
+        $header = " <li class = 'pathFolder'><img alt = '' src = '".$this->view->coreWebroot."/public/images/FileTree/directory.png' /><span><a href = '".$this->view->webroot."/folder/".$parent->getKey()."'>".$this->Component->Utility->sliceName($parent->getName(), 15)."</a></span></li>".$header;
         }
+      $parent = $parent->getParent();
       }
+    $header = "<ul class='pathBrowser'>".$header;
+    $header .= "</ul>";
+    $this->view->header = $header;
 
-    $this->view->sameLocation = $items;
+    $folders = array();
+    $parents = $itemDao->getFolders();
+    foreach($parents as $parent)
+      {
+      if($this->Folder->policyCheck($parent, $this->userSession->Dao, MIDAS_POLICY_READ))
+        {
+        $folders[] = $parent;
+        }
+      }
+    $this->view->folders = $folders;
 
+    $itemDao->setDescription(htmlentities($itemDao->getDescription()));
     $this->view->json['item'] = $itemDao->toArray();
     $this->view->json['item']['message']['delete'] = $this->t('Delete');
     $this->view->json['item']['message']['sharedItem'] = $this->t('This item is currrently shared by other folders and/or communities. Deletion will make it disappear in all these folders and/or communitites. ');

core/public/css/folder/folder.view.css

@@ -11,7 +11,7 @@ div.viewInfo{
 }
 
 div.viewHeader{
-  padding: 0px 0px 4px 25px!important;
+  padding: 0px 0px 4px 15px!important;
 }
 
 div.genericBigButton{

core/public/css/item/item.view.css

@@ -1,6 +1,3 @@
-div#revisionContent{
-  display:none;
-}
 div.viewAction{
   display:block!important;
 }
@@ -15,7 +12,6 @@ table#browseTable{
 
 table#metadataTable {
   display: table!important;
-  width: 580px;
   table-layout: fixed;
 }
 
@@ -43,7 +39,7 @@ div.genericInfo .genericSubtitle {
 }
 
 .itemStats {
-	float: right;
+  float: right;
   font-size: 10px;
   color: #777777;
   margin-right: 10px;
@@ -83,4 +79,61 @@ img.closeVisuButton{
 
 div.manageMetadata{
   float:right;
-}
+}
+
+#revisionList h3 a {
+  text-decoration: none;
+}
+
+#revisionList a img {
+  float: left;
+  margin-right: 2px;
+}
+
+#parentList a img {
+  position: relative;
+  top: 3px;
+}
+
+#licenseDiv {
+
+}
+
+div.itemViewMainSection {
+  border-top: 1px solid #D7D7D7;
+  margin-bottom: 14px;
+}
+
+div.itemViewMainSection h4 {
+  color: #999;
+  font-size: 11px;
+  text-shadow: white 0px 1px 1px;
+  text-transform: uppercase;
+  margin-top: 0.67em;
+  margin-bottom: 0.67em;
+}
+
+table.bitstreamList, table.metadataList {
+  width: 100%;
+  border-spacing: 0px;
+  border-collapse: collapse;
+}
+
+table.bitstreamList th, table.metadataList th {
+  border: 1px solid gray;
+  background-color: #D0D0F6;
+}
+
+table.bitstreamList td, table.metadataList td {
+  border: 1px solid #B5B5B5;
+}
+
+div.viewHeader{
+  padding: 0px 0px 4px 15px!important;
+}
+
+div.revisionEntry {
+  padding-left: 13px !important;
+  padding-right: 13px !important;
+  border-top: 1px solid #A7A7A7 !important;
+}