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

module/block/js/admin.js

@@ -4,7 +4,6 @@ $(function()
     var preValue   = '';
     $(document).on('change', '#blockParams #paramstype', function()
     {
-        console.log(preValue);
         $title = $('#blockParams').find('#title');
         var value = $(this).find('option:selected').html();
         if($title.val().indexOf(blockTitle + ' - ' + preValue) >= 0) $title.val(blockTitle + ' - ' + value);

module/datatable/model.php

@@ -41,7 +41,7 @@ class datatableModel extends model
             $fields = $this->loadModel('workflowfield')->getList($module);
             foreach($fields as $field)
             {
-                if($field->buildin == 1) continue;    
+                if($field->buildin) continue;    
                 $this->config->$module->datatable->fieldList[$field->field]['title']    = $field->name;
                 $this->config->$module->datatable->fieldList[$field->field]['width']    = '120';
                 $this->config->$module->datatable->fieldList[$field->field]['fixed']    = 'no';

module/editor/lang/en.php

@@ -36,7 +36,7 @@ $lang->editor->editFileError = 'You can only modify ZenTao files!';
 $lang->editor->notWritable    = "Not wirtable. Permission is required. Please try chmod 777 -R ";
 $lang->editor->notDelete      = 'Cannot be deleted. Please check your permissions!';
 $lang->editor->emptyFileName  = 'Please enter a File Name!';
-$lang->editor->onlyLocalVisit = "This feature only works when the IP is 127.0.0.1. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Help</a>";
+$lang->editor->onlyLocalVisit = "This feature only works when the IP is 127.0.0.1 for security. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Help</a>";
 
 $lang->editor->translate['config.php']  = 'config';
 $lang->editor->translate['control.php'] = 'control';

module/productplan/view/linkbug.html.php

@@ -66,7 +66,7 @@
       <div class="btn-toolbar">
         <?php echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?>
       </div>
-      <div class=''></div>
+      <div class='text'></div>
     </div>
   </form>
 </div>

module/productplan/view/linkstory.html.php

@@ -74,7 +74,7 @@
       <div class="btn-toolbar">
         <?php echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?>
       </div>
-      <div class=''></div>
+      <div class='text'></div>
     </div>
   </form>
 </div>

module/productplan/view/view.html.php

@@ -38,7 +38,7 @@
     if(!$plan->deleted)
     {
         $flow = $this->loadModel('workflow')->getByModule('productplan');
-        echo $this->loadModel('flow')->buildOperateMenu($flow, $productplan, 'view');
+        echo $this->loadModel('flow')->buildOperateMenu($flow, $plan, 'view');
 
         if(common::hasPriv('productplan', 'create') and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), "<i class='icon-treemap-alt'></i> " . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'");
         if(common::hasPriv('productplan', 'edit')) echo html::a($this->createLink('productplan', 'edit', "planID=$plan->id"), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");

module/project/css/view.css

@@ -1,5 +1,5 @@
 .block-burn .panel-body{margin-top: 20px;}
-.data-stats .widthTr td{padding:0px;}
+.data-stats .statsTr td{padding:0px;}
 
 #burnWrapper {max-width: 400px; margin: 0 auto; padding: 8px; position: relative;}
 #burnYUnit {position: absolute; color: #CBD0DB; top: -10px; left: 10px;}

module/project/view/all.html.php

@@ -40,7 +40,7 @@
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
           <th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->project->code);?></th>
-          <?php $colWidth = common::checkEnLang() ? 'w-130px' : '1-100px';?>
+          <?php $colWidth = common::checkEnLang() ? 'w-130px' : 'w-100px';?>
           <th class='<?php echo $colWidth;?>'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
           <th class='w-90px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->project->end);?></th>
           <th class='w-90px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->project->status);?></th>

module/project/view/view.html.php

@@ -229,7 +229,7 @@
               <div class="detail-content">
                 <table class='table table-data data-stats'>
                   <tbody>
-                    <tr class='widthTr'><td class='w-100px'></td><td></td><td></td><td></td></tr>
+                    <tr class='statsTr'><td class='w-100px'></td><td></td><td></td><td></td></tr>
                     <tr>
                       <td colspan="4">
                         <?php $progress = ($project->totalConsumed + $project->totalLeft) ? round($project->totalConsumed / ($project->totalConsumed + $project->totalLeft), 3) * 100 : 0;?>

module/score/lang/en.php

@@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal']         = 'Save Template';
 $lang->score->methods['testtask']['runCase']         = 'Run Test Case';
 $lang->score->methods['testcase']['create']          = 'Create Test Case';
 $lang->score->methods['build']['create']             = 'Create Build';
-$lang->score->methods['project']['create']           = 'Create Project';
-$lang->score->methods['project']['close']            = 'Finish Project';
+$lang->score->methods['project']['create']           = "Create {$lang->projectCommon}";
+$lang->score->methods['project']['close']            = "Finish {$lang->projectCommon}";
 $lang->score->methods['productplan']['create']       = 'Create Plan';
 $lang->score->methods['release']['create']           = 'Create Release';
 $lang->score->methods['block']['set']                = 'Custom Block';

module/search/view/buildform.html.php

@@ -60,6 +60,11 @@ $operatorWidth = common::checkEnLang() ? 'w-110px' : 'w-90px';
 #toggle-queries{position: absolute; right: 0px; top: 40px; width: 13px; background: #79cdfb; border-radius: 6px; height: 30px;cursor: pointer}
 #toggle-queries .icon{ position: absolute; top: 6px; right: -2px; color: #fff;}
 </style>
+<?php if($style != 'simple'):?>
+  <div id='toggle-queries'>
+    <i class='icon icon-angle-left'></i>
+  </div>
+<?php endif;?>
 <form method='post' action='<?php echo $this->createLink('search', 'buildQuery');?>' target='hiddenwin' id='<?php echo $formId;?>' class='search-form<?php if($style == 'simple') echo ' search-form-simple';?>'>
 <div class='hidden'>
 <?php
@@ -202,9 +207,6 @@ foreach($fieldParams as $fieldName => $param)
         </table>
       </td>
       <?php if($style != 'simple'):?>
-      <div id='toggle-queries'>
-      <i class='icon icon-angle-left'></i>
-      </div>
       <td class='w-160px hidden' rowspan='2' id='userQueries'>
         <h4><?php echo $lang->search->savedQuery;?></h4>
         <ul>