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

module/bug/view/edit.html.php

@@ -13,7 +13,6 @@
 <?php
 include '../../common/view/header.html.php';
 include '../../common/view/chosen.html.php';
-include '../../common/view/alert.html.php';
 include '../../common/view/kindeditor.html.php';
 js::set('page'                   , 'edit');
 js::set('changeProductConfirmed' , false);

module/product/view/browse.html.php

@@ -113,7 +113,7 @@
           $vars = "story={$story->id}";
           common::printIcon('story', 'change',     $vars, $story, 'list', 'random');
           common::printIcon('story', 'review',     $vars, $story, 'list', 'search');
-          common::printIcon('story', 'close',      $vars, $story, 'list', 'off');
+          common::printIcon('story', 'close',      $vars, $story, 'list', 'off', '', 'iframe', true);
           common::printIcon('story', 'edit',       $vars, $story, 'list', 'pencil');
           common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
           ?>

module/product/view/roadmap.html.php

@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class='container'>
+<div>
   <div id='titlebar'><div class='heading'><i class='icon-code-fork'></i> <?php echo $lang->product->roadmap;?></div></div>
   <table class='table-grid w-p100'>
     <?php 

module/project/view/doc.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
-<div class='container'>
+<div>
   <div id='titlebar'>
     <div class='heading'>
       <?php echo html::icon($lang->icons['doc']);?> <?php echo $lang->project->doc;?>

module/project/view/managemembers.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('projectID', $project->id);?>
 <?php js::set('roles', $roles);?>
-<div class='container mw-700px'>
+<div>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['team']);?></span>

module/project/view/manageproducts.html.php

@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class='container mw-700px'>
+<div>
   <div id='titlebar'>
     <div class='heading'>
       <?php echo html::icon($lang->icons['product']);?> <?php echo $lang->project->manageProducts;?>

module/project/view/team.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmUnlinkMember', $lang->project->confirmUnlinkMember)?>
-<div class='container mw-700px'>
+<div>
   <div id='titlebar'>
     <div class='heading'>
       <?php echo html::icon($lang->icons['team']);?> <?php echo $lang->project->team;?>
@@ -22,7 +22,7 @@
       <?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers, '', "class='btn btn-primary'");?>
     </div>
   </div>
-  <table class='table tablesorter bd-0' id='memberList'>
+  <table class='table tablesorter' id='memberList'>
     <thead>
       <tr>
         <th><?php echo $lang->team->account;?></th>

module/release/view/browse.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->release->confirmDelete)?>
-<div class='container mw-900px'>
+<div>
   <div id='titlebar'>
     <div class='heading'><i class='icon-tags'></i> <?php echo $lang->release->browse;?>  </div>
     <div class='actions'>

module/search/view/buildform.html.php

@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/alert.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <style>
 #bysearchTab {transition: all .3s cubic-bezier(.175, .885, .32, 1);}

module/testtask/view/edit.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container mw-800px'>
+<div class='container'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix' title='TESTTASK'><?php echo html::icon($lang->icons['testtask']);?></span>