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

module/bug/js/browse.js

@@ -1,36 +1,34 @@
-$(document).ready(function()
+$(function()
 {
     if(browseType == 'bysearch') ajaxGetSearchForm();
     if($('#bugList thead th.w-title').width() < 150) $('#bugList thead th.w-title').width(150);
 
     if(flow == 'onlyTest')
     {
-        $('#modulemenu > .nav').append($('#featurebar > .submenu').html());
         toggleSearch();
-
         $(".export").modalTrigger({width:650, type:'iframe'});
 
-        $('#modulemenu > .nav > li').removeClass('active');
-        $('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
+        $('#subNavbar > .nav > li').removeClass('active');
+        $('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
 
-        var navWidth = $('#modulemenu > .nav').width();
+        var navWidth = $('#subNavbar > .nav').width();
         var leftWidth  = 0;
         var rightWidth = 0;
 
-        $rightNav = $('#modulemenu > .nav > li.right');
+        $rightNav = $('#subNavbar > .nav > li.right');
         rightLength = $rightNav.length;
         for(i = 0; i < rightLength; i++) rightWidth += $rightNav.eq(i).width();
 
-        var maxWidth = navWidth - $('#modulemenu > .nav > #bysearchTab').width() - rightWidth - 100;
+        var maxWidth = navWidth - $('#subNavbar > .nav > #bysearchTab').width() - rightWidth - 100;
 
-        $('#modulemenu > .nav > li:not(.right)').each(function()
+        $('#subNavbar > .nav > li:not(.right)').each(function()
         {
             if(leftWidth > maxWidth)
             {
                 if($(this).attr('id') != 'moreMenus' && $(this).attr('id') != 'bysearchTab')
                 {
-                    $('#moreMenus').removeClass('hidden');
-                    $('#moreMenus > ul').append($(this)[0]);
+                    $('#subNavbar').removeClass('hidden');
+                    $('#subNavbar > ul').append($(this)[0]);
                 }
             }
             else

module/bug/view/edit.html.php

@@ -65,10 +65,13 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               <?php echo html::textarea('comment', '', "rows='5' class='form-control kindeditor' hidefocus='true'");?>
             </div>
           </div>
-          <div class='form-group'><?php echo $this->fetch('file', 'buildform');?></div>
+          <div class="detail">
+            <div class="detail-title"><?php echo $lang->files;?></div>
+            <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
+          </div>
 
           <div class='actions actions-form text-center'>
-            <?php 
+            <?php
             echo html::hidden('lastEditedDate', $bug->lastEditedDate);
             echo html::submitButton('', '', 'btn btn-wide btn-primary');
             $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
@@ -98,7 +101,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                   <th><?php echo $lang->bug->module;?></th>
                   <td>
                     <div class='input-group' id='moduleIdBox'>
-                    <?php 
+                    <?php
                     echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");
                     if(count($moduleOptionMenu) == 1)
                     {
@@ -125,7 +128,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                   <td>
                     <?php
                     /**
-                     * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task. 
+                     * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
                      * These thress types if upgrade from bugfree2.x.
                      */
                     if($bug->type != 'designchange') unset($lang->bug->typeList['designchange']);

module/common/lang/en.php

@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree      = 'Tree View|project|tree|projectID=%s'
 $lang->project->subMenu->qa = new stdclass();
 $lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
 $lang->project->subMenu->qa->build    = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport');
+$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
 
 $lang->project->subMenu->action = new stdclass();
 $lang->project->subMenu->action->dynamic  = 'Dynamic|project|dynamic|projectID=%s';

module/common/lang/zh-cn.php

@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree      = '树状图|project|tree|projectID=%s'
 $lang->project->subMenu->qa = new stdclass();
 $lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
 $lang->project->subMenu->qa->build    = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport');
+$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
 
 $lang->project->subMenu->action = new stdclass();
 $lang->project->subMenu->action->dynamic  = '动态|project|dynamic|projectID=%s';

module/company/view/browse.html.php

@@ -114,7 +114,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
       <div class='table-footer'>
         <?php if($canBatchEdit):?>
         <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
-        <div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->edit);?></div>
+        <div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->edit, '', 'btn');?></div>
         <?php endif;?>
         <?php $pager->show('right', 'pagerjs');?>
       </div>

module/testcase/js/browse.js

@@ -21,20 +21,18 @@ function confirmBatchDelete(actionLink)
     return false;
 }
 
-$(document).ready(function()
+$(function()
 {
     if(browseType == 'bysearch') ajaxGetSearchForm();
     if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150);
 
     if(flow == 'onlyTest')
     {
-        $('#modulemenu > .nav').append($('#mainMenu > .pull-left.btn-toolbar').html());
-
         toggleSearch();
         $('.export').modalTrigger({width:650, type:'iframe', afterShown: setCheckedCookie})
 
-        $('#modulemenu > .nav > li').removeClass('active');
-        $('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
+        $('#subNavbar > .nav > li').removeClass('active');
+        $('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
     }
 });
 

module/testcase/view/edit.html.php

@@ -117,8 +117,9 @@
             <div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
           </div>
-          <div class='detail'>
-            <?php echo $this->fetch('file', 'buildform');?>
+          <div class="detail">
+            <div class="detail-title"><?php echo $lang->files;?></div>
+            <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
           </div>
           <div class='text-center detail'>
             <?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>

module/tree/view/ajaxgetdropmenu.html.php

@@ -6,6 +6,11 @@
   <?php
   foreach($modules as $moduleID => $module)
   {
+      if(empty($module))
+      {
+          $module = '/';
+          $modulesPinyin[$module] = '';
+      }
       echo html::a(sprintf($link, $productID, $moduleID), $module, '', "data-key='{$modulesPinyin[$module]}'");
   }
   ?>