From 07a203312b4641afa2a2f374c37b3ff85bf85a1a Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 30 May 2018 11:14:58 +0800
Subject: [PATCH]  * change pager UI in dynamic views.

---
 module/company/view/dynamic.html.php | 48 ++++++++++-----------------
 module/my/view/dynamic.html.php      | 48 ++++++++++-----------------
 module/product/view/dynamic.html.php | 49 ++++++++++------------------
 module/project/view/dynamic.html.php | 48 ++++++++++-----------------
 module/user/css/dynamic.css          |  2 +-
 module/user/view/dynamic.html.php    | 48 ++++++++++-----------------
 6 files changed, 91 insertions(+), 152 deletions(-)

diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index d44750ad3a..81fb857bc0 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -68,37 +68,25 @@
     </div>
     <?php endforeach;?>
   </div>
-  <?php if(!empty($firstAction)):?>
-  <?php
-  $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
-  $lastDate  = substr($action->originalDate, 0, 10);
-  $hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
-  $hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
-  ?>
-  <?php if($hasPre or $hasNext):?>
-  <div class='table-footer'>
-    <ul class='pager'>
-      <?php $class = $hasPre ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasPre) $link = inlink('dynamic', "browseType=$browseType&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre');
-        echo html::a($link, '<i class="icon icon-angle-left"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-      <?php $class = $hasNext ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasNext) $link = inlink('dynamic', "browseType=$browseType&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next');
-        echo html::a($link, '<i class="icon icon-angle-right"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-    </ul>
-  </div>
-  <?php endif;?>
-  <?php endif;?>
 </div>
+<?php if(!empty($firstAction)):?>
+<?php
+$firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
+$lastDate  = substr($action->originalDate, 0, 10);
+$hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
+$hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
+$preLink   = $hasPre ? inlink('dynamic', "browseType=$browseType&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "browseType=$browseType&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+?>
+<?php if($hasPre or $hasNext):?>
+<div id="mainActions">
+  <nav class="container">
+    <a id="prevPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-left"></i></a>
+    <a id="nextPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-right"></i></a>
+  </nav>
+</div>
+<?php endif;?>
+<?php endif;?>
 <script>
 var browseType = '<?php echo $browseType;?>';
 $(function()
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index 606b504829..c490ce599f 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -66,37 +66,25 @@
     </div>
     <?php endif;?>
   </div>
-  <?php if(!empty($firstAction)):?>
-  <?php
-  $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
-  $lastDate  = substr($action->originalDate, 0, 10);
-  $hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
-  $hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
-  ?>
-  <?php if($hasPre or $hasNext):?>
-  <div class='table-footer'>
-    <ul class='pager'>
-      <?php $class = $hasPre ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasPre) $link = inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre');
-        echo html::a($link, '<i class="icon icon-angle-left"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-      <?php $class = $hasNext ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasNext) $link = inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next');
-        echo html::a($link, '<i class="icon icon-angle-right"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-    </ul>
-  </div>
-  <?php endif;?>
-  <?php endif;?>
 </div>
+<?php if(!empty($firstAction)):?>
+<?php
+$firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
+$lastDate  = substr($action->originalDate, 0, 10);
+$hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
+$hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
+$preLink   = $hasPre ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+?>
+<?php if($hasPre or $hasNext):?>
+<div id="mainActions">
+  <nav class="container">
+    <a id="prevPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-left"></i></a>
+    <a id="nextPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-right"></i></a>
+  </nav>
+</div>
+<?php endif;?>
+<?php endif;?>
 <script>
 $(function()
 {
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index d339fc7378..1cd82d00be 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -68,39 +68,26 @@
       <?php echo $lang->action->noDynamic;?>
     </div>
     <?php endif;?>
-
   </div>
-  <?php if(!empty($firstAction)):?>
-  <?php
-  $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
-  $lastDate  = substr($action->originalDate, 0, 10);
-  $hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
-  $hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
-  ?>
-  <?php if($hasPre or $hasNext):?>
-  <div class='table-footer'>
-    <ul class='pager'>
-      <?php $class = $hasPre ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasPre) $link = inlink('dynamic', "productID=$productID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre');
-        echo html::a($link, '<i class="icon icon-angle-left"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-      <?php $class = $hasNext ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasNext) $link = inlink('dynamic', "productID=$productID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next');
-        echo html::a($link, '<i class="icon icon-angle-right"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-    </ul>
-  </div>
-  <?php endif;?>
-  <?php endif;?>
 </div>
+<?php if(!empty($firstAction)):?>
+<?php
+$firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
+$lastDate  = substr($action->originalDate, 0, 10);
+$hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
+$hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
+$preLink   = $hasPre ? inlink('dynamic', "productID=$productID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "productID=$productID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+?>
+<?php if($hasPre or $hasNext):?>
+<div id="mainActions">
+  <nav class="container">
+    <a id="prevPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-left"></i></a>
+    <a id="nextPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-right"></i></a>
+  </nav>
+</div>
+<?php endif;?>
+<?php endif;?>
 <script>
 $(function()
 {
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index b5eb94d236..038184de2b 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -70,37 +70,25 @@
     </div>
     <?php endif;?>
   </div>
-  <?php if(!empty($firstAction)):?>
-  <?php
-  $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
-  $lastDate  = substr($action->originalDate, 0, 10);
-  $hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
-  $hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
-  ?>
-  <?php if($hasPre or $hasNext):?>
-  <div class='table-footer'>
-    <ul class='pager'>
-      <?php $class = $hasPre ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasPre) $link = inlink('dynamic', "projectID=$projectID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre');
-        echo html::a($link, '<i class="icon icon-angle-left"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-      <?php $class = $hasNext ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasNext) $link = inlink('dynamic', "projectID=$projectID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next');
-        echo html::a($link, '<i class="icon icon-angle-right"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-    </ul>
-  </div>
-  <?php endif;?>
-  <?php endif;?>
 </div>
+<?php if(!empty($firstAction)):?>
+<?php
+$firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
+$lastDate  = substr($action->originalDate, 0, 10);
+$hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
+$hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
+$preLink   = $hasPre ? inlink('dynamic', "projectID=$projectID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "projectID=$projectID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+?>
+<?php if($hasPre or $hasNext):?>
+<div id="mainActions">
+  <nav class="container">
+    <a id="prevPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-left"></i></a>
+    <a id="nextPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-right"></i></a>
+  </nav>
+</div>
+<?php endif;?>
+<?php endif;?>
 <script>
 $(function()
 {
diff --git a/module/user/css/dynamic.css b/module/user/css/dynamic.css
index 62732de234..e608d5e460 100644
--- a/module/user/css/dynamic.css
+++ b/module/user/css/dynamic.css
@@ -1,4 +1,4 @@
-#dynamics {padding: 10px 0;}
+#dynamics {padding: 20px 20px 1px;}
 .dynamic {position: relative; padding-left: 170px;}
 .dynamic-date {position: absolute; left: 0; top: 0; width: 150px; border: 2px solid #eee; border-radius: 4px; padding: 14px 20px; height: 58px;}
 .dynamic-date:before {content: ' '; display: block; position: absolute; right: -22px; top: 26px; height: 2px; width: 20px; background-color: #eee;}
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 9f6501aa83..c3b81c962e 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -68,37 +68,25 @@
     </div>
     <?php endif;?>
   </div>
-  <?php if(!empty($firstAction)):?>
-  <?php
-  $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
-  $lastDate  = substr($action->originalDate, 0, 10);
-  $hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
-  $hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
-  ?>
-  <?php if($hasPre or $hasNext):?>
-  <div class='table-footer'>
-    <ul class='pager'>
-      <?php $class = $hasPre ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasPre) $link = inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre');
-        echo html::a($link, '<i class="icon icon-angle-left"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-      <?php $class = $hasNext ? '' : 'disabled';?>
-      <li class='<?php echo $class;?> pager-item-left'>
-        <?php
-        $link = '###';
-        if($hasNext) $link = inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next');
-        echo html::a($link, '<i class="icon icon-angle-right"></i>', '', "class='pager-item'");
-        ?>
-      </li>
-    </ul>
-  </div>
-  <?php endif;?>
-  <?php endif;?>
 </div>
+<?php if(!empty($firstAction)):?>
+<?php
+$firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
+$lastDate  = substr($action->originalDate, 0, 10);
+$hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
+$hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
+$preLink   = $hasPre ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+?>
+<?php if($hasPre or $hasNext):?>
+<div id="mainActions">
+  <nav class="container">
+    <a id="prevPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-left"></i></a>
+    <a id="nextPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-right"></i></a>
+  </nav>
+</div>
+<?php endif;?>
+<?php endif;?>
 <script type='text/javascript'>
 $(function()
 {