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

module/backup/lang/en.php

@@ -5,10 +5,10 @@ $lang->backup->history  = 'History';
 $lang->backup->delete   = 'Delete';
 $lang->backup->backup   = 'Backup';
 $lang->backup->restore  = 'Restore';
-$lang->backup->change   = 'Modify days';
+$lang->backup->change   = 'Modify expiration';
 $lang->backup->changeAB = 'Modify';
 
-$lang->backup->time  = 'Backup Time';
+$lang->backup->time  = 'Date';
 $lang->backup->files = 'Files';
 $lang->backup->size  = 'Size';
 

module/common/lang/en.php

@@ -464,7 +464,7 @@ $lang->noResultsMatch     = "No results match!";
 $lang->searchMore         = "More results：";
 $lang->chooseUsersToMail  = "Choose users that will be notified.";
 $lang->browserNotice      = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.';
-$lang->noticePasteImg     = "Support pasting images.";
+$lang->noticePasteImg     = "Paste images here.";
 
 /* 时间格式设置。*/
 if(!defined('DT_DATETIME1')) define('DT_DATETIME1',  'Y-m-d H:i:s');

module/cron/view/edit.html.php

@@ -60,7 +60,7 @@
         </tr>
         <tr>
           <th></th>
-          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
+          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
         </tr>
       </table>
     </form>

module/custom/js/working.js

@@ -0,0 +1,4 @@
+$(function()
+{
+  $('#mainMenu #workingTab').addClass('btn-active-text');
+})

module/custom/view/flow.html.php

@@ -30,7 +30,7 @@
             <?php endforeach;?>
           </td>
         </tr>
-        <tr><td></td><td><?php echo html::submitButton()?></td></tr>
+        <tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
         <tr>
           <td colspan='2' class='pd-0'>
             <div class='alert alert-info alert-block'><strong><?php echo $lang->custom->productProject->notice?></strong></div>

module/custom/view/required.html.php

@@ -15,7 +15,7 @@
   <div class='side-col' id='sidebar'>
     <div class='cell'>
       <div class='list-group'>
-        <?php 
+        <?php
         foreach($config->custom->requiredModules as $requiredModule)
         {
             $requiredModuleName = zget($lang->custom->moduleName, $requiredModule, $lang->$requiredModule->common);
@@ -38,7 +38,7 @@
           <th class='w-100px'>
           <?php
           $fields = $this->custom->getFormFields($moduleName, $method);
-  
+
           if($moduleName == 'testsuite' and $method == 'createlib')  $method = 'createLib';
           if($moduleName == 'testsuite' and $method == 'createcase')
           {
@@ -56,10 +56,8 @@
         <tr>
           <td></td>
           <td>
-          <?php
-          echo html::submitButton();
-          if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn'");
-          ?>
+          <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+          <?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
           </td>
         </tr>
       </table>

module/custom/view/score.html.php

@@ -32,8 +32,8 @@
         <tr>
           <th></th>
           <td>
-            <?php echo html::submitButton();?>
-            <?php common::printLink('score', 'reset', '', "<i class='icon-refresh'></i> " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn iframe" data-width="480"', true, true);?>
+            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php common::printLink('score', 'reset', '', "<i class='icon-refresh'></i> " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn btn-wide iframe" data-width="480"', true, true);?>
           </td>
         </tr>
       </table>

module/custom/view/set.html.php

@@ -35,7 +35,7 @@ EOT;
   <div class='side-col' id='sidebar'>
     <div class='cell'>
       <div class='list-group'>
-        <?php 
+        <?php
         foreach($lang->custom->{$module}->fields as $key => $value)
         {
             echo html::a(inlink('set', "module=$module&field=$key"), $value, '', " id='{$key}Tab'");
@@ -72,7 +72,7 @@ EOT;
         <?php endif;?>
         <tr>
           <td></td>
-          <td><?php echo html::submitButton();?></td>
+          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
         </tr>
       </table>
       <?php elseif($module == 'task' and $field == 'hours'):?>
@@ -88,7 +88,7 @@ EOT;
         </tr>
         <tr>
           <td></td>
-          <td><?php echo html::submitButton();?></td>
+          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
         </tr>
       </table>
       <?php elseif($module == 'bug' and $field == 'longlife'):?>
@@ -101,7 +101,7 @@ EOT;
               <span class='input-group-addon'><?php echo $lang->day?></span>
             </div>
           </td>
-          <td><?php echo html::submitButton();?></td>
+          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
         </tr>
       </table>
       <div class='alert alert-info alert-block'><?php echo $lang->custom->notice->longlife;?></div>
@@ -113,7 +113,7 @@ EOT;
         </tr>
         <tr>
           <td></td>
-          <td><?php echo html::submitButton();?></td>
+          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
         </tr>
       </table>
       <?php elseif($module == 'user' and $field == 'deleted'):?>
@@ -124,7 +124,7 @@ EOT;
         </tr>
         <tr>
           <td></td>
-          <td><?php echo html::submitButton();?></td>
+          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
         </tr>
       </table>
       <?php else:?>
@@ -151,11 +151,11 @@ EOT;
         <?php endforeach;?>
         <tr>
           <td colspan='<?php $canAdd ? print(3) : print(2);?>' class='text-center'>
-          <?php 
+          <?php
           $appliedTo = array($currentLang => $lang->custom->currentLang, 'all' => $lang->custom->allLang);
           echo html::radio('lang', $appliedTo, $lang2Set);
-          echo html::submitButton();
-          if(common::hasPriv('custom', 'restore')) echo html::linkButton($lang->custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin');
+          echo html::submitButton('', '', 'btn btn-primary btn-wide');
+          if(common::hasPriv('custom', 'restore')) echo html::linkButton($lang->custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin', '', 'btn btn-wide');
           ?>
           </td>
         </tr>

module/custom/view/working.html.php

@@ -22,7 +22,7 @@
       </div>
       <table class='table table-form'>
         <tr>
-          <th class='w-100px text-top'><?php echo $lang->custom->working;?></th>
+          <th class='w-150px text-top'><?php echo $lang->custom->working;?></th>
           <td>
             <?php $checkedKey = isset($config->global->flow) ? $config->global->flow : 'full';?>
             <?php foreach($lang->custom->workingList as $key => $value):?>
@@ -30,15 +30,9 @@
             <?php endforeach;?>
           </td>
         </tr>
-        <tr><td></td><td><?php echo html::submitButton()?></td></tr>
+        <tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
       </table>
     </form>
   </div>
 </div>
-<script>
-$(function()
-{
-    $('#mainMenu #workingTab').addClass('btn-active-text');
-})
-</script>
 <?php include '../../common/view/footer.html.php';?>

module/product/lang/en.php

@@ -52,7 +52,7 @@ $lang->product->unResolvedBugs   = 'Unresolved Bug';
 $lang->product->assignToNullBugs = 'Unassigned Bug';
 
 $lang->product->confirmDelete  = " Do you want to delete {$lang->productCommon}?";
-$lang->product->errorNoProduct = "{$lang->productCommon} is not created yet!";
+$lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
 $lang->product->accessDenied   = "You have no access to {$lang->productCommon}.";
 
 $lang->product->id            = 'ID';
@@ -72,20 +72,20 @@ $lang->product->whitelist     = 'Whitelist';
 $lang->product->branch        = '%s';
 $lang->product->qa            = 'QA';
 $lang->product->release       = 'Release';
-$lang->product->latestDynamic = 'Latest Dynamic';
+$lang->product->latestDynamic = 'Dynamic';
 $lang->product->iteration     = 'Iteration';
-$lang->product->iterationInfo = 'Iterate %s times';
-$lang->product->iterationView = 'Iteration View';
+$lang->product->iterationInfo = '%s Iterations';
+$lang->product->iterationView = 'Details';
 
 $lang->product->searchStory  = 'Search';
-$lang->product->assignedToMe = 'Assigned To Me';
-$lang->product->openedByMe   = 'Created By Me';
-$lang->product->reviewedByMe = 'Reviewed By Me';
+$lang->product->assignedToMe = 'AssignedToMe';
+$lang->product->openedByMe   = 'CreatedByMe';
+$lang->product->reviewedByMe = 'ReviewedByMe';
 $lang->product->closedByMe   = 'ClosedByMe';
 $lang->product->draftStory   = 'Draft';
 $lang->product->activeStory  = 'Activated';
 $lang->product->changedStory = 'Changed';
-$lang->product->willClose    = 'ToBeClose';
+$lang->product->willClose    = 'ToBeClosed';
 $lang->product->closedStory  = 'Closed';
 $lang->product->unclosed     = 'Open';
 $lang->product->unplan       = 'Wait';
@@ -100,8 +100,8 @@ $lang->product->typeList['branch']   = 'Multi Branch';
 $lang->product->typeList['platform'] = 'Multi Platform';
 
 $lang->product->typeTips = array();
-$lang->product->typeTips['branch']   = '(Divide the custom content.)';
-$lang->product->typeTips['platform'] = '(Divide IOS, Android, PC, etc.)';
+$lang->product->typeTips['branch']   = '(for the custom content)';
+$lang->product->typeTips['platform'] = '(for IOS, Android, PC, etc.)';
 
 $lang->product->branchName['normal']   = '';
 $lang->product->branchName['branch']   = 'Branch';
@@ -111,7 +111,7 @@ $lang->product->statusList['']       = '';
 $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Closed';
 
-$lang->product->aclList['open']    = "Default (User with {$lang->productCommon} View privilege have access to it)";
+$lang->product->aclList['open']    = "Default (User with privilege to {$lang->productCommon} can access to it.)";
 $lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->projectCommon} team members only)";
 $lang->product->aclList['custom']  = 'Custom (Team members and Whitelist members have access to it.)';
 

module/user/lang/en.php

@@ -38,7 +38,7 @@ $lang->user->phone       = 'Phone';
 $lang->user->address     = 'Address';
 $lang->user->zipcode     = 'Zip Code';
 $lang->user->join        = 'Join Date';
-$lang->user->visits      = 'Visit Count';
+$lang->user->visits      = 'Visits';
 $lang->user->ip          = 'Last IP';
 $lang->user->last        = 'Last Login';
 $lang->user->ranzhi      = 'Zdoo Account';
@@ -100,13 +100,20 @@ $lang->user->weakPassword = "Your password does not meet the setting requirement
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = 'Developer';
-$lang->user->roleList['qa']     = 'Tester';
+$lang->user->roleList['qa']     = 'QA';
 $lang->user->roleList['pm']     = 'Project Manager';
 $lang->user->roleList['po']     = 'Product Owner';
+<<<<<<< HEAD
+$lang->user->roleList['td']     = 'Test Director';
+$lang->user->roleList['pd']     = 'Product Director';
+$lang->user->roleList['qd']     = 'QA Director';
+$lang->user->roleList['top']    = 'Top Manager';
+=======
 $lang->user->roleList['td']     = 'Technical Manager';
 $lang->user->roleList['pd']     = 'Product Manager';
 $lang->user->roleList['qd']     = 'QA Manager';
 $lang->user->roleList['top']    = 'Senior Manager';
+>>>>>>> d53267cadf32651eb7ccfff3e0b1a5dd744d3d3e
 $lang->user->roleList['others'] = 'Other';
 
 $lang->user->genderList['m'] = 'M';