From 92a398bb1d35fe55374db601a8b917e9793032b8 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Sat, 26 Nov 2016 17:25:24 +0800
Subject: [PATCH]  * improve UI of project/manageproducts view.

---
 module/project/css/manageproducts.css       | 13 ++++++++-----
 module/project/view/manageproducts.html.php | 18 ++++++------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/module/project/css/manageproducts.css b/module/project/css/manageproducts.css
index 720a203e2f..c30eeca8b1 100644
--- a/module/project/css/manageproducts.css
+++ b/module/project/css/manageproducts.css
@@ -1,6 +1,9 @@
 .row {padding: 20px;}
-#productsBox .row > .col-sm-4 {padding: 8px 15px; border:1px solid #ddd;margin-bottom:5px; width:32%; margin-right:8px;}
-#productsBox .row > .col-sm-4 label {display:block; cursor: pointer;}
-#productsBox .row > .col-sm-4:hover {background: #f1f1f1; cursor: pointer;}
-#productsBox .row > .col-sm-4.checked, #productsBox .row > .col-sm-4.checked:hover {background: #E5FFE6; border: 1px solid #229F24;}
-.col-sm-4+.col-sm-4 {margin-left: 0;}
+#productsBox .row > .product {border:1px solid #ddd;margin-bottom:5px; width:32%; margin-right:8px; padding: 0; position: relative;}
+#productsBox .row > .product label {display:block; cursor: pointer; margin: 0; padding: 8px 10px 8px 30px;}
+#productsBox .row > .product:hover {background: #f1f1f1; cursor: pointer;}
+#productsBox .row > .product.checked, #productsBox .row > .product.checked:hover {background: #E5FFE6; border: 1px solid #229F24;}
+.product + .product {margin-left: 0;}
+#productsBox .row > .product.has-branch label {margin-right: 40%;}
+#productsBox .row > .product.has-branch > .form-control,
+#productsBox .row > .product.has-branch > .chosen-container {position: absolute; width: 40%!important; right: 3px; top: 3px;}
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 40af4449e5..060fa7cbba 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -24,17 +24,14 @@
         <?php foreach($allProducts as $productID => $productName):?>
         <?php if(isset($linkedProducts[$productID])):?>
         <?php $checked = 'checked';?>
-        <div class='col-sm-4 <?php echo $checked?>'>
-          <?php if(isset($branchGroups[$productID])) echo "<div class='col-sm-6' style='padding-left:0px'>"?>
-          <label for='<?php echo 'products'. $productID?>';>
+        <div class='product col-sm-4 <?php echo $checked . (isset($branchGroups[$productID]) ? ' has-branch' : '')?>'>
+          <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';>
             <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' $checked id='products{$productID}'> $productName";?>
           </label>
           <?php
           if(isset($branchGroups[$productID]))
           {
-              echo "</div><div class='col-sm-6'>";
-              echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='from-control chosen'");
-              echo '</div>';
+              echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");
           }
           ?>
         </div>
@@ -47,17 +44,14 @@
       <legend><?php echo $lang->project->unlinkedProducts;?></legend>
       <div class='row'>
         <?php foreach($allProducts as $productID => $productName):?>
-        <div class='col-sm-4'>
-          <?php if(isset($branchGroups[$productID])) echo "<div class='col-sm-6' style='padding-left:0px'>"?>
-          <label for='<?php echo 'products'. $productID?>';>
+        <div class='col-sm-4 product<?php echo isset($branchGroups[$productID]) ? ' has-branch' : ''?>'>
+          <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';>
             <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' id='products{$productID}'> $productName";?>
           </label>
           <?php
           if(isset($branchGroups[$productID]))
           {
-              echo "</div><div class='col-sm-6'>";
-              echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='from-control chosen'");
-              echo '</div>';
+              echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");
           }
           ?>
         </div>