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

module/my/css/managecontacts.css

@@ -1 +1,3 @@
 body.body-modal {padding-bottom: 20px; min-height: 400px}
+
+.side-col {padding-right: 40px; padding-top: 25px;}

module/my/view/managecontacts.html.php

@@ -11,9 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class="modal-content">
+<div id='mainContent' class='main-row main-content'>
   <?php if($mode == 'edit'):?>
-  <div class='col-sm-3 col-lg-2'>
+  <div class='side-col'>
     <?php
     foreach($lists as $id => $listName)
     {
@@ -25,18 +25,19 @@
     <?php echo html::a(inlink('managecontacts', "listID=0&mode=new"), '<i class="icon icon-plus"></i> ' . $lang->user->contacts->createList, '', "class='btn btn-block'"); ?>
   </div>
   <?php endif;?>
-  <?php $class = $mode == 'edit' ? 'col-sm-9 col-lg-10' : 'col-sm-12 col-lg-12';?>
+  <?php $class = $mode == 'edit' ? 'main-col' : '';?>
   <div class='<?php echo $class?>'>
-    <form method='post' target='hiddenwin' id='dataform'>
-      <div class='panel panel-sm'>
-        <div class='panel-heading'>
+    <div class='main-header'>
+      <h2>
         <?php if($mode == 'new'):?>
         <i class='icon-plus'></i> <strong><?php echo $lang->user->contacts->createList;?></strong>
         <?php else:?>
         <i class='icon-cogs'></i> <strong><?php echo $lang->user->contacts->manage;?></strong>
         <?php endif;?>
+      </h2>
     </div>
-        <div class='panel-body'>
+
+    <form method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'> 
         <tr>
           <th class='w-80px'><?php echo $lang->user->contacts->listName;?></th>
@@ -93,8 +94,6 @@
         </tr>
         <?php endif;?>
       </table>
-        </div>
-      </div>
     </form>
   </div>
 </div>

module/project/view/grouptask.html.php

@@ -14,8 +14,8 @@
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <div class="pull-left table-group-btns">
-      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-caret-up"></i></button>
-      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-caret-down"></i></button>
+      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-fold-all"></i></button>
+      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-unfold-all"></i></button>
     </div>
     <?php if(isset($lang->project->groupFilter[$groupBy])):?>
     <?php foreach($lang->project->groupFilter[$groupBy] as $filterKey => $name):?>