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

module/block/view/productstatisticblock.html.php

@@ -24,6 +24,7 @@
 .product-info .progress {position: absolute; left: 10px; top: 35px; right: 90px;}
 .product-info .progress-info {position: absolute; left: 8px; top: 10px; width: 180px; font-size: 12px;}
 .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;}
+html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 130px;}
 .product-info .type-value,
 .product-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .product-info .type-value {font-size: 14px;}

module/block/view/projectstatisticblock.html.php

@@ -12,6 +12,7 @@
 .product-info .progress {position: absolute; left: 10px; top: 35px; right: 90px;}
 .product-info .progress-info {position: absolute; left: 8px; top: 10px; width: 180px; font-size: 12px;}
 .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;}
+html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 130px;}
 .product-info .type-value,
 .product-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .product-info .type-value {font-size: 14px;}

module/company/css/browse.css

@@ -2,3 +2,5 @@
 form {position:relative}
 #querybox {float: none!important; width: auto;}
 #moreOrLite {right: 10px!important}
+
+#userList tbody td{white-space: nowrap; overflow:hidden}

module/company/view/browse.html.php

@@ -70,7 +70,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           </th>
           <th><?php common::printorderlink('realname', $orderBy, $vars, $lang->user->realname);?></th>
           <th><?php common::printOrderLink('account', $orderBy, $vars, $lang->user->account);?></th>
-          <th class="c-type"><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
+          <th class="w-90px"><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
           <th class="c-url"><?php common::printOrderLink('email', $orderBy, $vars, $lang->user->email);?></th>
           <th class="c-type"><?php common::printOrderLink('gender', $orderBy, $vars, $lang->user->gender);?></th>
           <th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
@@ -92,7 +92,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           </td>
           <td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname, '', "title='$user->realname'")) echo $user->realname;?></td>
           <td><?php echo $user->account;?></td>
-          <td class="c-type"><?php echo zget($lang->user->roleList, $user->role, '');?></td>
+          <td class="w-90px" title='<?php echo zget($lang->user->roleList, $user->role, '');?>'><?php echo zget($lang->user->roleList, $user->role, '');?></td>
           <td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>
           <td class="c-type"><?php echo zget($lang->user->genderList, $user->gender, $user->gender);?></td>
           <td><?php echo $user->phone;?></td>

module/misc/lang/en.php

@@ -16,10 +16,10 @@ $lang->misc->api    = 'http://api.zentao.net';
 
 $lang->misc->zentao = new stdclass();
 $lang->misc->zentao->version           = 'Version %s';
-$lang->misc->zentao->labels['about']   = 'About ZenTao';
-$lang->misc->zentao->labels['support'] = 'Technical Support';
+$lang->misc->zentao->labels['about']   = 'About';
+$lang->misc->zentao->labels['support'] = 'Support';
 $lang->misc->zentao->labels['cowin']   = 'Help Us';
-$lang->misc->zentao->labels['service'] = 'Service List';
+$lang->misc->zentao->labels['service'] = 'Service';
 
 $lang->misc->zentao->icons['about']   = 'group';
 $lang->misc->zentao->icons['support'] = 'question-sign';

module/my/lang/en.php

@@ -25,7 +25,7 @@ $lang->my->scoreRule      = 'Score Rule';
 $lang->my->noTodo         = 'No todos. ';
 
 $lang->my->taskMenu = new stdclass();
-$lang->my->taskMenu->assignedToMe = 'AssignedToMe';
+$lang->my->taskMenu->assignedToMe = 'Assigned To Me';
 $lang->my->taskMenu->openedByMe   = 'CreatedByMe';
 $lang->my->taskMenu->finishedByMe = 'FinishedByMe';
 $lang->my->taskMenu->closedByMe   = 'ClosedByMe';

module/project/lang/en.php

@@ -38,7 +38,7 @@ $lang->project->teamname      = 'Team Name';
 $lang->project->order         = "Sort {$lang->projectCommon}";
 $lang->project->products      = "Link {$lang->productCommon}";
 $lang->project->whitelist     = 'Whitelist';
-$lang->project->totalEstimate = 'Est.(h)';
+$lang->project->totalEstimate = 'Est';
 $lang->project->totalConsumed = 'Cost';
 $lang->project->totalLeft     = 'Left';
 $lang->project->progress      = 'Progress';

module/task/model.php

@@ -1123,7 +1123,7 @@ class taskModel extends model
             ->setDefault('status', 'done')
             ->setDefault('finishedBy, lastEditedBy', $this->app->user->account)
             ->setDefault('finishedDate, lastEditedDate', $now)
-            ->removeIF(!empty($oldTask->team), 'finishedBy,finishedDate,status')
+            ->removeIF(!empty($oldTask->team), 'finishedBy,finishedDate,status,left')
             ->remove('comment,files,labels')
             ->get();
 
@@ -1145,8 +1145,8 @@ class taskModel extends model
         }
         else
         {
-            $consumed = $oldTask->team[$this->app->user->account]->consumed;
-            if($task->consumed < $consumed)
+            $consumed = $task->consumed - $oldTask->team[$this->app->user->account]->consumed;
+            if($consumed < 0)
             {
                 dao::$errors[] = $this->lang->task->error->consumedSmall;
                 return false;

module/todo/view/batchcreate.html.php

@@ -16,7 +16,7 @@
 <div id="mainContent">
   <div class="main-header">
     <h2><?php echo $lang->todo->batchCreate . $lang->todo->common;?></h2>
-    <div class="input-group pull-left">
+    <div class="input-group pull-left" style='width:255px;'>
       <span class="input-group-addon"><?php echo $lang->todo->date;?></span>
       <input type="text" name="date" value="<?php echo $date;?>" class="form-control form-date" autocomplete="off" />
       <span class="input-group-addon">

module/tutorial/lang/en.php

@@ -11,7 +11,7 @@
  */
 $lang->tutorial = new stdclass();
 $lang->tutorial->common           = 'Tutorial';
-$lang->tutorial->desc             = 'Get to know ZenTao through finishing tasks. It will take about 10 mins, and you can quit it anytime.';
+$lang->tutorial->desc             = 'Get know ZenTao by doing tasks. It takes about 10 minutes, and you can quit it anytime.';
 $lang->tutorial->start            = "Let's go!";
 $lang->tutorial->exit             = 'Quit';
 $lang->tutorial->congratulation   = 'Congratulations! You have finished all tasks.';

module/user/lang/en.php

@@ -44,7 +44,7 @@ $lang->user->last        = 'Last Login';
 $lang->user->ranzhi      = 'Zdoo Account';
 $lang->user->ditto       = 'Ditto';
 $lang->user->originalPassword = 'Old Password';
-$lang->user->verifyPassword   = 'Your login password';
+$lang->user->verifyPassword   = 'Your Login Password';
 $lang->user->resetPassword    = 'Forgot Password?';
 
 $lang->user->index           = "Home";