Finish task #5021,#5018,#5017,#5016,#5015,#5005,#5003,#4987,#4985,#4653

module/product/lang/en.php

@@ -43,7 +43,7 @@ $lang->product->doc      = 'Doc';
 $lang->product->project  = $lang->projectCommon . 'List';
 $lang->product->build    = 'Build';
 
-$lang->product->currentProject   = 'Current Project';
+$lang->product->currentProject   = "Current {$lang->projectCommon}";
 $lang->product->activeStories    = 'Activated Story';
 $lang->product->changedStories   = 'Changed Story';
 $lang->product->draftStories     = 'Draft Story';

module/product/lang/zh-cn.php

@@ -43,7 +43,7 @@ $lang->product->doc      = '文档列表';
 $lang->product->project  = $lang->projectCommon . '列表';
 $lang->product->build    = '版本列表';
 
-$lang->product->currentProject   = '当前项目';
+$lang->product->currentProject   = '当前' . $lang->projectCommon;
 $lang->product->activeStories    = '激活需求';
 $lang->product->changedStories   = '已变更需求';
 $lang->product->draftStories     = '草稿需求';

module/report/view/workload.html.php

@@ -68,8 +68,8 @@
         <div data-ride='table'>
           <table class='table table-condensed table-striped table-bordered table-fixed no-margin' id="workload">
             <thead>
-              <tr class='colhead'>
-                <th class="w-200px"><?php echo $lang->report->user;?></th>
+              <tr class='colhead text-center'>
+                <th class="w-100px"><?php echo $lang->report->user;?></th>
                 <th><?php echo $lang->report->project;?></th>
                 <th class="w-100px"><?php echo $lang->report->task;?></th>
                 <th class="w-100px"><?php echo $lang->report->remain;?></th>
@@ -88,19 +88,13 @@
                 <?php foreach($load['task'] as $project => $info):?>
                 <?php $class = $color ? 'rowcolor' : '';?>
                 <?php if($id != 1) echo '<tr class="text-center">';?>
-                <td class="<?php echo $class;?>"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $project);?></td>
-                <td class="<?php echo $class;?> text-center"><?php echo $info['count'];?></td>
-                <td class="<?php echo $class;?> text-center"><?php echo $info['manhour'];?></td>
+                <td title='<?php echo $project?>' class="<?php echo $class;?> text-left"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $project);?></td>
+                <td class="<?php echo $class;?>"><?php echo $info['count'];?></td>
+                <td class="<?php echo $class;?>"><?php echo $info['manhour'];?></td>
                 <?php if($id == 1):?>
-                <td rowspan="<?php echo count($load['task']);?>" class="text-center">
-                  <?php echo $load['total']['count'];?>
-                </td>
-                <td rowspan="<?php echo count($load['task']);?>" class="text-center">
-                  <?php echo $load['total']['manhour'];?>
-                </td>
-                <td rowspan="<?php echo count($load['task']);?>" class="text-center">
-                  <?php echo round($load['total']['manhour'] / $allHour * 100, 2) . '%';?>
-                </td>
+                <td rowspan="<?php echo count($load['task']);?>"><?php echo $load['total']['count'];?></td>
+                <td rowspan="<?php echo count($load['task']);?>"><?php echo $load['total']['manhour'];?></td>
+                <td rowspan="<?php echo count($load['task']);?>"><?php echo round($load['total']['manhour'] / $allHour * 100, 2) . '%';?></td>
                 <?php endif;?>
                 <?php if($id != 1) echo '</tr>'; $id ++;?>
                 <?php $color = !$color;?>

module/story/model.php

@@ -2320,6 +2320,11 @@ class storyModel extends model
                 $title  = $story->planTitle;
                 $class .= ' text-ellipsis';
             }
+            if($id == 'sourceNote')
+            {
+                $title  = $story->sourceNote;
+                $class .= ' text-ellipsis';
+            }
 
             echo "<td class='" . $class . "' title='$title'>";
             switch($id)

module/story/view/view.html.php

@@ -94,7 +94,7 @@
             echo "</div>";
         }
 
-        if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile', '', 'showinonlybody');
+        if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
 
         echo "<div class='divider'></div>";
         common::printIcon('story', 'edit', "storyID=$story->id", $story);

module/todo/control.php

@@ -340,7 +340,7 @@ class todo extends control
             $this->lang->set('menugroup.todo', $from);
         }
 
-        $this->view->title      = "{$this->lang->todo->common} #$todo->id $todo->name";
+        $this->view->title      = $this->app->user->account == $todo->account ? "{$this->lang->todo->common} #$todo->id $todo->name" : $this->lang->todo->common ;
         $this->view->position[] = $this->lang->todo->view;
         $this->view->todo       = $todo;
         $this->view->times      = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);

module/todo/model.php

@@ -383,14 +383,14 @@ class todoModel extends model
             ->beginIF($begin)->andWhere('date')->ge($begin)->fi()
             ->beginIF($end)->andWhere('date')->le($end)->fi()
             ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
-            ->beginIF($status == 'undone')->andWhere('status')->ne('done')->fi()
+            ->beginIF($status == 'undone')->andWhere('status')->notin('done,closed')->fi()
             ->beginIF($date == 'cycle')->andWhere('cycle')->eq('1')->fi()
             ->beginIF($date != 'cycle')->andWhere('cycle')->eq('0')->fi()
             ->orderBy($orderBy)
             ->beginIF($limit > 0)->limit($limit)->fi()
             ->page($pager)
             ->query();
-
+        a($stmt);
         /* Set session. */
         $sql = explode('WHERE', $this->dao->get());
         $sql = explode('ORDER', $sql[1]);

module/user/view/create.html.php

@@ -25,7 +25,7 @@
       <table align='center' class="table table-form">
         <tr>
           <th class='w-verifyPassword'><?php echo $lang->user->dept;?></th>
-          <td class='w-p50'><?php echo html::select('dept', $depts, $deptID, "class='form-control chosen'");?></td>
+          <td class='w-p40'><?php echo html::select('dept', $depts, $deptID, "class='form-control chosen'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->account;?></th>
@@ -83,7 +83,8 @@
           </td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center form-actions'>
+          <th></th>
+          <td colspan='2' class='text-left form-actions'>
             <?php echo html::submitButton();?>
             <?php echo html::backButton();?>
           </td>