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

module/bug/js/create.js

@@ -122,25 +122,17 @@ $(function()
     var adjustBugTypeGroup = function()
     {
         var $group = $('#bugTypeInputGroup');
-        var width = $group.width(), addonWidth = 0;
+        var width = ($group.parent().width() - 10), addonWidth = 0;
         var $controls = $group.find('.chosen-single');
         $group.children('.input-group-addon').each(function()
         {
             addonWidth += $(this).outerWidth();
         });
-        $controls.css('width', Math.floor((width - addonWidth)/$controls.length));
+        var bestWidth = Math.floor((width - addonWidth)/$controls.length);
+        $controls.css('width', bestWidth);
+        var lastWidth = width - addonWidth - bestWidth * ($controls.length - 1);
+        $controls.last().css('width', lastWidth);
     };
     adjustBugTypeGroup();
-
-    // adjust style for file box
-    var ajustFilebox = function()
-    {
-        applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#contactListGroup').width() - 2) + 'px}', 'filebox')
-    };
-    ajustFilebox();
-    $(window).resize(function()
-    {
-        ajustFilebox();
-        adjustBugTypeGroup();
-    });
+    $(window).on('resize', adjustBugTypeGroup);
 });

module/bug/view/edit.html.php

@@ -177,10 +177,8 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                 <tr>
                   <th><?php echo $lang->bug->mailto;?></th>
                   <td>
-                    <div class='input-group'>
                     <?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?>
-                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists');?></div>
-                    </div>
+                    <?php echo $this->fetch('my', 'buildContactLists');?>
                   </td>
                 </tr>
               </tbody>

module/common/model.php

@@ -437,7 +437,6 @@ class commonModel extends model
     {
         global $lang, $app;
 
-        if(isset($lang->menugroup->$moduleName)) $moduleName = $lang->menugroup->$moduleName;
         if(!isset($lang->$moduleName->menu))
         {
             echo "<ul></ul>";
@@ -454,6 +453,7 @@ class commonModel extends model
         /* The beginning of the menu. */
         echo $isMobile ? '' : "<ul class='nav nav-default'>\n";
 
+        if(isset($lang->menugroup->$moduleName)) $moduleName = $lang->menugroup->$moduleName;
         /* Cycling to print every sub menus. */
         foreach($menu as $menuItem)
         {

module/testcase/view/batchedit.html.php

@@ -42,7 +42,7 @@
   <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>" id='batchEditForm'>
     <table class='table table-form table-fixed'>
       <thead>
-        <tr>
+        <tr class='text-center'>
           <th class='w-50px'><?php  echo $lang->idAB;?></th>
           <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->priAB;?></th>
           <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->statusAB;?></th>
@@ -51,11 +51,11 @@
           <?php endif;?>
           <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
           <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required');?>'><?php echo $lang->testcase->story;?></th>
-          <th class='required'><?php echo $lang->testcase->title;?></th>
+          <th class='text-left required'><?php echo $lang->testcase->title;?></th>
           <th class='w-120px required'><?php echo $lang->testcase->type;?></th>
           <th class='<?php echo zget($visibleFields, 'precondition', 'hidden') . zget($requiredFields, 'precondition', '', ' required');?>'><?php echo $lang->testcase->precondition;?></th>
           <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->testcase->keywords;?></th>
-          <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
+          <th class='w-250px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
         </tr>
       </thead>
       <tbody>
@@ -112,7 +112,12 @@
         <?php endforeach;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
+        <tr>
+          <td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
+        </tr>
       </tfoot>
     </table>
   </form>