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

lib/filter/filter.class.php

@@ -173,7 +173,8 @@ class validater
      */
     public static function checkLength($var, $max, $min = 0)
     {
-        return self::checkInt(strlen($var), $min, $max);
+        $length = function_exists('mb_strlen') ? mb_strlen($var, 'utf-8') : strlen($var);
+        return self::checkInt($length, $min, $max);
     }
 
     /**

module/product/view/ajaxgetdropmenu.html.php

@@ -40,7 +40,7 @@
     </ul>
  
     <?php if($closeds):?>
-    <div class='text-right'><a class='gray' id='more' onClick='switchMore()'><?php echo $lang->product->closed . ' <i class="icon-angle-right"></i>';?></a></div>
+    <div class='text-right actions'><a id='more' href='javascript:switchMore()'><?php echo $lang->product->closed;?></a></div>
     <?php endif;?>
  
   </div>

module/productplan/css/browse.css

@@ -1,3 +1,4 @@
 #productplan tbody > tr > td{border-right:1px solid #E4E4E4;}
 .table td .article-content {padding: 0}
+.table td .article-content *{margin:0px;}
 .table td .article-content ol,.table td .article-content ul{padding-left:20px;}

module/project/view/ajaxgetdropmenu.html.php

@@ -39,9 +39,12 @@
     ?>
     </ul>
  
+    <div>
+    <?php echo html::a($this->createLink('project', 'index', "locate=no&status=undone&projectID=$projectID"), $lang->project->allProject)?>
     <?php if($dones):?>
-      <div class='actions'><a id='more' href='javascript:switchMore()'><?php echo $lang->project->doneProjects . ' <i class="icon-angle-right"></i>';?></a></div>
+      <div class='pull-right actions'><a id='more' href='javascript:switchMore()'><?php echo $lang->project->doneProjects . ' <i class="icon-angle-right"></i>';?></a></div>
     <?php endif;?>
+    </div>
   </div>
   <div id='moreMenu'>
     <ul>

module/story/js/change.js

@@ -0,0 +1,9 @@
+$(function()
+{
+    $('#assignedTo').parents('tr').find('th').html($('#needNotReview').prop('checked') ? assignedTo : reviewedBy);
+})
+
+$('#needNotReview').change(function()
+{
+    $('#assignedTo').parents('tr').find('th').html($('#needNotReview').prop('checked') ? assignedTo : reviewedBy);
+})

module/story/js/create.js

@@ -0,0 +1,9 @@
+$(function()
+{
+    $('#assignedTo').parents('tr').find('th').html($('#needNotReview').prop('checked') ? assignedTo : reviewedBy);
+})
+
+$('#needNotReview').change(function()
+{
+    $('#assignedTo').parents('tr').find('th').html($('#needNotReview').prop('checked') ? assignedTo : reviewedBy);
+})

module/story/view/change.html.php

@@ -71,4 +71,6 @@
     <?php include '../../common/view/action.html.php';?>
   </div>
 </div>
+<?php js::set('assignedTo', $lang->story->assignedTo)?>
+<?php js::set('reviewedBy', $lang->story->reviewedBy)?>
 <?php include '../../common/view/footer.html.php';?>

module/story/view/create.html.php

@@ -120,4 +120,6 @@
     <span id='responser'></span>
   </form>
 </div>
+<?php js::set('assignedTo', $lang->story->assignedTo)?>
+<?php js::set('reviewedBy', $lang->story->reviewedBy)?>
 <?php include '../../common/view/footer.html.php';?>