ENH: Fixing style issues

Julien Jomier · Julien Jomier · commit 509648e91c0c · 2011-06-02T15:41:08.000+02:00
ENH: Added explore
diff --git a/core/controllers/BrowseController.php b/core/controllers/BrowseController.php
@@ -29,29 +29,20 @@ function init()
   /** Index Action*/
   public function indexAction()
     {
-    $communities = array();
     $items = array();
     $header = "";
 
-    if($this->logged && $this->userSession->Dao->isAdmin())
-      {
-      $communities = $this->Community->getAll();
-      }
-    else
-      {
-      $communities = $this->User->getUserCommunities($this->userSession->Dao);
-      $communities = array_merge($communities, $this->Community->getPublicCommunities());
-      }
-
     $this->view->Date = $this->Component->Date;
     
     $this->view->header = $this->t('Explore');
     
-    $this->view->itemThumbnails = $this->Item->getRandomItems($this->userSession->Dao, 0, 12, true);
+    $this->view->itemThumbnails = $this->Item->getRandomThumbnails($this->userSession->Dao, 0, 12, true);
+
+    $this->view->items = $this->Item->getMostPopulars($this->userSession->Dao,30);
+    
     $this->view->nUsers = $this->User->getCountAll();
     $this->view->nCommunities = $this->Community->getCountAll();
     $this->view->nItems = $this->Item->getCountAll();
-    $this->view->notifications = array();
     
     $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.');
diff --git a/core/controllers/FeedController.php b/core/controllers/FeedController.php
@@ -29,7 +29,7 @@ function init()
   public function indexAction()
     {
     $this->view->feeds = $this->Feed->getGlobalFeeds($this->userSession->Dao);
-    $this->view->itemThumbnails = $this->Item->getRandomItems($this->userSession->Dao, 0, 12, true);
+    $this->view->itemThumbnails = $this->Item->getRandomThumbnails($this->userSession->Dao, 0, 12, true);
     $this->view->nUsers = $this->User->getCountAll();
     $this->view->nCommunities = $this->Community->getCountAll();
     $this->view->nItems = $this->Item->getCountAll();
diff --git a/core/controllers/FolderController.php b/core/controllers/FolderController.php
@@ -126,8 +126,7 @@ public function viewAction()
           }
         $parent = $parent->getParent();
         }
-      $header = "<ul class = 'pathBrowser'>
-               <li class = 'pathData'><a href = '".$this->view->webroot."/browse'>".$this->t('Data')."</a></li>".$header;
+      $header = "<ul class = 'pathBrowser'>".$header;
       $header .= "</ul>";
       }
       
diff --git a/core/models/base/ItemModelBase.php b/core/models/base/ItemModelBase.php
@@ -46,6 +46,8 @@ abstract function getSharedToUser($userDao, $limit = 20);
   abstract function getSharedToCommunity($communityDao, $limit = 20);
   abstract function policyCheck($itemdao, $userDao = null, $policy = 0);
   abstract function getLastRevision($itemdao);
+  abstract function getMostPopulars($userDao, $limit=20);
+  abstract function getRandomThumbnails($userDao = null, $policy = 0, $limit = 10, $thumbnailFilter = false);
   
   /** save */
   public function save($dao)
diff --git a/core/models/pdo/ItemModel.php b/core/models/pdo/ItemModel.php
@@ -52,6 +52,30 @@ function getSharedToCommunity($communityDao, $limit = 20)
     return $results;
     }//end getSharedToCommunity
     
+  /**
+   * Get most popular items
+   * @param type $limit
+   * @return Array 
+   */ 
+  function getMostPopulars($userDao, $limit=20)
+    {
+    $sql = $this->database->select()
+                  ->setIntegrityCheck(false)
+                  ->from(array('i' => 'item'))
+                  ->where('privacy_status = ?', MIDAS_PRIVACY_PUBLIC)
+                  ->order(array('i.view DESC'))
+                  ->limit($limit);
+    $rowset = $this->database->fetchAll($sql);
+    $results = array();
+    foreach($rowset as $row)
+      {
+      $tmp = $this->initDao('Item', $row);
+      $results[] = $tmp;
+      }
+    return $results; 
+    }
+
+    
   /**
    * Get Items where user policy = Admin
    * @param type $userDao
@@ -248,7 +272,7 @@ function policyCheck($itemdao, $userDao = null, $policy = 0)
    * @param type $limit
    * @return array of ItemDao 
    */
-  function getRandomItems($userDao = null, $policy = 0, $limit = 10, $thumbnailFilter = false)
+  function getRandomThumbnails($userDao = null, $policy = 0, $limit = 10, $thumbnailFilter = false)
     {
     if($userDao == null)
       {
diff --git a/core/public/css/browse/browse.index.css b/core/public/css/browse/browse.index.css
@@ -8,6 +8,38 @@ div.feedThumbnail img{
   margin-right: 4px;
 }
 
+.itemSubTitle{
+  margin-top: 0px;
+  margin-bottom: 5px;
+}
+
+
 div.feedThumbnail a{
   border: 0px;
+}
+
+div.itemList{
+  
+}
+
+div.itemList span{
+  padding-left: 15px;
+}
+
+div.itemBlock {
+	padding-top: 5px;
+  padding-bottom: 5px;
+  border-bottom: 1px dotted grey;
+}
+
+div.itemBlock:hover{
+  background-color: #F6F9FE;
+  cursor: pointer;
+}
+
+div.itemStats {
+	float: right;
+  font-size: 10px;
+  border: none;
+  color: #777777;
 }
diff --git a/core/public/css/common/common.browser.css b/core/public/css/common/common.browser.css
@@ -6,7 +6,7 @@
 ul.pathBrowser{
   display: block;
   list-style-type: disc;
-  margin: 0;
+  margin: 0px;
   padding-left: 0px;
   float: left;
   -webkit-margin-before: 0em;
@@ -21,9 +21,9 @@ ul.pathBrowser li{
   list-style: none;
   float: left;
   background-repeat: no-repeat;
-  background-position: right 0px;
+  background-position: right -3px;
   display: list-item;
-  padding: 3px 22px 7px 3px;
+  padding: 0px 22px 7px 3px;
   text-shadow: 0px 1px 0px #EEE;
   background-image: url("../../images/icons/path-divider.png");
 }
diff --git a/core/public/css/common/common.genericPage.css b/core/public/css/common/common.genericPage.css
@@ -45,6 +45,6 @@ div.genericInfo .genericName{
   font-size: 16px;
 }
 
-div.genericInfo .genericCompany{
+div.genericInfo .genericSubtitle{
   font-weight: bold;
 }
diff --git a/core/public/css/community/community.index.css b/core/public/css/community/community.index.css
@@ -20,4 +20,4 @@ div.communityList span{
 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
@@ -5,4 +5,24 @@ div.viewSideBar input.globalButton{
 .genericInfo {
   margin-top: 5px;
   margin-left: 35px;
+}
+
+div.genericInfo .genericSubtitle {
+  font-weight: normal;
+}
+
+div.genericBigButton input{
+  border: none;
+  cursor: pointer;
+  background-color: #ffffff;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#c4c4c4));
+  background-image: -moz-linear-gradient(center top, #ffffff 0%, #c4c4c4 100% );
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#c4c4c4');
+}
+
+div.genericBigButton input:hover{
+  background-color: #bddcc9;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#bddcc9), to(#8ab79b));
+  background-image: -moz-linear-gradient(center top, #bddcc9 0%, #8ab79b 100% );
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bddcc9', endColorstr='#8ab79b');
 }
diff --git a/core/public/css/folder/folder.view.css b/core/public/css/folder/folder.view.css
@@ -9,3 +9,4 @@ div.viewAction{
 div.viewInfo{
   display:inherit!important;
 }
+
diff --git a/core/public/css/item/item.view.css b/core/public/css/item/item.view.css
@@ -21,7 +21,7 @@ div.genericInfo {
   position: relative;
 }
 
-div.genericInfo .genericCompany {
+div.genericInfo .genericSubtitle {
   font-size: 10px;
 }
 
diff --git a/core/public/css/user/user.index.css b/core/public/css/user/user.index.css
@@ -2,17 +2,12 @@ div.userList{
   
 }
 
-div.userList div{
+div.userBlock{
   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;
 }
@@ -25,4 +20,11 @@ div.userBlock:hover{
 .userSubTitle{
   margin-top: 0px;
   margin-bottom: 5px;
+}
+
+div.userStats {
+  float: right;
+  font-size: 10px;
+  border: none;
+  color: #777777;
 }
diff --git a/core/public/js/browse/browse.index.js b/core/public/js/browse/browse.index.js
@@ -1,6 +1,5 @@
   $(document).ready(function() {
 
-    
     $("#browseTable").treeTable();
     
     $("img.tableLoading").hide();
@@ -15,7 +14,6 @@
         $(this).fadeTo("fast",0.2);
     });
     
-    
     $('a.createCommunity').click(function()
     {
       if(json.global.logged)
@@ -30,6 +28,12 @@
         loadAjaxDynamicBar('login','/user/login');
         }
     });
+   
+      
+    $('.itemBlock').click(function(){
+        $(location).attr('href',($('> .itemTitle',this).attr('href')));
+       }) 
+    
   });
   
   //dependance: common/browser.js
diff --git a/core/views/browse/index.phtml b/core/views/browse/index.phtml
@@ -19,13 +19,27 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
 <link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot?>/public/css/common/common.browser.css" />
 <link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot?>/public/css/browse/browse.index.css" />
 <div class="viewMain">
- 
+  <h3 class='itemSubTitle'> <?php echo $this->t('Most Popular Items'); ?></h3>
+  <div class="itemList">
+  <?php 
+  if(!empty($this->items))
+    {
+    foreach($this->items as $item)
+      {
+      ?>  
+      <div class="itemBlock">
+      <a class="itemTitle" href="<?php echo $this->webroot?>/item/<?php echo $item->getItemId(); ?>"><?php echo $item->getName(); ?></a>
+      <div class="itemStats"><?php echo $item->getView(); ?> views, <?php echo $item->getDownload(); ?> downloads</div>
+      </div>
+  <?php    
+      }
+    }
+  ?>
+  </div>
+  
 </div>
 
 
-
-
-
 <div class="viewSideBar">
   <div class="sideElementFirst viewAction" >
     <h1>Actions</h1>
@@ -45,24 +59,12 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
     <div class="ajaxInfoElement">
     </div>
   </div>
-  
-  
+    
   <div class="defaultSide" >
-    <div align="justify"  class='sideElementFirst feedNotification'>
-MIDAS integrates multimedia server technology with 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='sideElement feedNotification'>
-                <h1>Notifications</h1>
-              </div>";
-      }
-      ?>
     <?php 
     if(!empty($this->itemThumbnails))
       {
-      echo '<div class="sideElement feedThumbnail">';
+      echo '<div class="sideElementFirst feedThumbnail">';
       echo '<h1>Thumbnails</h1>';
       foreach($this->itemThumbnails as $item)
         {
diff --git a/core/views/community/view.phtml b/core/views/community/view.phtml
@@ -14,9 +14,10 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.f
 $this->headScript()->appendFile($this->coreWebroot . '/public/js/community/community.view.js');
 $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.browser.js');
 ?>
-<link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot?>/public/css/community/community.view.css" />
 <link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot?>/public/css/common/common.browser.css" />
 <link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot?>/public/css/common/common.genericPage.css" />
+<link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot?>/public/css/community/community.view.css" />
+
 <div class="viewMain">
   <div class="genericThumbnail">
   <?php
@@ -32,7 +33,18 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
   ?>
   </div>
   <div class="genericInfo">
+  <?php
+  if($this->logged && !$this->isMember && ($this->canJoin || $this->isInvited))
+    {
+      ?>
+     <div class="genericBigButton genericWrapperTopRight">
+     <form type='post' action=''>
+      <input name='joinCommunity' type='submit' value='<?php echo $this->t('Join the community') ?>' />
+    </form>
+    </div>
+   <?php } ?>    
     <div class="genericName"><?php echo $this->communityDao->getName();?></div>
+    <div class="genericSubtitle" style="color:grey;"><?php echo $this->communityDao->getDescription(); ?></div>
   </div>
   <img class="tabsLoading" alt=""  src="<?php echo $this->coreWebroot?>/public/images/icons/loading.gif" />
   <div class="tabs" id='tabsGeneric'>
@@ -68,7 +80,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
       ?>
     <div id="tabs-2">
       <?php
-      echo $description;
+      echo nl2br($description);
       ?>
     </div>
     <?php
@@ -145,15 +157,6 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
 <div class="viewSideBar">
   
   <?php
-  if($this->logged && !$this->isMember && ($this->canJoin || $this->isInvited))
-    {
-    echo "
-    <form type='post' action=''>
-      <input name='joinCommunity' type='submit' class='globalButton' value='{$this->t('Join the community')}' />
-    </form>
-    ";
-    }
-  
   if($this->isModerator||$this->isAdmin||$this->isMember)
     {
     echo "  
diff --git a/core/views/helpers/Linkuser.php b/core/views/helpers/Linkuser.php
diff --git a/core/views/item/view.phtml b/core/views/item/view.phtml
diff --git a/core/views/user/index.phtml b/core/views/user/index.phtml
diff --git a/core/views/user/manage.phtml b/core/views/user/manage.phtml
diff --git a/core/views/user/userpage.phtml b/core/views/user/userpage.phtml

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function init()`
`29`	`29`	`public function indexAction()`
`30`	`30`	`{`
`31`	`31`	`$this->view->feeds = $this->Feed->getGlobalFeeds($this->userSession->Dao);`
`32`		`- $this->view->itemThumbnails = $this->Item->getRandomItems($this->userSession->Dao, 0, 12, true);`
	`32`	`+ $this->view->itemThumbnails = $this->Item->getRandomThumbnails($this->userSession->Dao, 0, 12, true);`
`33`	`33`	`$this->view->nUsers = $this->User->getCountAll();`
`34`	`34`	`$this->view->nCommunities = $this->Community->getCountAll();`
`35`	`35`	`$this->view->nItems = $this->Item->getCountAll();`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,7 @@ public function viewAction()`
`126`	`126`	`}`
`127`	`127`	`$parent = $parent->getParent();`
`128`	`128`	`}`
`129`		`- $header = "<ul class = 'pathBrowser'>`
`130`		`- <li class = 'pathData'><a href = '".$this->view->webroot."/browse'>".$this->t('Data')."</a></li>".$header;`
	`129`	`+ $header = "<ul class = 'pathBrowser'>".$header;`
`131`	`130`	`$header .= "</ul>";`
`132`	`131`	`}`
`133`	`132`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ div.genericInfo .genericName{`
`45`	`45`	`font-size: 16px;`
`46`	`46`	`}`
`47`	`47`
`48`		`-div.genericInfo .genericCompany{`
	`48`	`+div.genericInfo .genericSubtitle{`
`49`	`49`	`font-weight: bold;`
`50`	`50`	`}`