diff --git a/.gitignore b/.gitignore index c96a4cd45..fe42b98ea 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ TODO *.zip test.html -*.log \ No newline at end of file +*.log diff --git a/.jshintrc b/.jshintrc index 37136b133..f91c8ee5c 100644 --- a/.jshintrc +++ b/.jshintrc @@ -14,4 +14,4 @@ "unused" : true, // External variabls and plugins "predef": [ "AdminLTEOptions", "FastClick", "moment", "Morris", "Chart" ] -} \ No newline at end of file +} diff --git a/Gruntfile.js b/Gruntfile.js index 88ade36ae..7e60672e8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,7 @@ module.exports = function (grunt) { - + 'use strict'; grunt.initConfig({ @@ -95,19 +95,19 @@ module.exports = function (grunt) { } } }, - + // Optimize images image: { dynamic: { files: [{ expand: true, - cwd: 'build/img/', + cwd: 'build/img/', src: ['**/*.{png,jpg,gif,svg}'], dest: 'dist/img/' }] } }, - + // Validate JS code jshint: { options: { @@ -123,7 +123,7 @@ module.exports = function (grunt) { src: 'dist/js/pages/*.js' } }, - + csslint: { options: { csslintrc: 'build/less/.csslintrc' @@ -132,7 +132,7 @@ module.exports = function (grunt) { 'dist/css/AdminLTE.css', ] }, - + // Delete images in build directory // After compressing the images in the build/img dir, there is no need // for them @@ -162,4 +162,4 @@ module.exports = function (grunt) { // The default task (running "grunt" in console) is "watch" grunt.registerTask('default', ['watch']); -}; \ No newline at end of file +}; diff --git a/README.md b/README.md index d19ccb50d..d13e4cf64 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ 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. +**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 [Almsaeed Studio](https://almsaeedstudio.com)** @@ -88,7 +88,7 @@ Todo List Legacy Realeases ---------------- -AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://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. +AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://almsaeedstudio.com/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/almasaeed2010/AdminLTE/releases) section above. Change log ---------- diff --git a/documentation/build/include/adminlte-options.html b/documentation/build/include/adminlte-options.html index 22f8b682a..69b4da6ab 100644 --- a/documentation/build/include/adminlte-options.html +++ b/documentation/build/include/adminlte-options.html @@ -1,5 +1,5 @@ -
- +
+

Modifying the options of AdminLTE's app.js can be done using one of the following ways.

Editing app.js

@@ -8,7 +8,7 @@

Defining AdminLTEOptions

Alternatively, you can define a global options variable named AdminLTEOptions and initialize it before loading app.js.

Example

-
<script>
+  
<script>
   var AdminLTEOptions = {
     //Enable sidebar expand on hover effect for sidebar mini
     //This option is forced to true if both the fixed layout and sidebar mini
@@ -20,17 +20,17 @@
     enableBSToppltip: true
   };
 </script>
-<script src='dist/js/app.js' type='text/javascript'></script>
+<script src="dist/js/app.js" type="text/javascript"></script>

Available AdminLTE Options

-
{
+  
{
   //Add slimscroll to navbar menus
   //This requires you to load the slimscroll plugin
   //in every page before app.js
   navbarMenuSlimscroll: true,
   navbarMenuSlimscrollWidth: "3px", //The width of the scroll bar
   navbarMenuHeight: "200px", //The height of the inner menu
-  //General animation speed for JS animated elements such as box collapse/expand and 
+  //General animation speed for JS animated elements such as box collapse/expand and
   //sidebar treeview slide up/down. This options accepts an integer as milliseconds,
   //'fast', 'normal', or 'slow'
   animationSpeed: 500,
@@ -120,4 +120,4 @@
     lg: 1200
   }
 }
-
\ No newline at end of file +
diff --git a/documentation/build/include/advice.html b/documentation/build/include/advice.html index 426447392..260a190da 100644 --- a/documentation/build/include/advice.html +++ b/documentation/build/include/advice.html @@ -1,6 +1,6 @@ -
- -

+

+ +

Before you go to see your new awesome theme, here are few tips on how to familiarize yourself with it:

@@ -14,4 +14,4 @@

Note: LESS files are better commented than the compiled CSS file.

-
\ No newline at end of file +
diff --git a/documentation/build/include/browsers.html b/documentation/build/include/browsers.html index 5cc265f97..cb8412149 100644 --- a/documentation/build/include/browsers.html +++ b/documentation/build/include/browsers.html @@ -1,12 +1,12 @@ -
- +
+

AdminLTE supports the following browsers:

  • IE9+
  • -
  • FireFox (latest)
  • +
  • Firefox (latest)
  • Safari (latest)
  • Chrome (latest)
  • Opera (latest)

Note: IE9 does not support transitions or animations. The template will function properly but it won't use animations/transitions on IE9.

-
\ No newline at end of file +
diff --git a/documentation/build/include/components.html b/documentation/build/include/components.html index d4330b6b7..5606575e6 100644 --- a/documentation/build/include/components.html +++ b/documentation/build/include/components.html @@ -1,6 +1,6 @@ -
- -
+
+ +

Reminder!

AdminLTE uses all of Bootstrap 3 components. It's a good start to review @@ -8,7 +8,7 @@ that this documentation does not cover.

-
+

Tip!

If you go through the example pages and would like to copy a component, right-click on @@ -16,8 +16,8 @@ the HTML page.

-

Main Header

-

The main header contains the logo and navbar. Construction of the +

Main Header

+

The main header contains the logo and navbar. Construction of the navbar differs slightly from Bootstrap because it has components that Bootstrap doesn't provide. The navbar can be constructed in two way. This an example for the normal navbar and next we will provide an example for the top nav layout.

@@ -26,7 +26,7 @@ Main Header Example
- +
-
<header class="main-header">
+  
<header class="main-header">
   <a href="../../index2.html" class="logo">
     <!-- LOGO -->
     AdminLTE
@@ -184,7 +184,7 @@
                 <li><!-- start message -->
                   <a href="#">
                     <div class="pull-left">
-                      <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"/>
+                      <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
                     </div>
                     <h4>
                       Sender Name
@@ -256,13 +256,13 @@
         <!-- User Account: style can be found in dropdown.less -->
         <li class="dropdown user user-menu">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-            <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image"/>
+            <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image">
             <span class="hidden-xs">Alexander Pierce</span>
           </a>
           <ul class="dropdown-menu">
             <!-- User image -->
             <li class="user-header">
-              <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image" />
+              <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
               <p>
                 Alexander Pierce - Web Developer
                 <small>Member since Nov. 2012</small>
@@ -355,7 +355,7 @@
       
     
   
-  
+  
 <header class="main-header">
   <nav class="navbar navbar-static-top">
     <div class="container-fluid">
@@ -409,7 +409,7 @@
 
   
 
-  

Sidebar

+

Sidebar

The sidebar used in this page to the left provides an example of what your sidebar should like. Construction of a sidebar: @@ -421,7 +421,7 @@ <!-- user panel (Optional) --> <div class="user-panel"> <div class="pull-left image"> - <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image" /> + <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"> </div> <div class="pull-left info"> <p>User Name</p> @@ -433,9 +433,9 @@ <!-- Search Form (Optional) --> <form action="#" method="get" class="sidebar-form"> <div class="input-group"> - <input type="text" name="q" class="form-control" placeholder="Search..."/> + <input type="text" name="q" class="form-control" placeholder="Search..."> <span class="input-group-btn"> - <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button> + <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i></button> </span> </div> </form><!-- /.sidebar-form --> @@ -483,12 +483,12 @@ <!-- This div must placed right after the sidebar for it to work--> <div class="control-sidebar-bg"></div>

-

Once you create the sidebar, you will need a toggle button to open/close it. +

Once you create the sidebar, you will need a toggle button to open/close it. By adding the attribute data-toggle="control-sidebar" to any button, it will automatically act as the toggle button.

Toggle Button Example

-

+

Sidebar Toggle Markup

<button class="btn btn-default" data-toggle="control-sidebar">Toggle Right Sidebar</button>
@@ -538,7 +538,7 @@

Markup

<div class="info-box">
-  <-- Apply any bg-* class to to the icon to color it -->
+  <!-- Apply any bg-* class to to the icon to color it -->
   <span class="info-box-icon bg-red"><i class="fa fa-star-o"></i></span>
   <div class="info-box-content">
     <span class="info-box-text">Likes</span>
@@ -610,13 +610,13 @@
     
   
   

Markup

-
<-- Apply any bg-* class to to the info-box to color it -->
+  
<!-- Apply any bg-* class to to the info-box to color it -->
 <div class="info-box bg-red">
   <span class="info-box-icon"><i class="fa fa-comments-o"></i></span>
   <div class="info-box-content">
     <span class="info-box-text">Likes</span>
     <span class="info-box-number">41,410</span>
-    <-- The progress section is optional -->
+    <!-- The progress section is optional -->
     <div class="progress">
       <div class="progress-bar" style="width: 70%"></div>
     </div>
@@ -629,7 +629,7 @@
     first style apply any bg-* class to the icon itself. For the other style, apply the bg-* class to the info-box div.

-

Box

+

Box

The box component is the most widely used component through out this template. You can use it for anything from displaying charts to just blocks of text. It comes in many different styles that we will explore below.

@@ -818,9 +818,9 @@

AdminLTE data-widget attribute provides boxes with the ability to collapse or be removed. The buttons are placed in the box-tools which is placed in the box-header.

-<-- This will cause the box to be removed when clicked -->
+<!-- This will cause the box to be removed when clicked -->
 <button class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove"><i class="fa fa-times"></i></button>
-<-- This will cause the box to collapse when clicked -->
+<!-- This will cause the box to collapse when clicked -->
 <button class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse"><i class="fa fa-minus"></i></button>
@@ -899,7 +899,7 @@ </div><!-- /.box -->
-

We can also add labels, badges, pagination, tooltips, inputs and many more in the box tools. A few examples:

+

We can also add labels, badges, pagination, tooltips, inputs and many more in the box tools. A few examples:

@@ -932,7 +932,7 @@

Input

- +
@@ -947,7 +947,7 @@ <h3 class="box-title">Input</h3> <div class="box-tools pull-right"> <div class="has-feedback"> - <input type="text" class="form-control input-sm" placeholder="Search..."/> + <input type="text" class="form-control input-sm" placeholder="Search..."> <span class="glyphicon glyphicon-search form-control-feedback"></span> </div> </div><!-- /.box-tools --> @@ -989,7 +989,7 @@ If you inserted a box into the document after app.js was loaded, you have to activate the collapse/remove buttons explicitly by calling .activateBox():

-
<script>
+  
<script>
     $("#box-widget").activateBox();
 </script>
@@ -1045,7 +1045,7 @@

Direct Chat

- 3 + 3 @@ -1056,11 +1056,11 @@
-
- Alexander Pierce - 23 Jan 2:00 pm +
+ Alexander Pierce + 23 Jan 2:00 pm
- message user image + message user image
Is this template really for free? That's unbelievable!
@@ -1068,11 +1068,11 @@
-
- Sarah Bullock - 23 Jan 2:05 pm +
+ Sarah Bullock + 23 Jan 2:05 pm
- message user image + message user image
You better believe it!
@@ -1081,16 +1081,16 @@
-
    +
    • - - Contact Avatar -
    • @@ -1100,7 +1100,7 @@
\ No newline at end of file + diff --git a/documentation/build/include/download.html b/documentation/build/include/download.html index 708a18ca0..b8f0b47be 100644 --- a/documentation/build/include/download.html +++ b/documentation/build/include/download.html @@ -1,38 +1,35 @@ -
- -

- AdminLTE can be downloaded in two different versions, each appealing to different - skill levels and use case. +

+ +

+ AdminLTE can be downloaded in two different versions, each appealing to different skill levels and use case.

-
-
-
-
-

Ready

- +
+
+
+
+

Ready

+
-
-

Compiled and ready to use in production. Download this version - if you don't want to customize AdminLTE's LESS files.

- Download +
+

Compiled and ready to use in production. Download this version if you don't want to customize AdminLTE's LESS files.

+ Download
-
-
-
-

Source Code

- +
+
+
+

Source Code

+
-
-

All files including the compiled CSS. Download this version - if you plan on customizing the template. Requires a LESS compiler.

- Download +
+

All files including the compiled CSS. Download this version if you plan on customizing the template. Requires a LESS compiler.

+ Download
-
File Hierarchy of the Source Code Package
+  
File Hierarchy of the Source Code Package
 
 AdminLTE/
 ├── dist/
@@ -48,4 +45,4 @@ AdminLTE/
 │       ├── mixins.less
 └── plugins/
     ├── All the customized plugins CSS and JS files
-
\ No newline at end of file +
diff --git a/documentation/build/include/faq.html b/documentation/build/include/faq.html index c3fb6fbf9..9c4bae6a9 100644 --- a/documentation/build/include/faq.html +++ b/documentation/build/include/faq.html @@ -1,17 +1,12 @@ -
- +
+

Can AdminLTE be used with Wordpress?

AdminLTE is an HTML template that can be used for any purpose. However, it is not made to be easily installed on Wordpress. It will require some effort and enough knowledge of the Wordpress script to do so.

Is there an integration guide for PHP frameworks such as Yii or Symfony?

-

Short answer, no. However, there are forks and tutorials around the web that - provide info on how to integrate with many different frameworks. There are even versions of - AdminLTE that are integrated with jQuery ajax, AngularJS and/or MVC5 ASP .NET. -

+

Short answer, no. However, there are forks and tutorials around the web that provide info on how to integrate with many different frameworks. There are even versions of AdminLTE that are integrated with jQuery ajax, AngularJS and/or MVC5 ASP .NET.

How do I get notified of new AdminLTE versions?

-

The best option is to subscribe to our mailing list using the - subscription form on Almsaeed Studio. - If that's not appealing to you, you may watch the repository on Github - or visit Almsaeed Studio every now and then for updates and announcements.

+

The best option is to subscribe to our mailing list using the subscription form on Almsaeed Studio. + If that's not appealing to you, you may watch the repository on Github or visit Almsaeed Studio every now and then for updates and announcements.

diff --git a/documentation/build/include/implementations.html b/documentation/build/include/implementations.html index 307a91263..a84386d07 100644 --- a/documentation/build/include/implementations.html +++ b/documentation/build/include/implementations.html @@ -3,7 +3,7 @@

Thanks to many of AdminLTE users, there are multiple implementations of the template for easy integration with back-end frameworks. The following are some of them:

-
\ No newline at end of file + diff --git a/documentation/build/include/introduction.html b/documentation/build/include/introduction.html index 6ba0ca7d5..3a888506a 100644 --- a/documentation/build/include/introduction.html +++ b/documentation/build/include/introduction.html @@ -1,6 +1,6 @@ -
- -

+

+ +

AdminLTE is a popular open source WebApp template for admin dashboards and control panels. It is a responsive HTML template that is based on the CSS framework Bootstrap 3. It utilizes all of the Bootstrap components in its design and re-styles many @@ -9,4 +9,4 @@ allows it to be easily customized and built upon. This documentation will guide you through installing the template and exploring the various components that are bundled with the template.

-
\ No newline at end of file +
diff --git a/documentation/build/include/layout.html b/documentation/build/include/layout.html index 70109223a..8e046265b 100644 --- a/documentation/build/include/layout.html +++ b/documentation/build/include/layout.html @@ -1,6 +1,6 @@ -
- -

The layout consists of four major parts:

+
+ +

The layout consists of four major parts:

  • Wrapper .wrapper. A div that wraps the whole site.
  • Main Header .main-header. Contains the logo and navbar.
  • @@ -89,4 +89,4 @@ -
\ No newline at end of file +
diff --git a/documentation/build/include/license.html b/documentation/build/include/license.html index 91b1319e2..b326240be 100644 --- a/documentation/build/include/license.html +++ b/documentation/build/include/license.html @@ -3,8 +3,8 @@

AdminLTE

AdminLTE is an open source project that is licensed under the MIT license. - This allows you to do pretty much anything you want as long as you include + This allows you to do pretty much anything you want as long as you include the copyright in "all copies or substantial portions of the Software." Attribution is not required (though very much appreciated).

- \ No newline at end of file + diff --git a/documentation/build/include/plugins.html b/documentation/build/include/plugins.html index e7e04a267..e3a8779aa 100644 --- a/documentation/build/include/plugins.html +++ b/documentation/build/include/plugins.html @@ -1,47 +1,47 @@ -
- +
+

AdminLTE makes use of the following plugins. For documentation, updates or license information, please visit the provided links.

-
\ No newline at end of file +
diff --git a/documentation/build/include/upgrade.html b/documentation/build/include/upgrade.html index 1a701c665..d339bc6f5 100644 --- a/documentation/build/include/upgrade.html +++ b/documentation/build/include/upgrade.html @@ -1,5 +1,5 @@ -
- +
+

To upgrade from version 1.x to the lateset version, follow this guide.

New Files

Make sure you update all CSS and JS files that are related to AdminLTE. Otherwise, the layout will not @@ -23,4 +23,4 @@

Mailbox got an upgrade to include three different views. The views are inbox, read mail, and compose new email. To use these views, you should use the provided HTML files in the pages/mailbox folder.

Note: the old mailbox layout has been deprecated in favor of the new one and will be removed by the next release.

-
\ No newline at end of file +
diff --git a/documentation/build/index.html b/documentation/build/index.html index d1d8aaad9..862fbaf7e 100644 --- a/documentation/build/index.html +++ b/documentation/build/index.html @@ -4,17 +4,17 @@ AdminLTE 2 | Documentation - + - + - + - + - - - + + + @@ -58,29 +58,29 @@