Merge branch 'master' of https://github.com/ThaDafinser/ZfcDatagrid

ThaDafinser · Nov 7, 2013 · e74bf7c · e74bf7c
2 parents 1f8d298 + 01c5438
commit e74bf7c
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/view/zfc-datagrid/renderer/bootstrapTable/layout.phtml b/view/zfc-datagrid/renderer/bootstrapTable/layout.phtml
@@ -87,9 +87,9 @@ if($this->rowClickAction !== null){
  <?php 
  if($column->isSortActive() === true){
  if($column->getSortActiveDirection() === 'ASC'):?>
- <i class="icon-chevron-down"></i>
+ <i class="icon-chevron-down glyphicon glyphicon-chevron-down"></i>
  <?php else: ?>
- <i class="icon-chevron-up"></i>
+ <i class="icon-chevron-up glyphicon glyphicon-chevron-up"></i>
  <?php endif;
  }
  ?>
@@ -141,16 +141,16 @@ $paginatorOnclick = 'document.forms[\'form_'.$this->gridId.'\'].elements[\'' . $
 $paginatorOnclick.= 'document.forms[\'form_'.$this->gridId.'\'].submit(); return false;';
 ?>
 <!-- Start Pagination -->
-<div class="row-fluid">
- <div class="span4">
+<div class="row-fluid row">
+ <div class="span4 col-md-4">
  <?php echo $this->translate('Page').' '.$this->paginator->getCurrentPageNumber().' '.$this->translate('of').' '.$this->paginator->count(); ?>
  </div>
- <div class="span4">
+ <div class="span4 col-md-4">
  <div class="pagination">
 
  <input type="hidden" name="<?php echo $this->parameterNames['currentPage']; ?>" value="<?php echo $pages->current; ?>" />
-
- <ul>
+ <?php if (count($pages->pagesInRange) > 1): ?>
+ <ul class="pagination">
  <?php if($pages->current > 1):?>
  <li><a href="<?php echo 
  $this->url(null, 
@@ -227,9 +227,10 @@ $paginatorOnclick.= 'document.forms[\'form_'.$this->gridId.'\'].submit(); return
  <?php endif;?>
 
  </ul>
+ <?php endif; ?>
  </div>
  </div>
- <div class="span4 text-right">
+ <div class="span4 col-md-4 text-right">
  <?php echo $this->translate('Showing').' '.$this->paginator->getCurrentItemCount().' '.$this->translate('of').' '.$this->paginator->getTotalItemCount().' '.$this->translate('items'); ?>
  </div>
 </div><!-- End Pagination -->