ENH: CSS improvements

ENH: Added display of metadata in the item view
midasplatform · May 26, 2011 · 1de93d0 · 1de93d0
1 parent fbc21dc
commit 1de93d0
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 17 deletions.
diff --git a/core/controllers/ItemController.php b/core/controllers/ItemController.php
@@ -102,6 +102,8 @@ function viewAction()
     $this->view->title .= ' - '.$itemDao->getName();
     $this->view->metaDescription = substr($itemDao->getDescription(), 0, 160);
 
+    $this->view->metadatavalues = $this->ItemRevision->getMetadata($itemRevision);
+
 
     $tmp = Zend_Registry::get('notifier')->notify(MIDAS_NOTIFY_CAN_VISUALIZE, array('item' => $itemDao));
     if(isset($tmp['visualize']) && $tmp['visualize'] == true)

diff --git a/core/models/base/ItemRevisionModelBase.php b/core/models/base/ItemRevisionModelBase.php
@@ -40,6 +40,7 @@ public function __construct()
     } // end __construct()
 
   abstract function getByUuid($uuid);
+  abstract function getMetadata($revisiondao);
 
   /** save */
   public function save($dao)

diff --git a/core/models/pdo/ItemRevisionModel.php b/core/models/pdo/ItemRevisionModel.php
@@ -26,6 +26,31 @@ function getByUuid($uuid)
     return $dao;
     }
 
+  /** get the metadata associated with the revision */
+  function getMetadata($revisiondao)
+    {
+    if(!$revisiondao instanceof ItemRevisionDao)
+      {
+      throw new Zend_Exception("Error param.");
+      }
+
+    $metadatavalues = array();    
+    $sql = $this->database->select()
+                          ->setIntegrityCheck(false)
+                          ->from('metadatavalue')
+                          ->where('itemrevision_id = ?', $revisiondao->getKey())
+                          ->joinLeft('metadata','metadata.metadata_id = metadatavalue.metadata_id');
+
+    $rowset = $this->database->fetchAll($sql); 
+    foreach($rowset as $row)
+      {
+      $metadata = $this->initDao('Metadata', $row);
+      $metadatavalues[] = $metadata; 
+      }
+
+    return $metadatavalues;
+    }  // end getMetadata
+
   /** delete a revision*/
   function delete($revisiondao)
     {

diff --git a/core/public/css/community/community.index.css b/core/public/css/community/community.index.css
@@ -17,3 +17,7 @@ div.communityList span{
   padding-left: 15px;
 }
 
+div.communityBlock:hover{
+  background-color: #F6F9FE;
+  cursor: pointer;
+}
diff --git a/core/public/css/community/community.view.css b/core/public/css/community/community.view.css
@@ -1,3 +1,8 @@
 div.viewSideBar input.globalButton{
   margin-left: 0px!important;
+}
+
+.genericInfo {
+  margin-top: 5px;
+  margin-left: 35px;
 }
diff --git a/core/public/css/item/item.view.css b/core/public/css/item/item.view.css
@@ -9,4 +9,8 @@ div.viewInfo{
 
 table#browseTable{
   display: table!important;
+}
+
+table#metadataTable{
+  display: table!important;
 }
diff --git a/core/public/js/community/community.index.js b/core/public/js/community/community.index.js
@@ -17,11 +17,17 @@
     $('a.moreDescription').click(function(){
       $(this).parents('div').find('.shortDescription').hide();
       $(this).parents('div').find('.fullDescription').show();
+      return false;
     })
     $('a.lessDescription').click(function(){
       $(this).parents('div').find('.shortDescription').show();
       $(this).parents('div').find('.fullDescription').hide();
+      return false;
     })
 
+   $('.communityBlock').click(function(){
+     $(location).attr('href',($('> .communityTitle',this).attr('href')));
+    }) 
+
   });
 
diff --git a/core/views/community/index.phtml b/core/views/community/index.phtml
@@ -21,25 +21,30 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/community/communi
     {
     foreach($this->userCommunities as $community)
       {
-      echo "
-      <div>
-      <a class='communityTitle' href='{$this->webroot}/community/{$community->getKey()}'>{$community->getName()}</a>
+      ?>  
+      <div class="communityBlock">
+      <a class="communityTitle" href="<?php echo $this->webroot.'/community/'.$community->getKey();?>">
+      <?php echo $community->getName()?></a>
       <br/>
-        <span class='shortDescription' >
-        ";
-        if(strlen($community->getDescription())>270)
-          {
+      <?php 
+      if(strlen($community->getDescription())>270)
+          { ?>
+        <span class='shortDescription'>
+        <?php 
           echo substr($community->getDescription(), 0,270)."... <a class='moreDescription'>{$this->t('more')}</a>";
-          }
-        echo "
+        ?>
         </span>
-        <span class='fullDescription' style='display:none;'>
-        {$community->getDescription()}
-        <br/>
-        <a class='lessDescription'>{$this->t('less')}</a>
+        <span class="fullDescription" style="display:none;">
+        <?php echo $community->getDescription(); ?>
+        <a class='lessDescription'><?php echo $this->t('less'); ?></a>
         </span>
+      <?php } else { ?>
+      <span class='fullDescription'">
+      <?php echo $community->getDescription(); ?>
+      </span>
+      <?php } ?>
       </div>
-      ";
+  <?php    
       }
     }
   ?>

diff --git a/core/views/element/feed.phtml b/core/views/element/feed.phtml
@@ -75,6 +75,8 @@ PURPOSE.  See the above copyright notices for more information.
   $feeds=$this->feeds;
   if(!isset($feeds)||empty($feeds))
     {
+    echo $this->t("Feed is currently empty. It could be that the community is not very active 
+          or you may not have the permissions to see the feeds.");  
     return;
     }
 

diff --git a/core/views/item/view.phtml b/core/views/item/view.phtml
@@ -53,7 +53,39 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/item/item.view.
     </tbody>
   </table>
 
-  <h4 style="margin-bottom: 5px;"><?php echo $this->t('Last revision content')?>:</h4>
+  <h4 style="margin-bottom: 5px;"><?php echo $this->t('Latest revision metadata')?>:</h4>
+
+  <?php if(count($this->metadatavalues) == 0)
+    {
+    echo "No metadata for this revision.";  
+    }
+  else 
+    {  
+  ?>
+  <table 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>
+      </tr>
+    </thead>
+    <tbody>
+      <?php
+      foreach($this->metadatavalues as $metadata)
+        {
+        echo "<tr>";
+        echo "  <td>".$metadata->getElement()."</td>";
+        echo "  <td>".$metadata->getQualifier()."</td>";
+        echo "  <td>".$metadata->getValue()."</td>";
+        echo "</tr>";
+        }  
+      ?>        
+    </tbody>
+  </table>
+  <?php } ?>
+
+  <h4 style="margin-bottom: 5px;"><?php echo $this->t('Latest revision content')?>:</h4>
 
   <table id="browseTable" class="midasTree">
     <thead>
@@ -69,7 +101,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/item/item.view.
       foreach($bitstreams as $bitstream)
         {
         echo "<tr>";
-        echo "  <td >{$this->slicename($bitstream->getName(),50)}</td>";
+        echo "  <td>{$this->slicename($bitstream->getName(),50)}</td>";
         echo "  <td>{$this->Utility->formatSize($bitstream->getSizebytes())}  </td>";
         echo "  <td>{$bitstream->getMimetype()}</td>";
         echo "</tr>";
@@ -140,7 +172,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/item/item.view.
           <td><?php echo $this->itemDao->lastrevision->getRevision()?></td>
         </tr> 
         <tr>   
-          <td><?php echo $this->t('File');?></td>
+          <td><?php echo $this->t('# files');?></td>
           <td><?php echo count($this->itemDao->lastrevision->getBitstreams())?></td> 
         </tr>
       </tbody>