Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8

module/file/view/export.html.php

@@ -13,6 +13,11 @@
 <?php include '../../common/view/header.lite.html.php';?>
 <?php include '../../common/view/chosen.html.php';?>
 <?php $this->app->loadLang('file');?>
+<style>
+#customFields{margin-bottom:0px;margin-top:50px;}
+#exportFields_chosen{margin-top:15px;margin-bottom:10px;}
+#exportFields_chosen ul.chosen-choices{border:0px;box-shadow:none}
+</style>
 <script>
 function setDownloading()
 {
@@ -119,7 +124,7 @@ $(document).ready(function()
   </div>
 </div>
 <?php $isCustomExport = (!empty($customExport) and !empty($allExportFields));?>
-<form class='form-condensed' method='post' target='hiddenwin' style='padding: 40px 1% 50px'>
+<form class='form-condensed' method='post' target='hiddenwin' style='padding: 50px 1% 50px'>
   <table class='w-p100 table-fixed'>
     <tr>
       <td>
@@ -128,7 +133,7 @@ $(document).ready(function()
           <?php echo html::input('fileName', '', "class='form-control' autocomplete='off'");?>
         </div>
       </td>
-      <td class='w-60px'>
+      <td class='w-70px'>
         <?php echo html::select('fileType',   $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?>
       </td>
       <td class='w-80px'>
@@ -167,7 +172,7 @@ $(document).ready(function()
       if(!$hasDefaultField)$selectedFields[] = $field;
   }
   ?>
-  <div class='panel' id='customFields' style='margin-bottom:150px;display:none'>
+  <div class='panel' id='customFields' style='display:none'>
     <div class='panel-heading'><strong><?php echo $lang->file->exportFields?></strong></div>
     <div class='panel-body'>
       <p><?php echo html::select('exportFields[]', $exportFieldPairs, $selectedFields, "class='form-control chosen' multiple")?></p>
@@ -176,7 +181,9 @@ $(document).ready(function()
           <span class='input-group-addon'><?php echo $lang->file->tplTitle;?></span>
           <?php echo html::input('title', '', "class='form-control' autocomplete='off'")?>
           <?php if(common::hasPriv('file', 'setPublic')):?>
-          <span class='input-group-addon'><?php echo html::checkbox('public', array(1 => $lang->public));?></span>
+          <span class='input-group-addon' style='border-left:0px;'>
+            <label class="checkbox-inline"><input name="public[]" value="1" id="public1" type="checkbox" style='margin-top:0px;'> <?php echo $lang->public;?></label>
+          </span>
           <?php endif?>
           <span class='input-group-btn'><button id='saveTpl' type='button' onclick='saveTemplate()' class='btn btn-primary'><?php echo $lang->save?></button></span>
           <span class='input-group-btn'><button type='button' onclick='deleteTemplate()' class='btn'><?php echo $lang->delete?></button></span>

module/project/model.php

@@ -1155,7 +1155,7 @@ class projectModel extends model
         if(!isset($_POST['products'])) return;
         $products = $_POST['products'];
         $branches = isset($_POST['branch']) ? $_POST['branch'] : array();
-        $plans    = $_POST['plans'];
+        $plans    = isset($_POST['plans']) ? $_POST['plans'] : array();;
 
         $existedProducts = array();
         $addedProducts   = array();

module/project/view/taskheader.html.php

@@ -97,7 +97,7 @@
         </button>
         <ul class='dropdown-menu' id='exportActionMenu'>
         <?php 
-        $misc = common::hasPriv('task', 'export') ? "class='export iframe' data-width='700'" : "class=disabled";
+        $misc = common::hasPriv('task', 'export') ? "class='export iframe'" : "class=disabled";
         $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
         echo "<li>" . html::a($link, $lang->task->export, '', $misc) . "</li>";
         ?>

module/testcase/css/importfromlib.css

@@ -1,2 +1,4 @@
 #titlebar .input-group {position: relative; top: -6px; width: 350px;}
 #titlebar .input-group-addon, #titlebar .form-control {font-size: 12px; padding: 5px 10px; line-height: 18px; height: 30px}
+
+#importFromLib .chosen-container .chosen-drop{width:300px;}

module/testcase/view/importfromlib.html.php

@@ -48,7 +48,8 @@
       <?php endif;?>
       <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo $case->pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
       <td class='text-left nobr'><?php if(!common::printLink('testcase', 'view', "caseID=$case->id", $case->title)) echo $case->title;?></td>
-      <td class='text-left'><?php echo zget($libModules, $case->module, '');?></th>
+      <?php $libModule = zget($libModules, $case->module, '');?>
+      <td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></th>
       <td class='text-left' data-module='<?php echo $case->module?>' style='overflow:visible'><?php echo html::select("module[{$case->id}]", $modules, 0, "class='from-control chosen' onchange='setModule(this)'");?></th>
       <td><?php echo zget($lang->testcase->typeList, $case->type);?></th>
     </tr>

www/js/my.full.js

@@ -609,7 +609,7 @@ function setImageSize(image, maxWidth)
 function setModalTriggerLink()
 {
     $('.repolink').modalTrigger({width:960, type:'iframe'});
-    $(".export").modalTrigger({width:650, type:'iframe'});
+    $(".export").modalTrigger({width:800, type:'iframe'});
 }
 
 /**