From f1db15d15b160e4c1caf48326c9534d6131013f8 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 18 Apr 2018 13:14:07 +0800
Subject: [PATCH]  * adjust for branch manage page.

---
 module/branch/view/manage.html.php   | 80 ++++++++++++++--------------
 module/product/view/project.html.php |  2 +-
 www/theme/default/style.css          | 15 ++++++
 3 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php
index b747b0041c..f617bbdfc0 100644
--- a/module/branch/view/manage.html.php
+++ b/module/branch/view/manage.html.php
@@ -11,45 +11,47 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class="container mw-700px">
-  <div id="titlebar">
-    <div class="heading"><strong><?php printf($lang->branch->manageTitle, $this->lang->product->branchName[$this->session->currentProductType])?></strong></div>
+<div id='mainContent' class='main-content'>
+  <div class="center-block mw-700px">
+    <div class="main-header">
+      <h2><?php printf($lang->branch->manageTitle, $this->lang->product->branchName[$this->session->currentProductType])?></h2>
+    </div>
+    <form method='post' target='hiddenwin'>
+      <table class="table table-form">
+        <tr>
+          <td class='w-50px'></td>
+          <td class="w-300px">
+            <div id='branches'>
+              <?php foreach($branches as $branchID => $branch):?>
+              <div class='input-group' data-id='<?php echo $branchID?>'>
+                <?php echo html::input("branch[$branchID]", $branch, "class='form-control'")?>
+                <?php if(common::hasPriv('branch', 'sort')):?>
+                <span class='input-group-addon sort-handler'><a><i class='icon icon-move'></i></a></span>
+                <?php endif;?>
+                <?php if(common::hasPriv('branch', 'delete')):?>
+                <span class='input-group-addon'><?php echo html::a(inlink('delete', "branchID=$branchID"), "<i class='icon icon-trash'></i>", 'hiddenwin')?></span>
+                <?php endif;?>
+              </div>
+              <?php endforeach;?>
+             </div>
+             <div id='newbranches'>
+              <?php for($i = 0; $i < 2; $i++):?>
+              <div class='input-group'>
+                <?php echo html::input("newbranch[]", '', "class='form-control'")?>
+                 <span class='input-group-addon'><a href='javascript:;' onclick='addItem(this)'><i class='icon icon-plus'></i></a></span>
+                 <span class='input-group-addon'><a href='javascript:;' onclick='deleteItem(this)'><i class='icon icon-trash'></i></a></span>
+              </div>
+              <?php endfor;?>
+             </div>
+           </td>
+          <td></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td><?php echo html::submitButton();?> </td><td></td>
+        </tr>
+      </table>
+    </form>
   </div>
-  <form method='post' target='hiddenwin'>
-  <table class="table table-form">
-    <tr>
-      <td class='w-50px'></td>
-      <td class="w-300px">
-        <div id='branches'>
-          <?php foreach($branches as $branchID => $branch):?>
-          <div class='input-group' data-id='<?php echo $branchID?>'>
-            <?php echo html::input("branch[$branchID]", $branch, "class='form-control'")?>
-            <?php if(common::hasPriv('branch', 'sort')):?>
-            <span class='input-group-addon sort-handler'><a><i class='icon icon-move'></i></a></span>
-            <?php endif;?>
-            <?php if(common::hasPriv('branch', 'delete')):?>
-            <span class='input-group-addon'><?php echo html::a(inlink('delete', "branchID=$branchID"), "<i class='icon icon-trash'></i>", 'hiddenwin')?></span>
-            <?php endif;?>
-          </div>
-          <?php endforeach;?>
-         </div>
-         <div id='newbranches'>
-          <?php for($i = 0; $i < 2; $i++):?>
-          <div class='input-group'>
-            <?php echo html::input("newbranch[]", '', "class='form-control'")?>
-             <span class='input-group-addon'><a href='javascript:;' onclick='addItem(this)'><i class='icon icon-plus'></i></a></span>
-             <span class='input-group-addon'><a href='javascript:;' onclick='deleteItem(this)'><i class='icon icon-trash'></i></a></span>
-          </div>
-          <?php endfor;?>
-         </div>
-       </td>
-      <td></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td><?php echo html::submitButton();?> </td><td></td>
-    </tr>
-  </table>
-  </form>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 4d10363437..b246ceb8f8 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -16,7 +16,7 @@
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->product->project;?></span></span>
   </div>
 </div>
-<div id="mainContent">
+<div id="mainContent" class='main-content'>
   <table class="main-table table has-sort-head table-fixed table-project">
     <thead>
       <tr>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e58edc1fed..b008b9cc27 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -67,3 +67,18 @@ body.body-modal #mainMenu{margin-top:5px;}
 .modal.with-titlebar .modal-header .modal-body,  .modal-dialog.hide-header .modal-header .modal-body {z-index: 990}
 .modal.with-titlebar .modal-header .modal-title, .modal-dialog.hide-header .modal-header .modal-title {display: none}
 .modal.with-titlebar .modal-header .close, .modal-dialog.hide-header .modal-header .close {position: absolute; right: 15px; top: 15px}
+
+.fixedTfootAction {background-color: #f5f5f5; position: fixed; bottom: 40px; box-shadow: 0 -3px 4px rgba(0,0,0,0.05);}
+.ranzhiFixedTfootAction .fixedTfootAction {bottom: 0px;}
+.table > .fixedTfootAction > tr > td {border-bottom: none}
+.table > .fixedTfootAction.scrolled > tr > td {background: #2e6dad; border: none; color: #fff}
+.fixedTfootAction.scrolled .btn {border: 1px solid #fff; border-color: rgba(255,255,255,.5); background-color: #2e6dad!important; text-shadow: none; color: #e5e5e5!important;}
+.fixedTfootAction.scrolled .btn:hover {background-color: #2e6dad!important;}
+.fixedTfootAction.scrolled .pager,
+.fixedTfootAction.scrolled .pager > a,
+.fixedTfootAction.scrolled .pager > .dropdown > a,
+.fixedTfootAction.scrolled .table-actions > .text {color: #e5e5e5}
+.fixedTfootAction.scrolled .pager strong,
+.fixedTfootAction.scrolled .table-actions > .text strong {color: #fff;}
+.fixedTfootAction.scrolled .pager .dropdown > a:hover,
+.fixedTfootAction.scrolled .pager > a:hover {background-color: #2e6dad}