mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

bootstrapify pagination links, remove old styling, don't print links in takings, change <?= to be <?php (#116, #394)

Browse Source
This commit is contained in:
FrancescoUK
2016-03-15 19:08:14 +00:00
parent e3a10067f5
commit d4dae9fd32
13 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/config/pagination.php Normal file
View File

@@ -0,0 +1,23 @@
<?php if(!defined('BASEPATH')) exit('Direct Access Not Allowed');
/*
|--------------------------------------------------------------------------
| Bootstrap 3 pagination links styling
|--------------------------------------------------------------------------
|
| Source code from http://stackoverflow.com/questions/20088779/bootstrap-3-pagination-with-codeigniter
*/
$config['full_tag_open'] = "<ul class='pagination pagination-sm'>";
$config['full_tag_close'] ="</ul>";
$config['num_tag_open'] = '<li>';
$config['num_tag_close'] = '</li>';
$config['cur_tag_open'] = "<li class='disabled'><li class='active'><a href='#'>";
$config['cur_tag_close'] = "<span class='sr-only'></span></a></li>";
$config['next_tag_open'] = "<li>";
$config['next_tagl_close'] = "</li>";
$config['prev_tag_open'] = "<li>";
$config['prev_tagl_close'] = "</li>";
$config['first_tag_open'] = "<li>";
$config['first_tagl_close'] = "</li>";
$config['last_tag_open'] = "<li>";
$config['last_tagl_close'] = "</li>";

2
application/views/giftcards/manage.php
View File

@@ -63,7 +63,7 @@ function post_giftcard_form_submit(response)
array('class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line($controller_name.'_new'))); ?>
</div>
<div id="pagination"><?= $links ?></div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>

2
application/views/item_kits/manage.php
View File

@@ -76,7 +76,7 @@ function post_item_kit_form_submit(response)
array('class'=>'modal-dlg modal-btn-submit none', 'title'=>$this->lang->line($controller_name . '_new'))); ?>
</div>
<div id="pagination"><?= $links ?></div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>

2
application/views/items/manage.php
View File

@@ -168,7 +168,7 @@ function post_bulk_form_submit(response)
array('class'=>'modal-dlg modal-btn-new modal-btn-submit', 'title'=>$this->lang->line($controller_name . '_new'))); ?>
</div>
<div id="pagination"><?= $links ?></div>
<div id="pagination"><?php echo $links; ?></div>
<div id="titleTextImg">
<div style="float:left;vertical-align:text-top;"><?php echo $this->lang->line('common_search_options'). ': '; ?></div>

2
application/views/partial/header.php
View File

@@ -65,7 +65,7 @@
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=12068f9aba"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=19fb7e2d85"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->

2
application/views/people/manage.php
View File

@@ -84,7 +84,7 @@ function post_person_form_submit(response)
?>
</div>
<div id="pagination"><?= $links ?></div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>

2
application/views/reports/tabular_details.php
View File

@@ -24,7 +24,7 @@
foreach ($headers['summary'] as $header)
{
?>
<th width="<?=$header_width?>%"><?php echo $header; ?></th>
<th width="<?php echo $header_width; ?>%"><?php echo $header; ?></th>
<?php
}
?>

4
application/views/sales/form.php
View File

@@ -25,7 +25,7 @@
<?php if (isset($sale_info["invoice_number"]) && !empty($sale_info["invoice_number"]) &&
isset($sale_info['customer_id']) && isset($sale_info['email']) && !empty($sale_info['email'])): ?>
<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class'=>'form-control input-sm'));?>
<a id="send_invoice" href="javascript:void(0);"><?=$this->lang->line('sales_send_invoice')?></a>
<a id="send_invoice" href="javascript:void(0);"><?php echo $this->lang->line('sales_send_invoice');?></a>
<?php else: ?>
<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class'=>'form-control input-sm'));?>
<?php endif; ?>
@@ -67,7 +67,7 @@ $(document).ready(function()
<?php if (isset($sale_info['email'])): ?>
$("#send_invoice").click(function(event) {
if (confirm("<?php echo $this->lang->line('sales_invoice_confirm') . ' ' . $sale_info['email'] ?>")) {
$.get('<?=site_url() . "/sales/send_invoice/" . $sale_info['sale_id']?>',
$.get('<?php echo site_url() . "/sales/send_invoice/" . $sale_info['sale_id']; ?>',
function(response) {
dialog_support.hide();
post_form_submit(response);

2
application/views/sales/manage.php
View File

@@ -204,7 +204,7 @@ function init_table_sorting()
<a href="javascript:printdoc();"><div class="btn btn-info btn-sm pull-right print_hide"><?php echo $this->lang->line('common_print'); ?></div></a>
</div>
<div id="pagination"><?= $links ?></div>
<div class="print_hide" id="pagination"><?php echo $links; ?></div>
<div class="print_hide" id="titleTextImg">
<div style="float:left; vertical-align:text-top;"><?php echo $this->lang->line('common_search_options') . ': '; ?></div>

2
application/views/suppliers/manage.php
View File

@@ -64,7 +64,7 @@ function post_person_form_submit(response)
array('class'=>'modal-dlg modal-btn-submit none', 'title'=>$this->lang->line($controller_name . '_new'))); ?>
</div>
<div id="pagination"><?= $links ?></div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>

5
css/tables.css
View File

@@ -133,9 +133,4 @@ table.innertable tbody tr td
.totals table tr:last-child td
{
font-weight: bold;
}
#pagination a, #pagination strong
{
padding: 3px;
}

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
templates/spacelab/views/partial/header.php
View File

@@ -65,7 +65,7 @@
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=12068f9aba"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=19fb7e2d85"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->