mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-14 05:00:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

added jasny-bootstrap-3.1.3, removed bootstrap.file-input and changed image upload in general config (#116)

Browse Source 
For jasny-bootstrap-3.1.3 see: http://www.jasny.net/bootstrap/
This commit is contained in:
FrancescoUK
2016-02-12 09:32:21 +00:00
parent e35bd81c8b
commit 23b086fbc2
9 changed files with 2690 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/views/configs/general_config.php
View File

@@ -20,7 +20,18 @@
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('config_company_logo').':', 'company_logo', array('class'=>'wide')); ?>
<div class='form_field'>
<input name='company_logo' id='company_logo' class="btn btn-default btn-sm" type="file" title='<?php echo $this->lang->line("config_company_choose_file")?>'>
<div class="fileinput fileinput-new" data-provides="fileinput">
<div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
<img data-src="holder.js/100%x100%" <!-- alt="100%x100%" src="..." style="height: 100%; width: 100%; display: block;" --> >
</div>
<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 150px;"></div>
<div>
<span class="btn btn-default btn-sm btn-file">
<span class="fileinput-new"><!-- Select image --> <?php echo $this->lang->line("config_company_choose_file"); ?></span>
<span class="fileinput-exists">Change</span><input type="file" name="company_logo"></span>
<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput">Remove</a>
</div>
</div>
</div>
</div>
@@ -315,8 +326,6 @@ $(document).ready(function()
window.location='<?php echo site_url('config/backup_db') ?>';
});
$('input[type=file]').bootstrapFileInput();
$('#config_form').validate({
submitHandler:function(form)
{

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

@@ -9,6 +9,7 @@
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
<link rel="stylesheet" type="text/css" href="css/jasny-bootstrap.css"/>
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- start js template tags -->
@@ -27,10 +28,10 @@
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/bootstrap-3.3.6.js" language="javascript"></script>
<script type="text/javascript" src="js/bootstrap.file-input.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/jasny-bootstrap.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/phpjsdate.js" language="javascript"></script>
@@ -39,7 +40,7 @@
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=8fce06b653" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=e31a85ae49" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>