ENH: Some style fixes

ENH: Added User page
BUG: 9679: Data/Données should be renamed "Explore"

core/controllers/CommunityController.php

@@ -29,7 +29,7 @@ function init()
       }
     }  // end init()
 
-  /** manage community*/
+  /** Manage community*/
   function manageAction()
     {
     if(!$this->logged)  
@@ -214,7 +214,7 @@ function manageAction()
     }//end manageAction
 
 
-  /** index*/
+  /** Index */
   function indexAction()
     {
     $this->view->header = $this->t("Communities");
@@ -235,12 +235,12 @@ function indexAction()
     $this->Component->Sortdao->field = 'name';
     $this->Component->Sortdao->order = 'asc';
     usort($communities, array($this->Component->Sortdao, 'sortByName'));
-    $communities = $this->Component->Sortdao->arrayUniqueDao($communities );
+    $communities = $this->Component->Sortdao->arrayUniqueDao($communities);
 
     $this->view->userCommunities = $communities;
     }//end index
 
-  /** view a community*/
+  /** View a community*/
   function viewAction()
     {
     $this->view->Date = $this->Component->Date;
@@ -313,7 +313,7 @@ function viewAction()
 
     $this->view->title .= ' - '.$communityDao->getName();
     $this->view->metaDescription = substr($communityDao->getDescription(), 0, 160);
-    }//end view
+    } //end index
 
   /** Delete a community*/
   function deleteAction()
@@ -337,7 +337,7 @@ function deleteAction()
     $this->_redirect('/');
     }//end delete
 
-  /** Invit user to a community*/
+  /** Invite a user to a community*/
   function invitationAction()
     {
     $this->_helper->layout->disableLayout();
@@ -376,9 +376,9 @@ function invitationAction()
           }
         }
       }
-    }//end delete
+    }//end invite
 
-  /** create a community (ajax)*/
+  /** Create a community (ajax)*/
   function createAction()
     {
     if(!$this->logged)
@@ -404,9 +404,9 @@ function createAction()
       $this->_helper->layout->disableLayout();
       $this->view->form = $this->getFormAsArray($form);
       }
-    }//end index
+    }//end create
 
-  /** valid  entries (ajax)*/
+  /** Validate entries (ajax)*/
   public function validentryAction()
     {
     if(!$this->getRequest()->isXmlHttpRequest())

core/controllers/UserController.php

@@ -28,6 +28,30 @@ function init()
       }
     } // end init()
 
+  /** Index */
+  function indexAction()
+    {
+    $this->view->header = $this->t("Users");
+    $this->view->json['user']['createCommunity'] = $this->t('Create a community');
+    $this->view->json['user']['titleCreateLogin'] = $this->t('Please log in');
+    $this->view->json['user']['contentCreateLogin'] = $this->t('You need to be logged in to be able to create a community.');
+
+    if($this->logged && $this->userSession->Dao->isAdmin())
+      {
+      $users = $this->User->getAll();
+      }
+    else
+      {
+      $users = $this->User->getPublicUsers();
+      }
+
+    $this->Component->Sortdao->field = 'name';
+    $this->Component->Sortdao->order = 'asc';
+    usort($users, array($this->Component->Sortdao, 'sortByName'));
+    $users = $this->Component->Sortdao->arrayUniqueDao($users);
+
+    $this->view->users = $users;
+    } //end index
 
   /** Recover the password (ajax) */
   function recoverpasswordAction()
@@ -77,7 +101,6 @@ function make_seed_recoverpass()
 
       $user->setPassword(md5($pass));
 
-
       // Send the email
       $url = $this->getServerURL().$this->view->webroot;
 
@@ -100,7 +123,7 @@ function make_seed_recoverpass()
       } 
     } // end recoverpassword
 
-  /** logout an user*/
+  /** Logout a user */
   function logoutAction()
     {
     $this->userSession->Dao = null;
@@ -110,7 +133,7 @@ function logoutAction()
     } //end logoutAction
 
 
-  /** register an user*/
+  /** Register a user */
   function registerAction()
     {
     $form = $this->Form->User->createRegisterForm();
@@ -132,8 +155,7 @@ function registerAction()
     ));
     } //end register
 
-
-  /** check log in action*/
+  /** Login action */
   function loginAction()
     {
     $this->Form->User->uri = $this->getRequest()->getRequestUri();
@@ -159,7 +181,6 @@ function loginAction()
           $authLdap = false;
           }
 
-
         $passwordPrefix = Zend_Registry::get('configGlobal')->password->prefix;
         if($authLdap || $userDao != false && md5($passwordPrefix.$form->getValue('password')) == $userDao->getPassword())
           {
@@ -207,7 +228,7 @@ function loginAction()
     } // end method login
 
 
-  /** term of service */
+  /** Term of service */
   public function termofserviceAction()
     {
     if($this->getRequest()->isXmlHttpRequest())
@@ -217,7 +238,7 @@ public function termofserviceAction()
     } // end term of service
 
 
-  /** valid  entries (ajax)*/
+  /** Valid  entries (ajax) */
   public function validentryAction()
     {
     if(!$this->getRequest()->isXmlHttpRequest() && !$this->isTestingEnv())
@@ -274,7 +295,7 @@ public function validentryAction()
       }
     } //end valid entry
 
-  /** settings page action*/
+  /** Settings page action */
   public function settingsAction()
     {
     if(!$this->logged)
@@ -470,7 +491,7 @@ public function settingsAction()
     $this->view->customTabs = Zend_Registry::get('notifier')->notify(MIDAS_NOTIFY_GET_CONFIG_TABS, array());
     }
 
-  /** user page action*/
+  /** User page action*/
   public function userpageAction()
     {
     $this->view->Date = $this->Component->Date;
@@ -521,7 +542,7 @@ public function userpageAction()
     $this->view->information = array();
     }
 
-  /** manage files page action*/
+  /** Manage files page action*/
   public function manageAction()
     {
     $this->view->Date = $this->Component->Date;

core/layouts/layout.phtml

@@ -168,7 +168,7 @@ echo $this->doctype()
         }
       if($this->highNumberError)
         {
-        echo '<span style="color:red;">More thant 5 errors occured during the last 24 hours. <a href="'.$this->webroot.'/admin/#ui-tabs-2">Check the logs</a></span><br/><br/>';
+        echo '<span style="color:red;">More than 5 errors occured in the last 24 hours. <a href="'.$this->webroot.'/admin/#ui-tabs-2">Check the logs</a></span><br/><br/>';
         }
       ?>
       <div class=SubWrapper">
@@ -177,15 +177,16 @@ echo $this->doctype()
           <div class="SideBar">
             <ul>
               <li <?php if($this->activemenu=='feed') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/feed');" ><a href="<?php echo $this->webroot?>/feed"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/feed.png" /><span> <?php echo $this->t('Feed');?></span></a></li>
-              <li <?php if($this->activemenu=='browse') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse');" ><a href="<?php echo $this->webroot?>/browse"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/data.png" /><span> <?php echo $this->t('Data');?></span></a></li>
-              <li <?php if($this->activemenu=='community') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/community');" ><a href="<?php echo $this->webroot?>/community"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/community.png" /><span> <?php echo $this->t('Communities');?></span></a></li>
-              <li id="menuUserInfo" <?php if($this->activemenu=='user') {echo 'class="active"';} ?>  ><a href="javascript:;"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/upload.png" /><span> <?php echo $this->t('My Uploads');?></span></a></li>
+              <li <?php if($this->activemenu=='browse') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse');" ><a href="<?php echo $this->webroot?>/browse"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/explore.png" /><span> <?php echo $this->t('Explore');?></span></a></li>
+              <li <?php if($this->activemenu=='community') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/community');" ><a href="<?php echo $this->webroot?>/community"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/community2.png" /><span> <?php echo $this->t('Communities');?></span></a></li>
+              <li <?php if($this->activemenu=='user') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/user');" ><a href="<?php echo $this->webroot?>/user"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/users.png" /><span> <?php echo $this->t('Users');?></span></a></li>
+              <li id="menuUserInfo" <?php if($this->activemenu=='user') {echo 'class="active"';} ?>  ><a href="javascript:;"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/user.png" /><span> <?php echo $this->t('My profile');?></span></a></li>
 
                <?php
               if($this->showUploadedLink)
                 {
                 ?>
-               <li <?php if($this->activemenu=='uploaded') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse/uploaded');" ><a href="<?php echo $this->webroot?>/browse/uploaded"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/addfile.png" /><span> <?php echo $this->t('Uploaded files');?></span></a></li>
+               <li <?php if($this->activemenu=='uploaded') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse/uploaded');" ><a href="<?php echo $this->webroot?>/browse/uploaded"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/addfile.png" /><span> <?php echo $this->t('My uploads');?></span></a></li>
               <?php
                 }
               ?>

core/models/base/UserModelBase.php

@@ -53,6 +53,10 @@ abstract function getUserCommunities($userDao);
   abstract function getByUuid($uuid);
   /** Returns a user given its folder (either public,private or base folder) */
   abstract function getByFolder($folder);
+  /** Returns all the public users. Limited to 20 by default. */
+  abstract function getPublicUsers($limit = 20);
+  /** Returns all the users */
+  abstract function getAll();
 
   /** save */
   public function save($dao)

core/models/pdo/CommunityModel.php

@@ -63,12 +63,10 @@ function getAll()
       $return[] = $this->initDao('Community', $row);
       }
     return $return;
-    } // end getByName()
+    } // end getAll()
 
-  /** get public Communities
-   * 
-   * @return Array of Community Dao
-   */
+  /** Get public Communities
+   * @return Array of Community Dao */
   function getPublicCommunities($limit = 20)
     {
     if(!is_numeric($limit))
@@ -86,7 +84,7 @@ function getPublicCommunities($limit = 20)
       $return[] = $this->initDao('Community', $row);
       }
     return $return;
-    }
+    } // end getPublicCommunities()
 
   /** Return a list of communities corresponding to the search */
   function getCommunitiesFromSearch($search, $userDao, $limit = 14, $group = true, $order = 'view')

core/models/pdo/UserModel.php

@@ -74,6 +74,40 @@ public function getUserCommunities($userDao)
     return $return;
     } // end getUserCommunities
 
+  /** Get all */
+  function getAll()
+    {
+    $rowset = $this->database->fetchAll($this->database->select()); 
+    $return = array();
+    foreach($rowset as $row)
+      {      
+      $return[] = $this->initDao('User', $row);
+      }
+    return $return;
+    } // end getAll()
+
+  /** Get public users
+   * @return Array of Users Dao */
+  function getPublicUsers($limit = 20)
+    {
+    if(!is_numeric($limit))
+      {
+      throw new Zend_Exception("Error parameter.");
+      }
+    $sql = $this->database->select()->from($this->_name)
+                          ->where('privacy = ?', MIDAS_USER_PUBLIC)
+                          ->limit($limit);
+
+    $rowset = $this->database->fetchAll($sql);
+    $return = array();
+    foreach($rowset as $row)
+      {      
+      $return[] = $this->initDao('User', $row);
+      }
+    return $return;
+    } // end getPublicUsers()
+
+
   /** Returns a user given its folder (either public,private or base folder) */
   function getByFolder($folder)
     {

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

@@ -13,4 +13,8 @@ table#browseTable{
 
 table#metadataTable{
   display: table!important;
-}
+}
+
+div.genericInfo .genericCompany {
+  font-size: 10px;
+}

core/public/css/user/user.index.css

@@ -0,0 +1,23 @@
+div.userList{
+
+}
+
+div.userList div{
+  border-bottom: 1px dotted grey;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+div.userList a.userTitle{
+  font-weight: bold;
+  font-size: 14px;
+}
+
+div.userList span{
+  padding-left: 15px;
+}
+
+div.userBlock:hover{
+  background-color: #F6F9FE;
+  cursor: pointer;
+}

core/public/js/layout/main.js

@@ -196,7 +196,7 @@ $(function() {
     });
 
   $('#menuUserInfo').click(function(){
-      globalAuthAsk(json.global.webroot+'/user/userpage#tabs-3');
+      globalAuthAsk(json.global.webroot+'/user/userpage');
   });
   $("div.TopDynamicBar .closeButton").click(function()
   {

core/public/js/user/user.index.js

@@ -0,0 +1,8 @@
+  $(document).ready(function() {
+
+   $('.userBlock').click(function(){
+     $(location).attr('href',($('> .userTitle',this).attr('href')));
+    }) 
+
+  });
+

core/translation/fr-main.csv

@@ -238,4 +238,6 @@ Step 3: Where do you want to upload your files;Etape 3: Ou voulez vous ajouter d
 Save Link;Sauver Lien
 Please use the large file tool, the following files are too big:;Merci d'utiliser l'outil pour ajouter des fichiers volumineux pour les fichiers suivants:
 Not registered yet?;Pas encore enregistr�?
-Register here;Enregistrez vous ici
+Register here;Enregistrez vous ici
+My profile;Mon profile
+My uploads;Mes uploads

core/views/admin/index.phtml

@@ -95,7 +95,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/admin/admin.ind
          echo "Total space: {$assetstore->totalSpaceText}<br/>";
          if(($assetstore->freeSpace/$assetstore->totalSpace<0.10))
            {
-           echo "<b>Free space: {$assetstore->freeSpaceText}. Almost full!!!</b>";
+           echo "<b>Free space: {$assetstore->freeSpaceText}. Less than 10% free!</b>";
            }
          else
            {