Compare commits

...

1049 Commits
0.1 ... v2.4.17

Author SHA1 Message Date
REJack
e0670bb49c prep version 2019-08-14 13:17:23 +02:00
REJack
1ccb77f77a removed bootstrap-timepicker from package.json
(due it doesn't deliver dist files via bower/npm)
2019-08-14 13:09:21 +02:00
REJack
0261303218 updated bower components
- removed bootstrap-timepicker from bower.json (due it doesn't deliver dist files via bower/npm)
- updated fullcalendar to 3.10.1
- updated raphael to 2.3.0
2019-08-14 13:08:57 +02:00
REJack
b0416228a4 prep version 2019-08-13 08:57:25 +02:00
REJack
7b6e000dc6 fixed control-sidebar slide option
- renamed `slide` to `controlsidebarSlide` to avoid bootstrap js error
- reworked js to get slide false working without transition
- added .control-sidebar-hold-transition
2019-08-11 14:02:35 +02:00
REJack
d3a213afda updated bootstrap-slider to 10.6.2 (according to docs & package.json)
- updated bower.json
- updated package.json & package-lock.json
- added slider color options in build/less/miscellaneous.less
- updated bower_components
- updated pages/UI/sliders.html
- updated plugins files
2019-08-11 10:57:32 +02:00
REJack
3e4b0cdcb7 prep version to v2.4.16-pre 2019-08-09 13:42:32 +02:00
REJack
a3b070f1f9 updated npm devDependencies to reduce audit's
- updated Gruntfile.js
- rebuild dist files
2019-08-09 13:40:20 +02:00
REJack
d38b8fe970 updated bower.json 2019-08-09 13:38:43 +02:00
REJack
785cd511fd updated bower components
- updated bootstrap-datepicker to 1.9.0
- updated chart.js to 1.1.1
- updated ckeditor to 4.12.1
- updated jquery to 3.4.1
- updated raphael to 2.2.7
- updated select2 to 4.0.8
2019-08-09 13:38:10 +02:00
Raphael Jackstadt
239be16dac Merge pull request #2192 from philip/patch-1
Remove changelog.md link
2019-08-07 10:28:37 +02:00
Raphael Jackstadt
643d3e56f0 Merge pull request #2175 from phansys/semver
Trust semver constraints at `package.json` and `bower.json`
2019-08-07 10:28:12 +02:00
Philip Olson
76251ebd5e Remove changelog.md link
This file (changelog.md) no longer appears active; removing reference from README.md
2019-08-02 10:21:10 -07:00
Javier Spagnoletti
054c1f6936 Trust semver constraints at package.json and bower.json 2019-07-18 14:44:39 -03:00
Raphael Jackstadt
94aeea7ea7 Merge pull request #2174 from phansys/travis
Build on Travis CI
2019-07-18 12:35:53 +02:00
Javier Spagnoletti
72d14332eb Build on Travis CI 2019-07-17 11:52:40 -03:00
REJack
78d0c11374 bump version 2019-07-16 17:40:03 +02:00
REJack
7a2364e507 a simple try to fix ENOTFOUND Package @dev not found error 2019-07-16 17:17:54 +02:00
REJack
c3dc529221 bump version 2019-07-16 14:48:50 +02:00
REJack
d61cbbd627 fixed content-wrapper height calculation if footer isn't there 2019-07-16 14:45:30 +02:00
REJack
6c711a05ef prep version
- changes version to 2.4.13
- updated package.json
- updated build/less/AdminLTE.less & AdminLTE-without-plugins.less
- rebuilt dist files
- updated version in demo pages
2019-07-15 19:36:15 +02:00
REJack
6a5fa5a9d9 fixed collapsed sidebar-menu's sub menu indicator(angle) on hover 2019-07-15 19:20:45 +02:00
REJack
fd7ef956a0 rebuild dist js files 2019-07-15 19:17:28 +02:00
REJack
74315469c4 added .hidden-xs to .box-tools searchbar to avoid overlapping 2019-07-15 18:48:15 +02:00
REJack
e7f1f77dce added ability to use brand-logo with text instead of only a text logo 2019-07-15 18:42:23 +02:00
REJack
737f1c4ae5 added ability to use img logo instead of text logo 2019-07-15 18:10:26 +02:00
REJack
c9ae045e25 changed bootstrap-slider from * to @dev to avoid minimum-stability error 2019-07-11 15:53:16 +02:00
REJack
97348104dd added parent height:auto on tree expand to avoid child overlapping 2019-07-11 14:30:56 +02:00
REJack
b9efcc0f98 added asset packagist to composer.json 2019-07-11 13:39:56 +02:00
REJack
33ecce7207 changed content-wrapper calc() from % to vh & added content-wrapper calc() with collapsed header 2019-07-10 20:38:45 +02:00
REJack
b90ae59dc1 added ability to use fontawesome 5 icon on sidebar-toggle 2019-07-10 19:41:21 +02:00
REJack
639fa9e923 fixed multilevel collapse for child treeview menu 2019-07-09 13:17:28 +02:00
REJack
070193e486 updated select2 to latest version (v4.0.7) 2019-07-08 19:24:08 +02:00
REJack
9b29fa6cf0 prep version to v2.4.13-pre inside demo files 2019-07-08 13:40:53 +02:00
REJack
a1734eabda fixed scroll top bug in fixed layout mode 2019-07-08 13:37:49 +02:00
REJack
f6a5d05c90 prep version to v2.4.13-pre 2019-07-08 13:35:22 +02:00
Aigars Silkalns
b1edd9eaf8 Updated footer info
Updated version info in the footer and changed copyright text to the current one.
2019-06-18 15:15:46 +03:00
REJack
7309e2e5d5 bump version 2019-06-11 13:52:23 +02:00
REJack
af70f05345 added height auto to .login-page & .register-page 2019-06-11 12:14:18 +02:00
REJack
90b65eac6d bump version to v2.4.12-pre 2019-06-11 12:13:34 +02:00
REJack
340bbbaf93 fixed strange navigation menu behavior + dark space on reloads (#2126)
- changed height: 0px to height: auto for uk.treeview-menu to fix not smooth treeview closing
- fixed .content-wrapper calc, it returned -2% before
- changed order of js file generation
- rebuild dist files
2019-06-11 11:59:05 +02:00
REJack
67044517c3 fixed npm audit error 2019-06-11 11:53:48 +02:00
REJack
445a9c3e83 updated README.md
- changed github links to ColorlibHQ
- removed Donations part
2019-06-06 13:50:39 +02:00
REJack
7dda778f61 updated copyright in css & js files
- updated repository url in package.json
- updated copyright infos for js in Gruntfile.js
- updated copyright infos for css in AdminLTE.less & AdminLTE-without-plugins.less
- rebuild dist files
2019-06-06 11:32:52 +02:00
REJack
b2e020413d fixed sidebar menu tree dropdown always open
- added code from #2001 thanks @CoderSquirrel

Closes #1854 & #2001
2019-06-06 11:07:56 +02:00
REJack
2226c0e7cf fixed drag and drop breaking adminlte's design
- updated ControlSidebar.js to hide control sidebar instead of only moving it
- updated dashboard.js to use containment in sortable()
- added display none to control sidebar content in index.html

(Closes #1924)
2019-06-06 10:59:10 +02:00
REJack
3254b3b60f fixed missing time in "Date and time range" picker
Closes #2027
2019-06-06 10:05:15 +02:00
REJack
6f953ee8da updated dist files 2019-06-05 14:20:04 +02:00
REJack
b4fa509976 fixed ionicons path in docs (closes #2044) 2019-05-22 11:07:13 +02:00
REJack
c6720a8790 changed hr border color to @gray instead of @gray-lighter 2019-05-21 20:50:51 +02:00
REJack
c7509cfe70 package.json prep for v2.4.11 2019-05-21 19:02:47 +02:00
REJack
054c89ea53 changed min-height to calc in .content-wrapper 2019-05-21 12:34:52 +02:00
Aigars Silkalns
19113c3cbc Merge pull request #2093 from Imbuzi/patch-1
Update adminlte.js
2019-04-10 17:36:47 +03:00
Nicolas Bourasseau
17f46f4eca Update adminlte.js
Fixing bug throwing error "Uncaught ReferenceError: expandingEvent is not defined" when collapsing .box .
2019-04-10 16:34:28 +02:00
Aigars Silkalns
1d943023e3 Merge pull request #2091 from yohaneslumentut/skin-black-light-fixing
Fix layout skin-black-light height inconsistence
2019-04-08 13:48:39 +03:00
Yohanes Lumentut
4b9b563f42 Fix layout skin-black-light height inconsistence 2019-04-06 23:44:17 +07:00
Aigars Silkalns
bf86dc34e2 Merge pull request #2067 from Lowhearth/treeview-expand
Treeview expand
2019-03-24 19:43:28 +02:00
Aigars Silkalns
100a35f3ce Merge pull request #2076 from hirayama-onagigawa-computing/fix_box_widget_collapsing
Fix typo which breaks BoxWidget collapsing.
2019-03-24 19:42:50 +02:00
平山 度
998a1ff4be Fix typo which breaks BoxWidget collapsing. 2019-03-15 17:33:15 +09:00
Abdullah Almsaeed
4672183ea0 Bump version 2019-03-11 14:01:44 -04:00
Abdullah Almsaeed
4325d22a47 Allow zip file to include HTML and plugin files 2019-03-11 14:00:11 -04:00
Daniel Vilanova Yamuza
f8fe281c43 Fixed formatting 2019-02-24 15:23:09 +01:00
Daniel Vilanova Yamuza
68834fc648 Now the collapse and expand event are triggered after the event loop, Fixes #2019 2019-02-24 15:16:53 +01:00
Abdullah Almsaeed
f0edf90f88 Bump version 2019-02-18 07:29:19 -05:00
Abdullah Almsaeed
661398920d Upgrade bootstrap to 3.4.1 2019-02-18 07:28:41 -05:00
tbaragao
da1ec8ee33 Add Collapsing, Expanding and Removing Events (#2024)
Add Collapsing, Expanding and Removing Events
2019-01-31 13:10:32 -05:00
zacks
e691c465e3 add gitattributes (#2017)
* build(composer): add archive

* chore(gitattributes): add .gitattributes
2019-01-31 13:09:33 -05:00
Kevin Papst
5c3bc4e6a6 added Symfony 4 compatible AdminLTE bundle (#2012) 2019-01-31 13:08:39 -05:00
Evan Pratten
659d1eb18a Update index.html (#2006) 2019-01-31 13:08:10 -05:00
Olda Horák
cbda6b5c3b fix for issue #1976 (#1981)
* issue1976

* issue1976_grunt_js
2019-01-31 13:05:10 -05:00
kasarla shirisha
113a3b4c8e #1947 fixed content-wrapper height (#1948)
* fixed content-wrapper height

* updated content wrapper height
2018-08-22 14:40:03 -04:00
Abdullah Almsaeed
d9e6830184 Fix #1864 2018-07-15 14:48:11 -04:00
Abdullah Almsaeed
059c74fe83 Compile for production 2018-07-15 11:12:52 -04:00
Abdullah Almsaeed
b50004f17c Fix #1616 2018-07-15 11:11:21 -04:00
Abdullah Almsaeed
d04c596dc0 Compile for production 2018-07-15 11:03:30 -04:00
hendimarcos
43b92296a2 fix(skins): ISSUE 1925 - black layout, but font logo on the top is blue. (#1926)
https://github.com/almasaeed2010/AdminLTE/issues/1925
2018-07-15 11:00:33 -04:00
Abdullah Almsaeed
89d24bd778 bump version 2018-07-14 17:47:25 -04:00
Abdullah Almsaeed
c618c2814f Merge #1847 2018-07-14 17:40:00 -04:00
OKAZAKI EITARO
1339932caa Fixed an issue where height becomes NaN when there is no main-header (#1847) 2018-07-14 17:39:38 -04:00
Filip Chalupa
2de87c8ab8 Update npmignore: don't ignore bower_components (#1784)
- without them the npm package is crippled

- it's hard to import admin-lte less files since many of them reference missing bower_components
2018-07-14 17:38:59 -04:00
Abdullah Almsaeed
eb9098c2c8 Merge #1756 2018-07-14 17:37:49 -04:00
Abdullah Almsaeed
60eb217689 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2018-07-14 17:32:49 -04:00
Abdullah Almsaeed
5a4e022541 Merge 2018-07-14 17:32:34 -04:00
Kyle Spearrin
58ef2125b6 fix control sidebar top padding (#1525) 2018-07-14 17:30:00 -04:00
Abdullah Almsaeed
4215f97f7a Bump version 2018-07-14 17:14:30 -04:00
Abdullah Almsaeed
9baf70fde2 Update version 2018-07-14 17:12:36 -04:00
Abdullah Almsaeed
8ee5087b13 Run bower update 2018-07-14 17:11:55 -04:00
Farid Inawan
78a4398dde Update Timepicker (#1354)
With the new one, the widget is not hidden in scrolling container
2018-07-14 17:04:14 -04:00
Ivan
e38376ec15 Fixed multilevel menu inconguence on opening/closing (#1817) 2018-05-05 18:10:33 -04:00
Abdullah Almsaeed
79057e15c1 Fix issue #1842 2018-04-08 09:32:26 -04:00
Abdullah Almsaeed
17dee622be Bump version in package.json 2018-03-17 13:07:06 -04:00
Abdullah Almsaeed
342c3cc865 Update dependencies 2018-03-17 13:06:37 -04:00
Abdullah Almsaeed
88acf9c14f Fix composer versioning error 2018-02-04 08:53:33 -05:00
Abdullah Almsaeed
0e5b536102 Fix composer jquery conflict issue #1741 2018-02-04 08:52:33 -05:00
Abdullah Almsaeed
b3acb63ac5 Update dependencies and fix issue #1741 2018-02-04 07:54:57 -05:00
Abdullah Almsaeed
71cf6cb9f8 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2018-02-04 07:51:29 -05:00
Abdullah Almsaeed
281bb899b5 Update dependencies 2018-02-04 07:51:11 -05:00
Raphael Jackstadt
51e96d8ea9 Update ISSUE_TEMPLATE.md (#1751)
fix checkboxes for Issue type
2017-11-29 06:44:04 -05:00
Muhammad Iqmal
6d6d00a281 Fix Missing Chart.js File (#1738)
This PR will fix missing Chart.js on Index2.html. This missing file causes by typo which is written Chart.js where it should be chart.js
2017-11-26 10:43:54 -05:00
Abdullah Almsaeed
61dc63a6d5 Update bower.json 2017-11-26 10:43:11 -05:00
Brian Ellwood
96b63a6243 Create ISSUE_TEMPLATE.md (#1721)
Add issue template to make dealing with issues easier by having users supply relevant information upfront.
2017-11-15 08:13:34 -05:00
Abdullah Almsaeed
278785ad49 Add semicolons to support webpack 2017-10-26 16:53:11 -04:00
Abdullah Almsaeed
d4ed1e435a Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2017-10-26 16:50:17 -04:00
Abdullah Almsaeed
55d120a0b1 save 2017-10-26 16:50:13 -04:00
ADmad
53393404f1 Don't hardcode slimscroll options. (#1605) 2017-10-26 16:48:52 -04:00
msalasch
c3fb2e2bcd corrected error in the chart path in the charts pages (#1581) 2017-10-26 16:39:28 -04:00
Howard Gehring
f0421f5b36 Composer installer support (#1619)
* Update composer.json

Adding support for composer custom install path

* Update composer.json
2017-10-26 16:31:13 -04:00
bmanifold
a667b95b8d Fix box inside box collapsing error (#1681) (#1685)
* Previously, with a .box inside a .box, any clicking on a
  collapse/expand button in either .box would cause both of them to
  collapse/expand.  This commit makes sure parent and child boxes
  do not interfere with each other.
2017-10-26 16:30:08 -04:00
Joël Gaujard
b98b5914e7 Change JS comment for better parsing (#1693) 2017-10-26 16:27:57 -04:00
Abdullah Almsaeed
d7f2e977f5 Fix issue #1692 2017-10-15 15:46:02 -04:00
Abdullah Almsaeed
d53319e56f Upgrade yarn.lock 2017-10-09 12:36:16 -04:00
Abdullah Almsaeed
156f56c3c1 Fix background color 2017-10-09 12:32:18 -04:00
Abdullah Almsaeed
cc4654239b Fix issue #1664 and update bower plugins 2017-10-08 18:36:36 -04:00
Abdullah Almsaeed
f14e4aaccb Fix issue #1665 2017-10-08 18:25:37 -04:00
Abdullah Almsaeed
6157c7bc77 Fix issue #1567 2017-07-08 13:45:57 -04:00
Abdullah Almsaeed
4cae976a39 Fix issue #1512 2017-07-08 13:31:59 -04:00
Abdullah Almsaeed
1ee1030db2 We do not need the iCheck option anymore 2017-07-02 11:38:16 -04:00
Abdullah Almsaeed
f8c4a40c8b Update documentation links 2017-07-01 17:03:49 -04:00
Abdullah Almsaeed
857b15a275 Update plugins 2017-07-01 16:49:59 -04:00
linxuhua
9ccb1f6b68 managed jquery-ui by bower (#1558) 2017-07-01 16:33:53 -04:00
Abdullah Almsaeed
e47823e6f1 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2017-07-01 16:17:06 -04:00
Abdullah Almsaeed
06bb8c2be1 Add bower_components for direct downloads but ignore them when installing using npm or bower 2017-07-01 16:16:47 -04:00
Abdullah Almsaeed
76ce5a9c1f Fix box widget icons and chart js version in bower issue 2017-07-01 16:15:59 -04:00
Chadwick Johnson
a780269957 grammatical fix (#1553) 2017-06-27 16:11:06 -04:00
Abdullah Almsaeed
7cfbe94b7e Update npmignore 2017-06-25 14:56:15 -04:00
Abdullah Almsaeed
187dcfae4d add npmignore 2017-06-25 14:53:15 -04:00
Abdullah Almsaeed
f4ee8fba68 Use dependecy manager when applicable issue #1532 2017-06-25 14:46:09 -04:00
Abdullah Almsaeed
fbbc450c41 Fix issue #1547 2017-06-25 09:33:22 -04:00
Abdullah Almsaeed
4b0d73bab9 Fix issue #1536 2017-06-25 09:13:29 -04:00
Abdullah Almsaeed
41d3db21ed Fix issue #1549 2017-06-24 11:02:54 -04:00
Alexander Wunschik
9431039bf5 replaced boxed-bg images with static color 2017-06-06 10:51:25 +02:00
Abdullah Almsaeed
6f77ce584e Fix #1490 disabled nav tab 2017-05-18 17:52:37 -04:00
Abdullah Almsaeed
87209a984a Update docs links 2017-05-18 17:36:54 -04:00
Abdullah Almsaeed
406cda26d9 Update links 2017-05-18 17:36:20 -04:00
Abdullah Almsaeed
c6b45cdfa0 Resolve conflict 2017-05-18 08:22:52 -04:00
Abdullah Almsaeed
a60df9f050 Merge branch 'v2.4.0-dev' 2017-05-18 08:12:45 -04:00
Abdullah Almsaeed
4169db0857 Resolve conflicts 2017-05-18 08:11:54 -04:00
Abdullah Almsaeed
342a0ac17f Update dependencies 2017-05-17 19:23:47 -04:00
Abdullah Almsaeed
ec245fd46e Update README 2017-05-17 19:23:05 -04:00
Abdullah Almsaeed
ccb00ccdad Update modal page to add buttons and animation 2017-05-17 19:21:12 -04:00
Abdullah Almsaeed
7089f63213 Update README.md 2017-05-16 18:46:37 -04:00
Michaël Arnauts
bf174bfcb0 Fix typo in collapsed-sidebar.html (#1422) 2017-04-30 08:44:44 -04:00
Gavin Gilmour
1f797fd5f7 Fix README headers (#1425)
As title.
2017-04-16 08:55:27 -04:00
Gabor Mojzes
b12cc7d9e4 Updated changelog with already released versions (#1438)
* Fix style

* Updated changelog with already released versions
2017-04-16 08:53:16 -04:00
Gabor Mojzes
26a56938ce Fix Bootstrap version number (#1447) 2017-04-16 08:51:12 -04:00
Abdullah Almsaeed
4c25d55149 Refromat code 2017-04-04 18:54:18 -04:00
Gil Ferreira
eb782d743b Added CoPilot to example implementations. (#1359)
* Added CoPilot to example implementations. This is a version of AdminLTE that makes it easy to use Vue.js

* Added copilot into implementation page so it isn't overridden by grunt
2017-03-23 22:12:33 -04:00
Abdullah Almsaeed
b7da81b3d3 Merge pull request #1355 from utsman/fix-comment
Fix Comment
2017-03-23 19:18:25 -04:00
Abdullah Almsaeed
6f754362f5 Merge pull request #1398 from MrMitch/MrMitch-patch-name
fix name attribute in bower.json, fix #1397
2017-03-23 19:12:24 -04:00
Abdullah Almsaeed
d1dd9b8013 Merge pull request #1417 from wandersonwhcr/fix-screenshot-markdown
Fix Screenshot Mardown
2017-03-23 19:10:17 -04:00
Wanderson
936302b847 Fix screenshot mardown 2017-03-20 18:03:01 -03:00
Mickael GOETZ
a0475e08ae fix name attribute in bower.json
The package name cannot contain uppercase letters.
https://github.com/bower/spec/blob/master/json.md#name
2017-03-07 12:53:17 +01:00
Abdullah Almsaeed
235481d1d6 Remove font import from css and add it to html 2017-03-04 18:38:10 -05:00
Abdullah Almsaeed
37c8bbb019 Bump version up 2017-03-04 12:23:16 -05:00
Abdullah Almsaeed
890ccbdb09 Remove not needed comments 2017-03-04 12:20:23 -05:00
Abdullah Almsaeed
30324f4f33 Fix direct chat toggle trigger 2017-03-04 12:19:22 -05:00
Abdullah Almsaeed
324bca9f14 Activate bootstrap tooltips 2017-03-04 12:19:00 -05:00
Abdullah Almsaeed
2c372a2ce2 Create direct chat plugin 2017-03-04 12:13:04 -05:00
Abdullah Almsaeed
b04a99466d Add deprectated notice 2017-03-04 12:12:42 -05:00
Abdullah Almsaeed
201d482066 Update readme 2017-03-04 12:11:59 -05:00
Abdullah Almsaeed
b5f4bba4e6 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2017-02-27 08:29:01 -05:00
Abdullah Almsaeed
a1f6bb07d3 Update version to 2.3.12 2017-02-27 08:28:57 -05:00
Abdullah Almsaeed
024e3faa9d Update readme 2017-02-26 16:13:34 -05:00
Abdullah Almsaeed
436513ac24 Update readme 2017-02-26 16:12:36 -05:00
Abdullah Almsaeed
d2d63c857a Update readme 2017-02-26 16:09:42 -05:00
Abdullah Almsaeed
57c62f4222 Make JSHint happy 2017-02-26 16:05:36 -05:00
Abdullah Almsaeed
af4ece9a80 Update version 2017-02-26 16:04:47 -05:00
Abdullah Almsaeed
3f5abdbfca Make documentation compatible with the new js 2017-02-26 16:04:01 -05:00
Abdullah Almsaeed
383d685a5f Make pages compatible with the new js 2017-02-26 16:02:25 -05:00
Abdullah Almsaeed
075fe294ed Update todo list plugin usage example 2017-02-25 14:54:11 -05:00
Abdullah Almsaeed
9f870d0fad Add lint tasks and update less and js tasks 2017-02-25 14:53:27 -05:00
Abdullah Almsaeed
3c672fe9aa Seperate treeview plugin and fix control sidebar for the fixed layout 2017-02-25 14:52:04 -05:00
Abdullah Almsaeed
a7d49bd656 Make JSHint ignore app.js 2017-02-25 14:50:35 -05:00
Abdullah Almsaeed
f02c61eb0e Fix issue #1330 and update border colors 2017-02-25 14:47:24 -05:00
Abdullah Almsaeed
469e9cd136 Update data selector to match the name of the plugin 2017-02-25 14:46:01 -05:00
Abdullah Almsaeed
84ca9cdc24 Make listeners specific to the element 2017-02-25 14:45:03 -05:00
Abdullah Almsaeed
01b4740d93 Add more options and allow methods to get executed from outside the plugin 2017-02-25 14:43:23 -05:00
Abdullah Almsaeed
17c9366f4b Compile LESS 2017-02-25 14:40:16 -05:00
Abdullah Almsaeed
7cecd1922d Add compiled JS plugins 2017-02-25 14:39:54 -05:00
Abdullah Almsaeed
d10ba04ec9 Add TodoList plugin 2017-02-25 14:38:26 -05:00
Abdullah Almsaeed
51142e7fc9 Add BoxRefresh plugin 2017-02-25 14:38:05 -05:00
Abdullah Almsaeed
28c75ef8a0 Add BoxWidget plugin 2017-02-25 14:37:38 -05:00
Abdullah Almsaeed
cdc2e7e3d0 Create control sidebar functionality 2017-02-19 18:20:47 -05:00
Abdullah Almsaeed
b5e67488e7 Create JSHINT rules for Gruntfile 2017-02-19 10:44:41 -05:00
Abdullah Almsaeed
178adf5dc0 Create PushMenu widget 2017-02-19 10:43:39 -05:00
Abdullah Almsaeed
6683ab7303 Create Layout widget 2017-02-19 10:43:19 -05:00
Abdullah Almsaeed
7aa9f44d66 Create treeview css 2017-02-19 10:43:01 -05:00
Abdullah Almsaeed
bfbccf9bf7 Create Tree widget 2017-02-19 10:42:30 -05:00
Abdullah Almsaeed
61cd9ca7b0 Fix issue #1342 2017-02-18 17:32:34 -05:00
Abdullah Almsaeed
aa945e6e6f Update jquery to 3.1 2017-02-13 08:42:03 -05:00
Abdullah Almsaeed
d73be88861 Add JSCS and JSHINT rules 2017-02-13 08:41:47 -05:00
Abdullah Almsaeed
f46e5198b7 Make JSCS and JSHINT happy 2017-02-13 08:40:59 -05:00
Abdullah Almsaeed
be0a0b17b0 Comply with jscs andjshint 2017-02-12 19:15:52 -05:00
utsman
074d1ca039 Fix Comment 2017-02-06 01:39:19 +09:00
Abdullah Almsaeed
fcc14dcff7 Merge pull request #1328 from Skasi/master
Fix typos
2017-01-17 06:32:41 -08:00
Skasi
bd3799eb7c Fix typos 2017-01-17 15:28:35 +01:00
Abdullah Almsaeed
082ffa3d41 Merge pull request #1326 from Skasi/patch-1
Fix typo
2017-01-17 05:33:46 -08:00
Skasi
09c91313a0 Fix typo 2017-01-17 13:43:43 +01:00
Abdullah Almsaeed
1273f93e67 Update version number 2017-01-12 08:31:10 -08:00
Abdullah Almsaeed
74c27f7f11 Update README.md 2017-01-11 22:32:33 -08:00
Abdullah Almsaeed
501448ad6f Merge pull request #1311 from yajra/bump-npm-version
Bump npm version to v2.3.11.
2017-01-11 09:16:46 -05:00
Abdullah Almsaeed
cdcf40edc0 Update version 2017-01-11 09:14:59 -05:00
Arjay Angeles
8747e8be04 Bump npm version to v2.3.11. 2017-01-11 15:39:58 +08:00
Abdullah Almsaeed
2be703222a Update colors @gray color to @gray-lte 2017-01-08 16:03:57 -05:00
Abdullah Almsaeed
95d377eabc Fix default box solid color issue 2017-01-08 15:57:03 -05:00
Abdullah Almsaeed
194f92be3a Remove test from starter page 2017-01-08 15:43:46 -05:00
Abdullah Almsaeed
0c4ca8c4db Merge branch 'PeterDaveHelloKitchen-image-optimize' 2017-01-08 15:42:44 -05:00
Abdullah Almsaeed
2f3d9ca953 Merge PR #1108 to optimize images 2017-01-08 15:42:30 -05:00
Abdullah Almsaeed
02efe00fc9 Fix #1256 2017-01-08 15:37:30 -05:00
Abdullah Almsaeed
4758ab5216 Fix #1269 2017-01-08 15:32:52 -05:00
Abdullah Almsaeed
b621ed77f2 Fix #1276 2017-01-08 15:23:14 -05:00
Abdullah Almsaeed
76e1d899d5 Fix #1296 2017-01-08 15:07:55 -05:00
Abdullah Almsaeed
b016468ab2 Fix #1300 2017-01-08 15:03:40 -05:00
Abdullah Almsaeed
a527b7fe99 Allow for adminlte without plugin override 2017-01-08 12:40:55 -05:00
Abdullah Almsaeed
8410b2fdc1 Merge pull request #1101 from almasaeed2010/issue-668
Split CSS files
2017-01-08 12:39:05 -05:00
Abdullah Almsaeed
e73de15f31 Causes bootstrap slider to disappear
Revert "Merge pull request #1186 from manhhailua/patch-1"

This reverts commit 96174a1ada, reversing
changes made to 1817e83917.
2017-01-08 12:01:36 -05:00
Abdullah Almsaeed
96174a1ada Merge pull request #1186 from manhhailua/patch-1
sliders bug fixes
2017-01-08 11:58:49 -05:00
Abdullah Almsaeed
1817e83917 Merge pull request #1205 from tyrollins/master
Remove unnecessary coma
2017-01-08 11:43:38 -05:00
Abdullah Almsaeed
fff97052cc Merge pull request #1211 from cquanu/master
Update BS to v3.3.7
2017-01-08 11:38:15 -05:00
Abdullah Almsaeed
7ec1e072d9 Merge pull request #1224 from kennynaoh/master
Add CDNJS version badge in readme
2017-01-08 11:33:59 -05:00
Abdullah Almsaeed
3d4acd72d9 Fix typo 2017-01-08 11:27:44 -05:00
Abdullah Almsaeed
bb61097fea Merge pull request #1239 from zzzeep/master
Removed redundant punctuation ":"
2017-01-08 11:27:26 -05:00
Abdullah Almsaeed
5ecdce9813 Fix typo 2017-01-08 11:26:47 -05:00
Abdullah Almsaeed
508e4f0815 Merge pull request #1242 from gauravmak/patch-1
Wrong Spell
2017-01-08 11:25:24 -05:00
Abdullah Almsaeed
70b95bbf6f Merge pull request #1264 from Strato/patch-1
Fixed a typo
2017-01-08 11:24:31 -05:00
Abdullah Almsaeed
dc83709196 Merge pull request #1286 from marcusportmann/master
Fixed jumping buttons with Bootstrap tooltip
2017-01-08 11:18:20 -05:00
Abdullah Almsaeed
09651c1d0c Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2017-01-08 11:13:22 -05:00
Abdullah Almsaeed
eec8a98901 add laravel implementation PR #1301 2017-01-08 11:13:16 -05:00
Abdullah Almsaeed
e736df9f64 Merge pull request #1268 from eryshev/master
Add option to control sidemenu's tree views.
2017-01-06 11:01:55 -05:00
Abdullah Almsaeed
12ea7168fb Happy New Years! 🎉 2017-01-01 10:23:43 -05:00
Marcus Portmann
90e62c2af0 Fixed jumping buttons with Bootstrap tooltip 2016-12-21 21:11:49 +02:00
Abdullah Almsaeed
e499f26f76 Run LESS 2016-12-11 16:04:13 -05:00
Abdullah Almsaeed
53b904d946 Remove font antialiasing 2016-12-11 16:00:04 -05:00
Alexey ERYSHEV
7ec587b75b Add option to control sidemenu's tree views. 2016-12-05 13:17:36 +01:00
François Guillot
0159d06b24 Fixed a typo
It works because it's an alias. But it might be removed without warning.

While I'm here, being able to deactivate the treeview on the sidebar would be super nice, or have it as an _opt-in_ using a CSS class like *sidebar-as-tree*.
2016-12-02 14:48:17 +01:00
Gaurav Makhecha
51bf7c4a80 Wrong Spell 2016-11-07 17:11:44 +05:30
Abdullah Almsaeed
6e2f5b0708 Fix issue #1191 2016-11-06 13:19:15 -05:00
Abdullah Almsaeed
8a7b80c64c Add yarn lock file 2016-11-06 13:18:50 -05:00
Abdullah Almsaeed
ced14b133d Update version number 2016-11-04 10:42:55 -04:00
Abdullah Almsaeed
1fe157ae77 Update Bootstrap to 3.3.7 2016-11-04 10:41:51 -04:00
Abdullah Almsaeed
3cbb6273e0 Fix sidebar angle icon issue #1237 2016-11-04 10:36:03 -04:00
zzzeep
7e011ed4b5 Removed redundant punctuation ":" 2016-11-04 20:31:07 +08:00
Abdullah Almsaeed
e3d93f7e1d Update version 2016-10-19 12:31:38 -04:00
Abdullah Almsaeed
797b65b3ca Compile less and minify js 2016-10-19 11:34:25 -04:00
Abdullah Almsaeed
5b14053e35 Update version number 2016-10-19 11:30:41 -04:00
naoh
4de79841b4 Add CDNJS version badge in readme
This will add the badge to show its version on CDNJS and also link to its page on CDNJS!
2016-10-18 17:46:38 +08:00
Quan You
8d21b84474 Update BS to v3.3.7 2016-10-06 17:40:19 +08:00
Tyler Rollins
7561213185 remove unnecessary coma 2016-10-02 18:52:12 -07:00
Abdullah Almsaeed
1a89a2feab Merge pull request #1160 from antoniocambados/antoniocambados-patch-1158
Update sidebar.less
2016-09-12 16:23:06 -04:00
Abdullah Almsaeed
060f79063e Merge branch 'rickysang-master' 2016-09-12 16:22:01 -04:00
Abdullah Almsaeed
159887612e merge pull request #1165 2016-09-12 16:21:52 -04:00
Abdullah Almsaeed
e207c9c0c8 Merge pull request #1166 from liamgall/master
Fix link to dashboard in widgets page
2016-09-12 16:18:09 -04:00
Abdullah Almsaeed
be18803032 Merge pull request #1178 from mortonfox/patch-1
Fix link to changelog
2016-09-12 16:16:36 -04:00
Mạnh Phạm
821a3bc063 sliders bug fixes
- use `.bootstrapSlider()` instead of `.slider()` because `.slider()` does not work right with react.js
- add attribute:type to `.ionRangeSlider()`: related issue at [ion.rangeSlider repo](https://github.com/IonDen/ion.rangeSlider/issues/343)
2016-09-12 16:33:28 +07:00
Abdullah Almsaeed
79bd17075e Merge pull request #1184 from leoncheek/master
Fix sidebar angle rotate issue
2016-09-05 12:44:23 -04:00
Leon Cheek
30f9916802 Fix sidebar li.active fa-angle-left rotate. 2016-09-04 23:43:26 +08:00
Morton Fox
5170c4f8ea Fix link to changelog 2016-09-01 00:32:40 -04:00
Kihwan Kim
09a8974ab7 Merge pull request #1 from liamgall/liamgall-patch-1
changed index2.html to ../index2.html
2016-08-20 14:43:20 +09:00
Kihwan Kim
e989db685e changed index2.html to ../index2.html
it send me to file:///~~~/AdminLTE-2.3.6/pages/index2.html
so can't find page.

changed "index2.html" to "../index2.html"
2016-08-20 14:38:44 +09:00
rickysang
87cba5d352 Fix issue #1008 2016-08-19 18:19:40 +08:00
Antonio Cambados
8f0a652055 Update sidebar.less
Fixes https://github.com/almasaeed2010/AdminLTE/issues/1158: expandable indicators of sidebar's expandable menu items didn't toggle (rotate) upon expansion.
2016-08-11 08:47:38 +02:00
Abdullah Almsaeed
be11566d95 Update changelog 2016-08-04 19:22:06 -04:00
Abdullah Almsaeed
d4877677ab Update version 2016-08-04 19:20:57 -04:00
Abdullah Almsaeed
98400d1498 Use markdown in the changelog file 2016-08-04 19:17:03 -04:00
Abdullah Almsaeed
1bffa9fd44 Patch for issue #1098 2016-08-04 19:12:52 -04:00
Abdullah Almsaeed
7d78453e8a Update support emails 2016-07-16 07:13:49 -04:00
Peter Dave Hello
0e601c1463 optimize png images using zopflipng 2016-07-10 18:01:03 +08:00
Abdullah Almsaeed
b8ea25e8eb Provide fix for issue #668 2016-07-04 11:48:51 -04:00
Abdullah Almsaeed
16bb613abe Merge pull request #1096 from nobusugi246/fix_css_content_too_large
min-height of .content is too large.
2016-07-03 11:27:15 -04:00
Abdullah Almsaeed
0ab2eb7f38 Update version 2016-07-03 11:21:22 -04:00
Abdullah Almsaeed
665514209b Fix issue #1097 2016-07-03 11:17:11 -04:00
nobusugi246
13f3036479 min-height of .content is too large. 2016-07-03 11:27:07 +09:00
Abdullah Almsaeed
2de98d7b70 Remove changelog from readme and specify new source 2016-07-02 18:17:47 -04:00
Abdullah Almsaeed
140c350c5c Merge pull request #1040 from OskarStark/patch-1
updated changelog with already released versions
2016-07-02 18:09:39 -04:00
Abdullah Almsaeed
68e473db43 Update package.json version 2016-07-02 10:18:53 -04:00
Abdullah Almsaeed
64a91f7b56 Update version number 2016-07-01 16:36:20 -04:00
Abdullah Almsaeed
8e278e1145 Fix issue #1093 2016-07-01 14:09:03 -04:00
Abdullah Almsaeed
bca8e8ec66 Fix issue #427 by updating slimscroll 2016-07-01 12:39:46 -04:00
Abdullah Almsaeed
db51bd8b98 Fix isse #683 2016-07-01 12:36:40 -04:00
Abdullah Almsaeed
1a29b58111 Revert boxed layout fix to attempt another 2016-07-01 12:31:17 -04:00
Abdullah Almsaeed
35dacb3f97 Fix issue #1091 2016-07-01 12:13:44 -04:00
Abdullah Almsaeed
688631379b Fix issue #683 2016-07-01 12:07:06 -04:00
Abdullah Almsaeed
05f0528552 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2016-07-01 11:59:45 -04:00
Abdullah Almsaeed
20cd83d204 Fix issue #995 2016-07-01 11:59:39 -04:00
Abdullah Almsaeed
9d6c25d7b2 Merge pull request #1094 from xvonabur/patch-2
Remove sidebar click handler, before assigning one. Fix sidebar autoclose bug.
2016-07-01 11:57:19 -04:00
Abdullah Almsaeed
6ed3a7bfc4 Merge pull request #1006 from Jerome1337/fix-sidebar-label
Fix/allow multiple labels on Firefox
2016-06-29 09:19:00 -04:00
Abdullah Almsaeed
476653811a Merge pull request #1090 from choonho/master
Update typo replated with jQuery
2016-06-28 22:53:15 -04:00
Choonho Son
84ad18c3e8 Update typo replated with jQuery
jQuery file is jquery-2.2.3.min.js not jQuery-2.2.3.min.js

Signed-off-by: Choonho Son <choonho.son@gmail.com>
2016-06-29 01:54:32 +00:00
Abdullah Almsaeed
59c8ea100a Merge pull request #1003 from yu1ro/replace-year
replace 2015 to 2016
2016-06-28 20:39:03 -04:00
Abdullah Almsaeed
493bdb6580 Merge pull request #1015 from Fl0ux/master
Update Date Range Picker
2016-06-28 19:15:44 -04:00
Abdullah Almsaeed
abe80a0e92 Merge pull request #1029 from angelitomg/master
Update jQuery version to 2.2.3
2016-06-28 19:12:06 -04:00
Abdullah Almsaeed
0dc992837e Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2016-06-28 18:33:50 -04:00
Abdullah Almsaeed
ec2e31079b Revert 2016-06-28 18:33:46 -04:00
Abdullah Almsaeed
d003040ddc Merge pull request #1089 from almasaeed2010/revert-1084-master
Revert "Fixed loss of "active" class after collapsing menu"
2016-06-28 18:33:23 -04:00
Abdullah Almsaeed
b07ef01535 Revert "Fixed loss of "active" class after collapsing menu" 2016-06-28 18:32:19 -04:00
Abdullah Almsaeed
b4f1c53713 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2016-06-28 16:03:24 -04:00
Abdullah Almsaeed
bcd808d203 - 2016-06-28 16:03:18 -04:00
Abdullah Almsaeed
9b80592460 Merge pull request #1084 from blz-ea/master
Add "disable sidebar accordion feature" to preserve active classes in the sidebar.
2016-06-28 16:02:43 -04:00
Abdullah Almsaeed
8438a30eaa Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2016-06-28 15:29:11 -04:00
Abdullah Almsaeed
da310983fd Update ChartJS to 1.1.1 2016-06-28 15:29:03 -04:00
Abdullah Almsaeed
04e4fcb934 Merge pull request #1061 from freedayko/update-select2
Update Select2 plugin to version 4.0.3
2016-06-28 15:18:37 -04:00
Abdullah Almsaeed
1c243550e4 Merge 2016-06-28 15:01:00 -04:00
Abdullah Almsaeed
b71926e6ac Update Readme 2016-06-28 14:58:25 -04:00
Abdullah Almsaeed
f9a3f8b5ff Merge pull request #1041 from OskarStark/patch-2
added missing changelog to README. refs #1040
2016-06-28 14:38:07 -04:00
blz-ea
0c4ebb13c2 Update AdminLTE.css 2016-06-27 09:40:06 +05:00
blz-ea
198e91c64a Update app.js 2016-06-27 09:38:45 +05:00
Aleksandr Palyan
9b77655eb3 Update Select2 plugin to version 4.0.3 2016-05-27 21:42:25 +03:00
Oskar Stark
c9dcc7c1dd added missing changelog to README. refs #1040 2016-05-09 10:57:19 +02:00
Oskar Stark
e5e0c53b0c updated changelog with already released versions
2.3.2 and 2.3.3 were missing
2016-05-09 10:54:51 +02:00
Angelito
6eab94926c Update jQuery version to 2.2.3 2016-05-01 14:56:20 -03:00
Foulques du Peloux
a0addfa177 Update Date Range Picker 2016-04-19 16:49:45 +02:00
Foulques du Peloux
cb6ac64ac4 Update Date Range Picker 2016-04-19 16:48:50 +02:00
Foulques du Peloux
e61eb404d2 Newest momentjs version 2016-04-19 16:48:20 +02:00
Foulques du Peloux
ea7823b72c Delete old momentjs version 2016-04-19 16:48:01 +02:00
Foulques du Peloux
88b4e3d8b6 Delete old momentjs version 2016-04-19 16:47:48 +02:00
Foulques du Peloux
446b1cec52 Update Date Range Picker 2016-04-19 16:47:19 +02:00
Foulques du Peloux
d73cf99666 Update Date Range Picker 2016-04-19 16:46:52 +02:00
Jerome Pogeant
139b4604c5 Update sidebar label template to allow multiple labels 2016-04-08 10:32:03 +02:00
Yuichiro Kawano
af4360260c replace 2015 to 2016
close #998
2016-04-05 23:11:29 +09:00
Abdullah Almsaeed
0050e298a2 Merge pull request #991 from johnberberich/patch-1
Add Bower, NPM and Packagist versions to README.md
2016-03-28 18:50:42 -04:00
John Berberich
d051696b4b Add Bower, NPM and Packagist versions to README.md 2016-03-28 17:17:47 -04:00
Abdullah Almsaeed
a49aaf581b Add notification for changelog 2016-03-24 11:09:27 -04:00
Abdullah Almsaeed
8db9797950 Update BS version 2016-03-24 10:31:41 -04:00
Abdullah Almsaeed
497ca6d7e6 Update version number 2016-03-24 10:00:18 -04:00
Abdullah Almsaeed
034c31e089 Merge pull request #976 from suvjunmd/markup
Fixed W3C Markup Validation errors and warnings
2016-03-23 11:50:55 -04:00
Abdullah Almsaeed
bdec7573df Merge pull request #983 from johnberberich/fix-help-block-validation
Apply validation state colors to form group help blocks
2016-03-23 11:49:13 -04:00
John Berberich
f3b2f0d46c Apply form validation state colors to help blocks 2016-03-23 11:30:40 -04:00
Dmitri Suvorov
c2bc22698c Fixed W3C Markup Validation errors and warnings 2016-03-20 21:05:32 +02:00
Abdullah Almsaeed
bd61a3b66b Merge #918. Fix date-range button selection issue 2016-03-14 12:14:28 -04:00
Abdullah Almsaeed
fe147c9b21 Merge pull request #944 from bluemanos/master
update font-awesome to 4.5.0, change CDN to cdnjs.com
2016-03-13 21:14:03 -04:00
Abdullah Almsaeed
faa724a692 Merge pull request #935 from schulzetenberg/master
Add datepicker example
2016-03-13 21:11:52 -04:00
Abdullah Almsaeed
dbfd0322c0 Merge pull request #904 from 0xMatt/master
Improve tree click event handler
2016-03-13 21:02:41 -04:00
Abdullah Almsaeed
720c036708 Merge pull request #816 from magikMaker/feature/package-json
added main property to package.json
2016-03-13 20:56:05 -04:00
Abdullah Almsaeed
2f64568f4c Fix #957. Make pace visible in skin black 2016-03-13 20:47:41 -04:00
Abdullah Almsaeed
18b882dd3f Update ckeditor 2016-03-13 20:16:33 -04:00
Abdullah Almsaeed
4fbef59be1 Fix typo 2016-03-13 20:12:38 -04:00
Szymon Bluma
9c28589ad6 updated momentjs library to 2.11.2 2016-02-25 15:18:13 +01:00
Szymon Bluma
bd36febbc0 update font-awesome to 4.5.0, change CDN to cdnjs.com 2016-02-25 15:07:14 +01:00
Abdullah Almsaeed
2b73a99716 Fix sentence 2016-02-24 10:21:30 -05:00
Abdullah Almsaeed
be82cd2d05 Update README.md 2016-02-24 10:20:20 -05:00
Jacob Schulzetenberg
bc696b82cc Formatting fix 2016-02-19 13:31:25 -07:00
Jacob Schulzetenberg
fe3382b879 Add datepicker plugin to examples 2016-02-19 13:28:53 -07:00
Jacob Schulzetenberg
525f1e62fe Merge remote-tracking branch 'refs/remotes/almasaeed2010/master' 2016-02-19 12:40:21 -07:00
Abdullah Almsaeed
10e1f7fc2d Update License 2016-02-09 13:19:29 -05:00
0xMatt
f284016fa8 Improve click event handler 2016-02-01 12:44:51 -06:00
Abdullah Almsaeed
93e99de603 Merge pull request #877 from suvjunmd/jQuery
Updated jQuery to version 2.2.0
2016-01-18 10:45:30 -05:00
Abdullah Almsaeed
6a45ff52d0 Add Laravel implementation #858 2016-01-18 10:44:17 -05:00
Dmitri Suvorov
45b64a9739 Updated jQuery to version 2.2.0 2016-01-16 23:55:16 +02:00
Abdullah Almsaeed
74428d3ec4 Fix issue #812 2016-01-16 13:29:23 -05:00
Abdullah Almsaeed
e6318e7386 Update BS to v3.3.6 2016-01-16 12:48:26 -05:00
Abdullah Almsaeed
41d18400ba Merge pull 2016-01-16 11:28:59 -05:00
Abdullah Almsaeed
fceb5eebe6 Add .sass-cache to gitignore 2016-01-16 11:28:40 -05:00
Abdullah Almsaeed
f741eec73c Merge pull request #822 from condor-bird/patch-5
Duplicate attribute type button
2016-01-16 11:22:47 -05:00
Abdullah Almsaeed
b1e8da631e Merge pull request #818 from gabel/update_bootstrap_slider
Update to bootsrap-slider 5.3.1
2016-01-16 11:22:26 -05:00
Abdullah Almsaeed
732d6bbd59 Merge pull request #821 from pdesmarais/master
Updating to ion.RangeSlider v2.1.2
2016-01-16 11:22:11 -05:00
Abdullah Almsaeed
5482534db4 Merge pull request #829 from gabel/update_momentjs
update moment.js cdn links to version 2.10.6
2016-01-16 11:21:54 -05:00
Abdullah Almsaeed
65904edd76 Merge pull request #831 from gabel/update_colorpicker
Update to bootstrap-colorpicker version  2.3.0
2016-01-16 11:21:42 -05:00
Abdullah Almsaeed
93f2ad2fef Merge pull request #854 from aqnouch/patch-1
Updated copyright to 2016
2016-01-16 11:21:11 -05:00
Abdullah Almsaeed
e92b9acd19 Merge pull request #825 from gabel/update_select2
Update to select2 version 4.0.1
2016-01-16 11:15:35 -05:00
AQNOUCH Mohammed
03ff6f5d9f Updated copyright to 2016 2016-01-01 00:55:21 +00:00
Martin Fischer
d30707611d Update to bootstrap-colorpicker version 2.3.0 2015-12-04 19:18:37 +01:00
Martin Fischer
d7189ad95c update moment.js cdn links to version 2.10.6 2015-12-03 21:40:10 +01:00
Martin Fischer
34ce040105 Update to select2 version 4.0.1 2015-12-02 21:37:31 +01:00
condor
c174dc7b63 Duplicate attribute type button
Duplicate attribute type="button"
2015-12-02 11:46:07 +06:00
Patrick Desmarais
2681b8bd2e Changing the img paths in the css files 2015-12-01 16:00:25 -05:00
Patrick Desmarais
dce8dd7070 Updating to ion.RangeSlider v2.1.2 2015-12-01 14:37:14 -05:00
Martin Fischer
12bf734658 update to bootsrap-slider 5.3.1 2015-11-30 20:53:21 +01:00
Bjørn Wikkeling
ff6ce09d39 added npm install to readme 2015-11-30 14:48:50 +01:00
Bjørn Wikkeling
9c15693784 added main property to package.json 2015-11-30 14:41:24 +01:00
Abdullah Almsaeed
1ee281b3b9 Increment version number 2015-10-23 10:50:49 -04:00
Abdullah Almsaeed
57e10bc372 Fix issue #752 2015-10-23 10:48:01 -04:00
Abdullah Almsaeed
bbb67bafa5 Compile changes 2015-10-22 12:38:34 -04:00
Abdullah Almsaeed
1c448a3afa Merge pull request #717 from zviryatko/patch-1
Fix animation bug with collapsed sidebar and treeview menu.
2015-10-22 12:37:06 -04:00
Abdullah Almsaeed
9ca725c313 Merge pull request #741 from Soullivaneuh/patch-2
Do not use absolute position for .pull-right on sidebar
2015-10-22 12:29:33 -04:00
Abdullah Almsaeed
0cfe69d351 Add rails gem to documentation 2015-10-16 20:30:01 -04:00
Abdullah Almsaeed
13697c4743 Merge pull request #734 from racketlogger/master
Add new rails gem supporting AdminLTE sources
2015-10-16 20:29:09 -04:00
Abdullah Almsaeed
250fa7bbd7 Merge pull request #729 from Yellowen/master
Sidebar autoclose on turbolinks fixed. close #718
2015-10-16 19:43:22 -04:00
Sullivan SENECHAL
4a83dc18ce Do not use absolute position for .pull-right on sidebar 2015-10-15 16:11:34 +02:00
Carlos Puchol
02c76b9075 Add new rails gem supporting AdminLTE sources
Add a link to the new gem that uses less and it's more maintainable
2015-10-13 16:58:36 -07:00
xvonabur
20eba516a4 Remove sidebar click handler, before assigning one 2015-10-11 15:56:02 +03:00
Sameer Rahmani
b76c319144 Sidebar autoclose on turbolinks fixed. close #718 2015-10-11 15:40:34 +03:30
Abdullah Almsaeed
1accd72830 Merge pull request #712 from iaesaudi/patch-1
Update README.md
2015-10-06 09:50:49 -04:00
Abdullah Almsaeed
eb887847b3 Merge pull request #716 from novashultz/master
Fixed typo: way -> ways
2015-10-06 09:50:34 -04:00
Abdullah Almsaeed
8340a48561 Merge pull request #719 from iamgoodbytes/fix-fastclick
Fixes #688
2015-10-06 09:50:02 -04:00
Joris Hens
94d164d7e4 Fixes #688
Loading the minified version of fastclick doesn't work. My guess is that the FastClick object gets renamed in the minification process, making the check for "typeOf FastClick" useless and causing FastClick to never execute. Loading the unminified version of fastclick removes the 300ms click delay across the board.
2015-10-05 20:52:17 +02:00
Alexandr
f2b7e0eecc Update app.js
Fix bug with treeview menu when sidebar is collapsed and you clicked to menu which already visible.
2015-10-04 20:04:58 +03:00
novashultz
58cc994008 Fix spelling 2015-10-01 17:20:47 -04:00
iae SAUDI
26d33dffe4 Update README.md 2015-09-30 09:42:01 +03:00
Abdullah Almsaeed
4cd707a49e Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-09-29 07:34:35 -04:00
Abdullah Almsaeed
5e66dfdcae Merge pull request #702 from iaesaudi/master
Implementing Pace to AdminLTE
2015-09-27 11:18:15 -04:00
Abdullah Almsaeed
9157e62294 Merge pull request #706 from dev-ggallon/feature/bootstrap_less
Update Bootstrap less files to 3.3.5
2015-09-27 11:16:59 -04:00
Abdullah Almsaeed
8a7a7ae527 Add new map and implementation reference 2015-09-26 16:22:57 -04:00
Gwenael Gallon
7032389411 Build CSS with Bootstrap less files 3.3.5 2015-09-24 08:57:37 +02:00
Abdullah Almsaeed
9505f59ac6 Merge pull request #699 from lukechilds/master
Attach push menu event listener to document
2015-09-23 20:37:38 -04:00
Gwenael Gallon
226ba4f4ed Update Bootstrap less files to 3.3.5 2015-09-23 08:43:22 +02:00
Yasser Lotfy
9c0d5d8c03 - Update to Pace v1.0.2 so there is no errors appears on Safari browsers.
- Modified one of the original styles to be matched with AdminLTE and Works good on both Desktop and Mobile versions.
- Minified .js and .css files
- Created new pace page for Pace preview
- Added Pace page to navigation to the whole theme files
2015-09-22 12:42:36 +03:00
Luke Childs
6e19e37251 Build minified JS 2015-09-21 17:36:24 +01:00
Luke Childs
fe3af68654 Attach push menu event listener to document 2015-09-21 17:36:09 +01:00
Abdullah Almsaeed
ef8624bff7 Merge pull request #697 from simivar/master
methods to toggle/remove boxes
2015-09-21 11:42:13 -04:00
simivar
f6593b34d2 methods to toggle/remove boxes 2015-09-21 14:41:29 +02:00
Abdullah Almsaeed
0dad027265 Update version 2015-09-19 14:29:39 -04:00
Abdullah Almsaeed
0748343f22 Update version 2015-09-19 14:28:07 -04:00
Abdullah Almsaeed
86712ae424 Fix issue #676 2015-09-19 14:18:38 -04:00
Abdullah Almsaeed
aa26f6eb7a Reformat 2015-09-19 14:18:18 -04:00
Abdullah Almsaeed
435dcfba80 Reformat 2015-09-19 14:18:04 -04:00
Abdullah Almsaeed
9bd1f6aa28 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-09-19 14:06:27 -04:00
Abdullah Almsaeed
ee1782c007 Reformat code 2015-09-19 14:05:54 -04:00
Abdullah Almsaeed
6cd614c582 Merge pull request #681 from yrchen/Fix-Plugin-dataTables
Fix wrong path for static images
2015-09-15 17:58:19 -04:00
Xaver Y.R. Chen
31725e0868 Fix wrong path for static images 2015-09-13 01:00:42 +08:00
Abdullah Almsaeed
2f72188c28 Merge master 2015-09-07 13:29:42 -04:00
Abdullah Almsaeed
9e93fa988e Correct sidebar link 2015-09-07 13:29:07 -04:00
Abdullah Almsaeed
080e4da6e8 Add instructions link to modals 2015-09-06 17:20:42 -04:00
Abdullah Almsaeed
dc84e46552 Merge pull request #663 from Dennis14e/patch_format
Formatting
2015-09-02 12:17:34 -04:00
Dennis Neufeld
8c2b2a41a1 Run grunt 2015-08-28 23:12:45 +02:00
Dennis Neufeld
91f47a8b7a Formatting 2015-08-28 15:55:13 +02:00
Abdullah Almsaeed
2dcddd175d Merge pull request #657 from freezy-sk/652-disable-W005
Skip W005 check
2015-08-24 18:35:44 -04:00
freezy
1ca659788b Skip W005 check until it will be possible to ignore it only in file pages/examples/invoice-print.html 2015-08-25 00:15:45 +02:00
Abdullah Almsaeed
685ba27900 Fix input group size 2015-08-24 18:08:24 -04:00
Abdullah Almsaeed
996444f55b Fix bootlint W008 2015-08-24 18:05:38 -04:00
Abdullah Almsaeed
b747fdf973 Fix bootlint E009 2015-08-24 18:00:33 -04:00
Abdullah Almsaeed
396b319c7e Fix bootlint E014 2015-08-24 17:52:49 -04:00
Abdullah Almsaeed
9fa335f363 Fix bootlint W007 warnings 2015-08-24 17:39:52 -04:00
Abdullah Almsaeed
283355e533 Remove unwated JS script 2015-08-24 17:36:51 -04:00
Abdullah Almsaeed
56aabaa0b1 Merge from remote source 2015-08-24 17:33:12 -04:00
Abdullah Almsaeed
86387efc8f Merge pull request #656 from freezy-sk/652-fix-E029
Fixed Bootlint error E029
2015-08-24 17:32:06 -04:00
Abdullah Almsaeed
18691817cf Merge pull request #655 from freezy-sk/652-fix-E033
Fixed Bootlint error E033
2015-08-24 17:29:04 -04:00
Abdullah Almsaeed
0b9e3c822c Merge pull request #653 from freezy-sk/652-fix-W007
Fixed Bootlint warning W007
2015-08-24 17:27:00 -04:00
freezy
ec43144a62 Fixed Bootlint error E029 2015-08-24 23:15:13 +02:00
freezy
be2ca6a21e Fixed Bootlint error E033 2015-08-24 23:10:49 +02:00
freezy
8c7fc61559 Fixed Bootlint warning W007 2015-08-24 22:54:49 +02:00
Abdullah Almsaeed
cba5477a46 Reduce text-elipsis rules 2015-08-24 12:45:35 -04:00
Abdullah Almsaeed
dcc45e5915 Update bootlint to include all relevant html files 2015-08-24 12:38:40 -04:00
Abdullah Almsaeed
72847dc136 Merge pull request #648 from freezy-sk/638-bootlint
Added Bootstrap linter
2015-08-24 10:54:46 -04:00
freezy
f68e1edb0e Added bootlint for pages 2015-08-22 19:22:37 +02:00
Abdullah Almsaeed
feac61b20c Compile navs.less 2015-08-21 11:31:20 -04:00
Abdullah Almsaeed
fc9554f866 Merge pull request #640 from devmark/patch-1
navs add different color
2015-08-21 11:29:38 -04:00
Abdullah Almsaeed
5d9e59efce Merge pull request #637 from Dennis14e/patch_format
Formatting and stuff
2015-08-21 11:28:50 -04:00
Mark
f7dc1429e2 navs add different color
https://github.com/almasaeed2010/AdminLTE/issues/429
2015-08-19 15:34:37 +08:00
Dennis Neufeld
3c05a7858f Fix Photo URL 2015-08-17 07:42:55 +02:00
Dennis Neufeld
81e784af15 Formatting and stuff 2015-08-17 07:39:25 +02:00
Abdullah Almsaeed
81aa879d3a Updated .gitignore 2015-08-16 21:49:41 -04:00
Abdullah Almsaeed
d3a547c5d3 Updated version 2015-08-16 20:50:48 -04:00
Abdullah Almsaeed
02cd4e32ee Updated changelog 2015-08-16 20:48:55 -04:00
Abdullah Almsaeed
8ab58de601 Updated changelog 2015-08-16 20:28:46 -04:00
Abdullah Almsaeed
ae37d79c1d Updated changelog 2015-08-16 20:26:00 -04:00
Abdullah Almsaeed
f25c90f598 Fixed csslint error 2015-08-16 20:25:45 -04:00
Abdullah Almsaeed
dde604023b Fix issue #430 2015-08-16 16:31:59 -04:00
Abdullah Almsaeed
6ab5a66fa2 Fix issue #578 2015-08-16 16:21:46 -04:00
Abdullah Almsaeed
a335278aa1 Fix issue #579 2015-08-16 16:19:20 -04:00
Abdullah Almsaeed
31af666ccc Merge pull request #635 from Dennis14e/patch_head
head-changes
2015-08-16 16:11:54 -04:00
Abdullah Almsaeed
393bb3ca1f Merge pull request #632 from Dennis14e/patch_glyphicons
Updated Glyphicons page
2015-08-16 16:10:21 -04:00
Abdullah Almsaeed
746ecd5cd3 Format 2015-08-16 16:09:31 -04:00
Abdullah Almsaeed
3faad543cb Update version 2015-08-16 16:06:46 -04:00
Abdullah Almsaeed
36f31d1448 Fixed typo attachemnt to attachment 2015-08-16 16:06:20 -04:00
Abdullah Almsaeed
738252af74 Merge feature/profile 2015-08-16 15:58:11 -04:00
Abdullah Almsaeed
67fd530662 Resized images 2015-08-16 15:55:36 -04:00
Abdullah Almsaeed
1555830bc6 Add activity tab to profile 2015-08-16 15:51:13 -04:00
Abdullah Almsaeed
ac99249af7 Add new profile page link to sidebar 2015-08-16 13:21:18 -04:00
Abdullah Almsaeed
2f390152bc Created and updated the profile page 2015-08-15 21:47:49 -04:00
Dennis Neufeld
71657fc0bc Some asset changes 2015-08-13 18:03:46 +02:00
Dennis Neufeld
c38df88d5a Updated page titles 2015-08-13 17:55:46 +02:00
Dennis Neufeld
a1c8225c2e Add meta X-UA-Compatible 2015-08-13 17:50:04 +02:00
Dennis Neufeld
1ba31abdc6 Lowercase charset ("UTF-8" to "utf-8") 2015-08-13 17:41:23 +02:00
Dennis Neufeld
418f73e2a8 Updated Glyphicons page 2015-08-13 08:27:09 +02:00
Abdullah Almsaeed
e13db59eb3 Updated version 2015-08-12 18:53:37 -04:00
Abdullah Almsaeed
7df333d8b6 Merge social widgets feature 2015-08-12 18:39:36 -04:00
Abdullah Almsaeed
e7653c8655 Add box-comment feature 2015-08-12 18:35:20 -04:00
Abdullah Almsaeed
af4deafa7c Add social widgets 2015-08-12 15:30:28 -04:00
Abdullah Almsaeed
a0a4a3207a Merge pull request #627 from Dennis14e/patch_version
Update files to v2.2.1
2015-08-12 14:55:42 -04:00
Abdullah Almsaeed
27d94de81a Merge pull request #628 from Dennis14e/patch_bootstrapversion
Updated Bootstrap version comment to v3.3.5
2015-08-12 14:54:49 -04:00
Dennis Neufeld
4e6e19a9f7 Updated Bootstrap version comment to v3.3.5 2015-08-12 07:50:02 +02:00
Dennis Neufeld
648d682618 Update files to v2.2.1 2015-08-12 07:40:05 +02:00
Abdullah Almsaeed
361db6d391 Updated local version 2015-08-11 10:24:45 -04:00
Abdullah Almsaeed
f525567feb Updated version info 2015-08-11 10:24:17 -04:00
Abdullah Almsaeed
70cda3605b Merge pull request #626 from Dennis14e/patch_html5shiv
Update html5shiv v3.7.3
2015-08-11 10:19:56 -04:00
Dennis Neufeld
7860607b5b Update html5shiv v3.7.3 2015-08-10 20:07:11 +02:00
Abdullah Almsaeed
5e57d8f4c1 Updated Boostrap to 3.3.5 2015-08-08 13:29:58 -04:00
Abdullah Almsaeed
dfc6a3d7ac updated changelog 2015-08-08 13:29:46 -04:00
Abdullah Almsaeed
7964338817 Merge pull request #608 from emnsen/patch-1
remove multiple selection height property
2015-08-08 13:17:44 -04:00
Abdullah Almsaeed
de59b4c4c9 Merge pull request #624 from Dennis14e/patch_fontawesome
Updated Font Awesome v4.4.0
2015-08-08 13:16:23 -04:00
Dennis Neufeld
87534fa1f0 Updated Font Awesome v4.4.0 2015-08-08 11:58:28 +02:00
Abdullah Almsaeed
2f8cd4f324 Merge pull request #620 from Dennis14e/master
Formatting files, HTML5
2015-08-07 18:02:07 -04:00
Abdullah Almsaeed
0eb8c98efd Merge pull request #611 from sahilm/add-missing-license-field
Fix #610 Missing license field
2015-08-07 18:02:00 -04:00
Dennis Neufeld
48dc576492 Fix HTML Comments (Documentation), run grunt 2015-08-05 19:50:45 +02:00
Dennis Neufeld
bdc89f14fe Edit README.md 2015-08-04 23:56:56 +02:00
Dennis Neufeld
0fce8ad2db HTML5 Pages - UI 2015-08-04 20:08:42 +02:00
Dennis Neufeld
ade5e66851 HTML5 Pages - Tables 2015-08-04 19:43:19 +02:00
Dennis Neufeld
5cb4f2840b HTML5 Pages - Mailbox 2015-08-04 19:39:07 +02:00
Dennis Neufeld
ccebf2492a HTML5 Pages - Layout 2015-08-04 19:30:38 +02:00
Dennis Neufeld
560b79e884 HTML5 Pages - Forms 2015-08-04 19:25:06 +02:00
Dennis Neufeld
d311cc0ab2 HTML5 Pages - Examples 2015-08-04 19:16:41 +02:00
Dennis Neufeld
502b6e6b2d HTML5 Pages - Charts 2015-08-04 18:59:18 +02:00
Dennis Neufeld
63230ebf57 HTML5 Pages 2015-08-04 18:48:08 +02:00
Dennis Neufeld
d20b62ca81 HTML5 Documentation 2015-08-04 18:33:36 +02:00
Dennis Neufeld
9837243bc9 Formatting files (newline, trailing spaces, ...) 2015-08-04 18:21:03 +02:00
Dennis Neufeld
a981cb8e54 Formatting Documentation Build files 2015-08-04 18:19:39 +02:00
Sahil Muthoo
1d34316754 Fix #610 Missing license field 2015-07-30 17:23:37 +05:30
Emin Şen
a7158e5ab8 remove multiple selection height property 2015-07-30 13:15:32 +03:00
Abdullah Almsaeed
30e6e1f034 Conform to CSSLINT rules 2015-07-25 15:52:28 -04:00
Abdullah Almsaeed
2827e4d2fb Added CSSLINT 2015-07-25 15:51:57 -04:00
Abdullah Almsaeed
0943d33ff3 compressed images 2015-07-25 15:06:31 -04:00
Abdullah Almsaeed
37a065bb99 conform to jshint rules 2015-07-25 15:06:16 -04:00
Abdullah Almsaeed
b1a94d780f Added rules for jshint 2015-07-25 15:05:44 -04:00
Abdullah Almsaeed
b8b38a29fa added grunt plugins 2015-07-25 15:05:25 -04:00
Abdullah Almsaeed
13aa44fe14 Added jshint, clean and image plugins to lint JS files, remove build images and compress images respectively 2015-07-25 15:05:02 -04:00
Abdullah Almsaeed
12996b0242 Compressed images 2015-07-25 15:03:18 -04:00
Abdullah Almsaeed
6676c7d068 formatted core.less 2015-07-24 19:39:42 -04:00
Abdullah Almsaeed
2296534d36 Fixed issue with active nav-stacked background 2015-07-24 19:36:51 -04:00
Abdullah Almsaeed
6bf4e63c44 Fixed issue with user menu on small screens 2015-07-24 19:33:52 -04:00
Abdullah Almsaeed
efd38d62be Updated changelog 2015-07-24 19:27:21 -04:00
Abdullah Almsaeed
a081021a9d Updated changelog 2015-07-24 19:26:57 -04:00
Abdullah Almsaeed
0bd8306502 Update boxwidget and tree to activate ajax loaded elements 2015-07-24 19:26:15 -04:00
Abdullah Almsaeed
8f1173b340 Fixed issue #590 2015-07-23 14:58:16 -04:00
Abdullah Almsaeed
b6148c802e Merge pull request #575 from irfanevrens/patch-1
improvements on some html comments.
2015-07-23 14:57:37 -04:00
Abdullah Almsaeed
10ca2ed070 Fixed issue #584 2015-07-20 23:26:06 -04:00
Abdullah Almsaeed
7760b0d516 Bootstrap social plugin changed google-plus button to google 2015-07-20 23:03:49 -04:00
Abdullah Almsaeed
ef2c51694d Fixed ajax loaded BoxWidget #593 2015-07-20 23:02:35 -04:00
Abdullah Almsaeed
a8406b4102 Removed unnecessary \!important 2015-07-20 22:36:04 -04:00
Abdullah Almsaeed
7c93106626 Updated select2 implementation to be responsive 2015-07-20 18:17:52 -04:00
Abdullah Almsaeed
2ceb6e19b8 Updates 2015-07-20 18:08:01 -04:00
Abdullah Almsaeed
d75e3e18c9 ChartJS requires css height in newer version 2015-07-20 18:07:07 -04:00
Abdullah Almsaeed
c848c6737f Merge pull request #581 from Dennis14e/master
Formatting files
2015-07-19 14:00:26 -04:00
Dennis Neufeld
8cecbcf2ca Format some files 2015-07-12 15:46:20 +02:00
Dennis Neufeld
63ad645910 Add newline of dist/*.min.css files 2015-07-12 15:44:02 +02:00
Dennis Neufeld
5befe56edc Format dist/*.js files 2015-07-12 15:42:55 +02:00
Dennis Neufeld
3f81b24501 Format less files 2015-07-12 15:42:26 +02:00
Dennis Neufeld
9fae8c8a00 Fix typo in pages/layout/top-nav.html 2015-07-12 15:36:36 +02:00
İrfan Evrens
6e5a7e47bf improvements on some html comments. 2015-07-12 05:36:12 +03:00
Abdullah Almsaeed
4bebda892a Updated docs 2015-07-08 18:00:28 -04:00
Abdullah Almsaeed
a6c2500da3 Updated version in footer 2015-07-08 17:18:12 -04:00
Abdullah Almsaeed
0bc1c2d7ae Updated changelog 2015-07-08 17:16:29 -04:00
Abdullah Almsaeed
824a8f3264 Updated changelog 2015-07-08 17:12:41 -04:00
Abdullah Almsaeed
145fbe8a1b Merge pull request #560 from 01-Scripts/patch-2
Fix typo in forms/general.php
2015-07-08 17:04:47 -04:00
Abdullah Almsaeed
3d9087a5cf Merge pull request #552 from masteradhoc/patch-2
Update ChartJS to 1.0.2
2015-07-08 16:59:05 -04:00
Abdullah Almsaeed
477c0ec8af Merge pull request #553 from masteradhoc/patch-1
Update ChartJS to 1.0.2
2015-07-08 16:58:53 -04:00
Michael
ead60ced86 Fix typo in forms/general.php 2015-07-05 14:32:19 +02:00
Brian
24722d195e Update ChartJS to 1.0.2
Update ChartJS to 1.0.2
2015-07-02 09:25:41 +02:00
Brian
229ac9a996 Update ChartJS to 1.0.2
Update ChartJS to 1.0.2
2015-07-02 09:25:20 +02:00
Abdullah Almsaeed
1e21624ddd Merge pull request #543 from danielsum/patch-1
Update Bootstrap-social.less
2015-07-02 00:35:05 -04:00
Abdullah Almsaeed
d74cec4227 Merge pull request #540 from fschaeffer/patch-3
enable font awesome in form controls
2015-07-02 00:32:56 -04:00
Abdullah Almsaeed
175d349e64 Merge pull request #533 from Dennis14e/master
More Formatting Pages
2015-07-02 00:30:05 -04:00
Daniel Sum
4e9daad75e Update Bootstrap Less
Hi Abdullah, 

I've seen that bootstrap-social.less is not up to date as Pinterest for instance was not in the list... May I suggest to use the import from bower package to keep up to date this little stylesheet or use a little script to update this vendor package : 

````bash
#!/usr/bin/env bash

curl -o build/less/bootstrap-social.less https://raw.githubusercontent.com/lipis/bootstrap-social/gh-pages/bootstrap-social.less
````

PS: I've just discovered your package and make a little donation, great work !
2015-06-27 17:23:31 +02:00
Florian Schaeffer
17fbe16151 enable font awesome in form controls
the form controls are preconfigured to use glyhicons but lack the support for FA icons
2015-06-25 07:17:51 +02:00
Abdullah Almsaeed
e5771daaf5 Added posibility to add image to info-box instead of icon #522 2015-06-23 16:18:07 +03:00
Dennis Neufeld
7ddea34311 Formatting Pages 2/2 2015-06-22 19:54:28 +02:00
Dennis Neufeld
6220d2c4fd Formatting Pages 1/2 2015-06-22 19:29:03 +02:00
Abdullah Almsaeed
c7c3381856 Updated local clone 2015-06-22 17:11:18 +03:00
Abdullah Almsaeed
4b1e5f1e42 Merge pull request #524 from fschaeffer/patch-1
Allow collapsible form in box
2015-06-22 16:47:03 +03:00
Abdullah Almsaeed
eb8012df48 Fixed issue #531 2015-06-22 16:39:50 +03:00
Abdullah Almsaeed
1411dda538 Merge pull request #527 from Dennis14e/master
Formatting Pages
2015-06-21 03:40:46 +03:00
Dennis Neufeld
7a2181964d Format pages - UI 2015-06-20 14:40:29 +02:00
Dennis Neufeld
6c795e84e9 Format pages - tables 2015-06-20 13:39:59 +02:00
Dennis Neufeld
23adb8661c Format pages - mailbox 2015-06-20 13:32:34 +02:00
Dennis Neufeld
57d18a266a Format pages - layout 2015-06-20 13:21:20 +02:00
Dennis Neufeld
65d99c7b6c Format pages - forms 2015-06-20 13:11:32 +02:00
Dennis Neufeld
4ce12b818c Format pages - examples 2015-06-20 12:59:38 +02:00
Dennis Neufeld
14cb228dcb Format pages - charts 2015-06-20 12:39:14 +02:00
Dennis Neufeld
68e1d9d7d5 Format pages 2015-06-20 12:38:52 +02:00
Dennis Neufeld
2c0e0af494 Format index pages 2015-06-20 12:22:30 +02:00
Abdullah Almsaeed
ab07ef8c92 Merge pull request #510 from 01-Scripts/patch-1
Wrong color code provided for orange class.
2015-06-19 15:44:27 +03:00
Abdullah Almsaeed
3c031bccde Merge pull request #509 from YasserHassan/patch-1
Trigger expand/collapse events for right sidebar
2015-06-19 15:44:08 +03:00
Florian Schaeffer
3e48dba688 Allow collapsible form in box
See issue #523
2015-06-19 12:29:00 +02:00
Abdullah Almsaeed
8feef037b7 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-06-17 14:40:15 +03:00
Abdullah Almsaeed
f19c8f619e Fix sidebar-mini with Safari issue #410 2015-06-17 14:39:11 +03:00
Abdullah Almsaeed
6b234f1186 Updated change log and removed rtl.html 2015-06-17 14:31:49 +03:00
Michael
a16d1478eb Wrong color code provided for orange class. 2015-06-15 19:50:35 +02:00
Yasser Hassan
3058ba125c Trigger expand/collapse events for right sidebar
This commit will trigger the events `expanded.pushMenu` and `collapsed.pushMenu` on expanding and collapsing the right sidebar respectively as mentioned in #444.
2015-06-14 15:00:29 +02:00
Abdullah Almsaeed
bf2f7223aa Merge pull request #497 from angelitomg/master
Duplicated iCheck call removed
2015-06-14 01:51:03 +03:00
Abdullah Almsaeed
ad68d5e466 Added support for Select2 2015-06-13 02:36:04 +03:00
Abdullah Almsaeed
13f00afa61 Updated support email on bower.json 2015-06-11 11:39:24 +03:00
Abdullah Almsaeed
b7c4e32abe Merge pull request #503 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-06-11 11:38:13 +03:00
Kevin Kirsche
c2c97171dd Remove moot version property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-10 19:05:17 -04:00
Abdullah Almsaeed
406de4e708 pull from master 2015-06-09 01:41:48 +03:00
Abdullah Almsaeed
586db744f7 Milestone 2.1.2 2015-06-09 01:41:18 +03:00
Angelito M. Goulart
14600d7016 Duplicated iCheck call removed 2015-06-08 11:43:45 -03:00
Abdullah Almsaeed
e8553fd402 Merge pull request #491 from ivantcholakov/master
Datatables, examples, switching to the new 1.10 API.
2015-06-08 01:26:10 +03:00
Ivan Tcholakov
1e096c9eec Datatables, examples, switching to the new 1.10 API. 2015-06-07 05:10:41 +03:00
Abdullah Almsaeed
8ae58fe1f6 Merge pull request #483 from masteradhoc/masteradhoc-patch-typo
Patch - Typo waring -> warning
2015-06-02 17:05:14 +03:00
Abdullah Almsaeed
a676363cf6 Merge pull request #481 from Green-Cat/patch-1
Fixes typo. Symphony -> Symfony
2015-06-02 16:50:24 +03:00
Brian
381d380797 Fixed typo (waring -> warning)
This fixes a typo in multiple files.
See #482

This shouldn affect the website, cause the typo got fixed in .css and
.html files.
2015-06-02 14:10:26 +02:00
Green Cat
a5cb88e44f Same fix in the build folder 2015-06-01 18:03:14 +01:00
Green Cat
6f02bcd6c5 Fixes typo. Symphony -> Symfony 2015-06-01 17:59:32 +01:00
Abdullah Almsaeed
13ec90f533 Fix typo in core.less 2015-06-01 13:18:35 +03:00
Abdullah Almsaeed
fd58f76090 Merge pull request #476 from masteradhoc/patch-1
Typo in AdminLTE.css
2015-06-01 13:16:41 +03:00
Abdullah Almsaeed
b8b837ad4d Merge pull request #475 from masteradhoc/masteradhoc-patch-1
Added comment to viewport meta
2015-06-01 13:06:49 +03:00
Brian
aa1e07b564 Update AdminLTE.css
Typo
2015-06-01 10:31:02 +02:00
Brian
75919217fd Update buttons.html
Commented metatag
2015-06-01 09:29:32 +02:00
Brian
a9d1889cc8 Update general.html
Commented metatag
2015-06-01 09:29:29 +02:00
Brian
a94a21dc52 Update icons.html
Commented metatag
2015-06-01 09:29:26 +02:00
Brian
e37ea9d383 Update modals.html
Commented metatag
2015-06-01 09:29:24 +02:00
Brian
1ea7dea2ec Update sliders.html
Commented metatag
2015-06-01 09:29:20 +02:00
Brian
0cdbdca0cb Update timeline.html
Commented metatag
2015-06-01 09:29:17 +02:00
Brian
9023977238 Update inline.html
Commented metatag
2015-06-01 09:28:37 +02:00
Brian
35912a5a6d Update morris.html
Commented metatag
2015-06-01 09:28:31 +02:00
Brian
1bfa07d562 Update flot.html
Commented metatag
2015-06-01 09:28:17 +02:00
Brian
c1298a0eab Update chartjs.html
Commented metatag
2015-06-01 09:28:04 +02:00
Brian
b98e09f88a Update register.html
Commented metatag
2015-06-01 09:27:47 +02:00
Brian
2860bc0fdb Update login.html
Commented metatag
2015-06-01 09:27:38 +02:00
Brian
e9ff619013 Update lockscreen.html
Commented metatag
2015-06-01 09:27:29 +02:00
Brian
4c8d3b929a Update invoice.html
Commented metatag
2015-06-01 09:27:18 +02:00
Brian
88d8a6fd9b Update invoice-print.html
Commented metatag
2015-06-01 09:27:07 +02:00
Brian
615c1707be Update blank.html
Commented metatag
2015-06-01 09:26:57 +02:00
Brian
d87ac0306b Update 500.html
Commented metatag
2015-06-01 09:26:44 +02:00
Brian
f501a96712 Update 404.html
Commented metatag
2015-06-01 09:26:33 +02:00
Brian
f520388da9 Update advanced.html
Commented metatag
2015-06-01 09:26:04 +02:00
Brian
05ace29173 Update editors.html
Commented metatag
2015-06-01 09:26:01 +02:00
Brian
cb091b7094 Update general.html
Commented metatag
2015-06-01 09:25:55 +02:00
Brian
32c6fc147d Update top-nav.html
Commented metatag
2015-06-01 09:25:23 +02:00
Brian
0561cecd77 Update rtl.html
Commented metatag
2015-06-01 09:25:15 +02:00
Brian
73c403b796 Update fixed.html
Commented metatag
2015-06-01 09:25:08 +02:00
Brian
1cc2f8be47 Update collapsed-sidebar.html
Commented metatag
2015-06-01 09:25:02 +02:00
Brian
110da40511 Update boxed.html
Commented metatag
2015-06-01 09:24:55 +02:00
Brian
3fee45b583 Update compose.html
Commented metatag
2015-06-01 09:24:32 +02:00
Brian
8c4cfbf887 Update mailbox.html
Commented metatag
2015-06-01 09:24:22 +02:00
Brian
8dc6a9d021 Update read-mail.html
Commented metatag
2015-06-01 09:24:08 +02:00
Brian
7ee63f97bd Update data.html
Commented metatag
2015-06-01 09:23:46 +02:00
Brian
1a62467472 Update simple.html
Commented the metatag
2015-06-01 09:23:39 +02:00
Brian
00de9b4e8d Update widgets.html
Commented the metatag
2015-06-01 09:23:18 +02:00
Brian
1428e23c28 Update calendar.html
Commented the meta tag.
2015-06-01 09:23:08 +02:00
Brian
6015ecef25 Update buttons.html
Commented the meta tag.
2015-06-01 09:22:10 +02:00
Brian
75e2910a69 Update index.html
Commented the meta tag.
2015-06-01 09:20:32 +02:00
Brian
322c309bbd Update index2.html
Commented the meta tag.
2015-06-01 09:20:29 +02:00
Brian
becf3981b5 Update starter.html
Commented the meta tag.
2015-06-01 09:17:52 +02:00
Abdullah Almsaeed
c2730bf40b Merged master 2015-05-30 00:51:47 +03:00
Abdullah Almsaeed
094ac31d18 Merge pull request #458 from suvjunmd/wysihtml5
Updated Bootstrap-wysihtml5 to 0.3.3
2015-05-30 00:51:06 +03:00
Abdullah Almsaeed
bfb9370dad Fixed issue #414 2015-05-27 14:12:52 +03:00
Abdullah Almsaeed
cd058f0a92 Merge pull request #460 from suvjunmd/plugins
Updated plugins links in documentation
2015-05-27 14:08:08 +03:00
Abdullah Almsaeed
1bccec3bca Merge pull request #459 from suvjunmd/momentjs
Fixed Moment.js deprecation warning
2015-05-27 14:07:23 +03:00
Abdullah Almsaeed
a0b752343d Merge pull request #457 from suvjunmd/jqueryui
Updated jQuery UI to 1.11.4
2015-05-27 14:05:12 +03:00
Dmitri Suvorov
c9200169fb Updated plugins links in documentation 2015-05-24 18:04:00 +03:00
Dmitri Suvorov
f6c3fb88d1 Fixed Moment.js deprecation warning 2015-05-24 17:40:05 +03:00
Dmitri Suvorov
073701cd00 Updated Bootstrap-wysihtml5 to 0.3.3 2015-05-24 17:16:24 +03:00
Dmitri Suvorov
d0ac3e7922 Updated jQuery UI to 1.11.4 2015-05-24 16:40:57 +03:00
Abdullah Almsaeed
1252cf423c Updated jQuery UI 2015-05-23 14:07:08 +03:00
Abdullah Almsaeed
84ce31cabb Updated AdminLTE Options list in documentation 2015-05-23 13:42:51 +03:00
Abdullah Almsaeed
ec8fa4a9e4 Updated skin list style in documentation 2015-05-23 13:40:30 +03:00
Abdullah Almsaeed
0d5a039b5d Merge pull request #436 from freezy-sk/doc-skins
Updated list of skins with skin switch and removed whitespace from end of lines
2015-05-23 13:12:49 +03:00
Abdullah Almsaeed
68ff51a0c4 resolved conflict with master 2015-05-23 13:11:51 +03:00
Abdullah Almsaeed
fa75a8d3b0 Updating from master 2015-05-23 13:10:39 +03:00
Abdullah Almsaeed
aa6552502d Added animation speed option to app.js 2015-05-23 13:09:35 +03:00
Abdullah Almsaeed
6f09c02537 Merge pull request #450 from pbihler/boxActivate
Enable explicit box activation
2015-05-23 12:51:18 +03:00
Pascal Bihler
3eb31be585 Enable explicit box activation 2015-05-21 11:06:14 +02:00
freezy
1ca9859367 Skin switch functionality in layout's skin list 2015-05-17 12:07:03 +02:00
freezy
d3494a468e Updated list of skins and removed whitespace from end of lines in documentation build files 2015-05-17 11:48:37 +02:00
freezy
8adf3ef9e8 Updated list of skins and removed whitespace from end of lines 2015-05-17 04:03:01 +02:00
Abdullah Almsaeed
d08e0e0c69 Updated AdminLTE's version 2015-05-17 02:21:28 +03:00
Abdullah Almsaeed
81fabc38c8 Merge pull request #411 from suvjunmd/breadcrumbs
Fixed text inside breadcrumbs
2015-05-17 02:16:43 +03:00
Abdullah Almsaeed
375905f41b Merge pull request #407 from albertofem/patch-1
Typo
2015-05-17 02:16:11 +03:00
Abdullah Almsaeed
f45f1101b7 Fixed documentation typo #428 2015-05-17 01:53:28 +03:00
Abdullah Almsaeed
493ce24f47 Fixed issue #422 2015-05-17 01:46:29 +03:00
Abdullah Almsaeed
6d981a4315 Referenced Bootstrap LESS resources 2015-05-17 01:46:07 +03:00
Dmitri Suvorov
b219c57f9e Fixed text inside breadcrumbs 2015-05-09 18:40:19 +03:00
Alberto Fernández
3836ac6712 Typo 2015-05-09 13:07:26 +02:00
Abdullah Almsaeed
e55c2b85aa Fix issue #405 2015-05-09 00:02:45 -04:00
Abdullah Almsaeed
7948e11145 Invalid file name caused server to not load jQuery 2015-05-08 17:25:54 -04:00
Abdullah Almsaeed
077bacd847 Updated docs 2015-05-08 16:57:00 -04:00
Abdullah Almsaeed
2401235e98 Fixed issue #403 2015-05-08 16:39:34 -04:00
Abdullah Almsaeed
b203535862 Merge pull request #401 from suvjunmd/index2
Removed redundant link and script elements
2015-05-07 19:37:35 -04:00
Abdullah Almsaeed
d9cc6e3d37 Merge pull request #400 from suvjunmd/datatables
Updated DataTables to 1.10.7
2015-05-07 19:37:13 -04:00
Abdullah Almsaeed
72a190f384 Merge pull request #399 from suvjunmd/jquery
Updated jQuery to 2.1.4
2015-05-07 19:36:13 -04:00
Dmitri Suvorov
bc3b170782 Removed redundant link and script elements 2015-05-07 23:32:18 +03:00
Dmitri Suvorov
1ea3e97d1f Updated DataTables to 1.10.7 2015-05-07 22:44:30 +03:00
Dmitri Suvorov
02c04ca12d Updated jQuery to 2.1.4 2015-05-07 21:56:39 +03:00
Abdullah Almsaeed
2b8e2c3859 Updated documentation 2015-05-07 00:04:48 -04:00
Abdullah Almsaeed
d72176caa7 Fixed issue with extending $.AdminLTE.options 2015-05-06 23:59:51 -04:00
Abdullah Almsaeed
c0280e2819 Fixed a problem click propagation for the control sidebar toggle button 2015-05-06 22:53:47 -04:00
Abdullah Almsaeed
b80104171d Updated change log and versioning info 2015-05-06 20:16:11 -04:00
Abdullah Almsaeed
7bfbc542cc Removed extra css 2015-05-06 17:47:30 -04:00
Abdullah Almsaeed
c46d8723f7 Updated hover color for navs 2015-05-06 17:41:43 -04:00
Abdullah Almsaeed
66f6c40b47 added overlay feature as suggested in issue #355 2015-05-05 10:45:52 -04:00
Abdullah Almsaeed
95a5719287 Added implementations section to the documentation 2015-05-05 10:41:17 -04:00
Abdullah Almsaeed
654fcc0922 Added enhancement per suggestion in #383 2015-05-04 23:14:19 -04:00
Abdullah Almsaeed
2af6d6ee45 Added border to box 2015-05-04 23:10:29 -04:00
Abdullah Almsaeed
e35f602533 Removed trailing white space 2015-05-04 23:10:08 -04:00
Abdullah Almsaeed
e0577e6d01 Removed alert from the top of the page 2015-05-04 23:09:29 -04:00
Abdullah Almsaeed
416583c0e0 Removed depricated tabs bottom 2015-05-04 23:00:52 -04:00
Abdullah Almsaeed
f2c3bd47aa Fixed custom tabs issue #378 2015-05-04 22:56:42 -04:00
Abdullah Almsaeed
9adf789426 Fixed Safari & sidebar mini issue #370 2015-05-04 22:00:20 -04:00
Abdullah Almsaeed
d2bbd218f2 merged master 2015-05-04 21:52:34 -04:00
Abdullah Almsaeed
4780c4ad61 Fixed Safari control sidebar issue #377 2015-05-04 21:50:20 -04:00
Abdullah Almsaeed
c8ef738577 Merge pull request #391 from suvjunmd/breadcrumb
Fixed text inside breadcrumbs
2015-05-04 21:19:29 -04:00
Abdullah Almsaeed
6b2a9191e1 Merge pull request #389 from suvjunmd/typos
Fixed typos
2015-05-04 21:18:55 -04:00
Abdullah Almsaeed
c07774f947 Merge pull request #388 from suvjunmd/shiv
Updated links to the latest versions of HTML5 Shiv and Respond.js
2015-05-04 21:16:57 -04:00
Dmitri Suvorov
a89298e29c Fixed text inside breadcrumbs 2015-05-01 23:07:29 +03:00
Dmitri Suvorov
3e5e1008b5 Fixed typos 2015-05-01 22:46:17 +03:00
Dmitri Suvorov
bb7d6e72d5 Updated links to the latest versions of HTML5 Shiv and Respond.js 2015-05-01 21:44:04 +03:00
Abdullah Almsaeed
244134986b Merge pull request #387 from suvjunmd/email
Changed input type from text to email
2015-05-01 11:02:04 -04:00
Dmitri Suvorov
064de16cdd Changed input type from text to email 2015-05-01 17:41:15 +03:00
Abdullah Almsaeed
cf6a37dc80 Compiled #386 2015-04-30 20:18:36 -04:00
Abdullah Almsaeed
25f3628be8 #386 2015-04-30 20:18:05 -04:00
Abdullah Almsaeed
01c0071459 Updates 2015-04-30 20:17:35 -04:00
Abdullah Almsaeed
7fd2c0bf47 Merge pull request #386 from iaesaudi/patch-3
Fix Animation on Safari
2015-04-30 20:16:57 -04:00
iae SAUDI
89bc33ce4c Fix Animation on Safari
Fix Animation issue in the LESS file :)
2015-05-01 03:15:22 +03:00
Abdullah Almsaeed
c51c10f236 Merge pull request #367 from suvjunmd/icons
Updated Icons page to Font Awesome 4.3
2015-04-26 10:03:38 -04:00
Dmitri Suvorov
38dbc01055 Updated Icons page to Font Awesome 4.3 2015-04-25 22:07:35 +03:00
Abdullah Almsaeed
4b6b9ffef9 updated docs 2015-04-25 12:58:28 -04:00
Abdullah Almsaeed
2c1ef3d5d8 Updated docs 2015-04-25 12:58:13 -04:00
Abdullah Almsaeed
28ffb61ecc Merge pull request #366 from suvjunmd/typos
Fix typos
2015-04-25 12:47:05 -04:00
Dmitri Suvorov
35ea2489b5 Fix typos 2015-04-25 14:46:22 +03:00
Abdullah Almsaeed
e419815b34 Updated Bootstrap version in comments 2015-04-22 22:21:14 -04:00
Abdullah Almsaeed
bba4150caa Merge pull request #362 from suvjunmd/typos2
Fix typos
2015-04-22 22:20:41 -04:00
Abdullah Almsaeed
1277b22ebe Updated dataTables plugin and added extensions 2015-04-22 22:03:13 -04:00
Dmitri Suvorov
6d1efe98c7 Fix typos 2015-04-23 00:13:31 +03:00
Abdullah Almsaeed
c546ed7062 Merge pull request #360 from stefanmajoor/master
Fixed typo in bower.json
2015-04-22 13:37:48 -04:00
stefanmajoor
36df97fe10 Update bower.json 2015-04-22 16:08:14 +02:00
Abdullah Almsaeed
75d1407041 Implemented suggestion in issue #341 2015-04-20 21:50:36 -04:00
Abdullah Almsaeed
22926e6792 removed unwanted margining 2015-04-19 20:56:29 -04:00
Abdullah Almsaeed
c1caa414f4 Updated boxshadow 2015-04-19 20:49:35 -04:00
Abdullah Almsaeed
bc4c3fca69 Updated box shoadow for navbar dropdown menus 2015-04-19 20:48:07 -04:00
Abdullah Almsaeed
d6861e81be added close right sidebar on document click if the slide option is enabled 2015-04-19 19:15:49 -04:00
Abdullah Almsaeed
d4674d3a1d Updated app.js 2015-04-19 18:41:56 -04:00
Abdullah Almsaeed
654614067b Removed debug code 2015-04-19 18:00:21 -04:00
Abdullah Almsaeed
f23da45064 Updated mailbox iCheck plugin 2015-04-19 11:21:04 -04:00
Abdullah Almsaeed
0f46cb356b Added demo to blank page 2015-04-19 11:16:32 -04:00
Abdullah Almsaeed
4bc1bbe090 Updated docs 2015-04-19 11:16:01 -04:00
Abdullah Almsaeed
bd926b06ac Add collapse option for labels and folders in mailbox 2015-04-19 11:15:42 -04:00
Abdullah Almsaeed
d928b118df Added option to enable expand sidebar on hover for sidebar mini 2015-04-19 08:56:15 -04:00
Abdullah Almsaeed
84ef3ce4da Updated changelog 2015-04-19 08:22:12 -04:00
Abdullah Almsaeed
811d1f3dbe Fix for sidebar mini and fixed layout 2015-04-19 08:21:03 -04:00
Abdullah Almsaeed
4476517642 Fix for sidebar mini logo overflow 2015-04-17 13:50:49 -04:00
Abdullah Almsaeed
125734950b Revert Bower version to 2.0.5 - latest stable release 2015-04-16 11:46:53 -04:00
Abdullah Almsaeed
6757b695af Update Bower 2015-04-16 11:44:18 -04:00
Abdullah Almsaeed
b149ad3db2 Removed support of RTL 2015-04-15 19:37:07 -04:00
Abdullah Almsaeed
69235fee35 Updated Bootstrap.css 2015-04-15 19:28:31 -04:00
Abdullah Almsaeed
ac2b52005c RTL version in progress 2015-04-15 19:28:17 -04:00
Abdullah Almsaeed
ed56daaf97 Merge pull request #337 from gabel/bootstrap-3.3.4
Updated bootstrap to 3.3.4
2015-04-15 19:26:31 -04:00
Abdullah Almsaeed
fd7106ce5b Added bootstrap-rtl 2015-04-15 19:08:15 -04:00
Abdullah Almsaeed
bc4a25452e Fixed typos 2015-04-15 19:07:57 -04:00
Abdullah Almsaeed
777a93ddc4 Published 2015-04-15 19:07:24 -04:00
Abdullah Almsaeed
35e0d2e73d Ignore logs 2015-04-15 19:07:05 -04:00
Abdullah Almsaeed
94e52710d5 updated 2015-04-15 19:06:16 -04:00
Abdullah Almsaeed
8f6d175488 updated 2015-04-15 19:05:38 -04:00
Abdullah Almsaeed
6eb0cefc4f changed control sidebar icon 2015-04-15 19:05:23 -04:00
Abdullah Almsaeed
9a4adb7546 Updated daterangepicker plugin 2015-04-15 18:26:56 -04:00
Abdullah Almsaeed
9ac155ee5c Fixed issue #338 2015-04-15 18:08:35 -04:00
Abdullah Almsaeed
d5c8cb8ab2 Added ability to make item clickable as suggested in issue #323 2015-04-15 18:06:38 -04:00
Abdullah Almsaeed
436856b1c3 Removed unused mixins 2015-04-14 19:14:34 -04:00
Martin Fischer
64096856cc Updated bootstrap to 3.3.4 2015-04-14 08:11:30 +02:00
Abdullah Almsaeed
e0bd7ba438 Created light skin for control sidebar 2015-04-13 21:44:47 -04:00
Abdullah Almsaeed
a1f496be11 Added default dark skin to control sidebar 2015-04-13 21:43:45 -04:00
Abdullah Almsaeed
dc2b2fef49 Fixed issue #329 2015-04-09 21:06:47 -04:00
Abdullah Almsaeed
cd4c9aecba Fixed issue #325 2015-04-09 20:59:44 -04:00
Abdullah Almsaeed
ffe1d9ced5 Fixed issue #328 2015-04-09 19:43:40 -04:00
Abdullah Almsaeed
ba23ea0a11 Fixed right sidebar and boxed layout issues 2015-04-09 19:21:44 -04:00
Abdullah Almsaeed
0d48b12fc0 Fixed sidebar mini transition issue 2015-04-09 19:19:23 -04:00
Abdullah Almsaeed
340be0df61 Updates to v2.1 alpha 2015-04-09 18:52:51 -04:00
Abdullah Almsaeed
0fc9439050 Updated light skin logos 2015-04-07 21:06:05 -04:00
Abdullah Almsaeed
0e7def36bb Adjusted contacts pane position in direct chat 2015-04-07 21:05:43 -04:00
Abdullah Almsaeed
1ef5178a6c Adjusted box overlay zindex 2015-04-07 21:04:55 -04:00
Abdullah Almsaeed
ac534fd60c Added path variable to boxed layout bg img 2015-04-04 12:55:15 -04:00
Abdullah Almsaeed
a056fbf5b2 Merge pull request #320 from Elbandi/master
Allow configure image path for boxed-bg.jpg
2015-04-04 12:52:05 -04:00
Abdullah Almsaeed
5a97938d81 Update demo 2015-04-03 23:19:41 -04:00
Abdullah Almsaeed
34a1353630 Updated 2015-04-03 22:55:46 -04:00
Abdullah Almsaeed
85b64ef0e7 Updated top layout 2015-04-03 22:55:30 -04:00
Abdullah Almsaeed
467d442c22 Added new chartjs preview page 2015-04-03 21:33:33 -04:00
Abdullah Almsaeed
b71df6e81c Added control sidebar to all pages 2015-04-03 21:19:55 -04:00
Abdullah Almsaeed
802592aa4a compiled updates 2015-04-03 20:52:09 -04:00
Abdullah Almsaeed
95fe7c218e moved chart class to miscellaneous.less 2015-04-03 20:49:47 -04:00
Abdullah Almsaeed
7516fece64 Updated links to display sidebar mini properly 2015-04-03 20:48:20 -04:00
Abdullah Almsaeed
fb77d2171c Force control sidebar to slide over content on small screens 2015-04-03 12:44:22 -04:00
Abdullah Almsaeed
4db47e6ca4 updated changelog 2015-04-03 12:43:37 -04:00
Abdullah Almsaeed
46c31acf01 Added clearfix to box elements 2015-04-03 12:34:36 -04:00
Abdullah Almsaeed
bad990bd1a Updated demo menu 2015-04-03 12:20:14 -04:00
Abdullah Almsaeed
5a2dd478fb Fixed sidebar-mini image issue 2015-04-03 12:19:55 -04:00
Abdullah Almsaeed
75596d1189 updated version 2015-04-03 12:00:48 -04:00
Abdullah Almsaeed
c74cf61565 pulled changes 2015-04-03 11:59:42 -04:00
Abdullah Almsaeed
09463c8db2 updated text colors for labels menu in sidebar 2015-04-03 11:59:05 -04:00
Abdullah Almsaeed
e9276e43ac Added skins to css and updated js 2015-04-03 11:58:10 -04:00
Abdullah Almsaeed
a00ab59882 Updated control sidebar to get rid of the need for javascript to keep up with its height 2015-04-03 11:57:46 -04:00
Abdullah Almsaeed
9a122a39d6 Add skins auto compile 2015-04-03 11:56:51 -04:00
Abdullah Almsaeed
bbef7a40e9 Added light skin files 2015-04-03 11:56:11 -04:00
Andras Elso
0b5d6e55ed Allow configure image path for boxed-bg.jpg 2015-04-03 11:30:51 +02:00
Abdullah Almsaeed
5e888faa31 Updates to control sidebar 2015-03-28 20:39:26 -04:00
Abdullah Almsaeed
4dacac85ec Updated broken links 2015-03-28 17:33:02 -04:00
Abdullah Almsaeed
bfb25a6ee8 Updated control sidebar 2015-03-28 14:44:48 -04:00
Abdullah Almsaeed
7cc7d81ad9 Created light sidebar and added new skin mixins 2015-03-28 11:14:54 -04:00
Abdullah Almsaeed
2f7f43109d Updatd collapsed sidebar support 2015-03-27 19:30:02 -04:00
Abdullah Almsaeed
ca3f112980 Updated build 2015-03-27 19:29:28 -04:00
Abdullah Almsaeed
940ac58558 Updated docs 2015-03-27 19:29:03 -04:00
Abdullah Almsaeed
919fba82f6 Added logo support for sidebar-mini 2015-03-25 19:05:57 -04:00
Abdullah Almsaeed
c2158b1138 don't remember 2015-03-25 19:00:53 -04:00
Abdullah Almsaeed
d0664b2695 Added https to CDN link 2015-03-25 18:59:50 -04:00
Abdullah Almsaeed
9ffad71b0d Fixed h2 issue that caused inability to click links 2015-03-25 17:06:41 -04:00
Abdullah Almsaeed
993aff4e31 Prettified the charts and added chartjs 2015-03-23 10:13:35 -04:00
Abdullah Almsaeed
d373b16699 Removed unwanted height restriction on sidebar 2015-03-23 00:30:16 -04:00
Abdullah Almsaeed
1ad2394ff4 Added sidebar mini support to pages 2015-03-23 00:29:33 -04:00
Abdullah Almsaeed
e9b5020cc1 removed deprecated mailbox 2015-03-23 00:25:49 -04:00
Abdullah Almsaeed
046df357d9 Replaced placehold.it image with a local link 2015-03-22 22:53:08 -04:00
Abdullah Almsaeed
df02e559cb Updated ion icons http to https 2015-03-22 22:49:04 -04:00
Abdullah Almsaeed
cbd471a3b2 Update README.md 2015-03-22 22:27:58 -04:00
Abdullah Almsaeed
8365e0e4c8 Update README.md 2015-03-22 21:38:10 -04:00
Abdullah Almsaeed
63b7c3d50e Update README.md 2015-03-22 21:37:48 -04:00
Abdullah Almsaeed
4abde39635 Added span to sidebar links to be compatible with sidebar mini 2015-03-22 21:17:14 -04:00
Abdullah Almsaeed
b4cde82b74 Sidebar mini is here 2015-03-22 21:16:06 -04:00
Abdullah Almsaeed
a771ce89ea Removed weird margin 2015-03-22 21:06:13 -04:00
Abdullah Almsaeed
de6f3a91f9 Compiled css files 2015-03-22 21:03:19 -04:00
Abdullah Almsaeed
cb5ab444d5 Prepared skins to be compatible with sidebar mini 2015-03-22 21:01:46 -04:00
Abdullah Almsaeed
7c7cc5768a Added comments 2015-03-22 17:32:38 -04:00
Abdullah Almsaeed
2b2b706438 Added transition support to sidebar mini 2015-03-22 17:31:15 -04:00
Abdullah Almsaeed
776aa33cb8 Removed extra transition function 2015-03-22 17:28:38 -04:00
Abdullah Almsaeed
c8328e944c Typo fix 2015-03-22 09:25:28 -04:00
Abdullah Almsaeed
d83809c4e9 Update Ion Icons 2015-03-22 08:45:38 -04:00
Abdullah Almsaeed
ae4fcde836 Merge from master 2015-03-21 22:38:14 -04:00
Abdullah Almsaeed
ab57813844 Updated color pallete style 2015-03-21 22:37:23 -04:00
Abdullah Almsaeed
f0fe6d8eff Update README.md 2015-03-20 11:32:59 -04:00
Abdullah Almsaeed
c25a8710f4 Updated version number 2015-03-17 11:36:50 -04:00
Abdullah Almsaeed
c7d5dea45d Updated changelog 2015-03-17 11:34:36 -04:00
Abdullah Almsaeed
edd6de2e50 Updated files 2015-03-17 11:27:50 -04:00
Abdullah Almsaeed
09b425e63e Updated version info 2015-03-17 11:26:08 -04:00
Abdullah Almsaeed
3810f026ce Fixed issue #288 2015-03-17 11:23:28 -04:00
Abdullah Almsaeed
c6e7e8dd07 Merge pull request #279 from Fuhrmann/patch-1
Update Gruntfile.js
2015-03-14 01:06:34 -04:00
Abdullah Almsaeed
4f40077a5b Update README.md 2015-03-09 10:23:06 -04:00
Abdullah Almsaeed
3e3fedd4f5 Fix bower.json issue #227 2015-03-09 10:21:18 -04:00
Ricardo Fuhrmann
544fc08aab Update Gruntfile.js
minor typo
2015-03-06 19:37:57 -04:00
Abdullah Almsaeed
22c5b35043 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-03-05 23:03:45 -05:00
Abdullah Almsaeed
c285b41223 Merge pull request #278 from Acris/master
Update demo.js
2015-03-05 23:03:30 -05:00
Abdullah Almsaeed
b11c60a6f8 Updated docs 2015-03-05 22:47:23 -05:00
Acris
5051f21522 Update demo.js
update href='#' to href='javascript:void(0);'
2015-03-05 16:07:32 +08:00
Abdullah Almsaeed
5121f708f7 Update README.md 2015-03-04 11:12:30 -05:00
Abdullah Almsaeed
ebf6b8b937 Update package.json 2015-03-04 11:11:25 -05:00
Abdullah Almsaeed
aec621eb77 Update bower.json 2015-03-04 11:10:56 -05:00
Abdullah Almsaeed
66491416c8 Merge pull request #276 from albelop/patch-1
Change AdminLTE.js to app.js in bower.json
2015-03-04 11:10:20 -05:00
albelop
c6aedd60d3 Fixed .js filename. 2015-03-04 10:34:13 +01:00
Abdullah Almsaeed
b2baf6e74f Fixed typo 2015-03-04 00:01:02 -05:00
Abdullah Almsaeed
41dbb2f9c1 Fixed indentation issue with code examples 2015-03-04 00:00:28 -05:00
Abdullah Almsaeed
59e2ba0e17 Update README.md 2015-03-03 20:40:19 -05:00
Abdullah Almsaeed
0391457ff5 Removed execution permissions from all files 2015-03-03 20:36:58 -05:00
Abdullah Almsaeed
11d8befda2 Updated changelog 2015-03-03 20:06:47 -05:00
Abdullah Almsaeed
1b54f8946d Updated versions in JS and CSS files 2015-03-03 20:04:07 -05:00
Abdullah Almsaeed
9cf17863fa Updated change log 2015-03-03 20:03:17 -05:00
Abdullah Almsaeed
9197cb613f Fixed sidebar issue 2015-03-03 19:59:20 -05:00
Abdullah Almsaeed
9753353574 Updated docs 2015-03-03 19:58:14 -05:00
Abdullah Almsaeed
5c93ffc613 Updated documentation 2015-03-02 20:11:20 -05:00
Abdullah Almsaeed
cdb3d56c38 Updated version in css 2015-03-02 18:53:54 -05:00
Abdullah Almsaeed
7165c78c3c modified permissions 2015-03-02 18:41:47 -05:00
Abdullah Almsaeed
fdb97e3d5d Created separated print.less files 2015-03-02 18:41:16 -05:00
Abdullah Almsaeed
70e9032937 Dynamically build documentation using Grunt includes 2015-03-02 18:39:46 -05:00
Abdullah Almsaeed
8015fa3456 Updated sidebar markup 2015-03-01 19:21:05 -05:00
Abdullah Almsaeed
dbfcd57ecd Updated README.md 2015-03-01 19:19:53 -05:00
Abdullah Almsaeed
e8504a1245 Added bower.json 2015-03-01 12:48:16 -05:00
Abdullah Almsaeed
643976f10e Solved issue with hash links 2015-02-27 22:28:50 -05:00
Abdullah Almsaeed
ed51f8b0ef Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-02-27 22:06:26 -05:00
Abdullah Almsaeed
b81fd035f6 Updated widgets page to include AdminLTE2.0 components 2015-02-27 22:06:16 -05:00
Abdullah Almsaeed
c78bf1f4d5 Updated docs 2015-02-27 22:05:43 -05:00
Abdullah Almsaeed
1093482f1b Merge pull request #263 from ETNyx/calendar_fix_link
Calendar: add missing protocols for external libraries
2015-02-27 21:27:45 -05:00
Abdullah Almsaeed
d9aae29254 Fixed user menu bottom border radius inconsistency 2015-02-27 21:21:40 -05:00
Abdullah Almsaeed
bb63d927e7 Updated image credits 2015-02-27 21:20:59 -05:00
Abdullah Almsaeed
f882a5a054 Compiled CSS update 2015-02-27 21:14:40 -05:00
Abdullah Almsaeed
b200298e2c Made text in info boxes default to uppercase letters 2015-02-27 21:14:04 -05:00
Abdullah Almsaeed
c5aa9e00f5 Starter template. Stripped from anything not needed and commented well. 2015-02-27 21:13:18 -05:00
Abdullah Almsaeed
7b5711f4e4 Added support for direct chat contacts toggle button 2015-02-27 19:58:00 -05:00
Abdullah Almsaeed
26fc4f6a53 Corrected versioning issues 2015-02-27 19:57:17 -05:00
Silvestr Hašek
7534497535 Calendar: add missing protocols for external lib 2015-02-27 11:11:43 +01:00
Abdullah Almsaeed
1a0afe89b9 Fixed out of bounds checkbox issue 2015-02-26 21:03:58 -05:00
Abdullah Almsaeed
01cd01345a Update README.md 2015-02-26 20:27:46 -05:00
Abdullah Almsaeed
6e2661c367 Updated 2015-02-26 20:27:08 -05:00
Abdullah Almsaeed
970ba215ad Merge pull request #248 from alekstrust/master
make entire breadcrumb item clickable
2015-02-26 20:23:42 -05:00
Abdullah Almsaeed
e180f1f4d9 Merge pull request #260 from githubjeka/patch-1
Update documentation for .layout-boxed
2015-02-26 20:18:48 -05:00
Abdullah Almsaeed
c8a5c85dd4 Fixed issue #262 2015-02-26 20:12:42 -05:00
Evgeniy Tkachenko
e3c644bb21 Update documentation for .layout-boxed
https://github.com/almasaeed2010/AdminLTE/blob/master/dist/css/AdminLTE.css#L44
2015-02-26 09:04:31 +03:00
Abdullah Almsaeed
52777c1e2a Fixed comment typo 2015-02-25 13:40:23 -05:00
Abdullah Almsaeed
59fbae2aee Fixed margin issue with box loding state 2015-02-25 11:03:56 -05:00
Abdullah Almsaeed
57fb76966b Added arrow to select boxes 2015-02-25 10:13:11 -05:00
Abdullah Almsaeed
4a4457b5d3 Updated version numbers 2015-02-25 10:01:46 -05:00
Abdullah Almsaeed
99b5803008 Updated upgrade guide notes 2015-02-25 10:00:48 -05:00
Abdullah Almsaeed
d6e65c12d9 Updated version numbers 2015-02-25 10:00:21 -05:00
Abdullah Almsaeed
a2b8c69593 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-02-24 20:46:58 -05:00
Abdullah Almsaeed
ec6a274b1c Recompiled less files 2015-02-24 20:46:46 -05:00
Abdullah Almsaeed
b95e38d6b0 Updated version in AdminLTE.less 2015-02-24 20:46:19 -05:00
Abdullah Almsaeed
436006b2c1 Update README.md 2015-02-22 19:59:19 -05:00
Abdullah Almsaeed
d2f6b5bdb2 Update README.md 2015-02-22 19:55:00 -05:00
Abdullah Almsaeed
c5c2e7e4a1 Updated code highlighting 2015-02-22 14:15:19 -05:00
Abdullah Almsaeed
8a49ac4816 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-02-22 14:12:29 -05:00
Abdullah Almsaeed
da2d2c2adb Updated README.md 2015-02-22 14:12:01 -05:00
Abdullah Almsaeed
877bedc208 Updated changelog 2015-02-22 11:34:01 -05:00
Abdullah Almsaeed
3d77a6b859 Updated docs 2015-02-22 11:33:40 -05:00
Abdullah Almsaeed
653a929d06 Increased box shadow alpha value 2015-02-22 11:31:15 -05:00
Abdullah Almsaeed
3850d5a89a Removed demo.js 2015-02-22 11:29:34 -05:00
Javier Távara
1d9d946f88 make entire breadcrumb item clickable 2015-02-21 18:11:57 -05:00
Abdullah Almsaeed
2dbfbc2845 Merge pull request #247 from shaialon/master
Fix typo + clean spaces
2015-02-21 18:10:16 -05:00
Shai Alon
fca08b462a Fix typo 2015-02-22 00:10:29 +02:00
Abdullah Almsaeed
0223d7b34a Discard 2015-02-21 12:21:55 -05:00
Abdullah Almsaeed
ae6d7a4844 Updated info-box 2015-02-21 00:36:34 -05:00
Abdullah Almsaeed
207fe83431 Fixed link to knob.js 2015-02-21 00:35:54 -05:00
Abdullah Almsaeed
ffb2731764 Cleaned code 2015-02-20 16:46:03 -05:00
Abdullah Almsaeed
45c82f5a1a Updated jquery.knob.js 2015-02-20 16:45:48 -05:00
Abdullah Almsaeed
90e693f67b Updated jquery.knob.js 2015-02-20 16:45:30 -05:00
Abdullah Almsaeed
8e3453382d Updated skins 2015-02-20 14:05:43 -05:00
Abdullah Almsaeed
e1fd521e38 Fixed dropdown links in navbar on small screens issue 2015-02-20 13:53:11 -05:00
Abdullah Almsaeed
cab4b05331 Modified skin black 2015-02-19 19:24:27 -05:00
Abdullah Almsaeed
c9025c7143 Fixed dashboard v1 calendar style issue 2015-02-17 20:14:16 -05:00
Abdullah Almsaeed
000eaf8ea6 Resolved conflict between Bootstrap tooltips and jQueryUI 2015-02-17 20:08:04 -05:00
Abdullah Almsaeed
7d4d182a40 Updated docs 2015-02-17 19:12:54 -05:00
Abdullah Almsaeed
e22fbd6a15 Modified default label style 2015-02-16 21:06:55 -05:00
Abdullah Almsaeed
28664a1551 Removed trailing spaces 2015-02-16 16:22:03 -05:00
Abdullah Almsaeed
09aaa0ac2d Added deprecated mailbox notice 2015-02-16 16:21:08 -05:00
Abdullah Almsaeed
cf4b2ba96f Added documentation to box-tools 2015-02-16 16:20:44 -05:00
Abdullah Almsaeed
cd239fb930 Updated labels and collapsed box 2015-02-16 15:01:03 -05:00
Abdullah Almsaeed
2c215d004d Update 2015-02-16 15:00:27 -05:00
Abdullah Almsaeed
69f4bc9245 Updated 2015-02-16 14:08:14 -05:00
Abdullah Almsaeed
49abea0294 Updated AdminLTE version info 2015-02-16 13:59:53 -05:00
Abdullah Almsaeed
d99355d8bb Removed presentation image 2015-02-16 13:36:28 -05:00
Abdullah Almsaeed
f35ef596ec Updated keywords 2015-02-16 13:35:26 -05:00
Abdullah Almsaeed
f67bf85a40 Locally hosted jQuery & Bootstrap files 2015-02-16 13:33:56 -05:00
Abdullah Almsaeed
3996c72e66 Fixed issue with unselectable form items in dashboard v1 2015-02-16 12:57:01 -05:00
Abdullah Almsaeed
f84eb88bcf Fixed IE10 issue 2015-02-16 12:56:28 -05:00
Abdullah Almsaeed
174be54e9b Reorganized color palette 2015-02-16 00:44:30 -05:00
Abdullah Almsaeed
5f18b60e56 Updated color palette 2015-02-16 00:32:31 -05:00
Abdullah Almsaeed
279ad811ee Updated dropdown hover effects to be more readable 2015-02-15 21:57:42 -05:00
Abdullah Almsaeed
cf4ab6fa0d ; 2015-02-15 21:54:55 -05:00
Abdullah Almsaeed
afc7053354 Added -webkit- support for transform transitions 2015-02-15 21:48:14 -05:00
Abdullah Almsaeed
2370bd873e Modifed layout-top-nav to have a better look 2015-02-15 21:45:16 -05:00
Abdullah Almsaeed
ebc66a896e Updated calendar side widgets box style to solid 2015-02-15 21:33:44 -05:00
Abdullah Almsaeed
3efb12b93f Updated the style of Timeline to match the rest of the template 2015-02-15 21:30:35 -05:00
Abdullah Almsaeed
ba74d2f179 Added tooltips 2015-02-15 20:49:16 -05:00
Abdullah Almsaeed
451cef5ec9 New Announcement 2015-02-15 20:43:18 -05:00
Abdullah Almsaeed
745fd328bf Updated bootstrap js files 2015-02-15 20:41:17 -05:00
Abdullah Almsaeed
f388f54538 Added target _blank to print button 2015-02-15 19:47:14 -05:00
Abdullah Almsaeed
ac94f181a9 Added chartjs page 2015-02-15 19:46:50 -05:00
Abdullah Almsaeed
51822ddcb0 Modifed links and add check all button 2015-02-15 19:46:13 -05:00
Abdullah Almsaeed
78ac2fe031 Merge pull request #235 from homebysix/master
Fixed a few typos.
2015-02-14 17:08:57 -05:00
Abdullah Almsaeed
2dd4d573f4 Fixed mailbox link 2015-02-13 19:06:07 -05:00
Abdullah Almsaeed
09a8ac4573 Added new mailbox/inbox/read/compose 2015-02-13 19:04:03 -05:00
Abdullah Almsaeed
3c0552ab73 Removed unused selectors from prepare layout function 2015-02-10 20:13:05 -05:00
Abdullah Almsaeed
79e8c7395a fixed transition issues 2015-02-10 19:53:16 -05:00
Elliot Jordan
26381847ce Fixed a few typos. 2015-02-10 09:14:32 -08:00
Abdullah Almsaeed
acbb2f4020 Added fastclick.js to deal with touch screen click lag time 2015-02-07 16:34:25 -05:00
Abdullah Almsaeed
c8c02c68cf Updates Docs 2015-02-07 16:01:45 -05:00
Abdullah Almsaeed
79c250d7ba Modified tips 2015-02-07 12:54:22 -05:00
Abdullah Almsaeed
5fb6d42a2b Added tips to how to create a cretain layout in the layout options pages 2015-02-07 12:51:34 -05:00
Abdullah Almsaeed
1e9e9b8f9b Added sidebar collapsed layout example 2015-02-07 12:37:42 -05:00
Abdullah Almsaeed
61b38618ad Added warning to morris.js 2015-02-07 11:48:16 -05:00
Abdullah Almsaeed
dd8bfbc5d6 Fixed broken links 2015-02-07 11:44:45 -05:00
Abdullah Almsaeed
10bde1cf79 Added links to layout options 2015-02-07 11:35:34 -05:00
Abdullah Almsaeed
eccd2b521d Changed notification menu style 2015-02-06 19:00:29 -05:00
Abdullah Almsaeed
18529ffaef Added layout pages 2015-02-06 18:40:49 -05:00
Abdullah Almsaeed
f73abda0f3 Added icheck to login & register pages 2015-02-06 17:08:16 -05:00
Abdullah Almsaeed
fd947242ac Fixed jumpy footer 2015-02-06 16:43:14 -05:00
Abdullah Almsaeed
3888ca4471 Updated sign in and register pages 2015-02-06 12:33:55 -05:00
Abdullah Almsaeed
c371b396af Fixed issues with lockscreen css 2015-02-05 18:18:29 -05:00
Abdullah Almsaeed
2fd6632111 Updated lockscreen style 2015-02-05 18:08:52 -05:00
Abdullah Almsaeed
19c0faaca0 Made all logo links consistent 2015-02-04 17:12:18 -05:00
Abdullah Almsaeed
64f0082d8a Made all logo links consistent 2015-02-04 17:12:08 -05:00
almasaeed2010
a56e67be26 Removed unused files 2015-02-04 16:43:03 -05:00
almasaeed2010
b00e8de8b8 updated .gitignore to not ignore png files 2015-02-04 13:30:02 -05:00
almasaeed2010
169c2c7558 Updated app.js & removed skins from main css file 2015-02-04 13:27:27 -05:00
almasaeed2010
50cfcf7c46 Added compnent box documentation 2015-02-03 12:25:15 -05:00
almasaeed2010
c9065c46ee Added link handlers to callouts and alerts 2015-02-03 11:29:17 -05:00
almasaeed2010
6a44a9dc04 Fixed media queries 2015-02-02 17:09:59 -05:00
almasaeed2010
e219f5c692 Updated documentation 2015-02-02 14:47:07 -05:00
almasaeed2010
7f65b2cd9c Fixed grunt copyright comments 2015-02-02 13:38:02 -05:00
almasaeed2010
748b5b5a08 .left-side is now deprecated in favor of .main-sidebar. This will allow us to add support for rtl in the future. 2015-02-02 12:39:29 -05:00
almasaeed2010
87adc23aa8 Added colors pallete to general UI 2015-02-02 12:09:02 -05:00
almasaeed2010
2a35eafb8b Added app.min.js 2015-02-02 11:52:30 -05:00
Abdullah Almsaeed
b44054594b Delete TODO 2015-02-02 11:33:29 -05:00
almasaeed2010
31b8b27666 Added all files 2015-02-02 11:32:49 -05:00
almasaeed2010
e504685879 Added link to modals.html in sidebar menu 2015-02-02 11:23:08 -05:00
almasaeed2010
4c49db6b95 Removed unused files 2015-02-02 11:16:50 -05:00
almasaeed2010
66c2b94e8d Update app.js and .gitignore 2015-02-02 11:12:29 -05:00
almasaeed2010
03dea0694a AdminLTE 2.0 alpha 2015-02-01 16:25:09 -05:00
Abdullah Almsaeed
61cd864a07 Update calendar.html 2014-12-10 17:29:20 -05:00
Abdullah Almsaeed
a680ab42c8 Merge pull request #173 from JulienItard/master
Fix - #165
2014-12-10 17:25:29 -05:00
Julien ITARD
41f205b602 Fix - #165 2014-12-09 10:26:59 +01:00
Abdullah Almsaeed
9ce321f7d3 Fix links 2014-12-06 12:21:25 -05:00
Abdullah Almsaeed
ff0bce1fae Merge pull request #164 from GromNaN/patch-1
Fix composer package name
2014-11-26 16:26:15 -05:00
Jérôme Tamarelle
13c5bfd89f Fix composer package name
The name must be lower case #163
2014-11-26 16:10:52 +01:00
Abdullah Almsaeed
0495d691f5 Merge pull request #150 from irfanevrens/patch-2
removed "px"s
2014-11-11 12:33:14 -05:00
Abdullah Almsaeed
0079a98135 Merge pull request #149 from irfanevrens/patch-1
removed "px"s
2014-11-11 12:33:08 -05:00
Abdullah Almsaeed
d73834a2b5 Merge pull request #143 from andrejsc/patch-1
Fix .btn-file class
2014-11-03 10:25:37 -05:00
Andrejs Cainikovs
5603363872 Fix .btn-file class in less as well 2014-11-03 13:44:16 +01:00
İrfan Evrens
2fb8daa671 removed "px"s 2014-11-03 00:15:51 +02:00
İrfan Evrens
d4e3af2995 removed "px"s 2014-11-03 00:12:28 +02:00
Abdullah Almsaeed
3eb5e01c89 Update composer.json 2014-10-31 11:53:04 -04:00
Abdullah Almsaeed
e335bffa6b Merge pull request #134 from luka8088/master
Composer json
2014-10-31 11:48:34 -04:00
Abdullah Almsaeed
933a303486 Added docs link 2014-10-30 21:31:01 -04:00
Abdullah Almsaeed
a5131165ab Merge pull request #142 from reinaris/patch-2
Fixed a typo in index.html
2014-10-29 00:12:18 -04:00
Andrejs Cainikovs
8f0800243e Fix .btn-file class 2014-10-27 20:58:28 +01:00
Abdullah Almsaeed
a35f2f4052 Merge pull request #141 from reinaris/patch-1
Changed link in Readme
2014-10-22 10:23:39 -04:00
Rein Aris
0cf4223adc Fixed a typo in index.html
Changed `seach` into `search`
2014-10-22 13:38:57 +02:00
Rein Aris
6fb9338bc2 Changed link in Readme
Changed link to the main Almsaeed Studio page.
It pointed to localhost
2014-10-22 12:58:10 +02:00
Abdullah Almsaeed
2754bb3c41 Merge pull request #99 from nordicway/master
Fix logo link on invoice page
2014-10-20 12:56:37 -04:00
luka8088
ca86f6e899 Composer 2014-10-14 15:46:52 +02:00
Abdullah Almsaeed
70f6d20345 Announcement about comments section
We have added a comments section in our website to discuss AdminLTE.
2014-10-13 16:40:28 -04:00
Abdullah Almsaeed
4f12178ce3 Merge pull request #102 from stivyw/master
Mail box not loading all js resources, fix
2014-09-26 19:04:22 -04:00
Abdullah Almsaeed
1b4ce382bb Merge pull request #118 from alexishida/master
update bootstrap-slide.js
2014-09-26 18:30:58 -04:00
alexishida
2fa0b63ebe update bootstrap-slide.js 2014-09-24 23:13:29 -04:00
Abdullah Almsaeed
e7c61ff4f4 Merge pull request #92 from fballiano/master
bootstrap, jquery, jqueryui, font-awesome updated and moved to cdn
2014-09-18 11:08:07 -04:00
Stivy Wenderson
2e6e2085f2 Mail box not loading all js resources, fix 2014-08-29 22:46:54 -03:00
almasaeed2010
6c362b13e9 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2014-08-27 18:57:00 -04:00
almasaeed2010
fff8d72fa5 Fixed dashboard.js 2014-08-27 18:56:17 -04:00
nordicway
8d725ff092 Fix logo link on invoice page 2014-08-26 23:21:29 +02:00
Fabrizio Balliano
896263dd5f also ionicons is now loaded from cdn 2014-08-14 20:29:46 +02:00
Fabrizio Balliano
743133b857 also ionicons is now loaded from cdn 2014-08-14 20:25:41 +02:00
Fabrizio Balliano
8ec353b38c fullcalendard updated to latest stable and moved to cdn 2014-08-14 14:14:14 +02:00
Fabrizio Balliano
a498d22e95 ckeditor updated and moved to CDN 2014-08-14 13:59:48 +02:00
Fabrizio Balliano
acab3dac61 bootstrap, jquery, jqueryui, font-awesome updated and moved to cdn 2014-08-14 13:44:24 +02:00
Fabrizio Balliano
040c5d1998 added idea files from phpstorm 2014-08-14 13:41:35 +02:00
Abdullah Almsaeed
7de4faa420 Update README.md 2014-07-31 12:01:17 -04:00
almasaeed2010
debcd84146 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2014-07-31 11:55:14 -04:00
almasaeed2010
5e1a7df64b Added missing files 2014-07-31 11:53:00 -04:00
Abdullah Almsaeed
e715f1b75d Merge pull request #82 from manhg/master
Fix bug of image max width (supposed to be width of its container)
2014-07-27 13:57:12 -04:00
Giang Manh
a34bf866ef Fix bug of image max width (supposed to be width of its container) 2014-07-25 17:55:26 +09:00
Abdullah Almsaeed
0e6963e04d Update README.md 2014-07-24 17:07:03 -04:00
Abdullah Almsaeed
9d04e5fe1a Update README.md 2014-07-24 17:04:22 -04:00
almasaeed2010
b8291ce83c Redisgned Dashboard 2014-07-24 16:35:20 -04:00
Abdullah Almsaeed
5a659ff5d6 Merge pull request #73 from joey-di-nardo/patch-1
Fix issue #71
2014-07-21 08:34:53 -04:00
Abdullah Almsaeed
c1c379d0f9 Merge pull request #75 from cdodd/master
Remove .DS_Store files and add to gitignore
2014-07-21 08:34:41 -04:00
Craig Dodd
4fb173d0a5 Remove .DS_Store files and add to gitignore 2014-07-21 10:08:50 +01:00
joey-di-nardo
91bec2dd52 Fix issue #71 2014-07-20 12:04:42 -04:00
Abdullah Almsaeed
465f581a94 Update README.md 2014-07-18 09:12:30 -04:00
Abdullah
ac69a861ee Fixed demo.js link errors 2014-07-03 12:05:05 -04:00
Abdullah Almsaeed
cfa254e96f Update app.js
Removed demo functions
2014-07-03 11:46:35 -04:00
Abdullah Almsaeed
2715d7b111 Update demo.js
Added missing functions
2014-07-03 11:46:12 -04:00
Abdullah Almsaeed
6e4a3aeea0 Merge pull request #62 from seven1m/footer
Account for (optional) footer in wrapper height calc.
2014-07-03 11:42:14 -04:00
Abdullah Almsaeed
5ad2be7757 Merge pull request #61 from seven1m/master
Don't apply iCheck plugin to checkboxes with 'simple' css class.
2014-07-03 11:41:32 -04:00
Tim Morgan
d8ac55d6a3 Don't apply iCheck plugin to checkboxes with 'simple' css class. 2014-07-02 14:10:39 -05:00
Tim Morgan
1d900be948 Account for (optional) footer in wrapper height calc. 2014-07-02 14:04:41 -05:00
Abdullah Almsaeed
35ba9268b6 Merge pull request #46 from seven1m/master
Fix timeline bug where vertical line covers elements in same .row
2014-06-26 23:15:10 -04:00
Abdullah Almsaeed
bdf6cd6fd4 Update AdminLTE.css 2014-06-22 19:14:57 -04:00
Abdullah Almsaeed
7737015bdc Update core.less 2014-06-22 19:14:13 -04:00
Tim Morgan
eb15ebc9d5 Fix timeline bug where vertical line covers elements in same .row 2014-05-25 22:46:24 -05:00
Abdullah Almsaeed
f31f32b317 Merge pull request #33 from toooni/patch-1
prevent wrong link button font color
2014-05-05 09:14:08 -04:00
Abdullah Almsaeed
e12d021779 Merge pull request #36 from jakubsacha/master
Split demo functions to different javascript file
2014-05-04 22:25:58 -04:00
activ
3a999f72ce split demo functions to different javascript file 2014-05-03 16:37:02 +02:00
toooni
841ef63f20 prevent wrong link button font color
prevents link buttons to be always in a dark color when in a box header
2014-04-22 12:55:27 +02:00
Abdullah Almsaeed
3395b8b18b Merge pull request #27 from rdutra/master
using relative paths when importing fonts from google
2014-04-17 12:47:04 -04:00
rdutra
ce062a3533 using relative paths when importing fonts from google 2014-04-17 13:39:18 -03:00
Abdullah Almsaeed
4dc1189fa1 Update README.md 2014-04-05 20:18:35 -04:00
almasaeed2010
41b271f3fc Updating to version 1.2 2014-04-05 20:12:30 -04:00
Abdullah Almsaeed
aa2170285c Merge pull request #20 from jbouzekri/master
Remove netbeans project configuration
2014-04-04 19:11:33 -04:00
jbouzekri
d56557e274 Remove netbeans project configuration 2014-04-04 23:02:40 +02:00
Abdullah Almsaeed
024b276c20 Update README.md 2014-04-02 18:52:34 -04:00
Abdullah Almsaeed
854142ca16 Merge pull request #16 from TuurDutoit/patch-1
Fixed typo in README.md
2014-03-29 10:46:17 -04:00
Tuur Dutoit
67910e590e Fixed typo in README.md
fontawsome -> fontawesome
2014-03-29 09:59:22 +00:00
Abdullah Almsaeed
1027479da9 Notice for IE users
Use http://almsaeedstudio.com/AdminLTE for a preview. I noticed some js issues in the preview page caused by the use of an iframe.
2014-03-24 10:44:44 -04:00
Abdullah Almsaeed
30b27596b2 Update README.md 2014-03-05 20:47:47 -05:00
Abdullah Almsaeed
90f829f420 Added new skin and plugin
New skin (skin-black). Added pace plugin to show page loading like
youtube.
2014-03-05 20:31:35 -05:00
Abdullah Almsaeed
ec3856d238 Update README.md 2014-02-19 11:07:18 -05:00
Abdullah Almsaeed
274063d472 Add flattr button 2014-02-19 11:06:46 -05:00
Abdullah Almsaeed
b1f6042969 Fixed compile error
The mixing.less file had an error on line 83. Look at issue #4
2014-02-16 15:35:03 -05:00
Abdullah Almsaeed
248cb48bbd ignored readme 2014-02-16 15:35:03 -05:00
almasaeed2010
9ee5a751a6 Update README.md 2014-02-04 00:45:26 -05:00
almasaeed2010
424eab60e3 Update README.md 2014-02-04 00:37:37 -05:00
almasaeed2010
58638459fd Added browser support list 2014-02-02 12:58:21 -05:00
almasaeed2010
a3f0e2d580 Update README.md 2014-02-01 14:18:02 -05:00
almasaeed2010
1e58140233 Update README.md 2014-02-01 14:16:43 -05:00
almasaeed2010
2960616a69 Update README.md 2014-02-01 12:12:19 -05:00
almasaeed2010
27e0398db6 Create README.md 2014-02-01 11:15:26 -05:00
Abdullah Almsaeed
b2a34fdcd3 Redesign
Redesigned from top to bottom
2014-02-01 10:49:36 -05:00
7596 changed files with 707089 additions and 111616 deletions

5
.gitattributes vendored Normal file
View File

@@ -0,0 +1,5 @@
* text=auto
/.github export-ignore
.gitattributes export-ignore
.gitignore export-ignore

34
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,34 @@
<!--
Before opening a new issue, please search through the existing issues to
see if your topic has already been addressed. Note that you may need to
remove the "is:open" filter from the search bar to include closed issues.
Check the appropriate type for your issue below by placing an x between the
brackets.
Please note that issues which do not fall under any of the below categories
will be closed.
--->
### Issue type:
- [ ] Feature request <!-- Requesting the implementation of a new feature -->
- [ ] Bug report <!-- Reporting unexpected or erroneous behavior -->
- [ ] Documentation <!-- Proposing a modification to the documentation -->
<!--
Please describe the environment.
-->
### Environment:
* AdminLTE Version: <!-- Example: 2.4 -->
* Operating System: <!-- Example: OSX/Android -->
* Browser (Version): <!-- Example: Chrome (Latest) -->
<!--
BUG REPORTS must include:
* Steps or URL needed to reproduce the bug/issue
* Any relevant error messages (screenshots may also help)
* A snippet of your markup (where applicable)
FEATURE REQUESTS must include:
* A detailed description of the proposed functionality
-->
### Description:

11
.gitignore vendored Normal file
View File

@@ -0,0 +1,11 @@
*.DS_Store
*.log
*.zip
.idea
.sass-cache/
/nbproject/
/nbproject/private/
/node_modules/
ad.js
TODO
test.html

2
.npmignore Normal file
View File

@@ -0,0 +1,2 @@
documentation/
composer.json

24
.travis.yml Normal file
View File

@@ -0,0 +1,24 @@
language: node_js
node_js:
- 8
- 9
- 10
- 11
- 12
env:
- INSTALL=bower
- INSTALL=yarn
- INSTALL=npm
matrix:
fast_finish: true
install:
- if [ "bower" == $INSTALL ]; then yarn global add bower && bower install; fi
- if [ "yarn" == $INSTALL ]; then yarn install; fi
- if [ "npm" == $INSTALL ]; then npm install; fi
script:
- echo 'Tests must be configured'

312
Gruntfile.js Normal file
View File

@@ -0,0 +1,312 @@
// AdminLTE Gruntfile
module.exports = function (grunt) { // jshint ignore:line
'use strict';
grunt.initConfig({
pkg : grunt.file.readJSON('package.json'),
watch : {
less : {
// Compiles less files upon saving
files: ['build/less/*.less'],
tasks: ['less:development', 'less:production', 'replace', 'notify:less']
},
js : {
// Compile js files upon saving
files: ['build/js/*.js'],
tasks: ['js', 'notify:js']
},
skins: {
// Compile any skin less files upon saving
files: ['build/less/skins/*.less'],
tasks: ['less:skins', 'less:minifiedSkins', 'notify:less']
}
},
// Notify end of tasks
notify: {
less: {
options: {
title : 'AdminLTE',
message: 'LESS finished running'
}
},
js : {
options: {
title : 'AdminLTE',
message: 'JS bundler finished running'
}
}
},
// 'less'-task configuration
// This task will compile all less files upon saving to create both AdminLTE.css and AdminLTE.min.css
less : {
// Development not compressed
development : {
files: {
// compilation.css : source.less
'dist/css/AdminLTE.css' : 'build/less/AdminLTE.less',
// AdminLTE without plugins
'dist/css/alt/AdminLTE-without-plugins.css' : 'build/less/AdminLTE-without-plugins.less',
// Separate plugins
'dist/css/alt/AdminLTE-select2.css' : 'build/less/select2.less',
'dist/css/alt/AdminLTE-fullcalendar.css' : 'build/less/fullcalendar.less',
'dist/css/alt/AdminLTE-bootstrap-social.css': 'build/less/bootstrap-social.less'
}
},
// Production compressed version
production : {
options: {
compress: true
},
files : {
// compilation.css : source.less
'dist/css/AdminLTE.min.css' : 'build/less/AdminLTE.less',
// AdminLTE without plugins
'dist/css/alt/AdminLTE-without-plugins.min.css' : 'build/less/AdminLTE-without-plugins.less',
// Separate plugins
'dist/css/alt/AdminLTE-select2.min.css' : 'build/less/select2.less',
'dist/css/alt/AdminLTE-fullcalendar.min.css' : 'build/less/fullcalendar.less',
'dist/css/alt/AdminLTE-bootstrap-social.min.css': 'build/less/bootstrap-social.less'
}
},
// Non minified skin files
skins : {
files: {
'dist/css/skins/skin-blue.css' : 'build/less/skins/skin-blue.less',
'dist/css/skins/skin-black.css' : 'build/less/skins/skin-black.less',
'dist/css/skins/skin-yellow.css' : 'build/less/skins/skin-yellow.less',
'dist/css/skins/skin-green.css' : 'build/less/skins/skin-green.less',
'dist/css/skins/skin-red.css' : 'build/less/skins/skin-red.less',
'dist/css/skins/skin-purple.css' : 'build/less/skins/skin-purple.less',
'dist/css/skins/skin-blue-light.css' : 'build/less/skins/skin-blue-light.less',
'dist/css/skins/skin-black-light.css' : 'build/less/skins/skin-black-light.less',
'dist/css/skins/skin-yellow-light.css': 'build/less/skins/skin-yellow-light.less',
'dist/css/skins/skin-green-light.css' : 'build/less/skins/skin-green-light.less',
'dist/css/skins/skin-red-light.css' : 'build/less/skins/skin-red-light.less',
'dist/css/skins/skin-purple-light.css': 'build/less/skins/skin-purple-light.less',
'dist/css/skins/_all-skins.css' : 'build/less/skins/_all-skins.less'
}
},
// Skins minified
minifiedSkins: {
options: {
compress: true
},
files : {
'dist/css/skins/skin-blue.min.css' : 'build/less/skins/skin-blue.less',
'dist/css/skins/skin-black.min.css' : 'build/less/skins/skin-black.less',
'dist/css/skins/skin-yellow.min.css' : 'build/less/skins/skin-yellow.less',
'dist/css/skins/skin-green.min.css' : 'build/less/skins/skin-green.less',
'dist/css/skins/skin-red.min.css' : 'build/less/skins/skin-red.less',
'dist/css/skins/skin-purple.min.css' : 'build/less/skins/skin-purple.less',
'dist/css/skins/skin-blue-light.min.css' : 'build/less/skins/skin-blue-light.less',
'dist/css/skins/skin-black-light.min.css' : 'build/less/skins/skin-black-light.less',
'dist/css/skins/skin-yellow-light.min.css': 'build/less/skins/skin-yellow-light.less',
'dist/css/skins/skin-green-light.min.css' : 'build/less/skins/skin-green-light.less',
'dist/css/skins/skin-red-light.min.css' : 'build/less/skins/skin-red-light.less',
'dist/css/skins/skin-purple-light.min.css': 'build/less/skins/skin-purple-light.less',
'dist/css/skins/_all-skins.min.css' : 'build/less/skins/_all-skins.less'
}
}
},
// Uglify task info. Compress the js files.
uglify: {
options : {
mangle : true,
output: {
comments: 'some'
},
},
production: {
files: {
'dist/js/adminlte.min.js': ['dist/js/adminlte.js']
}
}
},
// Concatenate JS Files
concat: {
options: {
separator: '\n\n',
banner : '/*! AdminLTE app.js\n'
+ '* ================\n'
+ '* Main JS application file for AdminLTE v2. This file\n'
+ '* should be included in all pages. It controls some layout\n'
+ '* options and implements exclusive AdminLTE plugins.\n'
+ '*\n'
+ '* @author Colorlib\n'
+ '* @support <https://github.com/ColorlibHQ/AdminLTE/issues>\n'
+ '* @version <%= pkg.version %>\n'
+ '* @repository <%= pkg.repository.url %>\n'
+ '* @license MIT <http://opensource.org/licenses/MIT>\n'
+ '*/\n\n'
+ '// Make sure jQuery has been loaded\n'
+ 'if (typeof jQuery === \'undefined\') {\n'
+ 'throw new Error(\'AdminLTE requires jQuery\')\n'
+ '}\n\n'
},
dist : {
src : [
'build/js/BoxRefresh.js',
'build/js/BoxWidget.js',
'build/js/ControlSidebar.js',
'build/js/DirectChat.js',
'build/js/PushMenu.js',
'build/js/TodoList.js',
'build/js/Tree.js',
'build/js/Layout.js',
],
dest: 'dist/js/adminlte.js'
}
},
// Replace image paths in AdminLTE without plugins
replace: {
withoutPlugins : {
src : ['dist/css/alt/AdminLTE-without-plugins.css'],
dest : 'dist/css/alt/AdminLTE-without-plugins.css',
replacements: [
{
from: '../img',
to : '../../img'
}
]
},
withoutPluginsMin: {
src : ['dist/css/alt/AdminLTE-without-plugins.min.css'],
dest : 'dist/css/alt/AdminLTE-without-plugins.min.css',
replacements: [
{
from: '../img',
to : '../../img'
}
]
}
},
// Build the documentation files
includes: {
build: {
src : ['*.html'], // Source files
dest : 'documentation/', // Destination directory
flatten: true,
cwd : 'documentation/build',
options: {
silent : true,
includePath: 'documentation/build/include'
}
}
},
// Optimize images
image: {
dynamic: {
files: [
{
expand: true,
cwd : 'build/img/',
src : ['**/*.{png,jpg,gif,svg,jpeg}'],
dest : 'dist/img/'
}
]
}
},
// Validate JS code
jshint: {
options: {
jshintrc: 'build/js/.jshintrc'
},
grunt : {
options: {
jshintrc: 'build/grunt/.jshintrc'
},
src : 'Gruntfile.js'
},
core : {
src: 'build/js/*.js'
},
demo : {
src: 'dist/js/demo.js'
},
pages : {
src: 'dist/js/pages/*.js'
}
},
jscs: {
options: {
config: 'build/js/.jscsrc'
},
core : {
src: '<%= jshint.core.src %>'
},
pages : {
src: '<%= jshint.pages.src %>'
}
},
// Validate CSS files
csslint: {
options: {
csslintrc: 'build/less/.csslintrc'
},
dist : [
'dist/css/AdminLTE.css'
]
},
// Validate Bootstrap HTML
bootlint: {
options: {
relaxerror: ['W005']
},
files : ['pages/**/*.html', '*.html']
},
// Delete images in build directory
// After compressing the images in the build/img dir, there is no need
// for them
clean: {
build: ['build/img/*']
}
});
// Load all grunt tasks
// LESS Compiler
grunt.loadNpmTasks('grunt-contrib-less');
// Watch File Changes
grunt.loadNpmTasks('grunt-contrib-watch');
// Compress JS Files
grunt.loadNpmTasks('grunt-contrib-uglify');
// Include Files Within HTML
grunt.loadNpmTasks('grunt-includes');
// Optimize images
grunt.loadNpmTasks('grunt-image');
// Validate JS code
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-jscs');
// Delete not needed files
grunt.loadNpmTasks('grunt-contrib-clean');
// Lint CSS
grunt.loadNpmTasks('grunt-contrib-csslint');
// Lint Bootstrap
grunt.loadNpmTasks('grunt-bootlint');
// Concatenate JS files
grunt.loadNpmTasks('grunt-contrib-concat');
// Notify
grunt.loadNpmTasks('grunt-notify');
// Replace
grunt.loadNpmTasks('grunt-text-replace');
// Linting task
grunt.registerTask('lint', ['jshint', 'csslint', 'bootlint']);
// JS task
grunt.registerTask('js', ['concat', 'uglify']);
// CSS Task
grunt.registerTask('css', ['less:development', 'less:production', 'replace']);
// The default task (running 'grunt' in console) is 'watch'
grunt.registerTask('default', ['watch']);
};

View File

@@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2013 almasaeed2010
Copyright (c) 2014-2017 Abdullah Almsaeed
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in

View File

@@ -1,6 +1,53 @@
AdminLTE
========
Introduction
============
Completely free admin control panel theme. Based on bootstrap 3.x.
[![Build Status](https://img.shields.io/travis/ColorlibHQ/AdminLTE.svg)](https://travis-ci.org/ColorlibHQ/AdminLTE)
![Bower version](https://img.shields.io/bower/v/adminlte.svg)
[![npm version](https://img.shields.io/npm/v/admin-lte.svg)](https://www.npmjs.com/package/admin-lte)
[![Packagist](https://img.shields.io/packagist/v/almasaeed2010/adminlte.svg)](https://packagist.org/packages/almasaeed2010/adminlte)
[![CDNJS](https://img.shields.io/cdnjs/v/admin-lte.svg)](https://cdnjs.com/libraries/admin-lte)
Visit http://www.almsaeedstudio.com/AdminLTE-pre for a preview.
**AdminLTE** -- is a fully responsive admin template. Based on **[Bootstrap 3](https://github.com/twbs/bootstrap)** framework. Highly customizable and easy to use. Fits many screen resolutions from small mobile devices to large desktops. Check out the live preview now and see for yourself.
**Download & Preview on [AdminLTE.IO](https://adminlte.io)**
### Looking for Premium Templates?
**AdminLTE.IO just opened a new premium templates website. Hand picked to ensure the best quality and the most affordable prices. Visit https://themequarry.com for more information.**
## Documentation & Installation Guide
Visit the [online documentation](https://adminlte.io/docs) for the most
updated guide.
!["AdminLTE Presentation"](https://adminlte.io/AdminLTE2.png "AdminLTE Presentation")
### Contribution
Contribution are always **welcome and recommended**! Here is how:
- Fork the repository ([here is the guide](https://help.github.com/articles/fork-a-repo/)).
- Clone to your machine ```git clone https://github.com/YOUR_USERNAME/AdminLTE.git```
- Make your changes
- Create a pull request
#### Contribution Requirements:
- When you contribute, you agree to give a non-exclusive license to AdminLTE.IO to use that contribution in any context as we (AdminLTE.IO) see appropriate.
- If you use content provided by another party, it must be appropriately licensed using an [open source](http://opensource.org/licenses) license.
- Contributions are only accepted through Github pull requests.
- Finally, contributed code must work in all supported browsers (see above for browser support).
### License
AdminLTE is an open source project by [AdminLTE.IO](https://adminlte.io) that is licensed under [MIT](http://opensource.org/licenses/MIT). AdminLTE.IO
reserves the right to change the license of future releases. Wondering what you can or can't do? View the [license guide](https://adminlte.io/docs/license).
### Legacy Releases
AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://adminlte.io/themes/AdminLTE/documentation/index.html#upgrade), but if you intend to keep using AdminLTE 1.x, you can download the latest release from the [releases](https://github.com/ColorlibHQ/AdminLTE/releases) section above.
### Change log
**For the most recent change log, visit the [releases page](https://github.com/ColorlibHQ/AdminLTE/releases).** We will add detailed release notes to each new release.
### Image Credits
- [Pixeden](http://www.pixeden.com/psd-web-elements/flat-responsive-showcase-psd)
- [Graphicsfuel](http://www.graphicsfuel.com/2013/02/13-high-resolution-blur-backgrounds/)
- [Pickaface](http://pickaface.net/)
- [Unsplash](https://unsplash.com/)
- [Uifaces](http://uifaces.com/)

View File

@@ -1,143 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Template</title>
<meta charset="UTF-8">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<!-- bootstrap 3.0.2 -->
<link href="css/bootstrap.min.css" rel="stylesheet" />
<!-- font Awesome -->
<link href="css/font-awesome.min.css" rel="stylesheet" />
<!-- Theme style -->
<link href="theme/theme.css" rel="stylesheet" />
<!-- Google font Signika -->
<link href='http://fonts.googleapis.com/css?family=Signika+Negative' rel='stylesheet' type='text/css'>
</head>
<body>
<nav class="navbar navbar-theme bg-blue navbar-static-top" role="navigation">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html"><span class="fa fa-shield"></span> AdminLTE</a>
<a href="#" class='lte-menu-sm visible-xs navbar-brand'>
<span class="fa fa-list"></span>
</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-gears"></i></a>
<ul class="dropdown-menu navbar-selector">
<li role="presentation" class="dropdown-header font-primary noClick">Navbar Color</li>
<li class="font-primary" data-color="bg-primary"><a href="#"><i class="fa fa-gear"></i> Primary</a></li>
<li class="font-blue" data-color="bg-blue"><a href="#"><i class="fa fa-gear"></i> Blue <small class="text-muted">(default)</small></a></li>
<li class="font-light-blue" data-color="bg-light-blue"><a href="#"><i class="fa fa-gear"></i> Light Blue</a></li>
<li class="font-green" data-color="bg-green"><a href="#"><i class="fa fa-gear"></i> Green</a></li>
<li class="font-yellow" data-color="bg-yellow"><a href="#"><i class="fa fa-gear"></i> Yellow</a></li>
<li class="font-purple" data-color="bg-purple"><a href="#"><i class="fa fa-gear"></i> Purple</a></li>
<li class="font-red" data-color="bg-red"><a href="#"><i class="fa fa-gear"></i> Red</a></li>
</ul>
</li>
<li><a href="#"><i class="fa fa-bullhorn"></i></a></li>
<li><a href="#"><i class="fa fa-envelope"></i></a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i></a>
<ul class="dropdown-menu">
<li><a href="#">Profile</a></li>
<li><a href="#">Friends</a></li>
<li><a href="#">Settings</a></li>
<li class="divider"></li>
<li><a href="#">Privacy</a></li>
</ul>
</li>
</ul>
<form class="navbar-form navbar-right">
<div class="form-group">
<input type="text" name="search" class="form-control" placeholder="..."/>
</div>
</form>
</div><!-- /.navbar-collapse -->
</nav>
<div class="lte-main-content">
<!-- side bar -->
<div class="lte-sidebar col-md-2 col-sm-3 hidden-xs">
<ul class="lte-sidebar-menu">
<li class="active"><a href="index.html"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="lte-tree">
<a href="#"><i class="fa fa-bar-chart-o"></i> Charts<i class="pull-right fa fa-angle-right"></i></a>
<ul class="lte-tree-menu">
<li><a href="charts/flot.html"><i class="fa fa-bar-chart-o"></i> Flot</a></li>
<li><a href="charts/jqplot.html"><i class="fa fa-bar-chart-o"></i> JQplot</a></li>
<li><a href="charts/xcharts.html"><i class="fa fa-bar-chart-o"></i> xCharts</a></li>
</ul>
</li>
<li><a href="ui.html"><i class="fa fa-tint"></i> User Interface </a></li>
<!--<li><a href="widgets.html"><i class="fa fa-gear"></i> Widgets</a></li>-->
<li class="lte-tree">
<a href="#"><i class="fa fa-pagelines"></i> Example Pages <i class="pull-right fa fa-angle-right"></i></a>
<ul class="lte-tree-menu">
<li><a href="examples/invoice.html"><i class="fa fa-money"></i> Invoice</a></li>
<li><a href="examples/login.html"><i class="fa fa-sign-in"></i> Login</a></li>
<li><a href="examples/register.html"><i class="fa fa-lock"></i> Register</a></li>
<li><a href="examples/blank_page.html"><i class="fa fa-paperclip"></i> Blank Page</a></li>
<li><a href="examples/404.html"><i class="fa fa-unlink"></i> 404 Error Page</a></li>
<li><a href="examples/500.html"><i class="fa fa-unlink"></i> 500 Error Page</a></li>
</ul>
</li>
<li><a href="forms.html"><i class="fa fa-edit"></i> Forms</a></li>
<li><a href="typography.html"><i class="fa fa-text-width"></i> Typography</a></li>
<li><a href="calendar.html"><i class="fa fa-calendar"></i> Calendar</a></li>
<li class="lte-tree">
<a href="#"><i class="fa fa-pagelines"></i> Multilevel Dropdown<i class="pull-right fa fa-angle-right"></i></a>
<ul class="lte-tree-menu">
<li class="lte-tree">
<a href="#"><i class="fa fa-pagelines"></i> Level 1<i class="pull-right fa fa-angle-right"></i></a>
<ul class="lte-tree-menu">
<li class="lte-tree">
<a href="#"><i class="fa fa-pagelines"></i> Level 2<i class="pull-right fa fa-angle-right"></i></a>
<ul class="lte-tree-menu">
<li><a href="#"><i class="fa fa-pagelines"></i> Level 3</a></li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</div>
<!-- /.side-bar-->
<div class="lte-main-container col-md-10 col-sm-9">
<!-- main content -->
<div class="page-header">
<i class="fa fa-paperclip"></i> Blank Page <small>example page</small>
</div>
<!-- /.page-header -->
<!-- PUT CONTENT HERE -->
</div>
</div>
<!-- ./.lte-main-content -->
<footer>
Copyright &copy; 2013 - <a>Preview</a> - <a>Purchase</a> - Built with <a target="blank" href="http://getbootstrap.com">Bootstrap 3</a>
</footer>
<!-- JQuery 1.10.2 -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<!-- Bootstrap -->
<script src="js/bootstrap.min.js" type="text/javascript"></script>
<!-- LTE Tree -->
<script src="js/lteTree.js" type="text/javascript"></script>
<!-- LTE App -->
<script src="js/lteApp.js" type="text/javascript"></script>
</body>
</html>

64
bower.json Normal file
View File

@@ -0,0 +1,64 @@
{
"name": "admin-lte",
"homepage": "https://adminlte.io",
"authors": [
"Abdullah Almsaeed <abdullah@almsaeedstudio.com>"
],
"description": "Admin dashboard and control panel template",
"main": [
"index2.html",
"dist/css/AdminLTE.css",
"dist/js/adminlte.js",
"build/less/AdminLTE.less"
],
"keywords": [
"css",
"js",
"html",
"template",
"admin",
"bootstrap",
"theme",
"backend",
"responsive"
],
"license": "MIT",
"ignore": [
"/.*",
"node_modules",
"bower_components",
"composer.json",
"documentation"
],
"dependencies": {
"chart.js": "^1.0",
"ckeditor": "^4.7",
"bootstrap-colorpicker": "^2.5.1",
"bootstrap": "^3.4",
"jquery": "^3.4.1",
"datatables.net": "^1.10.15",
"datatables.net-bs": "^2.1.1",
"bootstrap-datepicker": "^1.7",
"bootstrap-daterangepicker": "^2.1.25",
"moment": "^2.18.1",
"fastclick": "^1.0.6",
"Flot": "flot#^0.8.3",
"fullcalendar": "^3.4",
"inputmask": "jquery.inputmask#^3.3.7",
"ion.rangeSlider": "ionrangeslider#^2.2",
"jvectormap": "^1.2.2",
"jquery-knob": "^1.2.13",
"morris.js": "^0.5.1",
"PACE": "pace#^1.0.2",
"select2": "^4.0.7",
"jquery-slimscroll": "slimscroll#^1.3.8",
"jquery-sparkline": "^2.1.3",
"font-awesome": "^4.7",
"Ionicons": "ionicons#^2.0.1",
"jquery-ui": "1.11.4",
"seiyria-bootstrap-slider": "^10.6.2"
},
"resolutions": {
"jquery": "^3.4.1"
}
}

18
bower_components/Flot/.bower.json vendored Normal file
View File

@@ -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
bower_components/Flot/.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
*.min.js
!excanvas.min.js
node_modules/

3
bower_components/Flot/.travis.yml vendored Normal file
View File

@@ -0,0 +1,3 @@
language: node_js
node_js:
- 0.8

22
bower_components/Flot/LICENSE.txt vendored Normal file
View File

@@ -0,0 +1,22 @@
Copyright (c) 2007-2014 IOLA and Ole Laursen
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

View File

@@ -1,3 +1,51 @@
## Flot 0.8.3 ##
### Changes ###
- Updated example code to avoid encouraging unnecessary re-plots.
(patch by soenter, pull request #1221)
### Bug fixes ###
- Added a work-around to disable the allocation of extra space for first and
last axis ticks, allowing plots to span the full width of their container.
A proper solution for this bug will be implemented in the 0.9 release.
(reported by Josh Pigford and andig, issue #1212, pull request #1290)
- Fixed a regression introduced in 0.8.1, where the last tick label would
sometimes wrap rather than extending the plot's offset to create space.
(reported by Elite Gamer, issue #1283)
- Fixed a regression introduced in 0.8.2, where the resize plugin would use
unexpectedly high amounts of CPU even when idle.
(reported by tommie, issue #1277, pull request #1289)
- Fixed the selection example to work with jQuery 1.9.x and later.
(reported by EGLadona and dmfalke, issue #1250, pull request #1285)
- Added a detach shim to fix support for jQuery versions earlier than 1.4.x.
(reported by ngavard, issue #1240, pull request #1286)
- Fixed a rare 'Uncaught TypeError' when using the resize plugin in IE 7/8.
(reported by tleish, issue #1265, pull request #1289)
- Fixed zoom constraints to apply only in the direction of the zoom.
(patch by Neil Katin, issue #1204, pull request #1205)
- Markings lines are no longer blurry when drawn on pixel boundaries.
(reported by btccointicker and Rouillard, issue #1210)
- Don't discard original pie data-series values when combining slices.
(patch by Phil Tsarik, pull request #1238)
- Fixed broken auto-scale behavior when using deprecated [x|y]2axis options.
(reported by jorese, issue #1228, pull request #1284)
- Exposed the dateGenerator function on the plot object, as it used to be
before time-mode was moved into a separate plugin.
(patch by Paolo Valleri, pull request #1028)
## Flot 0.8.2 ##
### Changes ###

8
bower_components/Flot/component.json vendored Normal file
View File

@@ -0,0 +1,8 @@
{
"name": "Flot",
"version": "0.8.3",
"main": "jquery.flot.js",
"dependencies": {
"jquery": ">= 1.2.6"
}
}

View File

@@ -0,0 +1,173 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: AJAX</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
var options = {
lines: {
show: true
},
points: {
show: true
},
xaxis: {
tickDecimals: 0,
tickSize: 1
}
};
var data = [];
$.plot("#placeholder", data, options);
// Fetch one series, adding to what we already have
var alreadyFetched = {};
$("button.fetchSeries").click(function () {
var button = $(this);
// Find the URL in the link right next to us, then fetch the data
var dataurl = button.siblings("a").attr("href");
function onDataReceived(series) {
// Extract the first coordinate pair; jQuery has parsed it, so
// the data is now just an ordinary JavaScript object
var firstcoordinate = "(" + series.data[0][0] + ", " + series.data[0][1] + ")";
button.siblings("span").text("Fetched " + series.label + ", first point: " + firstcoordinate);
// Push the new data onto our existing data array
if (!alreadyFetched[series.label]) {
alreadyFetched[series.label] = true;
data.push(series);
}
$.plot("#placeholder", data, options);
}
$.ajax({
url: dataurl,
type: "GET",
dataType: "json",
success: onDataReceived
});
});
// Initiate a recurring data update
$("button.dataUpdate").click(function () {
data = [];
alreadyFetched = {};
$.plot("#placeholder", data, options);
var iteration = 0;
function fetchData() {
++iteration;
function onDataReceived(series) {
// Load all the data in one pass; if we only got partial
// data we could merge it with what we already have.
data = [ series ];
$.plot("#placeholder", data, options);
}
// Normally we call the same URL - a script connected to a
// database - but in this case we only have static example
// files, so we need to modify the URL.
$.ajax({
url: "data-eu-gdp-growth-" + iteration + ".json",
type: "GET",
dataType: "json",
success: onDataReceived
});
if (iteration < 5) {
setTimeout(fetchData, 1000);
} else {
data = [];
alreadyFetched = {};
}
}
setTimeout(fetchData, 1000);
});
// Load the first series by default, so we don't have an empty plot
$("button.fetchSeries:first").click();
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>AJAX</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>Example of loading data dynamically with AJAX. Percentage change in GDP (source: <a href="http://epp.eurostat.ec.europa.eu/tgm/table.do?tab=table&init=1&plugin=1&language=en&pcode=tsieb020">Eurostat</a>). Click the buttons below:</p>
<p>The data is fetched over HTTP, in this case directly from text files. Usually the URL would point to some web server handler (e.g. a PHP page or Java/.NET/Python/Ruby on Rails handler) that extracts it from a database and serializes it to JSON.</p>
<p>
<button class="fetchSeries">First dataset</button>
[ <a href="data-eu-gdp-growth.json">see data</a> ]
<span></span>
</p>
<p>
<button class="fetchSeries">Second dataset</button>
[ <a href="data-japan-gdp-growth.json">see data</a> ]
<span></span>
</p>
<p>
<button class="fetchSeries">Third dataset</button>
[ <a href="data-usa-gdp-growth.json">see data</a> ]
<span></span>
</p>
<p>If you combine AJAX with setTimeout, you can poll the server for new data.</p>
<p>
<button class="dataUpdate">Poll for data</button>
</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,87 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Adding Annotations</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
var d1 = [];
for (var i = 0; i < 20; ++i) {
d1.push([i, Math.sin(i)]);
}
var data = [{ data: d1, label: "Pressure", color: "#333" }];
var markings = [
{ color: "#f6f6f6", yaxis: { from: 1 } },
{ color: "#f6f6f6", yaxis: { to: -1 } },
{ color: "#000", lineWidth: 1, xaxis: { from: 2, to: 2 } },
{ color: "#000", lineWidth: 1, xaxis: { from: 8, to: 8 } }
];
var placeholder = $("#placeholder");
var plot = $.plot(placeholder, data, {
bars: { show: true, barWidth: 0.5, fill: 0.9 },
xaxis: { ticks: [], autoscaleMargin: 0.02 },
yaxis: { min: -2, max: 2 },
grid: { markings: markings }
});
var o = plot.pointOffset({ x: 2, y: -1.2});
// Append it to the placeholder that Flot already uses for positioning
placeholder.append("<div style='position:absolute;left:" + (o.left + 4) + "px;top:" + o.top + "px;color:#666;font-size:smaller'>Warming up</div>");
o = plot.pointOffset({ x: 8, y: -1.2});
placeholder.append("<div style='position:absolute;left:" + (o.left + 4) + "px;top:" + o.top + "px;color:#666;font-size:smaller'>Actual measurements</div>");
// Draw a little arrow on top of the last label to demonstrate canvas
// drawing
var ctx = plot.getCanvas().getContext("2d");
ctx.beginPath();
o.left += 4;
ctx.moveTo(o.left, o.top);
ctx.lineTo(o.left, o.top - 10);
ctx.lineTo(o.left + 10, o.top - 5);
ctx.lineTo(o.left, o.top);
ctx.fillStyle = "#000";
ctx.fill();
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Adding Annotations</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>Flot has support for simple background decorations such as lines and rectangles. They can be useful for marking up certain areas. You can easily add any HTML you need with standard DOM manipulation, e.g. for labels. For drawing custom shapes there is also direct access to the canvas.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,97 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Interacting with axes</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
function generate(start, end, fn) {
var res = [];
for (var i = 0; i <= 100; ++i) {
var x = start + i / 100 * (end - start);
res.push([x, fn(x)]);
}
return res;
}
var data = [
{ data: generate(0, 10, function (x) { return Math.sqrt(x);}), xaxis: 1, yaxis:1 },
{ data: generate(0, 10, function (x) { return Math.sin(x);}), xaxis: 1, yaxis:2 },
{ data: generate(0, 10, function (x) { return Math.cos(x);}), xaxis: 1, yaxis:3 },
{ data: generate(2, 10, function (x) { return Math.tan(x);}), xaxis: 2, yaxis: 4 }
];
var plot = $.plot("#placeholder", data, {
xaxes: [
{ position: 'bottom' },
{ position: 'top'}
],
yaxes: [
{ position: 'left' },
{ position: 'left' },
{ position: 'right' },
{ position: 'left' }
]
});
// Create a div for each axis
$.each(plot.getAxes(), function (i, axis) {
if (!axis.show)
return;
var box = axis.box;
$("<div class='axisTarget' style='position:absolute; left:" + box.left + "px; top:" + box.top + "px; width:" + box.width + "px; height:" + box.height + "px'></div>")
.data("axis.direction", axis.direction)
.data("axis.n", axis.n)
.css({ backgroundColor: "#f00", opacity: 0, cursor: "pointer" })
.appendTo(plot.getPlaceholder())
.hover(
function () { $(this).css({ opacity: 0.10 }) },
function () { $(this).css({ opacity: 0 }) }
)
.click(function () {
$("#click").text("You clicked the " + axis.direction + axis.n + "axis!")
});
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Interacting with axes</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>With multiple axes, you sometimes need to interact with them. A simple way to do this is to draw the plot, deduce the axis placements and insert a couple of divs on top to catch events.</p>
<p>Try clicking an axis.</p>
<p id="click"></p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,114 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Time zones</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
<script language="javascript" type="text/javascript" src="date.js"></script>
<script type="text/javascript">
$(function() {
timezoneJS.timezone.zoneFileBasePath = "tz";
timezoneJS.timezone.defaultZoneFile = [];
timezoneJS.timezone.init({async: false});
var d = [
[Date.UTC(2011, 2, 12, 14, 0, 0), 28],
[Date.UTC(2011, 2, 12, 15, 0, 0), 27],
[Date.UTC(2011, 2, 12, 16, 0, 0), 25],
[Date.UTC(2011, 2, 12, 17, 0, 0), 19],
[Date.UTC(2011, 2, 12, 18, 0, 0), 16],
[Date.UTC(2011, 2, 12, 19, 0, 0), 14],
[Date.UTC(2011, 2, 12, 20, 0, 0), 11],
[Date.UTC(2011, 2, 12, 21, 0, 0), 9],
[Date.UTC(2011, 2, 12, 22, 0, 0), 7.5],
[Date.UTC(2011, 2, 12, 23, 0, 0), 6],
[Date.UTC(2011, 2, 13, 0, 0, 0), 5],
[Date.UTC(2011, 2, 13, 1, 0, 0), 6],
[Date.UTC(2011, 2, 13, 2, 0, 0), 7.5],
[Date.UTC(2011, 2, 13, 3, 0, 0), 9],
[Date.UTC(2011, 2, 13, 4, 0, 0), 11],
[Date.UTC(2011, 2, 13, 5, 0, 0), 14],
[Date.UTC(2011, 2, 13, 6, 0, 0), 16],
[Date.UTC(2011, 2, 13, 7, 0, 0), 19],
[Date.UTC(2011, 2, 13, 8, 0, 0), 25],
[Date.UTC(2011, 2, 13, 9, 0, 0), 27],
[Date.UTC(2011, 2, 13, 10, 0, 0), 28],
[Date.UTC(2011, 2, 13, 11, 0, 0), 29],
[Date.UTC(2011, 2, 13, 12, 0, 0), 29.5],
[Date.UTC(2011, 2, 13, 13, 0, 0), 29],
[Date.UTC(2011, 2, 13, 14, 0, 0), 28],
[Date.UTC(2011, 2, 13, 15, 0, 0), 27],
[Date.UTC(2011, 2, 13, 16, 0, 0), 25],
[Date.UTC(2011, 2, 13, 17, 0, 0), 19],
[Date.UTC(2011, 2, 13, 18, 0, 0), 16],
[Date.UTC(2011, 2, 13, 19, 0, 0), 14],
[Date.UTC(2011, 2, 13, 20, 0, 0), 11],
[Date.UTC(2011, 2, 13, 21, 0, 0), 9],
[Date.UTC(2011, 2, 13, 22, 0, 0), 7.5],
[Date.UTC(2011, 2, 13, 23, 0, 0), 6]
];
var plot = $.plot("#placeholderUTC", [d], {
xaxis: {
mode: "time"
}
});
var plot = $.plot("#placeholderLocal", [d], {
xaxis: {
mode: "time",
timezone: "browser"
}
});
var plot = $.plot("#placeholderChicago", [d], {
xaxis: {
mode: "time",
timezone: "America/Chicago"
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Time zones</h2>
</div>
<div id="content">
<h3>UTC</h3>
<div class="demo-container" style="height: 300px;">
<div id="placeholderUTC" class="demo-placeholder"></div>
</div>
<h3>Browser</h3>
<div class="demo-container" style="height: 300px;">
<div id="placeholderLocal" class="demo-placeholder"></div>
</div>
<h3>Chicago</h3>
<div class="demo-container" style="height: 300px;">
<div id="placeholderChicago" class="demo-placeholder"></div>
</div>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 231 B

View File

@@ -0,0 +1,91 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Basic Options</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function () {
var d1 = [];
for (var i = 0; i < Math.PI * 2; i += 0.25) {
d1.push([i, Math.sin(i)]);
}
var d2 = [];
for (var i = 0; i < Math.PI * 2; i += 0.25) {
d2.push([i, Math.cos(i)]);
}
var d3 = [];
for (var i = 0; i < Math.PI * 2; i += 0.1) {
d3.push([i, Math.tan(i)]);
}
$.plot("#placeholder", [
{ label: "sin(x)", data: d1 },
{ label: "cos(x)", data: d2 },
{ label: "tan(x)", data: d3 }
], {
series: {
lines: { show: true },
points: { show: true }
},
xaxis: {
ticks: [
0, [ Math.PI/2, "\u03c0/2" ], [ Math.PI, "\u03c0" ],
[ Math.PI * 3/2, "3\u03c0/2" ], [ Math.PI * 2, "2\u03c0" ]
]
},
yaxis: {
ticks: 10,
min: -2,
max: 2,
tickDecimals: 3
},
grid: {
backgroundColor: { colors: [ "#fff", "#eee" ] },
borderWidth: {
top: 1,
right: 1,
bottom: 2,
left: 2
}
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Basic Options</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>There are plenty of options you can set to control the precise looks of your plot. You can control the ticks on the axes, the legend, the graph type, etc.</p>
<p>Flot goes to great lengths to provide sensible defaults so that you don't have to customize much for a good-looking result.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,57 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Basic Usage</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
var d1 = [];
for (var i = 0; i < 14; i += 0.5) {
d1.push([i, Math.sin(i)]);
}
var d2 = [[0, 3], [4, 8], [8, 5], [9, 13]];
// A null signifies separate line segments
var d3 = [[0, 12], [7, 12], null, [7, 2.5], [12, 2.5]];
$.plot("#placeholder", [ d1, d2, d3 ]);
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Basic Usage</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>You don't have to do much to get an attractive plot. Create a placeholder, make sure it has dimensions (so Flot knows at what size to draw the plot), then call the plot function with your data.</p>
<p>The axes are automatically scaled.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,64 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Categories</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.categories.js"></script>
<script type="text/javascript">
$(function() {
var data = [ ["January", 10], ["February", 8], ["March", 4], ["April", 13], ["May", 17], ["June", 9] ];
$.plot("#placeholder", [ data ], {
series: {
bars: {
show: true,
barWidth: 0.6,
align: "center"
}
},
xaxis: {
mode: "categories",
tickLength: 0
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Categories</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>With the categories plugin you can plot categories/textual data easily.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

@@ -0,0 +1,69 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Image Plots</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.image.js"></script>
<script type="text/javascript">
$(function() {
var data = [[["hs-2004-27-a-large-web.jpg", -10, -10, 10, 10]]];
var options = {
series: {
images: {
show: true
}
},
xaxis: {
min: -8,
max: 4
},
yaxis: {
min: -8,
max: 4
}
};
$.plot.image.loadDataImages(data, options, function () {
$.plot("#placeholder", data, options);
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Image Plots</h2>
</div>
<div id="content">
<div class="demo-container" style="width:600px;height:600px;">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>The Cat's Eye Nebula (<a href="http://hubblesite.org/gallery/album/nebula/pr2004027a/">picture from Hubble</a>).</p>
<p>With the image plugin, you can plot static images against a set of axes. This is for useful for adding ticks to complex prerendered visualizations. Instead of inputting data points, you specify the images and where their two opposite corners are supposed to be in plot space.</p>
<p>Images represent a little further complication because you need to make sure they are loaded before you can use them (Flot skips incomplete images). The plugin comes with a couple of helpers for doing that.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,118 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Interactivity</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
var sin = [],
cos = [];
for (var i = 0; i < 14; i += 0.5) {
sin.push([i, Math.sin(i)]);
cos.push([i, Math.cos(i)]);
}
var plot = $.plot("#placeholder", [
{ data: sin, label: "sin(x)"},
{ data: cos, label: "cos(x)"}
], {
series: {
lines: {
show: true
},
points: {
show: true
}
},
grid: {
hoverable: true,
clickable: true
},
yaxis: {
min: -1.2,
max: 1.2
}
});
$("<div id='tooltip'></div>").css({
position: "absolute",
display: "none",
border: "1px solid #fdd",
padding: "2px",
"background-color": "#fee",
opacity: 0.80
}).appendTo("body");
$("#placeholder").bind("plothover", function (event, pos, item) {
if ($("#enablePosition:checked").length > 0) {
var str = "(" + pos.x.toFixed(2) + ", " + pos.y.toFixed(2) + ")";
$("#hoverdata").text(str);
}
if ($("#enableTooltip:checked").length > 0) {
if (item) {
var x = item.datapoint[0].toFixed(2),
y = item.datapoint[1].toFixed(2);
$("#tooltip").html(item.series.label + " of " + x + " = " + y)
.css({top: item.pageY+5, left: item.pageX+5})
.fadeIn(200);
} else {
$("#tooltip").hide();
}
}
});
$("#placeholder").bind("plotclick", function (event, pos, item) {
if (item) {
$("#clickdata").text(" - click point " + item.dataIndex + " in " + item.series.label);
plot.highlight(item.series, item.datapoint);
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Interactivity</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>One of the goals of Flot is to support user interactions. Try pointing and clicking on the points.</p>
<p>
<label><input id="enablePosition" type="checkbox" checked="checked"></input>Show mouse position</label>
<span id="hoverdata"></span>
<span id="clickdata"></span>
</p>
<p>A tooltip is easy to build with a bit of jQuery code and the data returned from the plot.</p>
<p><label><input id="enableTooltip" type="checkbox" checked="checked"></input>Enable tooltip</label></p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

Before

Width:  |  Height:  |  Size: 916 B

After

Width:  |  Height:  |  Size: 916 B

View File

Before

Width:  |  Height:  |  Size: 891 B

After

Width:  |  Height:  |  Size: 891 B

View File

Before

Width:  |  Height:  |  Size: 897 B

After

Width:  |  Height:  |  Size: 897 B

View File

Before

Width:  |  Height:  |  Size: 916 B

After

Width:  |  Height:  |  Size: 916 B

View File

@@ -0,0 +1,153 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Navigation</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<style type="text/css">
#placeholder .button {
position: absolute;
cursor: pointer;
}
#placeholder div.button {
font-size: smaller;
color: #999;
background-color: #eee;
padding: 2px;
}
.message {
padding-left: 50px;
font-size: smaller;
}
</style>
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.navigate.js"></script>
<script type="text/javascript">
$(function() {
// generate data set from a parametric function with a fractal look
function sumf(f, t, m) {
var res = 0;
for (var i = 1; i < m; ++i) {
res += f(i * i * t) / (i * i);
}
return res;
}
var d1 = [];
for (var t = 0; t <= 2 * Math.PI; t += 0.01) {
d1.push([sumf(Math.cos, t, 10), sumf(Math.sin, t, 10)]);
}
var data = [ d1 ],
placeholder = $("#placeholder");
var plot = $.plot(placeholder, data, {
series: {
lines: {
show: true
},
shadowSize: 0
},
xaxis: {
zoomRange: [0.1, 10],
panRange: [-10, 10]
},
yaxis: {
zoomRange: [0.1, 10],
panRange: [-10, 10]
},
zoom: {
interactive: true
},
pan: {
interactive: true
}
});
// show pan/zoom messages to illustrate events
placeholder.bind("plotpan", function (event, plot) {
var axes = plot.getAxes();
$(".message").html("Panning to x: " + axes.xaxis.min.toFixed(2)
+ " &ndash; " + axes.xaxis.max.toFixed(2)
+ " and y: " + axes.yaxis.min.toFixed(2)
+ " &ndash; " + axes.yaxis.max.toFixed(2));
});
placeholder.bind("plotzoom", function (event, plot) {
var axes = plot.getAxes();
$(".message").html("Zooming to x: " + axes.xaxis.min.toFixed(2)
+ " &ndash; " + axes.xaxis.max.toFixed(2)
+ " and y: " + axes.yaxis.min.toFixed(2)
+ " &ndash; " + axes.yaxis.max.toFixed(2));
});
// add zoom out button
$("<div class='button' style='right:20px;top:20px'>zoom out</div>")
.appendTo(placeholder)
.click(function (event) {
event.preventDefault();
plot.zoomOut();
});
// and add panning buttons
// little helper for taking the repetitive work out of placing
// panning arrows
function addArrow(dir, right, top, offset) {
$("<img class='button' src='arrow-" + dir + ".gif' style='right:" + right + "px;top:" + top + "px'>")
.appendTo(placeholder)
.click(function (e) {
e.preventDefault();
plot.pan(offset);
});
}
addArrow("left", 55, 60, { left: -100 });
addArrow("right", 25, 60, { left: 100 });
addArrow("up", 40, 45, { top: -100 });
addArrow("down", 40, 75, { top: 100 });
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Navigation</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p class="message"></p>
<p>With the navigate plugin it is easy to add panning and zooming. Drag to pan, double click to zoom (or use the mouse scrollwheel).</p>
<p>The plugin fires events (useful for synchronizing several plots) and adds a couple of public methods so you can easily build a little user interface around it, like the little buttons at the top right in the plot.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,79 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Percentiles</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.fillbetween.js"></script>
<script type="text/javascript">
$(function() {
var males = {"15%": [[2, 88.0], [3, 93.3], [4, 102.0], [5, 108.5], [6, 115.7], [7, 115.6], [8, 124.6], [9, 130.3], [10, 134.3], [11, 141.4], [12, 146.5], [13, 151.7], [14, 159.9], [15, 165.4], [16, 167.8], [17, 168.7], [18, 169.5], [19, 168.0]], "90%": [[2, 96.8], [3, 105.2], [4, 113.9], [5, 120.8], [6, 127.0], [7, 133.1], [8, 139.1], [9, 143.9], [10, 151.3], [11, 161.1], [12, 164.8], [13, 173.5], [14, 179.0], [15, 182.0], [16, 186.9], [17, 185.2], [18, 186.3], [19, 186.6]], "25%": [[2, 89.2], [3, 94.9], [4, 104.4], [5, 111.4], [6, 117.5], [7, 120.2], [8, 127.1], [9, 132.9], [10, 136.8], [11, 144.4], [12, 149.5], [13, 154.1], [14, 163.1], [15, 169.2], [16, 170.4], [17, 171.2], [18, 172.4], [19, 170.8]], "10%": [[2, 86.9], [3, 92.6], [4, 99.9], [5, 107.0], [6, 114.0], [7, 113.5], [8, 123.6], [9, 129.2], [10, 133.0], [11, 140.6], [12, 145.2], [13, 149.7], [14, 158.4], [15, 163.5], [16, 166.9], [17, 167.5], [18, 167.1], [19, 165.3]], "mean": [[2, 91.9], [3, 98.5], [4, 107.1], [5, 114.4], [6, 120.6], [7, 124.7], [8, 131.1], [9, 136.8], [10, 142.3], [11, 150.0], [12, 154.7], [13, 161.9], [14, 168.7], [15, 173.6], [16, 175.9], [17, 176.6], [18, 176.8], [19, 176.7]], "75%": [[2, 94.5], [3, 102.1], [4, 110.8], [5, 117.9], [6, 124.0], [7, 129.3], [8, 134.6], [9, 141.4], [10, 147.0], [11, 156.1], [12, 160.3], [13, 168.3], [14, 174.7], [15, 178.0], [16, 180.2], [17, 181.7], [18, 181.3], [19, 182.5]], "85%": [[2, 96.2], [3, 103.8], [4, 111.8], [5, 119.6], [6, 125.6], [7, 131.5], [8, 138.0], [9, 143.3], [10, 149.3], [11, 159.8], [12, 162.5], [13, 171.3], [14, 177.5], [15, 180.2], [16, 183.8], [17, 183.4], [18, 183.5], [19, 185.5]], "50%": [[2, 91.9], [3, 98.2], [4, 106.8], [5, 114.6], [6, 120.8], [7, 125.2], [8, 130.3], [9, 137.1], [10, 141.5], [11, 149.4], [12, 153.9], [13, 162.2], [14, 169.0], [15, 174.8], [16, 176.0], [17, 176.8], [18, 176.4], [19, 177.4]]};
var females = {"15%": [[2, 84.8], [3, 93.7], [4, 100.6], [5, 105.8], [6, 113.3], [7, 119.3], [8, 124.3], [9, 131.4], [10, 136.9], [11, 143.8], [12, 149.4], [13, 151.2], [14, 152.3], [15, 155.9], [16, 154.7], [17, 157.0], [18, 156.1], [19, 155.4]], "90%": [[2, 95.6], [3, 104.1], [4, 111.9], [5, 119.6], [6, 127.6], [7, 133.1], [8, 138.7], [9, 147.1], [10, 152.8], [11, 161.3], [12, 166.6], [13, 167.9], [14, 169.3], [15, 170.1], [16, 172.4], [17, 169.2], [18, 171.1], [19, 172.4]], "25%": [[2, 87.2], [3, 95.9], [4, 101.9], [5, 107.4], [6, 114.8], [7, 121.4], [8, 126.8], [9, 133.4], [10, 138.6], [11, 146.2], [12, 152.0], [13, 153.8], [14, 155.7], [15, 158.4], [16, 157.0], [17, 158.5], [18, 158.4], [19, 158.1]], "10%": [[2, 84.0], [3, 91.9], [4, 99.2], [5, 105.2], [6, 112.7], [7, 118.0], [8, 123.3], [9, 130.2], [10, 135.0], [11, 141.1], [12, 148.3], [13, 150.0], [14, 150.7], [15, 154.3], [16, 153.6], [17, 155.6], [18, 154.7], [19, 153.1]], "mean": [[2, 90.2], [3, 98.3], [4, 105.2], [5, 112.2], [6, 119.0], [7, 125.8], [8, 131.3], [9, 138.6], [10, 144.2], [11, 151.3], [12, 156.7], [13, 158.6], [14, 160.5], [15, 162.1], [16, 162.9], [17, 162.2], [18, 163.0], [19, 163.1]], "75%": [[2, 93.2], [3, 101.5], [4, 107.9], [5, 116.6], [6, 122.8], [7, 129.3], [8, 135.2], [9, 143.7], [10, 148.7], [11, 156.9], [12, 160.8], [13, 163.0], [14, 165.0], [15, 165.8], [16, 168.7], [17, 166.2], [18, 167.6], [19, 168.0]], "85%": [[2, 94.5], [3, 102.8], [4, 110.4], [5, 119.0], [6, 125.7], [7, 131.5], [8, 137.9], [9, 146.0], [10, 151.3], [11, 159.9], [12, 164.0], [13, 166.5], [14, 167.5], [15, 168.5], [16, 171.5], [17, 168.0], [18, 169.8], [19, 170.3]], "50%": [[2, 90.2], [3, 98.1], [4, 105.2], [5, 111.7], [6, 118.2], [7, 125.6], [8, 130.5], [9, 138.3], [10, 143.7], [11, 151.4], [12, 156.7], [13, 157.7], [14, 161.0], [15, 162.0], [16, 162.8], [17, 162.2], [18, 162.8], [19, 163.3]]};
var dataset = [
{ label: "Female mean", data: females["mean"], lines: { show: true }, color: "rgb(255,50,50)" },
{ id: "f15%", data: females["15%"], lines: { show: true, lineWidth: 0, fill: false }, color: "rgb(255,50,50)" },
{ id: "f25%", data: females["25%"], lines: { show: true, lineWidth: 0, fill: 0.2 }, color: "rgb(255,50,50)", fillBetween: "f15%" },
{ id: "f50%", data: females["50%"], lines: { show: true, lineWidth: 0.5, fill: 0.4, shadowSize: 0 }, color: "rgb(255,50,50)", fillBetween: "f25%" },
{ id: "f75%", data: females["75%"], lines: { show: true, lineWidth: 0, fill: 0.4 }, color: "rgb(255,50,50)", fillBetween: "f50%" },
{ id: "f85%", data: females["85%"], lines: { show: true, lineWidth: 0, fill: 0.2 }, color: "rgb(255,50,50)", fillBetween: "f75%" },
{ label: "Male mean", data: males["mean"], lines: { show: true }, color: "rgb(50,50,255)" },
{ id: "m15%", data: males["15%"], lines: { show: true, lineWidth: 0, fill: false }, color: "rgb(50,50,255)" },
{ id: "m25%", data: males["25%"], lines: { show: true, lineWidth: 0, fill: 0.2 }, color: "rgb(50,50,255)", fillBetween: "m15%" },
{ id: "m50%", data: males["50%"], lines: { show: true, lineWidth: 0.5, fill: 0.4, shadowSize: 0 }, color: "rgb(50,50,255)", fillBetween: "m25%" },
{ id: "m75%", data: males["75%"], lines: { show: true, lineWidth: 0, fill: 0.4 }, color: "rgb(50,50,255)", fillBetween: "m50%" },
{ id: "m85%", data: males["85%"], lines: { show: true, lineWidth: 0, fill: 0.2 }, color: "rgb(50,50,255)", fillBetween: "m75%" }
];
$.plot($("#placeholder"), dataset, {
xaxis: {
tickDecimals: 0
},
yaxis: {
tickFormatter: function (v) {
return v + " cm";
}
},
legend: {
position: "se"
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Percentiles</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>Height in centimeters of individuals from the US (2003-2006) as function of age in years (source: <a href="http://www.cdc.gov/nchs/data/nhsr/nhsr010.pdf">CDC</a>). The 15%-85%, 25%-75% and 50% percentiles are indicated.</p>
<p>For each point of a filled curve, you can specify an arbitrary bottom. As this example illustrates, this can be useful for plotting percentiles. If you have the data sets available without appropriate fill bottoms, you can use the fillbetween plugin to compute the data point bottoms automatically.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,122 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Real-time updates</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
// We use an inline data source in the example, usually data would
// be fetched from a server
var data = [],
totalPoints = 300;
function getRandomData() {
if (data.length > 0)
data = data.slice(1);
// Do a random walk
while (data.length < totalPoints) {
var prev = data.length > 0 ? data[data.length - 1] : 50,
y = prev + Math.random() * 10 - 5;
if (y < 0) {
y = 0;
} else if (y > 100) {
y = 100;
}
data.push(y);
}
// Zip the generated y values with the x values
var res = [];
for (var i = 0; i < data.length; ++i) {
res.push([i, data[i]])
}
return res;
}
// Set up the control widget
var updateInterval = 30;
$("#updateInterval").val(updateInterval).change(function () {
var v = $(this).val();
if (v && !isNaN(+v)) {
updateInterval = +v;
if (updateInterval < 1) {
updateInterval = 1;
} else if (updateInterval > 2000) {
updateInterval = 2000;
}
$(this).val("" + updateInterval);
}
});
var plot = $.plot("#placeholder", [ getRandomData() ], {
series: {
shadowSize: 0 // Drawing is faster without shadows
},
yaxis: {
min: 0,
max: 100
},
xaxis: {
show: false
}
});
function update() {
plot.setData([getRandomData()]);
// Since the axes don't change, we don't need to call plot.setupGrid()
plot.draw();
setTimeout(update, updateInterval);
}
update();
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Real-time updates</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>You can update a chart periodically to get a real-time effect by using a timer to insert the new data in the plot and redraw it.</p>
<p>Time between updates: <input id="updateInterval" type="text" value="" style="text-align: right; width:5em"> milliseconds</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,76 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Resizing</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<link href="../shared/jquery-ui/jquery-ui.min.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../shared/jquery-ui/jquery-ui.min.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.resize.js"></script>
<script type="text/javascript">
$(function() {
var d1 = [];
for (var i = 0; i < 14; i += 0.5) {
d1.push([i, Math.sin(i)]);
}
var d2 = [[0, 3], [4, 8], [8, 5], [9, 13]];
var d3 = [[0, 12], [7, 12], null, [7, 2.5], [12, 2.5]];
var placeholder = $("#placeholder");
var plot = $.plot(placeholder, [d1, d2, d3]);
// The plugin includes a jQuery plugin for adding resize events to any
// element. Add a callback so we can display the placeholder size.
placeholder.resize(function () {
$(".message").text("Placeholder is now "
+ $(this).width() + "x" + $(this).height()
+ " pixels");
});
$(".demo-container").resizable({
maxWidth: 900,
maxHeight: 500,
minWidth: 450,
minHeight: 250
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Resizing</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p class="message"></p>
<p>Sometimes it makes more sense to just let the plot take up the available space. In that case, we need to redraw the plot each time the placeholder changes its size. If you include the resize plugin, this is handled automatically.</p>
<p>Drag the bottom and right sides of the plot to resize it.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,152 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Selection</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
<script type="text/javascript">
$(function() {
// Shim allowing us to get the state of the check-box on jQuery versions
// prior to 1.6, when prop was added. The reason we don't just use attr
// is because it doesn't work in jQuery versions 1.9.x and later.
// TODO: Remove this once Flot's minimum supported jQuery reaches 1.6.
if (typeof $.fn.prop != 'function') {
$.fn.prop = $.fn.attr;
}
var data = [{
label: "United States",
data: [[1990, 18.9], [1991, 18.7], [1992, 18.4], [1993, 19.3], [1994, 19.5], [1995, 19.3], [1996, 19.4], [1997, 20.2], [1998, 19.8], [1999, 19.9], [2000, 20.4], [2001, 20.1], [2002, 20.0], [2003, 19.8], [2004, 20.4]]
}, {
label: "Russia",
data: [[1992, 13.4], [1993, 12.2], [1994, 10.6], [1995, 10.2], [1996, 10.1], [1997, 9.7], [1998, 9.5], [1999, 9.7], [2000, 9.9], [2001, 9.9], [2002, 9.9], [2003, 10.3], [2004, 10.5]]
}, {
label: "United Kingdom",
data: [[1990, 10.0], [1991, 11.3], [1992, 9.9], [1993, 9.6], [1994, 9.5], [1995, 9.5], [1996, 9.9], [1997, 9.3], [1998, 9.2], [1999, 9.2], [2000, 9.5], [2001, 9.6], [2002, 9.3], [2003, 9.4], [2004, 9.79]]
}, {
label: "Germany",
data: [[1990, 12.4], [1991, 11.2], [1992, 10.8], [1993, 10.5], [1994, 10.4], [1995, 10.2], [1996, 10.5], [1997, 10.2], [1998, 10.1], [1999, 9.6], [2000, 9.7], [2001, 10.0], [2002, 9.7], [2003, 9.8], [2004, 9.79]]
}, {
label: "Denmark",
data: [[1990, 9.7], [1991, 12.1], [1992, 10.3], [1993, 11.3], [1994, 11.7], [1995, 10.6], [1996, 12.8], [1997, 10.8], [1998, 10.3], [1999, 9.4], [2000, 8.7], [2001, 9.0], [2002, 8.9], [2003, 10.1], [2004, 9.80]]
}, {
label: "Sweden",
data: [[1990, 5.8], [1991, 6.0], [1992, 5.9], [1993, 5.5], [1994, 5.7], [1995, 5.3], [1996, 6.1], [1997, 5.4], [1998, 5.4], [1999, 5.1], [2000, 5.2], [2001, 5.4], [2002, 6.2], [2003, 5.9], [2004, 5.89]]
}, {
label: "Norway",
data: [[1990, 8.3], [1991, 8.3], [1992, 7.8], [1993, 8.3], [1994, 8.4], [1995, 5.9], [1996, 6.4], [1997, 6.7], [1998, 6.9], [1999, 7.6], [2000, 7.4], [2001, 8.1], [2002, 12.5], [2003, 9.9], [2004, 19.0]]
}];
var options = {
series: {
lines: {
show: true
},
points: {
show: true
}
},
legend: {
noColumns: 2
},
xaxis: {
tickDecimals: 0
},
yaxis: {
min: 0
},
selection: {
mode: "x"
}
};
var placeholder = $("#placeholder");
placeholder.bind("plotselected", function (event, ranges) {
$("#selection").text(ranges.xaxis.from.toFixed(1) + " to " + ranges.xaxis.to.toFixed(1));
var zoom = $("#zoom").prop("checked");
if (zoom) {
$.each(plot.getXAxes(), function(_, axis) {
var opts = axis.options;
opts.min = ranges.xaxis.from;
opts.max = ranges.xaxis.to;
});
plot.setupGrid();
plot.draw();
plot.clearSelection();
}
});
placeholder.bind("plotunselected", function (event) {
$("#selection").text("");
});
var plot = $.plot(placeholder, data, options);
$("#clearSelection").click(function () {
plot.clearSelection();
});
$("#setSelection").click(function () {
plot.setSelection({
xaxis: {
from: 1994,
to: 1995
}
});
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Selection</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>1000 kg. CO<sub>2</sub> emissions per year per capita for various countries (source: <a href="http://en.wikipedia.org/wiki/List_of_countries_by_carbon_dioxide_emissions_per_capita">Wikipedia</a>).</p>
<p>Flot supports selections through the selection plugin. You can enable rectangular selection or one-dimensional selection if the user should only be able to select on one axis. Try left-click and drag on the plot above where selection on the x axis is enabled.</p>
<p>You selected: <span id="selection"></span></p>
<p>The plot command returns a plot object you can use to control the selection. Click the buttons below.</p>
<p>
<button id="clearSelection">Clear selection</button>
<button id="setSelection">Select year 1994</button>
</p>
<p>Selections are really useful for zooming. Just replot the chart with min and max values for the axes set to the values in the "plotselected" event triggered. Enable the checkbox below and select a region again.</p>
<p><label><input id="zoom" type="checkbox"></input>Zoom to selection.</label></p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,150 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Error Bars</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.errorbars.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.navigate.js"></script>
<script type="text/javascript">
$(function() {
function drawArrow(ctx, x, y, radius){
ctx.beginPath();
ctx.moveTo(x + radius, y + radius);
ctx.lineTo(x, y);
ctx.lineTo(x - radius, y + radius);
ctx.stroke();
}
function drawSemiCircle(ctx, x, y, radius){
ctx.beginPath();
ctx.arc(x, y, radius, 0, Math.PI, false);
ctx.moveTo(x - radius, y);
ctx.lineTo(x + radius, y);
ctx.stroke();
}
var data1 = [
[1,1,.5,.1,.3],
[2,2,.3,.5,.2],
[3,3,.9,.5,.2],
[1.5,-.05,.5,.1,.3],
[3.15,1.,.5,.1,.3],
[2.5,-1.,.5,.1,.3]
];
var data1_points = {
show: true,
radius: 5,
fillColor: "blue",
errorbars: "xy",
xerr: {show: true, asymmetric: true, upperCap: "-", lowerCap: "-"},
yerr: {show: true, color: "red", upperCap: "-"}
};
var data2 = [
[.7,3,.2,.4],
[1.5,2.2,.3,.4],
[2.3,1,.5,.2]
];
var data2_points = {
show: true,
radius: 5,
errorbars: "y",
yerr: {show:true, asymmetric:true, upperCap: drawArrow, lowerCap: drawSemiCircle}
};
var data3 = [
[1,2,.4],
[2,0.5,.3],
[2.7,2,.5]
];
var data3_points = {
//do not show points
radius: 0,
errorbars: "y",
yerr: {show:true, upperCap: "-", lowerCap: "-", radius: 5}
};
var data4 = [
[1.3, 1],
[1.75, 2.5],
[2.5, 0.5]
];
var data4_errors = [0.1, 0.4, 0.2];
for (var i = 0; i < data4.length; i++) {
data4_errors[i] = data4[i].concat(data4_errors[i])
}
var data = [
{color: "blue", points: data1_points, data: data1, label: "data1"},
{color: "red", points: data2_points, data: data2, label: "data2"},
{color: "green", lines: {show: true}, points: data3_points, data: data3, label: "data3"},
// bars with errors
{color: "orange", bars: {show: true, align: "center", barWidth: 0.25}, data: data4, label: "data4"},
{color: "orange", points: data3_points, data: data4_errors}
];
$.plot($("#placeholder"), data , {
legend: {
position: "sw",
show: true
},
series: {
lines: {
show: false
}
},
xaxis: {
min: 0.6,
max: 3.1
},
yaxis: {
min: 0,
max: 3.5
},
zoom: {
interactive: true
},
pan: {
interactive: true
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Error Bars</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>With the errorbars plugin you can plot error bars to show standard deviation and other useful statistical properties.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,818 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Pie Charts</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<style type="text/css">
.demo-container {
position: relative;
height: 400px;
}
#placeholder {
width: 550px;
}
#menu {
position: absolute;
top: 20px;
left: 625px;
bottom: 20px;
right: 20px;
width: 200px;
}
#menu button {
display: inline-block;
width: 200px;
padding: 3px 0 2px 0;
margin-bottom: 4px;
background: #eee;
border: 1px solid #999;
border-radius: 2px;
font-size: 16px;
-o-box-shadow: 0 1px 2px rgba(0,0,0,0.15);
-ms-box-shadow: 0 1px 2px rgba(0,0,0,0.15);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.15);
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.15);
box-shadow: 0 1px 2px rgba(0,0,0,0.15);
cursor: pointer;
}
#description {
margin: 15px 10px 20px 10px;
}
#code {
display: block;
width: 870px;
padding: 15px;
margin: 10px auto;
border: 1px dashed #999;
background-color: #f8f8f8;
font-size: 16px;
line-height: 20px;
color: #666;
}
ul {
font-size: 10pt;
}
ul li {
margin-bottom: 0.5em;
}
ul.options li {
list-style: none;
margin-bottom: 1em;
}
ul li i {
color: #999;
}
</style>
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.pie.js"></script>
<script type="text/javascript">
$(function() {
// Example Data
//var data = [
// { label: "Series1", data: 10},
// { label: "Series2", data: 30},
// { label: "Series3", data: 90},
// { label: "Series4", data: 70},
// { label: "Series5", data: 80},
// { label: "Series6", data: 110}
//];
//var data = [
// { label: "Series1", data: [[1,10]]},
// { label: "Series2", data: [[1,30]]},
// { label: "Series3", data: [[1,90]]},
// { label: "Series4", data: [[1,70]]},
// { label: "Series5", data: [[1,80]]},
// { label: "Series6", data: [[1,0]]}
//];
//var data = [
// { label: "Series A", data: 0.2063},
// { label: "Series B", data: 38888}
//];
// Randomly Generated Data
var data = [],
series = Math.floor(Math.random() * 6) + 3;
for (var i = 0; i < series; i++) {
data[i] = {
label: "Series" + (i + 1),
data: Math.floor(Math.random() * 100) + 1
}
}
var placeholder = $("#placeholder");
$("#example-1").click(function() {
placeholder.unbind();
$("#title").text("Default pie chart");
$("#description").text("The default pie chart with no options set.");
$.plot(placeholder, data, {
series: {
pie: {
show: true
}
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true",
" }",
" }",
"});"
]);
});
$("#example-2").click(function() {
placeholder.unbind();
$("#title").text("Default without legend");
$("#description").text("The default pie chart when the legend is disabled. Since the labels would normally be outside the container, the chart is resized to fit.");
$.plot(placeholder, data, {
series: {
pie: {
show: true
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-3").click(function() {
placeholder.unbind();
$("#title").text("Custom Label Formatter");
$("#description").text("Added a semi-transparent background to the labels and a custom labelFormatter function.");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
radius: 1,
label: {
show: true,
radius: 1,
formatter: labelFormatter,
background: {
opacity: 0.8
}
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true,",
" radius: 1,",
" label: {",
" show: true,",
" radius: 1,",
" formatter: labelFormatter,",
" background: {",
" opacity: 0.8",
" }",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-4").click(function() {
placeholder.unbind();
$("#title").text("Label Radius");
$("#description").text("Slightly more transparent label backgrounds and adjusted the radius values to place them within the pie.");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
radius: 1,
label: {
show: true,
radius: 3/4,
formatter: labelFormatter,
background: {
opacity: 0.5
}
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true,",
" radius: 1,",
" label: {",
" show: true,",
" radius: 3/4,",
" formatter: labelFormatter,",
" background: {",
" opacity: 0.5",
" }",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-5").click(function() {
placeholder.unbind();
$("#title").text("Label Styles #1");
$("#description").text("Semi-transparent, black-colored label background.");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
radius: 1,
label: {
show: true,
radius: 3/4,
formatter: labelFormatter,
background: {
opacity: 0.5,
color: "#000"
}
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: { ",
" show: true,",
" radius: 1,",
" label: {",
" show: true,",
" radius: 3/4,",
" formatter: labelFormatter,",
" background: { ",
" opacity: 0.5,",
" color: '#000'",
" }",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-6").click(function() {
placeholder.unbind();
$("#title").text("Label Styles #2");
$("#description").text("Semi-transparent, black-colored label background placed at pie edge.");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
radius: 3/4,
label: {
show: true,
radius: 3/4,
formatter: labelFormatter,
background: {
opacity: 0.5,
color: "#000"
}
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true,",
" radius: 3/4,",
" label: {",
" show: true,",
" radius: 3/4,",
" formatter: labelFormatter,",
" background: {",
" opacity: 0.5,",
" color: '#000'",
" }",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-7").click(function() {
placeholder.unbind();
$("#title").text("Hidden Labels");
$("#description").text("Labels can be hidden if the slice is less than a given percentage of the pie (10% in this case).");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
radius: 1,
label: {
show: true,
radius: 2/3,
formatter: labelFormatter,
threshold: 0.1
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true,",
" radius: 1,",
" label: {",
" show: true,",
" radius: 2/3,",
" formatter: labelFormatter,",
" threshold: 0.1",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-8").click(function() {
placeholder.unbind();
$("#title").text("Combined Slice");
$("#description").text("Multiple slices less than a given percentage (5% in this case) of the pie can be combined into a single, larger slice.");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
combine: {
color: "#999",
threshold: 0.05
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true,",
" combine: {",
" color: '#999',",
" threshold: 0.1",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-9").click(function() {
placeholder.unbind();
$("#title").text("Rectangular Pie");
$("#description").text("The radius can also be set to a specific size (even larger than the container itself).");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
radius: 500,
label: {
show: true,
formatter: labelFormatter,
threshold: 0.1
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true,",
" radius: 500,",
" label: {",
" show: true,",
" formatter: labelFormatter,",
" threshold: 0.1",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});"
]);
});
$("#example-10").click(function() {
placeholder.unbind();
$("#title").text("Tilted Pie");
$("#description").text("The pie can be tilted at an angle.");
$.plot(placeholder, data, {
series: {
pie: {
show: true,
radius: 1,
tilt: 0.5,
label: {
show: true,
radius: 1,
formatter: labelFormatter,
background: {
opacity: 0.8
}
},
combine: {
color: "#999",
threshold: 0.1
}
}
},
legend: {
show: false
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true,",
" radius: 1,",
" tilt: 0.5,",
" label: {",
" show: true,",
" radius: 1,",
" formatter: labelFormatter,",
" background: {",
" opacity: 0.8",
" }",
" },",
" combine: {",
" color: '#999',",
" threshold: 0.1",
" }",
" }",
" },",
" legend: {",
" show: false",
" }",
"});",
]);
});
$("#example-11").click(function() {
placeholder.unbind();
$("#title").text("Donut Hole");
$("#description").text("A donut hole can be added.");
$.plot(placeholder, data, {
series: {
pie: {
innerRadius: 0.5,
show: true
}
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" innerRadius: 0.5,",
" show: true",
" }",
" }",
"});"
]);
});
$("#example-12").click(function() {
placeholder.unbind();
$("#title").text("Interactivity");
$("#description").text("The pie can be made interactive with hover and click events.");
$.plot(placeholder, data, {
series: {
pie: {
show: true
}
},
grid: {
hoverable: true,
clickable: true
}
});
setCode([
"$.plot('#placeholder', data, {",
" series: {",
" pie: {",
" show: true",
" }",
" },",
" grid: {",
" hoverable: true,",
" clickable: true",
" }",
"});"
]);
placeholder.bind("plothover", function(event, pos, obj) {
if (!obj) {
return;
}
var percent = parseFloat(obj.series.percent).toFixed(2);
$("#hover").html("<span style='font-weight:bold; color:" + obj.series.color + "'>" + obj.series.label + " (" + percent + "%)</span>");
});
placeholder.bind("plotclick", function(event, pos, obj) {
if (!obj) {
return;
}
percent = parseFloat(obj.series.percent).toFixed(2);
alert("" + obj.series.label + ": " + percent + "%");
});
});
// Show the initial default chart
$("#example-1").click();
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
// A custom label formatter used by several of the plots
function labelFormatter(label, series) {
return "<div style='font-size:8pt; text-align:center; padding:2px; color:white;'>" + label + "<br/>" + Math.round(series.percent) + "%</div>";
}
//
function setCode(lines) {
$("#code").text(lines.join("\n"));
}
</script>
</head>
<body>
<div id="header">
<h2>Pie Charts</h2>
</div>
<div id="content">
<h3 id="title"></h3>
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
<div id="menu">
<button id="example-1">Default Options</button>
<button id="example-2">Without Legend</button>
<button id="example-3">Label Formatter</button>
<button id="example-4">Label Radius</button>
<button id="example-5">Label Styles #1</button>
<button id="example-6">Label Styles #2</button>
<button id="example-7">Hidden Labels</button>
<button id="example-8">Combined Slice</button>
<button id="example-9">Rectangular Pie</button>
<button id="example-10">Tilted Pie</button>
<button id="example-11">Donut Hole</button>
<button id="example-12">Interactivity</button>
</div>
</div>
<p id="description"></p>
<h3>Source Code</h3>
<pre><code id="code"></code></pre>
<br/>
<h2>Pie Options</h2>
<ul class="options">
<li style="border-bottom: 1px dotted #ccc;"><b>option:</b> <i>default value</i> - Description of option</li>
<li><b>show:</b> <i>false</i> - Enable the plugin and draw as a pie.</li>
<li><b>radius:</b> <i>'auto'</i> - Sets the radius of the pie. If value is between 0 and 1 (inclusive) then it will use that as a percentage of the available space (size of the container), otherwise it will use the value as a direct pixel length. If set to 'auto', it will be set to 1 if the legend is enabled and 3/4 if not.</li>
<li><b>innerRadius:</b> <i>0</i> - Sets the radius of the donut hole. If value is between 0 and 1 (inclusive) then it will use that as a percentage of the radius, otherwise it will use the value as a direct pixel length.</li>
<li><b>startAngle:</b> <i>3/2</i> - Factor of PI used for the starting angle (in radians) It can range between 0 and 2 (where 0 and 2 have the same result).</li>
<li><b>tilt:</b> <i>1</i> - Percentage of tilt ranging from 0 and 1, where 1 has no change (fully vertical) and 0 is completely flat (fully horizontal -- in which case nothing actually gets drawn).</li>
<li><b>shadow:</b> <ul>
<li><b>top:</b> <i>5</i> - Vertical distance in pixel of the tilted pie shadow.</li>
<li><b>left:</b> <i>15</i> - Horizontal distance in pixel of the tilted pie shadow.</li>
<li><b>alpha:</b> <i>0.02</i> - Alpha value of the tilted pie shadow.</li>
</ul>
<li><b>offset:</b> <ul>
<li><b>top:</b> <i>0</i> - Pixel distance to move the pie up and down (relative to the center).</li>
<li><b>left:</b> <i>'auto'</i> - Pixel distance to move the pie left and right (relative to the center).</li>
</ul>
<li><b>stroke:</b> <ul>
<li><b>color:</b> <i>'#FFF'</i> - Color of the border of each slice. Hexadecimal color definitions are prefered (other formats may or may not work).</li>
<li><b>width:</b> <i>1</i> - Pixel width of the border of each slice.</li>
</ul>
<li><b>label:</b> <ul>
<li><b>show:</b> <i>'auto'</i> - Enable/Disable the labels. This can be set to true, false, or 'auto'. When set to 'auto', it will be set to false if the legend is enabled and true if not.</li>
<li><b>radius:</b> <i>1</i> - Sets the radius at which to place the labels. If value is between 0 and 1 (inclusive) then it will use that as a percentage of the available space (size of the container), otherwise it will use the value as a direct pixel length.</li>
<li><b>threshold:</b> <i>0</i> - Hides the labels of any pie slice that is smaller than the specified percentage (ranging from 0 to 1) i.e. a value of '0.03' will hide all slices 3% or less of the total.</li>
<li><b>formatter:</b> <i>[function]</i> - This function specifies how the positioned labels should be formatted, and is applied after the legend's labelFormatter function. The labels can also still be styled using the class "pieLabel" (i.e. ".pieLabel" or "#graph1 .pieLabel").</li>
<li><b>radius:</b> <i>1</i> - Sets the radius at which to place the labels. If value is between 0 and 1 (inclusive) then it will use that as a percentage of the available space (size of the container), otherwise it will use the value as a direct pixel length.</li>
<li><b>background:</b> <ul>
<li><b>color:</b> <i>null</i> - Backgound color of the positioned labels. If null, the plugin will automatically use the color of the slice.</li>
<li><b>opacity:</b> <i>0</i> - Opacity of the background for the positioned labels. Acceptable values range from 0 to 1, where 0 is completely transparent and 1 is completely opaque.</li>
</ul>
</ul>
<li><b>combine:</b> <ul>
<li><b>threshold:</b> <i>0</i> - Combines all slices that are smaller than the specified percentage (ranging from 0 to 1) i.e. a value of '0.03' will combine all slices 3% or less into one slice).</li>
<li><b>color:</b> <i>null</i> - Backgound color of the positioned labels. If null, the plugin will automatically use the color of the first slice to be combined.</li>
<li><b>label:</b> <i>'Other'</i> - Label text for the combined slice.</li>
</ul>
<li><b>highlight:</b> <ul>
<li><b>opacity:</b> <i>0.5</i> - Opacity of the highlight overlay on top of the current pie slice. Currently this just uses a white overlay, but support for changing the color of the overlay will also be added at a later date.
</ul>
</ul>
<h2>Changes/Features</h2>
<ul>
<li style="list-style: none;"><i>v1.0 - November 20th, 2009 - Brian Medendorp</i></li>
<li>The pie plug-in is now part of the Flot repository! This should make it a lot easier to deal with.</li>
<li>Added a new option (innerRadius) to add a "donut hole" to the center of the pie, based on comtributions from Anthony Aragues. I was a little reluctant to add this feature because it doesn't work very well with the shadow created for the tilted pie, but figured it was worthwhile for non-tilted pies. Also, excanvas apparently doesn't support compositing, so it will fall back to using the stroke color to fill in the center (but I recommend setting the stroke color to the background color anyway).</li>
<li>Changed the lineJoin for the border of the pie slices to use the 'round' option. This should make the center of the pie look better, particularly when there are numerous thin slices.</li>
<li>Included a bug fix submitted by btburnett3 to display a slightly smaller slice in the event that the slice is 100% and being rendered with Internet Explorer. I haven't experienced this bug myself, but it doesn't seem to hurt anything so I've included it.</li>
<li>The tilt value is now used when calculating the maximum radius of the pie in relation to the height of the container. This should prevent the pie from being smaller than it needed to in some cases, as well as reducing the amount of extra white space generated above and below the pie.</li>
<li><b>Hover and Click functionality are now availabe!</b><ul>
<li>Thanks to btburnett3 for the original hover functionality and Anthony Aragues for the modification that makes it compatable with excanvas, this was a huge help!</li>
<li>Added a new option (highlight opacity) to modify the highlight created when mousing over a slice. Currently this just uses a white overlay, but an option to change the hightlight color will be added when the appropriate functionality becomes available.
<li>I had a major setback that required me to practically rebuild the hover/click events from scratch one piece at a time (I discovered that it only worked with a single pie on a page at a time), but the end result ended up being virtually identical to the original, so I'm not quite sure what exactly made it work.</li>
<li><span style="color: red;">Warning:</span> There are some minor issues with using this functionality in conjuction with some of the other more advanced features (tilt and donut). When using a donut hole, the inner portion still triggers the events even though that portion of the pie is no longer visible. When tilted, the interactive portions still use the original, untilted version of the pie when determining mouse position (this is because the isPointInPath function apparently doesn't work with transformations), however hover and click both work this way, so the appropriate slice is still highlighted when clicking, and it isn't as noticable of a problem.</li>
</ul></li>
<li>Included a bug fix submitted by Xavi Ivars to fix array issues when other javascript libraries are included in addition to jQuery</li>
<br/>
<li style="list-style: none;"><i>v0.4 - July 1st, 2009 - Brian Medendorp</i></li>
<li>Each series will now be shown in the legend, even if it's value is zero. The series will not get a positioned label because it will overlap with the other labels present and often makes them unreadable.</li>
<li>Data can now be passed in using the standard Flot method using an array of datapoints, the pie plugin will simply use the first y-value that it finds for each series in this case. The plugin uses this datastructure internally, but you can still use the old method of passing in a single numerical value for each series (the plugin will convert it as necessary). This should make it easier to transition from other types of graphs (such as a stacked bar graph) to a pie.</li>
<li>The pie can now be tilted at an angle with a new "tilt" option. Acceptable values range from 0-1, where 1 has no change (fully vertical) and 0 is completely flat (fully horizontal -- in which case nothing actually gets drawn). If the plugin determines that it will fit within the canvas, a drop shadow will be drawn under the tilted pie (this also requires a tilt value of 0.8 or less).</li>
<br/>
<li style="list-style: none;"><i>v0.3.2 - June 25th, 2009 - Brian Medendorp</i></li>
<li>Fixed a bug that was causing the pie to be shifted too far left or right when the legend is showing in some cases.</li>
<br/>
<li style="list-style: none;"><i>v0.3.1 - June 24th, 2009 - Brian Medendorp</i></li>
<li>Fixed a bug that was causing nothing to be drawn and generating a javascript error if any of the data values were set to zero.</li>
<br/>
<li style="list-style: none;"><i>v0.3 - June 23rd, 2009 - Brian Medendorp</i></li>
<li>The legend now works without any modifications! Because of changes made to flot and the plugin system (thanks Ole Laursen!) I was able to simplify a number of things and am now able to use the legend without the direct access hack that was required in the previous version.</li>
<br/>
<li style="list-style: none;"><i>v0.2 - June 22nd, 2009 - Brian Medendorp</i></li>
<li>The legend now works but only if you make the necessary changes to jquery.flot.js. Because of this, I changed the default values for pie.radius and pie.label.show to new 'auto' settings that change the default behavior of the size and labels depending on whether the legend functionality is available or not.</li>
<br/>
<li style="list-style: none;"><i>v0.1 - June 18th, 2009 - Brian Medendorp</i></li>
<li>Rewrote the entire pie code into a flot plugin (since that is now an option), so it should be much easier to use and the code is cleaned up a bit. However, the (standard flot) legend is no longer available because the only way to prevent the grid lines from being displayed also prevents the legend from being displayed. Hopefully this can be fixed at a later date.</li>
<li>Restructured and combined some of the options. It should be much easier to deal with now.</li>
<li>Added the ability to change the starting point of the pie (still defaults to the top).</li>
<li>Modified the default options to show the labels to compensate for the lack of a legend.</li>
<li>Modified this page to use a random dataset. <span style="color: red">Note: you may need to refresh the page to see the effects of some of the examples.</span></li>
<br/>
<li style="list-style: none;"><i>May 21st, 2009 - Brian Medendorp</i></li>
<li>Merged original pie modifications by Sergey Nosenko into the latest SVN version <i>(as of May 15th, 2009)</i> so that it will work with ie8.</li>
<li>Pie graph will now be centered in the canvas unless moved because of the legend or manually via the options. Additionally it prevents the pie from being moved beyond the edge of the canvas.</li>
<li>Modified the code related to the labelFormatter option to apply flot's legend labelFormatter first. This is so that the labels will be consistent, but still provide extra formatting for the positioned labels (such as adding the percentage value).</li>
<li>Positioned labels now have their backgrounds applied as a seperate element (much like the legend background) so that the opacity value can be set independently from the label itself (foreground). Additionally, the background color defaults to that of the matching slice.</li>
<li>As long as the labelOffset and radiusLimit are not set to hard values, the pie will be shrunk if the labels will extend outside the edge of the canvas</li>
<li>Added new options "radiusLimitFactor" and "radiusLimit" which limits how large the (visual) radius of the pie is in relation to the full radius (as calculated from the canvas dimensions) or a hard-pixel value (respectively). This allows for pushing the labels "outside" the pie.</li>
<li>Added a new option "labelHidePercent" that does not show the positioned labels of slices smaller than the specified percentage. This is to help prevent a bunch of overlapping labels from small slices.</li>
<li>Added a new option "sliceCombinePercent" that combines all slices smaller than the specified percentage into one larger slice. This is to help make the pie more attractive when there are a number of tiny slices. The options "sliceCombineColor" and "sliceCombineLabel" have also been added to change the color and name of the new slice if desired.</li>
<li>Tested in Firefox (3.0.10, 3.5b4), Internet Explorer (6.0.2900, 7.0.5730, 8.0.6001), Chrome (1.0.154), Opera (9.64), and Safari (3.1.1, 4 beta 5528.16).
</ul>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,121 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Toggling Series</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
var datasets = {
"usa": {
label: "USA",
data: [[1988, 483994], [1989, 479060], [1990, 457648], [1991, 401949], [1992, 424705], [1993, 402375], [1994, 377867], [1995, 357382], [1996, 337946], [1997, 336185], [1998, 328611], [1999, 329421], [2000, 342172], [2001, 344932], [2002, 387303], [2003, 440813], [2004, 480451], [2005, 504638], [2006, 528692]]
},
"russia": {
label: "Russia",
data: [[1988, 218000], [1989, 203000], [1990, 171000], [1992, 42500], [1993, 37600], [1994, 36600], [1995, 21700], [1996, 19200], [1997, 21300], [1998, 13600], [1999, 14000], [2000, 19100], [2001, 21300], [2002, 23600], [2003, 25100], [2004, 26100], [2005, 31100], [2006, 34700]]
},
"uk": {
label: "UK",
data: [[1988, 62982], [1989, 62027], [1990, 60696], [1991, 62348], [1992, 58560], [1993, 56393], [1994, 54579], [1995, 50818], [1996, 50554], [1997, 48276], [1998, 47691], [1999, 47529], [2000, 47778], [2001, 48760], [2002, 50949], [2003, 57452], [2004, 60234], [2005, 60076], [2006, 59213]]
},
"germany": {
label: "Germany",
data: [[1988, 55627], [1989, 55475], [1990, 58464], [1991, 55134], [1992, 52436], [1993, 47139], [1994, 43962], [1995, 43238], [1996, 42395], [1997, 40854], [1998, 40993], [1999, 41822], [2000, 41147], [2001, 40474], [2002, 40604], [2003, 40044], [2004, 38816], [2005, 38060], [2006, 36984]]
},
"denmark": {
label: "Denmark",
data: [[1988, 3813], [1989, 3719], [1990, 3722], [1991, 3789], [1992, 3720], [1993, 3730], [1994, 3636], [1995, 3598], [1996, 3610], [1997, 3655], [1998, 3695], [1999, 3673], [2000, 3553], [2001, 3774], [2002, 3728], [2003, 3618], [2004, 3638], [2005, 3467], [2006, 3770]]
},
"sweden": {
label: "Sweden",
data: [[1988, 6402], [1989, 6474], [1990, 6605], [1991, 6209], [1992, 6035], [1993, 6020], [1994, 6000], [1995, 6018], [1996, 3958], [1997, 5780], [1998, 5954], [1999, 6178], [2000, 6411], [2001, 5993], [2002, 5833], [2003, 5791], [2004, 5450], [2005, 5521], [2006, 5271]]
},
"norway": {
label: "Norway",
data: [[1988, 4382], [1989, 4498], [1990, 4535], [1991, 4398], [1992, 4766], [1993, 4441], [1994, 4670], [1995, 4217], [1996, 4275], [1997, 4203], [1998, 4482], [1999, 4506], [2000, 4358], [2001, 4385], [2002, 5269], [2003, 5066], [2004, 5194], [2005, 4887], [2006, 4891]]
}
};
// hard-code color indices to prevent them from shifting as
// countries are turned on/off
var i = 0;
$.each(datasets, function(key, val) {
val.color = i;
++i;
});
// insert checkboxes
var choiceContainer = $("#choices");
$.each(datasets, function(key, val) {
choiceContainer.append("<br/><input type='checkbox' name='" + key +
"' checked='checked' id='id" + key + "'></input>" +
"<label for='id" + key + "'>"
+ val.label + "</label>");
});
choiceContainer.find("input").click(plotAccordingToChoices);
function plotAccordingToChoices() {
var data = [];
choiceContainer.find("input:checked").each(function () {
var key = $(this).attr("name");
if (key && datasets[key]) {
data.push(datasets[key]);
}
});
if (data.length > 0) {
$.plot("#placeholder", data, {
yaxis: {
min: 0
},
xaxis: {
tickDecimals: 0
}
});
}
}
plotAccordingToChoices();
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Toggling Series</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder" style="float:left; width:675px;"></div>
<p id="choices" style="float:right; width:135px;"></p>
</div>
<p>This example shows military budgets for various countries in constant (2005) million US dollars (source: <a href="http://www.sipri.org/">SIPRI</a>).</p>
<p>Since all data is available client-side, it's pretty easy to make the plot interactive. Try turning countries on and off with the checkboxes next to the plot.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,90 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Series Types</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script type="text/javascript">
$(function() {
var d1 = [];
for (var i = 0; i < 14; i += 0.5) {
d1.push([i, Math.sin(i)]);
}
var d2 = [[0, 3], [4, 8], [8, 5], [9, 13]];
var d3 = [];
for (var i = 0; i < 14; i += 0.5) {
d3.push([i, Math.cos(i)]);
}
var d4 = [];
for (var i = 0; i < 14; i += 0.1) {
d4.push([i, Math.sqrt(i * 10)]);
}
var d5 = [];
for (var i = 0; i < 14; i += 0.5) {
d5.push([i, Math.sqrt(i)]);
}
var d6 = [];
for (var i = 0; i < 14; i += 0.5 + Math.random()) {
d6.push([i, Math.sqrt(2*i + Math.sin(i) + 5)]);
}
$.plot("#placeholder", [{
data: d1,
lines: { show: true, fill: true }
}, {
data: d2,
bars: { show: true }
}, {
data: d3,
points: { show: true }
}, {
data: d4,
lines: { show: true }
}, {
data: d5,
lines: { show: true },
points: { show: true }
}, {
data: d6,
lines: { show: true, steps: true }
}]);
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Series Types</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>Flot supports lines, points, filled areas, bars and any combinations of these, in the same plot and even on the same data series.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,107 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Stacking</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.stack.js"></script>
<script type="text/javascript">
$(function() {
var d1 = [];
for (var i = 0; i <= 10; i += 1) {
d1.push([i, parseInt(Math.random() * 30)]);
}
var d2 = [];
for (var i = 0; i <= 10; i += 1) {
d2.push([i, parseInt(Math.random() * 30)]);
}
var d3 = [];
for (var i = 0; i <= 10; i += 1) {
d3.push([i, parseInt(Math.random() * 30)]);
}
var stack = 0,
bars = true,
lines = false,
steps = false;
function plotWithOptions() {
$.plot("#placeholder", [ d1, d2, d3 ], {
series: {
stack: stack,
lines: {
show: lines,
fill: true,
steps: steps
},
bars: {
show: bars,
barWidth: 0.6
}
}
});
}
plotWithOptions();
$(".stackControls button").click(function (e) {
e.preventDefault();
stack = $(this).text() == "With stacking" ? true : null;
plotWithOptions();
});
$(".graphControls button").click(function (e) {
e.preventDefault();
bars = $(this).text().indexOf("Bars") != -1;
lines = $(this).text().indexOf("Lines") != -1;
steps = $(this).text().indexOf("steps") != -1;
plotWithOptions();
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Stacking</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>With the stack plugin, you can have Flot stack the series. This is useful if you wish to display both a total and the constituents it is made of. The only requirement is that you provide the input sorted on x.</p>
<p class="stackControls">
<button>With stacking</button>
<button>Without stacking</button>
</p>
<p class="graphControls">
<button>Bars</button>
<button>Lines</button>
<button>Lines with steps</button>
</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,76 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Symbols</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.symbol.js"></script>
<script type="text/javascript">
$(function() {
function generate(offset, amplitude) {
var res = [];
var start = 0, end = 10;
for (var i = 0; i <= 50; ++i) {
var x = start + i / 50 * (end - start);
res.push([x, amplitude * Math.sin(x + offset)]);
}
return res;
}
var data = [
{ data: generate(2, 1.8), points: { symbol: "circle" } },
{ data: generate(3, 1.5), points: { symbol: "square" } },
{ data: generate(4, 0.9), points: { symbol: "diamond" } },
{ data: generate(6, 1.4), points: { symbol: "triangle" } },
{ data: generate(7, 1.1), points: { symbol: "cross" } }
];
$.plot("#placeholder", data, {
series: {
points: {
show: true,
radius: 3
}
},
grid: {
hoverable: true
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Symbols</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>Points can be marked in several ways, with circles being the built-in default. For other point types, you can define a callback function to draw the symbol. Some common symbols are available in the symbol plugin.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,76 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Thresholds</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.threshold.js"></script>
<script type="text/javascript">
$(function() {
var d1 = [];
for (var i = 0; i <= 60; i += 1) {
d1.push([i, parseInt(Math.random() * 30 - 10)]);
}
function plotWithOptions(t) {
$.plot("#placeholder", [{
data: d1,
color: "rgb(30, 180, 20)",
threshold: {
below: t,
color: "rgb(200, 20, 30)"
},
lines: {
steps: true
}
}]);
}
plotWithOptions(0);
$(".controls button").click(function (e) {
e.preventDefault();
var t = parseFloat($(this).text().replace("Threshold at ", ""));
plotWithOptions(t);
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Thresholds</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>With the threshold plugin, you can apply a specific color to the part of a data series below a threshold. This is can be useful for highlighting negative values, e.g. when displaying net results or what's in stock.</p>
<p class="controls">
<button>Threshold at 5</button>
<button>Threshold at 0</button>
<button>Threshold at -2.5</button>
</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,135 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Tracking</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.crosshair.js"></script>
<script type="text/javascript">
$(function() {
var sin = [], cos = [];
for (var i = 0; i < 14; i += 0.1) {
sin.push([i, Math.sin(i)]);
cos.push([i, Math.cos(i)]);
}
plot = $.plot("#placeholder", [
{ data: sin, label: "sin(x) = -0.00"},
{ data: cos, label: "cos(x) = -0.00" }
], {
series: {
lines: {
show: true
}
},
crosshair: {
mode: "x"
},
grid: {
hoverable: true,
autoHighlight: false
},
yaxis: {
min: -1.2,
max: 1.2
}
});
var legends = $("#placeholder .legendLabel");
legends.each(function () {
// fix the widths so they don't jump around
$(this).css('width', $(this).width());
});
var updateLegendTimeout = null;
var latestPosition = null;
function updateLegend() {
updateLegendTimeout = null;
var pos = latestPosition;
var axes = plot.getAxes();
if (pos.x < axes.xaxis.min || pos.x > axes.xaxis.max ||
pos.y < axes.yaxis.min || pos.y > axes.yaxis.max) {
return;
}
var i, j, dataset = plot.getData();
for (i = 0; i < dataset.length; ++i) {
var series = dataset[i];
// Find the nearest points, x-wise
for (j = 0; j < series.data.length; ++j) {
if (series.data[j][0] > pos.x) {
break;
}
}
// Now Interpolate
var y,
p1 = series.data[j - 1],
p2 = series.data[j];
if (p1 == null) {
y = p2[1];
} else if (p2 == null) {
y = p1[1];
} else {
y = p1[1] + (p2[1] - p1[1]) * (pos.x - p1[0]) / (p2[0] - p1[0]);
}
legends.eq(i).text(series.label.replace(/=.*/, "= " + y.toFixed(2)));
}
}
$("#placeholder").bind("plothover", function (event, pos, item) {
latestPosition = pos;
if (!updateLegendTimeout) {
updateLegendTimeout = setTimeout(updateLegend, 50);
}
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Tracking</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<p>You can add crosshairs that'll track the mouse position, either on both axes or as here on only one.</p>
<p>If you combine it with listening on hover events, you can use it to track the intersection on the curves by interpolating the data points (look at the legend).</p>
<p id="hoverdata"></p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,147 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Visitors</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
<script type="text/javascript">
$(function() {
var d = [[1196463600000, 0], [1196550000000, 0], [1196636400000, 0], [1196722800000, 77], [1196809200000, 3636], [1196895600000, 3575], [1196982000000, 2736], [1197068400000, 1086], [1197154800000, 676], [1197241200000, 1205], [1197327600000, 906], [1197414000000, 710], [1197500400000, 639], [1197586800000, 540], [1197673200000, 435], [1197759600000, 301], [1197846000000, 575], [1197932400000, 481], [1198018800000, 591], [1198105200000, 608], [1198191600000, 459], [1198278000000, 234], [1198364400000, 1352], [1198450800000, 686], [1198537200000, 279], [1198623600000, 449], [1198710000000, 468], [1198796400000, 392], [1198882800000, 282], [1198969200000, 208], [1199055600000, 229], [1199142000000, 177], [1199228400000, 374], [1199314800000, 436], [1199401200000, 404], [1199487600000, 253], [1199574000000, 218], [1199660400000, 476], [1199746800000, 462], [1199833200000, 448], [1199919600000, 442], [1200006000000, 403], [1200092400000, 204], [1200178800000, 194], [1200265200000, 327], [1200351600000, 374], [1200438000000, 507], [1200524400000, 546], [1200610800000, 482], [1200697200000, 283], [1200783600000, 221], [1200870000000, 483], [1200956400000, 523], [1201042800000, 528], [1201129200000, 483], [1201215600000, 452], [1201302000000, 270], [1201388400000, 222], [1201474800000, 439], [1201561200000, 559], [1201647600000, 521], [1201734000000, 477], [1201820400000, 442], [1201906800000, 252], [1201993200000, 236], [1202079600000, 525], [1202166000000, 477], [1202252400000, 386], [1202338800000, 409], [1202425200000, 408], [1202511600000, 237], [1202598000000, 193], [1202684400000, 357], [1202770800000, 414], [1202857200000, 393], [1202943600000, 353], [1203030000000, 364], [1203116400000, 215], [1203202800000, 214], [1203289200000, 356], [1203375600000, 399], [1203462000000, 334], [1203548400000, 348], [1203634800000, 243], [1203721200000, 126], [1203807600000, 157], [1203894000000, 288]];
// first correct the timestamps - they are recorded as the daily
// midnights in UTC+0100, but Flot always displays dates in UTC
// so we have to add one hour to hit the midnights in the plot
for (var i = 0; i < d.length; ++i) {
d[i][0] += 60 * 60 * 1000;
}
// helper for returning the weekends in a period
function weekendAreas(axes) {
var markings = [],
d = new Date(axes.xaxis.min);
// go to the first Saturday
d.setUTCDate(d.getUTCDate() - ((d.getUTCDay() + 1) % 7))
d.setUTCSeconds(0);
d.setUTCMinutes(0);
d.setUTCHours(0);
var i = d.getTime();
// when we don't set yaxis, the rectangle automatically
// extends to infinity upwards and downwards
do {
markings.push({ xaxis: { from: i, to: i + 2 * 24 * 60 * 60 * 1000 } });
i += 7 * 24 * 60 * 60 * 1000;
} while (i < axes.xaxis.max);
return markings;
}
var options = {
xaxis: {
mode: "time",
tickLength: 5
},
selection: {
mode: "x"
},
grid: {
markings: weekendAreas
}
};
var plot = $.plot("#placeholder", [d], options);
var overview = $.plot("#overview", [d], {
series: {
lines: {
show: true,
lineWidth: 1
},
shadowSize: 0
},
xaxis: {
ticks: [],
mode: "time"
},
yaxis: {
ticks: [],
min: 0,
autoscaleMargin: 0.1
},
selection: {
mode: "x"
}
});
// now connect the two
$("#placeholder").bind("plotselected", function (event, ranges) {
// do the zooming
$.each(plot.getXAxes(), function(_, axis) {
var opts = axis.options;
opts.min = ranges.xaxis.from;
opts.max = ranges.xaxis.to;
});
plot.setupGrid();
plot.draw();
plot.clearSelection();
// don't fire event on the overview to prevent eternal loop
overview.setSelection(ranges, true);
});
$("#overview").bind("plotselected", function (event, ranges) {
plot.setSelection(ranges);
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Visitors</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder"></div>
</div>
<div class="demo-container" style="height:150px;">
<div id="overview" class="demo-placeholder"></div>
</div>
<p>This plot shows visitors per day to the Flot homepage, with weekends colored.</p>
<p>The smaller plot is linked to the main plot, so it acts as an overview. Try dragging a selection on either plot, and watch the behavior of the other.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

View File

@@ -0,0 +1,144 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples: Selection and zooming</title>
<link href="../examples.css" rel="stylesheet" type="text/css">
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
<script type="text/javascript">
$(function() {
// setup plot
function getData(x1, x2) {
var d = [];
for (var i = 0; i <= 100; ++i) {
var x = x1 + i * (x2 - x1) / 100;
d.push([x, Math.sin(x * Math.sin(x))]);
}
return [
{ label: "sin(x sin(x))", data: d }
];
}
var options = {
legend: {
show: false
},
series: {
lines: {
show: true
},
points: {
show: true
}
},
yaxis: {
ticks: 10
},
selection: {
mode: "xy"
}
};
var startData = getData(0, 3 * Math.PI);
var plot = $.plot("#placeholder", startData, options);
// Create the overview plot
var overview = $.plot("#overview", startData, {
legend: {
show: false
},
series: {
lines: {
show: true,
lineWidth: 1
},
shadowSize: 0
},
xaxis: {
ticks: 4
},
yaxis: {
ticks: 3,
min: -2,
max: 2
},
grid: {
color: "#999"
},
selection: {
mode: "xy"
}
});
// now connect the two
$("#placeholder").bind("plotselected", function (event, ranges) {
// clamp the zooming to prevent eternal zoom
if (ranges.xaxis.to - ranges.xaxis.from < 0.00001) {
ranges.xaxis.to = ranges.xaxis.from + 0.00001;
}
if (ranges.yaxis.to - ranges.yaxis.from < 0.00001) {
ranges.yaxis.to = ranges.yaxis.from + 0.00001;
}
// do the zooming
plot = $.plot("#placeholder", getData(ranges.xaxis.from, ranges.xaxis.to),
$.extend(true, {}, options, {
xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to },
yaxis: { min: ranges.yaxis.from, max: ranges.yaxis.to }
})
);
// don't fire event on the overview to prevent eternal loop
overview.setSelection(ranges, true);
});
$("#overview").bind("plotselected", function (event, ranges) {
plot.setSelection(ranges);
});
// Add the Flot version string to the footer
$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
});
</script>
</head>
<body>
<div id="header">
<h2>Selection and zooming</h2>
</div>
<div id="content">
<div class="demo-container">
<div id="placeholder" class="demo-placeholder" style="float:left; width:650px;"></div>
<div id="overview" class="demo-placeholder" style="float:right;width:160px; height:125px;"></div>
</div>
<p>Selection support makes it easy to construct flexible zooming schemes. With a few lines of code, the small overview plot to the right has been connected to the large plot. Try selecting a rectangle on either of them.</p>
</div>
<div id="footer">
Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
</html>

27
bower_components/Flot/flot.jquery.json vendored Normal file
View File

@@ -0,0 +1,27 @@
{
"name": "flot",
"version": "0.8.3",
"title": "Flot",
"author": {
"name": "Ole Laursen",
"url": "https://github.com/OleLaursen"
},
"licenses": [{
"type": "MIT",
"url": "http://github.com/flot/flot/blob/master/LICENSE.txt"
}],
"dependencies": {
"jquery": ">=1.2.6"
},
"description": "Flot is a pure JavaScript plotting library for jQuery, with a focus on simple usage, attractive looks and interactive features.",
"keywords": ["plot", "chart", "graph", "visualization", "canvas", "graphics"],
"homepage": "http://www.flotcharts.org",
"docs": "http://github.com/flot/flot/blob/master/API.md",
"demo": "http://www.flotcharts.org/flot/examples/",
"bugs": "http://github.com/flot/flot/issues",
"maintainers": [{
"name": "David Schnur",
"email": "dnschnur@gmail.com",
"url": "http://github.com/dnschnur"
}]
}

View File

@@ -1,6 +1,6 @@
/* Flot plugin for drawing all elements of a plot on the canvas.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
Flot normally produces certain elements, like axis labels and the legend, using

View File

@@ -1,6 +1,6 @@
/* Flot plugin for plotting textual data or categories.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
Consider a dataset like [["February", 34], ["March", 20], ...]. This plugin

View File

@@ -1,6 +1,6 @@
/* Flot plugin for showing crosshairs when the mouse hovers over the plot.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
The plugin supports these options:
@@ -139,7 +139,7 @@ The plugin also adds four public methods:
ctx.translate(plotOffset.left, plotOffset.top);
if (crosshair.x != -1) {
var adj = plot.getOptions().crosshair.lineWidth % 2 === 0 ? 0 : 0.5;
var adj = plot.getOptions().crosshair.lineWidth % 2 ? 0.5 : 0;
ctx.strokeStyle = c.color;
ctx.lineWidth = c.lineWidth;
@@ -147,12 +147,12 @@ The plugin also adds four public methods:
ctx.beginPath();
if (c.mode.indexOf("x") != -1) {
var drawX = Math.round(crosshair.x) + adj;
var drawX = Math.floor(crosshair.x) + adj;
ctx.moveTo(drawX, 0);
ctx.lineTo(drawX, plot.height());
}
if (c.mode.indexOf("y") != -1) {
var drawY = Math.round(crosshair.y) + adj;
var drawY = Math.floor(crosshair.y) + adj;
ctx.moveTo(0, drawY);
ctx.lineTo(plot.width(), drawY);
}

View File

@@ -1,6 +1,6 @@
/* Flot plugin for plotting error bars.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
Error bars are used to show standard deviation and other statistical

View File

@@ -1,6 +1,6 @@
/* Flot plugin for computing bottoms for filled line and bar charts.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
The case: you've got two series that you want to fill the area between. In Flot

View File

@@ -1,6 +1,6 @@
/* Flot plugin for plotting images.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
The data syntax is [ [ image, x1, y1, x2, y2 ], ... ] where (x1, y1) and

View File

@@ -1,6 +1,6 @@
/* Javascript plotting library for jQuery, version 0.8.2.
/* Javascript plotting library for jQuery, version 0.8.3.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
*/
@@ -38,6 +38,22 @@ Licensed under the MIT license.
var hasOwnProperty = Object.prototype.hasOwnProperty;
// A shim to provide 'detach' to jQuery versions prior to 1.4. Using a DOM
// operation produces the same effect as detach, i.e. removing the element
// without touching its jQuery data.
// Do not merge this into Flot 0.9, since it requires jQuery 1.4.4+.
if (!$.fn.detach) {
$.fn.detach = function() {
return this.each(function() {
if (this.parentNode) {
this.parentNode.removeChild( this );
}
});
};
}
///////////////////////////////////////////////////////////////////////////
// The Canvas object is a wrapper around an HTML5 <canvas> tag.
//
@@ -814,10 +830,24 @@ Licensed under the MIT license.
if (options.x2axis) {
options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis);
options.xaxes[1].position = "top";
// Override the inherit to allow the axis to auto-scale
if (options.x2axis.min == null) {
options.xaxes[1].min = null;
}
if (options.x2axis.max == null) {
options.xaxes[1].max = null;
}
}
if (options.y2axis) {
options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis);
options.yaxes[1].position = "right";
// Override the inherit to allow the axis to auto-scale
if (options.y2axis.min == null) {
options.yaxes[1].min = null;
}
if (options.y2axis.max == null) {
options.yaxes[1].max = null;
}
}
if (options.grid.coloredAreas)
options.grid.markings = options.grid.coloredAreas;
@@ -1416,7 +1446,7 @@ Licensed under the MIT license.
// Determine the axis's position in its direction and on its side
$.each(isXAxis ? xaxes : yaxes, function(i, a) {
if (a && a.reserveSpace) {
if (a && (a.show || a.reserveSpace)) {
if (a === axis) {
found = true;
} else if (a.options.position === pos) {
@@ -1520,17 +1550,12 @@ Licensed under the MIT license.
// jump as much around with replots
$.each(allAxes(), function (_, axis) {
if (axis.reserveSpace && axis.ticks && axis.ticks.length) {
var lastTick = axis.ticks[axis.ticks.length - 1];
if (axis.direction === "x") {
margins.left = Math.max(margins.left, axis.labelWidth / 2);
if (lastTick.v <= axis.max) {
margins.right = Math.max(margins.right, axis.labelWidth / 2);
}
margins.right = Math.max(margins.right, axis.labelWidth / 2);
} else {
margins.bottom = Math.max(margins.bottom, axis.labelHeight / 2);
if (lastTick.v <= axis.max) {
margins.top = Math.max(margins.top, axis.labelHeight / 2);
}
margins.top = Math.max(margins.top, axis.labelHeight / 2);
}
}
});
@@ -1564,20 +1589,18 @@ Licensed under the MIT license.
}
}
// init axes
$.each(axes, function (_, axis) {
axis.show = axis.options.show;
if (axis.show == null)
axis.show = axis.used; // by default an axis is visible if it's got data
axis.reserveSpace = axis.show || axis.options.reserveSpace;
var axisOpts = axis.options;
axis.show = axisOpts.show == null ? axis.used : axisOpts.show;
axis.reserveSpace = axisOpts.reserveSpace == null ? axis.show : axisOpts.reserveSpace;
setRange(axis);
});
if (showGrid) {
var allocatedAxes = $.grep(axes, function (axis) { return axis.reserveSpace; });
var allocatedAxes = $.grep(axes, function (axis) {
return axis.show || axis.reserveSpace;
});
$.each(allocatedAxes, function (_, axis) {
// make the ticks
@@ -1706,8 +1729,8 @@ Licensed under the MIT license.
axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
axis.tickSize = opts.tickSize || size;
// Time mode was moved to a plug-in in 0.8, but since so many people use this
// we'll add an especially friendly make sure they remembered to include it.
// Time mode was moved to a plug-in in 0.8, and since so many people use it
// we'll add an especially friendly reminder to make sure they included it.
if (opts.mode == "time" && !axis.tickGenerator) {
throw new Error("Time mode requires the flot.time plugin.");
@@ -1963,26 +1986,34 @@ Licensed under the MIT license.
yrange.from = Math.max(yrange.from, yrange.axis.min);
yrange.to = Math.min(yrange.to, yrange.axis.max);
if (xrange.from == xrange.to && yrange.from == yrange.to)
var xequal = xrange.from === xrange.to,
yequal = yrange.from === yrange.to;
if (xequal && yequal) {
continue;
}
// then draw
xrange.from = xrange.axis.p2c(xrange.from);
xrange.to = xrange.axis.p2c(xrange.to);
yrange.from = yrange.axis.p2c(yrange.from);
yrange.to = yrange.axis.p2c(yrange.to);
xrange.from = Math.floor(xrange.axis.p2c(xrange.from));
xrange.to = Math.floor(xrange.axis.p2c(xrange.to));
yrange.from = Math.floor(yrange.axis.p2c(yrange.from));
yrange.to = Math.floor(yrange.axis.p2c(yrange.to));
if (xrange.from == xrange.to || yrange.from == yrange.to) {
// draw line
if (xequal || yequal) {
var lineWidth = m.lineWidth || options.grid.markingsLineWidth,
subPixel = lineWidth % 2 ? 0.5 : 0;
ctx.beginPath();
ctx.strokeStyle = m.color || options.grid.markingsColor;
ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth;
ctx.moveTo(xrange.from, yrange.from);
ctx.lineTo(xrange.to, yrange.to);
ctx.lineWidth = lineWidth;
if (xequal) {
ctx.moveTo(xrange.to + subPixel, yrange.from);
ctx.lineTo(xrange.to + subPixel, yrange.to);
} else {
ctx.moveTo(xrange.from, yrange.to + subPixel);
ctx.lineTo(xrange.to, yrange.to + subPixel);
}
ctx.stroke();
}
else {
// fill area
} else {
ctx.fillStyle = m.color || options.grid.markingsColor;
ctx.fillRect(xrange.from, yrange.to,
xrange.to - xrange.from,
@@ -3117,7 +3148,7 @@ Licensed under the MIT license.
return plot;
};
$.plot.version = "0.8.2";
$.plot.version = "0.8.3";
$.plot.plugins = [];

View File

@@ -1,6 +1,6 @@
/* Flot plugin for adding the ability to pan and zoom the plot.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
The default behaviour is double click and scrollwheel up/down to zoom in, drag
@@ -260,8 +260,8 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L
var range = max - min;
if (zr &&
((zr[0] != null && range < zr[0]) ||
(zr[1] != null && range > zr[1])))
((zr[0] != null && range < zr[0] && amount >1) ||
(zr[1] != null && range > zr[1] && amount <1)))
return;
opts.min = min;

View File

@@ -1,6 +1,6 @@
/* Flot plugin for rendering pie charts.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
The plugin assumes that each series has a single data value, and that each
@@ -224,13 +224,16 @@ More detail and specific examples can be found in the included HTML file.
for (var i = 0; i < data.length; ++i) {
var value = data[i].data[0][1];
if (numCombined < 2 || value / total > options.series.pie.combine.threshold) {
newdata.push({
data: [[1, value]],
color: data[i].color,
label: data[i].label,
angle: value * Math.PI * 2 / total,
percent: value / (total / 100)
});
newdata.push(
$.extend(data[i], { /* extend to allow keeping all other original data values
and using them e.g. in labelFormatter. */
data: [[1, value]],
color: data[i].color,
label: data[i].label,
angle: value * Math.PI * 2 / total,
percent: value / (total / 100)
})
);
}
}

View File

@@ -0,0 +1,59 @@
/* Flot plugin for automatically redrawing plots as the placeholder resizes.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
It works by listening for changes on the placeholder div (through the jQuery
resize event plugin) - if the size changes, it will redraw the plot.
There are no options. If you need to disable the plugin for some plots, you
can just fix the size of their placeholders.
*/
/* Inline dependency:
* jQuery resize event - v1.1 - 3/14/2010
* http://benalman.com/projects/jquery-resize-plugin/
*
* Copyright (c) 2010 "Cowboy" Ben Alman
* Dual licensed under the MIT and GPL licenses.
* http://benalman.com/about/license/
*/
(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this);
(function ($) {
var options = { }; // no options
function init(plot) {
function onResize() {
var placeholder = plot.getPlaceholder();
// somebody might have hidden us and we can't plot
// when we don't have the dimensions
if (placeholder.width() == 0 || placeholder.height() == 0)
return;
plot.resize();
plot.setupGrid();
plot.draw();
}
function bindEvents(plot, eventHolder) {
plot.getPlaceholder().resize(onResize);
}
function shutdown(plot, eventHolder) {
plot.getPlaceholder().unbind("resize", onResize);
}
plot.hooks.bindEvents.push(bindEvents);
plot.hooks.shutdown.push(shutdown);
}
$.plot.plugins.push({
init: init,
options: options,
name: 'resize',
version: '1.0'
});
})(jQuery);

Some files were not shown because too many files have changed in this diff Show More