Merge branch 'master' of https://github.com/easysoft/zentaopms

module/product/css/browse.css

@@ -14,5 +14,3 @@
 .popoverStage .icon-caret-down{position:absolute;}
 a.removeModule{color:#ddd}
 a.removeModule:hover{color:red}
-
-tbody > tr > td > .btn-icon {margin-right: 3px;}

module/productplan/control.php

@@ -253,7 +253,7 @@ class productplan extends control
             {
                 $stories = array();
                 $order   = explode(',', $plan->order);
-                if(strpos($orderBy, 'asc') !== false) $order = array_reverse($order, true);
+                if(strpos($orderBy, 'desc') !== false) $order = array_reverse($order, true);
                 foreach($order as $id)
                 {
                     if(empty($id)) continue;

module/productplan/view/view.html.php

@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/sortable.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->productplan->confirmUnlinkStory)?>
 <?php js::set('confirmUnlinkBug', $lang->productplan->confirmUnlinkBug)?>
 <?php js::set('planID', $plan->id);?>
@@ -114,7 +115,7 @@
                 <th class='c-actions-1'> <?php echo $lang->actions?></th>
               </tr>
             </thead>
-            <tbody class='text-center'>
+            <tbody class='sortable text-center'>
               <?php
               $totalEstimate = 0.0;
               ?>