Compare commits

...

17 Commits

Author SHA1 Message Date
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
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
11 changed files with 157 additions and 116 deletions

195
README.md
View File

@@ -1,102 +1,145 @@
[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=almasaeed2010&url=http://almsaeedstudio.com&title=AdminLTE&language=&tags=github&category=software) [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=629XCUSXBHCBC "Donate")
------------------------
Announcements:
--------------
**Current AdminLTE version in master is v2 Beta 1**
Introduction
============
**AdminLTE** -- is a fully responsive admin template. Based on **Bootstrap 3** 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.
**Live Preview: http://almsaeedstudio.com/preview/**
**Download & Preview on [Almsaeed Studio](http://almsaeedstudio.com)**
Note: If the javascript in the preview does not work properly (specially IE users), please visit http://almsaeedstudio.com/AdminLTE (this could be because of the use of an iframe!)
Want More?
-----------
Looking for Premium Templates?
------------------------------
**Almsaeed studio just opened a new premium templates page. Hand picked to insure the best quality and the most affordable prices. Visit http://almsaeedstudio.com/premium for more information.**
!["AdminLTE Presentation"](http://almsaeedstudio.com/adminlte2.png "AdminLTE Presentation")
!["AdminLTE Presentation"] (http://almsaeedstudio.com/AdminLTE2.png "AdminLTE Presentation")
**AdminLTE** has been carefully coded with clear comments in all of its JS, LESS and HTML files. LESS has been used to increase code customizability.
Special Features:
-----------------
- **Fully responsive**
- **Enhanced for printing**
- **Sortable dashboard widgets**
- **18 plugins and 3 custom plugins**
- **Light weight and fast**
- **Compatible with most major browsers**
- **Full support for Glyphicons, Fontawesome and Ion icons**
Installation
------------
There are multiple ways to install AdminLTE.
Featured Pages:
----------------
- Dashboard
- Mailbox
- Calendar
- Invoice
- Lockscreen
- Login
- Register
- 404 Error
- 500 Error
- Blank page
####Download:
Featured Plugins:
-----------------
- Boostrap Slider
- Ion slider
- Bootstrap WYSIHTML5
- CKEditor
- Bootstrap Colorpicker
- Bootstrap Date range Picker
- Bootstrap Time Picker
- Data Tables
- Flot
- Morris.js
- Sparkilne
- Full Calendar
- iCheck
- jQuery input mask
- jQuery Knob
- jVector Map
- Slim Scroll
- Pace
- [Bootstrap Social Buttons](http://lipis.github.io/bootstrap-social/ "Bootstrap Social")
Download from Github or [visit Almsaeed Studio](http://almsaeedstudio.com) and download the lateset release.
Browser Support:
----------------
####Using The Command Line:
**Github**
- 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"
```
**Bower**
```
bower install git://github.com/almasaeed2010/AdminLTE.git
```
**Composer**
```
composer require "almasaeed2010/adminlte=~2.0"
```
Documentation
-------------
Visit the [online documentation](http://almsaeedstudio.com/themes/AdminLTE/documentation/index.html) for the most
updated guide. Information will be added on a weekly basis.
Browser Support
---------------
- IE 9+
- Firefox 5+
- Chrome 14+
- Safari 5+
- Opera 11+
- Firefox (latest)
- Chrome (latest)
- Safari (latest)
- Opera (latest)
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 Almsaeed Studio to use that contribution in any context as we (Almsaeed Studio) 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 [Almsaeed Studio](http://almsaeedstudio.com) that is licensed under [MIT](http://opensource.org/licenses/MIT). Almsaeed Studio
reserves the right to change the license of future releases.
Legacy Realeases
----------------
AdminLTE 1.x can be easily upgraded to 2.x using [this guide](http://almsaeedstudio.com/themes/AdminLTE/documentation/index.html#browsers), but if you intend to keep using AdminLTE 1.x, you can download the latest release from the [releases](https://github.com/almasaeed2010/AdminLTE/releases) section above.
Change log
----------
**v2.0:**
- Major layout bug fixes
- Change in layout mark up
- Added transitions to the sidebar
- New skins and modified previous skins
- Change in color scheme to a more complementing scheme
- Added footer support
- Removed pace.js from the main app.js
- Added support for collapsed sidebar as an initial state (add .sidebar-collapse to the body tag)
- Added boxed layout (.layout-boxed)
- Enhanced consistency in padding and margining
- Updated Bootstrap to 3.3.2
- Fixed navbar dropdown menu on small screens positioning issues.
- Updated Ion Icons to 2.0.0
- Updated FontAwesome to 4.3.0
- Added ChartJS 1.0.1
- Removed iCheck dependency
- Created Dashboard 2.0
- Created new Chat widget (DirectChat)
- Added transitions to DirectChat
- Added contacts pane to DirectChat
- Changed .right-side to .content-wrapper
- Changed .navbar-right to .navbar-custom-menu
- Removed unused files
- Updated lockscreen style (HTML markup changed!)
- Updated Login & Registration pages (HTML markup changed!)
- Updated buttons style.
- Enhanced border-radius consistency
- Added mailbox: inbox, read, and compose pages
- Bootstrap & jQuery are now hosted locally
- Created documentation.
**ver 1.2:**
Change log:
-----------
ver 1.2:
- Fixed the sidebar scroll issue when using the fixed layout.
- Added [Bootstrap Social Buttons](http://lipis.github.io/bootstrap-social/ "Bootstrap Social") plugin.
- Fixed RequireJS bug. Thanks to [StaticSphere](https://github.com/StaticSphere "github user").
ver 1.1:
**ver 1.1:**
- Added new skin. class: .skin-black
- Added [pace](http://github.hubspot.com/pace/docs/welcome/ "pace") plugin.
To Do List:
-----------
- More features
- Ajax version
- More skins
- Documentation
Image Credits
-------------
[Pixeden](http://www.pixeden.com/psd-web-elements/flat-responsive-showcase-psd)
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/)
[graphicsfuel](http://www.graphicsfuel.com/2013/02/13-high-resolution-blur-backgrounds/ "")
[Pickaface](http://pickaface.net/)
[ajaxload](http://www.ajaxload.info/ "")
[Unsplash](https://unsplash.com/)
[pickaface](http://pickaface.net/ "")
Donations
---------
Donations are **greatly appreciated!**
[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=629XCUSXBHCBC "Donate")

View File

@@ -1,5 +1,5 @@
/*!
* AdminLTE v1.2
* AdminLTE v2.0.1
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* License: Open source - MIT

View File

@@ -56,7 +56,7 @@
@box-border-color: #f4f4f4;
@box-border-radius: 3px;
@box-footer-bg: #fff;
@box-boxshadow: 0 1px 1px rgba(0, 0, 0, .05);
@box-boxshadow: 0 1px 1px rgba(0, 0, 0, .1);
@box-padding: 10px;
//Box variants

View File

@@ -3,7 +3,7 @@ CHANGE LOG:
v2.0
- Major layout bug fixes
- Change in layout mark up
- Added transitions to sidebar collapse
- Added transitions to the sidebar
- New skins and modified previous skins
- Change in color scheme to a more complementing scheme
- Added footer support
@@ -18,6 +18,9 @@ v2.0
- Added ChartJS 1.0.1
- Removed iCheck dependency
- Created Dashboard 2.0
- Created new Chat widget (DirectChat)
- Added transitions to DirectChat
- Added contacts pane to DirectChat
- Changed .right-side to .content-wrapper
- Changed .navbar-right to .navbar-custom-menu
- Removed unused files
@@ -27,3 +30,4 @@ v2.0
- Enhanced border-radius consistency
- Added mailbox: inbox, read, and compose pages
- Bootstrap & jQuery are now hosted locally
- Created documentation.

24
dist/css/AdminLTE.css vendored
View File

@@ -1,6 +1,6 @@
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
/*!
* AdminLTE v1.2
* AdminLTE v2.0.1
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* License: Open source - MIT
@@ -561,7 +561,7 @@ a:focus {
*/
/*Dropdowns in general*/
.dropdown-menu {
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-color: #eee;
}
.dropdown-menu > li > a {
@@ -1084,7 +1084,7 @@ a:focus {
position: relative;
display: block;
margin-bottom: 20px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
}
.small-box > .inner {
padding: 10px;
@@ -1164,7 +1164,7 @@ a:focus {
border-top: 3px solid #d2d6de;
margin-bottom: 20px;
width: 100%;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
}
.box.box-primary {
border-top-color: #3c8dbc;
@@ -1599,7 +1599,7 @@ a:focus {
min-height: 90px;
background: #fff;
width: 100%;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 2px;
margin-bottom: 15px;
}
@@ -1690,8 +1690,8 @@ a:focus {
clear: both;
}
.timeline > li > .timeline-item {
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 3px;
margin-top: 0px;
background: #fff;
@@ -2033,7 +2033,7 @@ a:focus {
.nav-tabs-custom {
margin-bottom: 20px;
background: #fff;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 3px;
}
.nav-tabs-custom > .nav-tabs {
@@ -2135,8 +2135,8 @@ a:focus {
}
.products-list > .item {
border-radius: 3px;
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
padding: 10px 0;
background: #fff;
}
@@ -3598,8 +3598,8 @@ fieldset[disabled] .btn-vk.active {
padding: 5px 10px;
font-weight: bold;
margin-bottom: 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 3px;
cursor: move;
}

File diff suppressed because one or more lines are too long

4
dist/js/app.js vendored
View File

@@ -1,5 +1,5 @@
/*! AdminLTE app.js
* ================
/*! AdminLTE 2.0.1 app.js
* ======================
* Main JS application file for AdminLTE v2. This file
* should be included in all pages. It controls some layout
* options and implements exclusive AdminLTE plugins.

4
dist/js/app.min.js vendored
View File

@@ -1,5 +1,5 @@
/*! AdminLTE app.js
* ================
/*! AdminLTE 2.0.1 app.js
* ======================
* Main JS application file for AdminLTE v2. This file
* should be included in all pages. It controls some layout
* options and implements exclusive AdminLTE plugins.

View File

@@ -27,8 +27,8 @@
font-weight: 500;
}
.content-wrapper {
background: #f4f5f7;
padding: 0 10px;
font-size: 14px;
}
.page-header {
border: 0;
@@ -53,7 +53,7 @@
.page-header span {
z-index: 5;
display: inline-block;
background-color: #f4f5f7;
background-color: #ecf0f5;
padding-right: 10px;
}
.page-header::before {
@@ -217,14 +217,7 @@
<div class="content body">
<div class="callout callout-warning">
<h4>Warning!</h4>
This documentation is under development. Some information may change as the template
goes through different pre-releases.
</div>
<div class="callout callout-danger">
<h4>Heads Up!</h4>
The current AdminLTE 2.0 version is in its Beta stage and should not be used in
production. It's however available for testing and to get developers familiar with
the new syntax.
This documentation is under development. Some information may change as the progress of creating the documentation continues.
</div>
<section id='introduction'>
<h2 class='page-header'><span>Introduction</span></h2>
@@ -257,7 +250,7 @@
<div class='box-body'>
<p>Compiled and ready to use in production. Download this version
if you don't want to customize AdminLTE's LESS files.</p>
<a href='#' class='btn btn-primary'><i class='fa fa-download'></i> Download</a>
<a href='http://almsaeedstudio.com/download/AdminLTE-dist' class='btn btn-primary'><i class='fa fa-download'></i> Download</a>
</div><!-- /.box-body -->
</div><!-- /.box -->
</div><!-- /.col -->
@@ -270,7 +263,7 @@
<div class='box-body'>
<p>All files including the compiled CSS. Download this version
if you plan on customizing the template. <b>Requires a LESS compiler.</b></p>
<a href='#' class='btn btn-danger'><i class='fa fa-download'></i> Download</a>
<a href='http://almsaeedstudio.com/download/AdminLTE' class='btn btn-danger'><i class='fa fa-download'></i> Download</a>
</div><!-- /.box-body -->
</div><!-- /.box -->
</div><!-- /.col -->
@@ -1505,7 +1498,7 @@ AdminLTE/
<div class="box-header with-border">
<h3 class="box-title">Labels</h3>
<div class="box-tools pull-right">
<span class="label label-default">8 New Messages</span>
<span class="label label-default">Some Label</span>
</div><!-- /.box-tools -->
</div><!-- /.box-header -->
<div class="box-body">
@@ -1656,6 +1649,9 @@ AdminLTE/
<section id='upgrade'>
<h2 class='page-header'><span>Upgrade Guide</span></h2>
<p class="lead">To upgrade from version 1.x to the lateset version, follow this guide.</p>
<h3>New Files</h3>
<p>Make sure you update all CSS and JS files that are related to AdminLTE. Otherwise, the layout will not
function properly. Most important files are AdminLTE.css, skins CSS files, and app.js.</p>
<h3>Layout Changes</h3>
<ol>
<li>The .wrapper div must be placed immediately after the body tag rather than after the header</li>
@@ -1705,7 +1701,7 @@ AdminLTE/
<p class="lead">AdminLTE is an open source project that is licensed under the <a href="http://opensource.org/licenses/MIT">MIT license</a>.
This allows you to do pretty much anything you want with it except selling it without any major modifications.
Attribution is not required (though very much appreciated).</p>
<h3>AdminLTE Premium Collection</h3>
<h3>AdminLTE Premium Collection (Coming Soon)</h3>
<p class="lead">AdminLTE's premium collection provides a set of non-open source components, plugins and widgets. To use
the premium collection, you must buy a license that fits your use case. The following is the set of available licenses:</p>
<p><b>Single Application License</b></p>

View File

@@ -386,7 +386,5 @@
<script src='../../plugins/fastclick/fastclick.min.js'></script>
<!-- AdminLTE App -->
<script src="../../dist/js/app.min.js" type="text/javascript"></script>
<!-- AdminLTE for demo purposes -->
<script src="../../dist/js/demo.js" type="text/javascript"></script>
</body>
</html>

View File

@@ -12,7 +12,7 @@
<link href="http://code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<!-- Theme style -->
<link href="../dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
<!-- AdminLTE Skins. Choose a skin from the css/skins
<!-- AdminLTE Skins. Choose a skin from the css/skins
folder instead of downloading all of them to reduce the load. -->
<link href="../dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" />
@@ -25,7 +25,7 @@
</head>
<body class="skin-blue">
<div class="wrapper">
<header class="main-header">
<a href="../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
@@ -580,7 +580,7 @@
14
</h3>
<p>
Notofications
Notifications
</p>
</div>
<div class="icon">