ENH: display browser

Author: Charles Marion

application/controllers/BrowseController.php

@@ -27,7 +27,7 @@ public function indexAction()
     $communities=array_merge($communities, $this->Community->getPubicCommunities());
 
     $header.="<ul class='pathBrowser'>";
-    $header.=" <li class='pathData'><a href='{$this->view->webroot}/browse'>Data</a></li>";
+    $header.=" <li class='pathData'><a href='{$this->view->webroot}/browse'>{$this->t('Data')}</a></li>";
     $header.="</ul>";
 
     $this->view->Date=$this->Component->Date;
@@ -45,6 +45,10 @@ public function indexAction()
     $this->view->nCommunities=$this->Community->getCountAll();
     $this->view->nItems=$this->Item->getCountAll();
     $this->view->notifications=array();
+    
+    $this->view->json['community']['createCommunity']=$this->t('Create a community');
+    $this->view->json['community']['titleCreateLogin']=$this->t('Please log in');
+    $this->view->json['community']['contentCreateLogin']=$this->t('You need to be logged in to be able to create a community.');
     }
 
   /** get getfolders content (ajax function for the treetable) */

application/controllers/FolderController.php

@@ -44,23 +44,29 @@ public function viewAction()
         {
         $items[$key]->size=$this->Component->Utility->formatSize($i->getSizebytes());
         }
-      $header.=" <li class='pathFolder'><a href='{$this->view->webroot}/folder/{$folder->getKey()}'>{$folder->getName()}</a></li>";
+      $header.=" <li class='pathFolder'><img alt='' src='{$this->view->webroot}/public/images/FileTree/folder_open.png' /><span><a href='{$this->view->webroot}/folder/{$folder->getKey()}'>{$folder->getName()}</a></span></li>";
       $parent=$folder->getParent();
       while($parent!==false)
         {
         if(strpos($parent->getName(), 'community')!==false&&$this->Folder->getCommunity($parent)!==false)
           {
           $community=$this->Folder->getCommunity($parent);
-          $header=" <li class='pathCommunity'><a href='{$this->view->webroot}/community/{$community->getKey()}'>{$community->getName()}</a></li>".$header;
+          $header=" <li class='pathCommunity'><img alt='' src='{$this->view->webroot}/public/images/icons/community.png' /><span><a href='{$this->view->webroot}/community/{$community->getKey()}'>{$community->getName()}</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->webroot}/public/images/icons/unknownUser-small.png' /><span><a href='{$this->view->webroot}/user/{$user->getKey()}'>{$user->getFullName()}</a></span></li>".$header;
+ 
           }
         else
           {
-          $header=" <li class='pathFolder'><a href='{$this->view->webroot}/folder/{$parent->getKey()}'>{$parent->getName()}</a></li>".$header;
+          $header=" <li class='pathFolder'><img alt='' src='{$this->view->webroot}/public/images/FileTree/directory.png' /><span><a href='{$this->view->webroot}/folder/{$parent->getKey()}'>{$parent->getName()}</a></span></li>".$header;
           }
         $parent=$parent->getParent();
         }
       $header="<ul class='pathBrowser'>
-               <li class='pathData'><a href='{$this->view->webroot}/browse'>Data</a></li>".$header;
+               <li class='pathData'><a href='{$this->view->webroot}/browse'>{$this->t('Data')}</a></li>".$header;
       $header.="</ul>";
       }
     $this->view->mainFolder=$folder;

application/models/pdo/FolderModel.php

@@ -272,6 +272,20 @@ function getCommunity($folder)
                                                            ->where('folder_id = ?', $folder->getFolderId())));
     return $dao;
     }
+    
+    /** Get user if  the folder is the main folder of one*/
+  function getUser($folder)
+    {
+    if(!$folder instanceof FolderDao)
+      {
+      throw new Zend_Exception("Should be a folder.");
+      }
+    $dao= $this->initDao('User', $this->fetchRow($this->select()
+                                                           ->setIntegrityCheck(false)
+                                                           ->from('user')
+                                                           ->where('folder_id = ?', $folder->getFolderId())));
+    return $dao;
+    }
 
   /** Create a folder */
   function createFolder($name,$description,$parent)

application/views/browse/index.phtml

@@ -10,12 +10,18 @@
   <img class="tableLoading" alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif"/>
   <table id="browseTable" class="midasTree">
     <thead>
+      <?php 
+    if(!empty($this->communities))
+      {  ?>
       <tr>
         <th class="thData"><?php echo $this->t('Name');?></th>
         <th class="thSize"><?php echo $this->t('Size');?></th>
         <th class="thDate"><?php echo $this->t('Modified');?></th>
         <th class="thCheckbox"></th>
       </tr>
+     <?php 
+      }
+     ?>
     </thead>
     <tbody>
       <?php
@@ -34,6 +40,13 @@
       ?>        
     </tbody>
   </table>
+  
+  <?php 
+  if(empty($this->communities))
+    {    
+    echo "<h4>{$this->t("No communty  available")}.<a class='createCommunity' >{$this->t("Create your own community")}!</a> </h4>";
+    }
+    ?>
 </div>
 <div class="viewSideBar">
   <div class="sideElementFirst viewAction" >
@@ -57,20 +70,21 @@
 
 
   <div class="defaultSide" >
-    BlaBla
-    <br/>  
+    <div align="justify" class='sideElementFirst feedNotification'>
+MIDAS integrates multimedia server technology with Kitware?s open-source data analysis and visualization clients. The server follows open standards for data storage, access and harvesting.
+  </div>
       <?php
     if(!empty($this->notifications))
       {
-      echo   "<div class='sideElementFirst feedNotification'>
+      echo   "<div class='sideElement feedNotification'>
                 <h1>Notifications</h1>
               </div>";
       }
       ?>
     <?php 
     if(!empty($this->itemThumbnails))
       {
-      echo '<div class="'.(empty($this->notifications)?'sideElementFirst':'sideElement').' feedThumbnail">';
+      echo '<div class="sideElement feedThumbnail">';
       echo '<h1>Thumbnails</h1>';
       foreach($this->itemThumbnails as $item)
         {

application/views/folder/view.phtml

@@ -44,6 +44,13 @@
 
     </tbody>
   </table>
+  
+    <?php 
+  if(empty($this->folders)&&empty($this->items))
+    {    
+    echo "<h4>{$this->t("This folder is empty")}.</h4>";
+    }
+    ?>
 </div>
 <div class="viewSideBar">
   <div class="sideElementFirst viewAction">
@@ -66,6 +73,7 @@
   </div>
 </div>
 
+<div class="defaultSideTrigger" type='folder' element='<?php echo $this->mainFolder->getFolderId() ?>'>
+</div>
 
-<div class="defaultSideTrigger" type='folder' element='<?php echo $this->mainFolder->getFolderId() ?>'/>
 

public/css/common/common.browser.css

@@ -23,12 +23,23 @@ ul.pathBrowser li{
   background-repeat: no-repeat;
   background-position: right 0px;
   display: list-item;
-  padding: 3px 22px 7px 10px;
+  padding: 3px 22px 7px 3px;
   text-shadow: 0px 1px 0px #EEE;
   background-image: url("../../images/icons/path-divider.png");
 }
 
 
+ul.pathBrowser li img{
+  position:relative;
+  top:0px;
+}
+
+
+ul.pathBrowser li span{
+  position:relative;
+  top:-2px;
+}
+
 
 ul.pathBrowser li a{
   font-size: 14px;
@@ -39,4 +50,4 @@ ul.pathBrowser li a{
 
 span.infoTitle{
   font-weight: bold;
-}
+}

public/images/icons/unknownUser-small.png

@@ -13,6 +13,22 @@
     $('div.feedThumbnail img').mouseout(function(){
         $(this).fadeTo("fast",0.2);
     });
+    
+    
+    $('a.createCommunity').click(function()
+    {
+      if(json.global.logged)
+        {
+        loadDialog("createCommunity","/community/create");
+        showDialog(json.community.createCommunity,false);
+        }
+      else
+        {
+        createNotive(json.community.contentCreateLogin,4000)
+        $("div.TopDynamicBar").show('blind');
+        loadAjaxDynamicBar('login','/user/login');
+        }
+    });
   });
 
   //dependance: common/browser.js

public/js/browse/browse.index.js

@@ -4,6 +4,7 @@
     $("img.tableLoading").hide();
     $("table#browseTable").show();
     genericCallbackSelect($('div.defaultSideTrigger'));
+    
   });
 
   //dependance: common/browser.js

public/js/folder/folder.view.js

@@ -139,10 +139,11 @@ $(function() {
       loadAjaxDynamicBar('login','/user/login');
     }
   });
+ 
 
   if(json.global.logged)
     {
-    $('.uploadFile').cluetip({
+    $('div.HeaderAction li.uploadFile').cluetip({
      cluetipClass: 'jtip',
      dropShadow: false,
      hoverIntent: false,