Merge branch 'kanban'

module/project/model.php

@@ -1234,11 +1234,11 @@ class projectModel extends model
     public function suspend($projectID)
     {
         $oldProject = $this->getById($projectID);
-        $now        = helper::now();
         $project = fixer::input('post')
             ->setDefault('status', 'suspended')
             ->setDefault('lastEditedBy', $this->app->user->account)
-            ->setDefault('lastEditedDate', $now)
+            ->setDefault('lastEditedDate', helper::now())
+            ->setDefault('suspendedDate', helper::today())
             ->remove('comment')->get();
 
         $this->dao->update(TABLE_PROJECT)->data($project)
@@ -1266,6 +1266,7 @@ class projectModel extends model
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
+            ->setIF($oldProject->realBegan == '0000-00-00', 'realBegan', helper::today())
             ->remove('comment,readjustTime,readjustTask')
             ->get();
 

module/project/view/browsebycard.html.php

@@ -159,7 +159,7 @@
                 </a>
                 <?php endforeach;?>
                 <?php if($project->teamCount > 3):?>
-                <?php echo '<span>…</span>';?>
+                <?php if($project->teamCount > 4) echo '<span>…</span>';?>
                 <a href='<?php echo helper::createLink('project', 'team', "projectID=$projectID");?>' title="<?php echo $users[$member];?>">
                   <?php echo html::smallAvatar(array('avatar' => $usersAvatar[end($project->teamMembers)], 'account' => $member)); ?>
                 </a>