Skip to content

Commit

Permalink
Update to AdminLTE 2.4.12
Browse files Browse the repository at this point in the history
Release Notes

    - Fixed strange navigation menu behavior + dark space on reloads
    - Added height auto to .login-page & .register-page
  • Loading branch information
N3Cr0N committed Jun 19, 2019
1 parent d0550bb commit c91fceb
Show file tree
Hide file tree
Showing 225 changed files with 35,358 additions and 243 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Control Sidebar -->
<aside class="control-sidebar control-sidebar-dark">
<aside class="control-sidebar control-sidebar-dark" style="display: none;">
<!-- Create the tabs -->
<ul class="nav nav-tabs nav-justified control-sidebar-tabs">
<li><a href="#control-sidebar-home-tab" data-toggle="tab"><i class="fa fa-home"></i></a></li>
Expand Down
9 changes: 4 additions & 5 deletions application/modules/backend/views/templates/footer.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b>Version</b> 2.4.9
<b>Version</b> 2.4.12
</div>
<strong>Copyright &copy; 2014-2016 <a href="https://adminlte.io">Almsaeed Studio</a>.</strong> All rights
reserved.
<strong>Copyright &copy; 2014-2019 <a href="https://adminlte.io">AdminLTE</a>.</strong> All rights
reserved.
</footer>


<!-- jQuery 3 -->
<script src="<?php echo base_url(); ?>assets/backend/AdminLTE/bower_components/jquery/dist/jquery.min.js"></script>
<!-- jQuery UI 1.11.4 -->
Expand Down Expand Up @@ -937,7 +936,7 @@ function drawMouseSpeedDemo() {
//Date range picker
$('#reservation').daterangepicker()
//Date range picker with time picker
$('#reservationtime').daterangepicker({ timePicker: true, timePickerIncrement: 30, format: 'MM/DD/YYYY h:mm A' })
$('#reservationtime').daterangepicker({ timePicker: true, timePickerIncrement: 30, locale: { format: 'MM/DD/YYYY hh:mm A' }})
//Date range as a button
$('#daterange-btn').daterangepicker(
{
Expand Down
18 changes: 18 additions & 0 deletions assets/backend/AdminLTE/bower_components/Flot/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "Flot",
"version": "0.8.3",
"main": "jquery.flot.js",
"dependencies": {
"jquery": ">= 1.2.6"
},
"homepage": "https://github.com/flot/flot",
"_release": "0.8.3",
"_resolution": {
"type": "version",
"tag": "v0.8.3",
"commit": "453b017cc5acfd75e252b93e8635f57f4196d45d"
},
"_source": "https://github.com/flot/flot.git",
"_target": "^0.8.3",
"_originalSource": "flot"
}
3 changes: 3 additions & 0 deletions assets/backend/AdminLTE/bower_components/Flot/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: node_js
node_js:
- 0.8
12 changes: 12 additions & 0 deletions assets/backend/AdminLTE/bower_components/Flot/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Makefile for generating minified files

.PHONY: all

# we cheat and process all .js files instead of an exhaustive list
all: $(patsubst %.js,%.min.js,$(filter-out %.min.js,$(wildcard *.js)))

%.min.js: %.js
yui-compressor $< -o $@

test:
./node_modules/.bin/jshint *jquery.flot.js
11 changes: 11 additions & 0 deletions assets/backend/AdminLTE/bower_components/Flot/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "Flot",
"version": "0.8.3",
"main": "jquery.flot.js",
"scripts": {
"test": "make test"
},
"devDependencies": {
"jshint": "0.9.1"
}
}
40 changes: 40 additions & 0 deletions assets/backend/AdminLTE/bower_components/Ionicons/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"ignore": [
"**/.*",
"builder",
"node_modules",
"bower_components",
"test",
"tests"
],
"version": "2.0.1",
"name": "Ionicons",
"license": "MIT",
"authors": [
"Ben Sperry <[email protected]>",
"Adam Bradley <[email protected]>",
"Max Lynch <[email protected]>"
],
"keywords": [
"fonts",
"icon font",
"icons",
"ionic",
"web font"
],
"main": [
"css/ionicons.css",
"fonts/*"
],
"homepage": "https://github.com/driftyco/ionicons",
"description": "Ionicons - free and beautiful icons from the creators of Ionic Framework",
"_release": "2.0.1",
"_resolution": {
"type": "version",
"tag": "v2.0.1",
"commit": "ecb4b806831005c25b97ed9089fbb1d7dcc0879c"
},
"_source": "https://github.com/driftyco/ionicons.git",
"_target": "^2.0.1",
"_originalSource": "ionicons"
}
31 changes: 31 additions & 0 deletions assets/backend/AdminLTE/bower_components/Ionicons/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"ignore": [
"**/.*",
"builder",
"node_modules",
"bower_components",
"test",
"tests"
],
"version": "2.0.0",
"name": "Ionicons",
"license": "MIT",
"authors": [
"Ben Sperry <[email protected]>",
"Adam Bradley <[email protected]>",
"Max Lynch <[email protected]>"
],
"keywords": [
"fonts",
"icon font",
"icons",
"ionic",
"web font"
],
"main": [
"css/ionicons.css",
"fonts/*"
],
"homepage": "https://github.com/driftyco/ionicons",
"description": "Ionicons - free and beautiful icons from the creators of Ionic Framework"
}
19 changes: 19 additions & 0 deletions assets/backend/AdminLTE/bower_components/Ionicons/component.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"repo": "driftyco/ionicons",
"development": {},
"version": "2.0.0",
"styles": [
"css/ionicons.css"
],
"name": "Ionicons",
"dependencies": {},
"keywords": [],
"license": "MIT",
"fonts": [
"fonts/ionicons.eot",
"fonts/ionicons.svg",
"fonts/ionicons.ttf",
"fonts/ionicons.woff"
],
"description": "The premium icon font for Ionic Framework."
}
36 changes: 36 additions & 0 deletions assets/backend/AdminLTE/bower_components/Ionicons/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"name": "driftyco/ionicons",
"license": [
"MIT"
],
"extra": {},
"authors": [
{
"homepage": "https://twitter.com/benjsperry",
"role": "Designer",
"name": "Ben Sperry",
"email": "[email protected]"
},
{
"homepage": "https://twitter.com/adamdbradley",
"role": "Developer",
"name": "Adam Bradley",
"email": "[email protected]"
},
{
"homepage": "https://twitter.com/maxlynch",
"role": "Developer",
"name": "Max Lynch",
"email": "[email protected]"
}
],
"keywords": [
"fonts",
"icon font",
"icons",
"ionic",
"web font"
],
"homepage": "http://ionicons.com/",
"description": "The premium icon font for Ionic Framework."
}
44 changes: 44 additions & 0 deletions assets/backend/AdminLTE/bower_components/PACE/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "PACE",
"main": "pace.js",
"version": "1.0.2",
"homepage": "http://github.hubspot.com/pace/docs/welcome",
"authors": [
"Zack Bloom <[email protected]>",
"Adam Schwartz <[email protected]>"
],
"description": "Automatic page load progress bar",
"keywords": [
"loading",
"load",
"pageload",
"progress",
"activity",
"ajax",
"spinner",
"progress",
"bar",
"automatic",
"client-side"
],
"license": "MIT",
"ignore": [
".*",
"Gruntfile.coffee",
"bower_components",
"docs",
"node_modules",
"package.json",
"templates",
"tests"
],
"_release": "1.0.2",
"_resolution": {
"type": "version",
"tag": "v1.0.2",
"commit": "c6846cbf6b928e9903b569269fa9fbf32f2554f4"
},
"_source": "https://github.com/HubSpot/pace.git",
"_target": "^1.0.2",
"_originalSource": "pace"
}
35 changes: 35 additions & 0 deletions assets/backend/AdminLTE/bower_components/PACE/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "PACE",
"main": "pace.js",
"version": "1.0.2",
"homepage": "http://github.hubspot.com/pace/docs/welcome",
"authors": [
"Zack Bloom <[email protected]>",
"Adam Schwartz <[email protected]>"
],
"description": "Automatic page load progress bar",
"keywords": [
"loading",
"load",
"pageload",
"progress",
"activity",
"ajax",
"spinner",
"progress",
"bar",
"automatic",
"client-side"
],
"license": "MIT",
"ignore": [
".*",
"Gruntfile.coffee",
"bower_components",
"docs",
"node_modules",
"package.json",
"templates",
"tests"
]
}
86 changes: 86 additions & 0 deletions assets/backend/AdminLTE/bower_components/PACE/install.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"resources": {
"head": [
{
"type": "script",
"src": "./pace.js",
"moduleType": "global",
"exports": ["Pace"]
},
{
"type": "style",
"src": "./themes/{{ options.color }}/pace-theme-{{ options.theme }}.css"
}
]
},
"options": {
"properties": {
"color": {
"title": "Color",
"type": "string",
"enum": [
"black",
"white",
"silver",
"red",
"orange",
"yellow",
"green",
"blue",
"pink",
"purple"
],
"enumNames": {
"black": "Black",
"white": "White",
"silver": "Silver",
"red": "Red",
"orange": "Orange",
"yellow": "Yellow",
"green": "Green",
"blue": "Blue",
"pink": "Pink",
"purple": "Purple"
},
"default": "blue"
},
"theme": {
"title": "Theme",
"type": "string",
"enum": [
"barber-shop",
"big-counter",
"bounce",
"center-atom",
"center-circle",
"center-radar",
"center-simple",
"corner-indicator",
"fill-left",
"flash",
"flat-top",
"loading-bar",
"mac-osx",
"minimal"
],
"enumNames": {
"barber-shop": "Barber Shop",
"big-counter": "Big Counter",
"bounce": "Bounce",
"center-atom": "Center Atom",
"center-circle": "Center Circle",
"center-radar": "Center Radar",
"center-simple": "Center Simple",
"corner-indicator": "Corner Indicator",
"fill-left": "Fill Left",
"flash": "Flash",
"flat-top": "Flat Top",
"loading-bar": "Loading Bar",
"mac-osx": "Mac OS X",
"minimal": "Minimal"
},
"default": "barber-shop"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "bootstrap-colorpicker",
"homepage": "https://github.com/itsjavi/bootstrap-colorpicker",
"version": "2.5.3",
"_release": "2.5.3",
"_resolution": {
"type": "version",
"tag": "2.5.3",
"commit": "525cd6a0aa26ae95803bbf34d231c4163136a314"
},
"_source": "https://github.com/itsjavi/bootstrap-colorpicker.git",
"_target": "^2.5.1",
"_originalSource": "bootstrap-colorpicker"
}
Loading

0 comments on commit c91fceb

Please sign in to comment.