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

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

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; ?>