ENH : Added chekbox selection (browser)

midasplatform · Mar 15, 2011 · 0268752 · 0268752
1 parent c3152f4
commit 0268752
Show file tree

Hide file tree

Showing 23 changed files with 137 additions and 33 deletions.
diff --git a/application/AppController.php b/application/AppController.php
@@ -78,7 +78,7 @@ public function preDispatch()
     );
     $login=array(
       "titleUploadLogin"=>$this->t('Please log in'),
-      "contentUploadLogin"=>utf8_encode($this->t('You need to be logged in to be able to upload files.'))
+      "contentUploadLogin"=>$this->t('You need to be logged in to be able to upload files.')
     );
 
     $browse=array(
@@ -91,6 +91,7 @@ public function preDispatch()
       'rename'=>$this->t('Rename'),
       'move'=>$this->t('Move'),
       'copy'=>$this->t('Copy'),
+      'element'=>$this->t('element'),
       'community' => array(
           'invit'=>$this->t('Invite collaborators'),
           'advanced'=>$this->t('Advanced properties'),

diff --git a/application/controllers/BrowseController.php b/application/controllers/BrowseController.php
@@ -143,20 +143,16 @@ public function getelementinfoAction()
     switch ($element)
       {
       case 'community':
-        $community=$this->Community->load($id);
+        $community=$this->Community->load($id);        
         $jsonContent=array_merge($jsonContent,$community->_toArray());
+        $jsonContent['creation']=$this->Component->Date->formatDate(strtotime($community->getCreation()));
+        $members=$community->getMemberGroup()->getUsers();
+        $jsonContent['members']=count($members);
         break;
       case 'folder':
         $folder=$this->Folder->load($id);
         $jsonContent=array_merge($jsonContent,$folder->_toArray());
-        if(isset($jsonContent['date']))
-          {
-          $jsonContent['creation']=$jsonContent['date'];
-          }        
-        else
-          {
-          $jsonContent['creation']=date('c');
-          }
+        $jsonContent['creation']=$this->Component->Date->formatDate(strtotime($jsonContent['date']));
         break;
       case 'item':
         $item=$this->Item->load($id);
@@ -175,6 +171,7 @@ public function getelementinfoAction()
     $jsonContent['translation']['Created']=$this->t('Created');
     $jsonContent['translation']['File']=$this->t('File');
     $jsonContent['translation']['Uploaded']=$this->t('Uploaded by');
+    $jsonContent['translation']['Private']=$this->t('This community is private');
     echo JsonComponent::encode($jsonContent);
     }//end getElementInfo
 

diff --git a/application/controllers/DownloadController.php b/application/controllers/DownloadController.php
@@ -89,7 +89,7 @@ public function indexAction()
 
     if(empty($folders)&&empty($revisions))
       {
-      throw new Zend_Exception("Permissions problem");
+      exit();
       }
     if(empty($folders)&&count($revisions)==1)
       {

diff --git a/application/controllers/InstallController.php b/application/controllers/InstallController.php
@@ -41,6 +41,7 @@ function indexAction()
     $this->view->writable=is_writable(BASE_PATH.'/application/configs');  
     $this->view->convertfound=$this->Component->Utility->IsImageMagickWorking();   
     $this->view->basePath=BASE_PATH;
+    setcookie("recentItems", '', time()+60*60*24*30,'/'); //30 days
     if(!empty($_POST)&&$this->view->writable)
       {
       $this->_redirect("/install/step2");

diff --git a/application/layouts/layout.phtml b/application/layouts/layout.phtml
@@ -126,7 +126,7 @@
               </a>
             </li>
           </ul>
-
+        <div class="viewNotice"></div>
         </div>
       </div>
     </div>
@@ -163,7 +163,7 @@
               echo "<div class='viewHeader'>{$this->header} </div>";
               }
             ?>
-            <div class="viewNotice"></div>
+
             <div class="viewWrapper">
               <!-- Content -->
               <?php echo $this->layout()->content ?>

diff --git a/application/views/browse/index.phtml b/application/views/browse/index.phtml
@@ -44,6 +44,10 @@
       </li>
     </ul>
   </div>
+  <div class="sideElement viewSelected" >
+    <h1><?php echo $this->t('Selected')?></h1>
+    <span></span>
+  </div>
   <div class="sideElementLast viewInfo" >
     <h1>Info</h1>    
     <img class="infoLoading" style="display:none;" alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif"/>

diff --git a/application/views/browse/uploaded.phtml b/application/views/browse/uploaded.phtml
@@ -2,7 +2,7 @@
   $this->headScript()->appendFile($this->webroot.'/public/js/user/user.userpage.js');
 ?>
 <div class="viewMain">
-  <? echo $this->element('Feed'); ?>
+  <? echo $this->element('feed'); ?>
   <img class="tableLoading" alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif"/>
   <table id="browseTable" class="midasTree">
     <thead>

diff --git a/application/views/community/index.phtml b/application/views/community/index.phtml
@@ -21,6 +21,10 @@
       </li>
     </ul>
   </div>
+  <div class="sideElement viewSelected" >
+      <h1><?php echo $this->t('Selected')?></h1>
+      <span></span>
+  </div>
   <div class="sideElementLast viewInfo">
     <h1>Info</h1>    
     To do

diff --git a/application/views/feed/index.phtml b/application/views/feed/index.phtml
@@ -8,21 +8,21 @@
   <?php echo $this->element('feed')?>
 </div>
 <div class="viewSideBar">
-
-  BlaBla
-  <br/>  <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)
       {

diff --git a/application/views/folder/view.phtml b/application/views/folder/view.phtml
@@ -54,6 +54,10 @@
       </li>
     </ul>
   </div>
+  <div class="sideElement viewSelected" >
+    <h1><?php echo $this->t('Selected')?></h1>
+    <span></span>
+  </div>
   <div class="sideElementLast viewInfo">
     <h1>Info</h1>    
     <img class="infoLoading" style="display:none;" alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif"/>

diff --git a/application/views/user/register.phtml b/application/views/user/register.phtml
@@ -3,7 +3,7 @@
 <link href="<?php echo $this->webroot?>/public/css/user/user.register.css" rel="stylesheet" type="text/css" />
 <div class="registerContent">  
   <div class="registerInfo">
-    To do
+    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>
   <div class="register">
     <form id="registerForm" class="genericForm" method="<?php echo $this->form['method']?>"  action="<?php echo $this->form['action']?>">

diff --git a/application/views/user/termofservice.phtml b/application/views/user/termofservice.phtml
@@ -1 +1 @@
-To do
+Copyright
diff --git a/application/views/user/userpage.phtml b/application/views/user/userpage.phtml
@@ -114,6 +114,10 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
         </li>
       </ul>
     </div>
+    <div class="sideElement viewSelected" >
+      <h1><?php echo $this->t('Selected')?></h1>
+      <span></span>
+    </div>
     <div class="sideElementLast viewInfo">
       <h1>Info</h1>    
       <img class="infoLoading" style="display:none;" alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif"/>

diff --git a/public/css/layout/view.css b/public/css/layout/view.css
@@ -52,14 +52,18 @@ div.viewSideBar{
   min-height: 500px; 
 }
 
+div.viewSelected{
+  display:none;
+}
+
 div.viewNotice{
   display: none;
   position: relative;
   background-color: #45b775;
   color: #012844;
   float: right;
-  top: -28px;
-  left: -10px;
+  top: -18px;
+  left: 175px;
   padding-left: 10px;
   padding-right: 10px;
   padding-top: 2px;

diff --git a/public/js/browse/browse.index.js b/public/js/browse/browse.index.js
@@ -31,4 +31,7 @@
       genericCallbackDblClick(node);
     }
 
-
+    function callbackCheckboxes(node)
+    {
+      genericCallbackCheckboxes(node);
+    }
diff --git a/public/js/common/common.browser.js b/public/js/common/common.browser.js
@@ -11,14 +11,56 @@
         ajaxSelectRequest = $.ajax({
           type: "POST",
           url: json.global.webroot+'/browse/getelementinfo',
-          data: { type: node.attr('type'), id: node.attr('element') },
+          data: {type: node.attr('type'), id: node.attr('element')},
           success: function(jsonContent){
             createInfo(jsonContent);
             $('img.infoLoading').hide();
 
           }
         });       
     }
+
+    var arraySelected=new Array();
+
+    function genericCallbackCheckboxes(node)
+    {
+      arraySelected=new Array();
+      arraySelected['folders']=new Array();
+      arraySelected['items']=new Array();
+
+      var folders='';
+      var items='';
+      node.find(".treeCheckbox:checked").each(function(){
+        if($(this).parents('tr').attr('type')!='item')
+          {
+          arraySelected['folders'].push($(this).attr('element'));
+          folders+=$(this).attr('element')+'-';
+          }
+        else
+          {
+          arraySelected['items'].push($(this).attr('element'));
+          items+=$(this).attr('element')+'-';
+          }
+      }); 
+      var link=json.global.webroot+'/download?folders='+folders+'&items='+items;
+      if((arraySelected['folders'].length+arraySelected['items'].length)>0)
+        {
+        $('div.viewSelected').show();
+        var html=(arraySelected['folders'].length+arraySelected['items'].length);
+        html+=' '+json.browse.element;
+        if((arraySelected['folders'].length+arraySelected['items'].length)>1)
+          {
+           html+='s'; 
+          }
+        html+='<br/><a href="'+link+'">'+json.browse.download+'</a>'; 
+        $('div.viewSelected span').html(html); 
+        }
+      else
+        {
+        $('div.viewSelected').hide();
+        $('div.viewSelected span').html('');
+        }
+    }
 
     function genericCallbackDblClick(node)
     {
@@ -116,6 +158,18 @@
         html+='    <td>'+arrayElement.translation.Created+'</td>';
         html+='    <td>'+arrayElement.creation+'</td>';
         html+='  </tr>';
+      if(arrayElement['type']=='community')
+        {
+        html+='  <tr>';
+        html+='    <td>Member';
+        if(parseInt(arrayElement['members'])>1)
+          {
+            html+='s';
+          }
+        html+=     '</td>';
+        html+='    <td>'+arrayElement['members']+'</td>';
+        html+='  </tr>';                
+        }
       if(arrayElement['type']=='item')
         {
         html+='  <tr>';
@@ -140,9 +194,14 @@
         html+=    '</td>';
         html+='    <td>'+arrayElement['nbitstream']+'</td>';
         html+='  </tr>';
-        html+='</table>';
-
+
         }
+      html+='</table>';    
+      if(arrayElement['type']=='community'&&arrayElement['privacy']==2)
+        {
+         html+='<h4>'+arrayElement.translation.Private+'</h4>';     
+        }
+
 
       if(arrayElement['thumbnail']!=undefined&&arrayElement['thumbnail']!='')
         {

diff --git a/public/js/community/community.index.js b/public/js/community/community.index.js
@@ -11,5 +11,4 @@ $('a.createCommunity').click(function()
     $("div.TopDynamicBar").show('blind');
     loadAjaxDynamicBar('login','/user/login');
     }
-
 });
diff --git a/public/js/community/community.view.js b/public/js/community/community.view.js
@@ -33,4 +33,9 @@
     function callbackDblClick(node)
     {
       genericCallbackDblClick(node);
+    }
+
+        function callbackCheckboxes(node)
+    {
+      genericCallbackCheckboxes(node);
     }
diff --git a/public/js/folder/folder.view.js b/public/js/folder/folder.view.js
@@ -18,4 +18,7 @@
       genericCallbackDblClick(node);
     }
 
-
+    function callbackCheckboxes(node)
+    {
+      genericCallbackCheckboxes(node);
+    }
diff --git a/public/js/layout/jquery.treeTable.js b/public/js/layout/jquery.treeTable.js
@@ -36,7 +36,6 @@
       });
       initializeAjax($(this),true);
     });
-
     initEvent();
 
 
@@ -260,6 +259,13 @@
           }
         });
        colorLines(true);
+
+   globalElement.find(".treeCheckbox").unbind('change');
+   globalElement.find(".treeCheckbox").change(function(){
+        if(typeof callbackCheckboxes == 'function') { 
+          callbackCheckboxes(globalElement); 
+          }
+   });
   }
 
   function colorLines(checkHidden)

diff --git a/public/js/layout/main.js b/public/js/layout/main.js
@@ -133,12 +133,13 @@ $(function() {
     }
     else
     {
-      showDialogWithContent(json.login.titleUploadLogin, json.login.contentUploadLogin,true);
+
+      createNotive(json.login.contentUploadLogin,4000)
       $("div.TopDynamicBar").show('blind');
       loadAjaxDynamicBar('login','/user/login');
     }
   });
-  
+
   if(json.global.logged)
     {
     $('.uploadFile').cluetip({

diff --git a/public/js/user/user.userpage.js b/public/js/user/user.userpage.js
@@ -33,4 +33,10 @@
     function callbackDblClick(node)
     {
       genericCallbackDblClick(node);
-    }
+    }
+
+    function callbackCheckboxes(node)
+    {
+      genericCallbackCheckboxes(node);
+    }
+
diff --git a/translation/fr-main.csv b/translation/fr-main.csv
@@ -95,3 +95,6 @@ Generated in;G
 Preview;Aper�u
 Uploaded by;Upload� par
 File;Fichier
+This community is private;Cette communaut� est priv�e
+Selected;S�lection
+element;�lement