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

module/block/view/qastatisticblock.html.php

@@ -115,7 +115,7 @@ $(function()
             <div class="progress-pie inline-block space progress-pie-100" data-value="<?php echo $product->assignedRate;?>" data-doughnut-size="80">
               <canvas width="100" height="100" style="width: 100px; height: 100px;"></canvas>
               <div class="progress-info">
-                <small><?php echo $lang->bug->allBugs . ' Bug';?></small>
+                <small><?php echo $lang->bug->allBugs;?></small>
                 <strong><span class="progress-value"><?php echo $product->total;?></span></strong>
               </div>
             </div>

module/common/view/datatable.fix.html.php

@@ -6,7 +6,7 @@
 $(function()
 {
     <?php if(!empty($setShowModule)):?>
-    $('#sidebar .cell .text-center:last').append("<a href='#showModuleModal' data-toggle='modal' class='text-secondary small'><?php echo $lang->datatable->showModule?></a><hr class='space-sm' />");
+    $('#sidebar .cell .text-center:last').append("<a href='#showModuleModal' data-toggle='modal' class='text-secondary small'><?php echo $lang->datatable->showModuleAB?></a><hr class='space-sm' />");
     <?php endif;?>
 
     var $btnToolbar = $('#main .table-header .btn-toolbar:first');

module/datatable/lang/en.php

@@ -19,6 +19,7 @@ $lang->datatable->branch   = 'Branch';
 $lang->datatable->platform = 'Platform';
 
 $lang->datatable->showModule             = 'Show module names on the list page';
+$lang->datatable->showModuleAB           = 'Show Module Names';
 $lang->datatable->showModuleList[]       = 'N/A';
 $lang->datatable->showModuleList['base'] = 'Base Node';
 $lang->datatable->showModuleList['end']  = 'End Node';

module/datatable/lang/zh-cn.php

@@ -19,6 +19,7 @@ $lang->datatable->branch   = '分支';
 $lang->datatable->platform = '平台';
 
 $lang->datatable->showModule             = '列表页是否显示模块名';
+$lang->datatable->showModuleAB           = '列表页是否显示模块名';
 $lang->datatable->showModuleList[]       = '不显示';
 $lang->datatable->showModuleList['base'] = '只显示一级模块';
 $lang->datatable->showModuleList['end']  = '只显示最后一级模块';

module/project/js/burn.js

@@ -10,12 +10,31 @@ $(function()
 /* Save burn as image.*/
 function downloadBurn()
 {
-    var canvas   = $('#burnCanvas');
-    var type     = 'png';
-    var imgSrc   = canvas.get(0).toDataURL("image/png");
-    imgData      = imgSrc.replace(type,'image/octet-stream');
-    var filename = 'burn.' + type;
-    saveFile(imgData,filename);
+    var $canvas = $('#burnCanvas');
+    $('#burnWrapper').append("<div class='hidden' id='cloneCanvas'></div>");
+    $('#cloneCanvas').append($canvas.clone());
+    $('#cloneCanvas').append("<img id='cloneImage' />");
+    $('#cloneCanvas #cloneImage').attr('src', $canvas.get(0).toDataURL("image/png"));
+    setTimeout(function()
+    {
+        /* Add watermark */
+        var canvas = document.querySelector('#cloneCanvas #burnCanvas');
+        var cans = canvas.getContext('2d');
+        cans.drawImage($('#cloneCanvas #cloneImage').get(0), 0, 0);
+        cans.font = "16px Microsoft JhengHei";
+        cans.fillStyle = "rgba(17, 17, 17, 0.50)";
+        cans.textAlign = 'left';
+        cans.textBaseline = 'Middle';
+        cans.fillText(watermark, 50, canvas.height - 50);
+
+        var type     = 'png';
+        var $canvas  = $('#cloneCanvas #burnCanvas');
+        var imgSrc   = $canvas.get(0).toDataURL("image/png");
+        imgData      = imgSrc.replace(type,'image/octet-stream');
+        var filename = projectName + '.' + type;
+        saveFile(imgData,filename);
+        $('#burnWrapper #cloneCanvas').remove();
+    }, 500);
 }
 
 var saveFile = function(data, filename)

module/project/lang/en.php

@@ -59,6 +59,7 @@ $lang->project->readjustTime  = "Adjust {$lang->projectCommon} Begin and End";
 $lang->project->readjustTask  = 'Adjust Task Begin and End';
 $lang->project->effort        = 'Effort';
 $lang->project->relatedMember = 'Team';
+$lang->project->watermark     = 'Exported by ZenTao';
 
 $lang->project->start    = 'Start';
 $lang->project->activate = 'Activate';

module/project/lang/zh-cn.php

@@ -59,6 +59,7 @@ $lang->project->readjustTime  = "调整{$lang->projectCommon}起止时间";
 $lang->project->readjustTask  = '顺延任务的起止时间';
 $lang->project->effort        = '日志';
 $lang->project->relatedMember = '相关成员';
+$lang->project->watermark     = '由禅道导出';
 
 $lang->project->start    = "开始";
 $lang->project->activate = "激活";

module/project/view/burn.html.php

@@ -13,6 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/chart.html.php';?>
 <?php js::set('projectID', $projectID);?>
+<?php js::set('projectName', $project->name);?>
+<?php js::set('watermark', $lang->project->watermark);?>
 <?php js::set('type', $type);?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>

module/testreport/view/browse.html.php

@@ -33,7 +33,7 @@
       <tr class='text-center'>
         <th class='w-id'>   <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
         <th class='text-left'><?php common::printOrderLink('title',     $orderBy, $vars, $lang->testreport->title);?></th>
-        <th class='w-user'> <?php common::printOrderLink('createdBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+        <th class='w-90px'> <?php common::printOrderLink('createdBy',   $orderBy, $vars, $lang->openedByAB);?></th>
         <th class='w-150px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->testreport->createdDate);?></th>
         <?php if($config->global->flow != 'onlyTest'):?>
         <th class='w-250px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->project);?></th>