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

module/bug/view/create.html.php

@@ -21,6 +21,12 @@ js::set('createBuild', $lang->build->create);
 js::set('refresh', $lang->refresh);
 js::set('flow', $config->global->flow);
 ?>
+<?php if($this->app->getClientLang() == 'en'):?>
+<style>
+#moduleIdBox .input-group-addon{padding: 5px 23px}
+#deadlineTd .input-group-addon{padding: 5px 18px}
+</style>
+<?php endif;?>
 <div id="mainContent" class="main-content fade">
   <div class="center-block">
     <div class="main-header">
@@ -110,7 +116,7 @@ js::set('flow', $config->global->flow);
             </td>
           <?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
           <?php if($showDeadline):?>
-            <td>
+            <td id='deadlineTd'>
               <div class='input-group'>
                 <span class='input-group-addon'><?php echo $lang->bug->deadline?></span>
                 <span><?php echo html::input('deadline', $deadline, "class='form-control form-date'");?></span>

module/project/view/treetask.html.php

@@ -2,6 +2,7 @@
   <h2 class="detail-title">
     <span class="label-id"><?php echo $task->id?></span>
     <span class="label label-task"><?php echo $lang->task->common?></span>
+    <span class="label label-task"><?php echo zget($lang->task->statusList, $task->status);?></span>
     <span class="title">
       <?php if($task->parent > 0) echo '<span class="label no-margin label-badge label-light">' . $this->lang->task->childrenAB . '</span>';?>
       <?php if(!empty($task->team)) echo '<span class="label no-margin label-badge label-light">' . $this->lang->task->multipleAB . '</span>';?>
@@ -10,7 +11,6 @@
   </h2>
   <div class="detail-content article-content">
     <div class="infos">
-      <span class="status-task status-wait"><span class="label label-dot"></span> <?php echo zget($lang->task->statusList, $task->status);?></span>
       <span><?php echo $lang->task->estimate;?> <?php echo $task->estimate . $lang->workingHour;?></span>
       <span><?php echo $lang->task->consumed;?> <?php echo round($task->consumed, 2) . $lang->workingHour;?></span>
       <span><?php echo $lang->task->left;?> <?php echo $task->left . $lang->workingHour;?></span>

module/report/css/bugcreate.css

@@ -1 +1,2 @@
-
+#begin{min-width: 85px}
+#end{min-width: 85px}

module/search/view/buildform.html.php

@@ -16,7 +16,7 @@ include '../../common/view/datepicker.html.php';
 include '../../common/view/chosen.html.php';
 $formId = 'searchForm-' . uniqid('');
 $fieldWidth    = $app->getClientLang() == 'en' ? 'w-130px' : 'w-110px';
-$operatorWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-90px';
+$operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-90px';
 ?>
 <style>
 #selectPeriod {padding: 4px 0; height: 197px; min-width: 120px}
@@ -53,7 +53,7 @@ $operatorWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-90px';
 #userQueries .label > .icon-close:hover {background-color: #ff5d5d; color: #fff;}
 @media (max-width: 1150px) {#userQueries {display: none}}
 <?php if($style == 'simple'):?>
-#<?php echo $formId;?> .form-actions {text-align: left; padding: 0!important; max-width: 200px; vertical-align: middle; width: 200px;}
+#<?php echo $formId;?> .form-actions {text-align: left; padding: 0!important; max-width: 200px; vertical-align: middle; width: 100px;}
 #queryBox.show {min-height: 66px;}
 <?php endif;?>
 #toggle-queries{position: absolute; right: 0px; top: 40px; width: 13px; background: #79cdfb; border-radius: 6px; height: 30px;cursor: pointer}

module/sso/lang/en.php

@@ -11,8 +11,8 @@
  */
 $lang->sso = new stdclass();
 $lang->sso->settings = 'Settings';
-$lang->sso->turnon   = 'On';
-$lang->sso->redirect = 'Auto Jump to Zdoo';
+$lang->sso->turnon   = 'Zdoo';
+$lang->sso->redirect = 'Back to Zdoo';
 $lang->sso->code     = 'Code';
 $lang->sso->key      = 'Secret Key';
 $lang->sso->addr     = 'Address';

module/story/view/edit.html.php

@@ -170,7 +170,7 @@
             <div class='detail-title'><?php echo $lang->story->legendLifeTime;?></div>
             <table class='table table-form'>
               <tr>
-                <th class='w-70px'><?php echo $lang->story->openedBy;?></th>
+                <th class='w-80px'><?php echo $lang->story->openedBy;?></th>
                 <td><?php echo $users[$story->openedBy];?></td>
               </tr>
               <tr>
@@ -206,7 +206,8 @@
               </tr>
               <?php endif;?>
               <tr>
-                <th class='w-70px'><?php echo $lang->story->linkStories;?></th>
+              <?php $width = $this->app->getClientLang() == 'en' ? 'w-110px': 'w-70px'?>
+                <th class=<?php echo $width?>><?php echo $lang->story->linkStories;?></th>
                 <td><?php echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
               </tr>
               <tr>

module/task/view/edit.html.php

@@ -20,6 +20,7 @@
 <?php js::set('confirmChangeProject', $lang->task->confirmChangeProject);?>
 <?php js::set('changeProjectConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
+<?php $thWidth = $this->app->getClientLang() == 'en' ? 'w-85px' : 'w-70px';?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>
@@ -89,12 +90,12 @@
             <table class='table table-form'>
               <?php if($task->parent <= 0):?>
               <tr>
-                <th class='w-80px'><?php echo $lang->task->project;?></th>
+                <th class=<?php echo $thWidth;?>><?php echo $lang->task->project;?></th>
                 <td><?php echo html::select('project', $projects, $task->project, 'class="form-control chosen" onchange="loadAll(this.value)"');?></td>
               </tr>
               <?php endif;?>
               <tr>
-                <th class='w-80px'><?php echo $lang->task->module;?></th>
+                <th class=<?php echo $thWidth;?>><?php echo $lang->task->module;?></th>
                 <td id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control chosen" onchange="loadModuleRelated()"');?></td>
               </tr>
               <?php if($config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
@@ -146,7 +147,7 @@
             <div class='detail-title'><?php echo $lang->task->legendEffort;?></div>
             <table class='table table-form'>
               <tr>
-                <th class='w-70px'><?php echo $lang->task->estStarted;?></th>
+                <th class=<?php echo $thWidth;?>><?php echo $lang->task->estStarted;?></th>
                 <td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
               </tr>
               <tr>
@@ -181,7 +182,7 @@
             <div class='detail-title'><?php echo $lang->task->legendLife;?></div>
             <table class='table table-form'>
               <tr>
-                <th class='w-70px'><?php echo $lang->task->openedBy;?></th>
+                <th class=<?php echo $thWidth;?>><?php echo $lang->task->openedBy;?></th>
                 <td><?php echo $users[$task->openedBy];?></td>
               </tr>
               <tr>