Fix AdminLTE http/https reference

Makefile

@@ -3,4 +3,4 @@ test:
 	cd Resources/doc && sphinx-build -W -b html -d _build/doctrees . _build/html
 
 bower:
-	/usr/local/node/node-v0.10.22/bin/bower update
+	bower update

Resources/public/vendor/AdminLTE/.bower.json

@@ -1,13 +1,13 @@
 {
   "name": "AdminLTE",
   "homepage": "https://github.com/almasaeed2010/AdminLTE",
-  "_release": "1.2",
+  "_release": "f31f32b317",
   "_resolution": {
-    "type": "tag",
-    "tag": "1.2",
-    "commit": "41b271f3fc75b1004ef1bcae22b058e13a59c1ba"
+    "type": "branch",
+    "branch": "master",
+    "commit": "f31f32b317cfeb0bc6a0c0c675124c8010e0e9e3"
   },
   "_source": "https://github.com/almasaeed2010/AdminLTE.git",
-  "_target": "1.2",
+  "_target": "master",
   "_originalSource": "https://github.com/almasaeed2010/AdminLTE.git"
 }

Resources/public/vendor/AdminLTE/README.md

@@ -63,6 +63,7 @@ Featured Plugins:
 - jVector Map
 - Slim Scroll
 - Pace
+- [Bootstrap Social Buttons](http://lipis.github.io/bootstrap-social/ "Bootstrap Social")
 
 Browser Support:
 ----------------

Resources/public/vendor/AdminLTE/css/AdminLTE.css

@@ -1,6 +1,6 @@
-@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,300italic,400italic,600italic);
+@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,300italic,400italic,600italic);
 
-@import url(http://fonts.googleapis.com/css?family=Kaushan+Script);
+@import url(//fonts.googleapis.com/css?family=Kaushan+Script);
 /*! 
  *   AdminLTE v1.2
  *   Author: AlmsaeedStudio.com
@@ -1318,7 +1318,7 @@ body > .header .logo .icon {
   float: left;
   cursor: default;
 }
-.box .box-header a {
+.box .box-header a:not(.btn) {
   color: #444;
 }
 .box .box-header > .box-tools {

Resources/public/vendor/AdminLTE/js/AdminLTE/app.js

@@ -134,76 +134,6 @@ $(function() {
         radioClass: 'iradio_minimal'
     });
 
-    /* For demo purposes */
-    var demo = $("<div />").css({
-        position: "fixed",
-        top: "150px",
-        right: "0",
-        background: "rgba(0, 0, 0, 0.7)",
-        "border-radius": "5px 0px 0px 5px",
-        padding: "10px 15px",
-        "font-size": "16px",
-        "z-index": "999999",
-        cursor: "pointer",
-        color: "#ddd"
-    }).html("<i class='fa fa-gear'></i>").addClass("no-print");
-
-    var demo_settings = $("<div />").css({
-        "padding": "10px",
-        position: "fixed",
-        top: "130px",
-        right: "-200px",
-        background: "#fff",
-        border: "3px solid rgba(0, 0, 0, 0.7)",
-        "width": "200px",
-        "z-index": "999999"
-    }).addClass("no-print");
-    demo_settings.append(
-            "<h4 style='margin: 0 0 5px 0; border-bottom: 1px dashed #ddd; padding-bottom: 3px;'>Layout Options</h4>"
-            + "<div class='form-group no-margin'>"
-            + "<div class='.checkbox'>"
-            + "<label>"
-            + "<input type='checkbox' onchange='change_layout();'/> "
-            + "Fixed layout"
-            + "</label>"
-            + "</div>"
-            + "</div>"
-            );
-    demo_settings.append(
-            "<h4 style='margin: 0 0 5px 0; border-bottom: 1px dashed #ddd; padding-bottom: 3px;'>Skins</h4>"
-            + "<div class='form-group no-margin'>"
-            + "<div class='.radio'>"
-            + "<label>"
-            + "<input name='skins' type='radio' onchange='change_skin(\"skin-black\");' /> "
-            + "Black"
-            + "</label>"
-            + "</div>"
-            + "</div>"
-
-            + "<div class='form-group no-margin'>"
-            + "<div class='.radio'>"
-            + "<label>"
-            + "<input name='skins' type='radio' onchange='change_skin(\"skin-blue\");' checked='checked'/> "
-            + "Blue"
-            + "</label>"
-            + "</div>"
-            + "</div>"
-            );
-
-    demo.click(function() {
-        if (!$(this).hasClass("open")) {
-            $(this).css("right", "200px");
-            demo_settings.css("right", "0");
-            $(this).addClass("open");
-        } else {
-            $(this).css("right", "0");
-            demo_settings.css("right", "-200px");
-            $(this).removeClass("open")
-        }
-    });
-
-    $("body").append(demo);
-    $("body").append(demo_settings);
 });
 function fix_sidebar() {
     //Make sure the body tag has the .fixed class

Resources/public/vendor/AdminLTE/js/AdminLTE/demo.js

@@ -0,0 +1,72 @@
+$(function() {
+    /* For demo purposes */
+    var demo = $("<div />").css({
+        position: "fixed",
+        top: "150px",
+        right: "0",
+        background: "rgba(0, 0, 0, 0.7)",
+        "border-radius": "5px 0px 0px 5px",
+        padding: "10px 15px",
+        "font-size": "16px",
+        "z-index": "999999",
+        cursor: "pointer",
+        color: "#ddd"
+    }).html("<i class='fa fa-gear'></i>").addClass("no-print");
+
+    var demo_settings = $("<div />").css({
+        "padding": "10px",
+        position: "fixed",
+        top: "130px",
+        right: "-200px",
+        background: "#fff",
+        border: "3px solid rgba(0, 0, 0, 0.7)",
+        "width": "200px",
+        "z-index": "999999"
+    }).addClass("no-print");
+    demo_settings.append(
+            "<h4 style='margin: 0 0 5px 0; border-bottom: 1px dashed #ddd; padding-bottom: 3px;'>Layout Options</h4>"
+            + "<div class='form-group no-margin'>"
+            + "<div class='.checkbox'>"
+            + "<label>"
+            + "<input type='checkbox' onchange='change_layout();'/> "
+            + "Fixed layout"
+            + "</label>"
+            + "</div>"
+            + "</div>"
+            );
+    demo_settings.append(
+            "<h4 style='margin: 0 0 5px 0; border-bottom: 1px dashed #ddd; padding-bottom: 3px;'>Skins</h4>"
+            + "<div class='form-group no-margin'>"
+            + "<div class='.radio'>"
+            + "<label>"
+            + "<input name='skins' type='radio' onchange='change_skin(\"skin-black\");' /> "
+            + "Black"
+            + "</label>"
+            + "</div>"
+            + "</div>"
+
+            + "<div class='form-group no-margin'>"
+            + "<div class='.radio'>"
+            + "<label>"
+            + "<input name='skins' type='radio' onchange='change_skin(\"skin-blue\");' checked='checked'/> "
+            + "Blue"
+            + "</label>"
+            + "</div>"
+            + "</div>"
+            );
+
+    demo.click(function() {
+        if (!$(this).hasClass("open")) {
+            $(this).css("right", "200px");
+            demo_settings.css("right", "0");
+            $(this).addClass("open");
+        } else {
+            $(this).css("right", "0");
+            demo_settings.css("right", "-200px");
+            $(this).removeClass("open")
+        }
+    });
+
+    $("body").append(demo);
+    $("body").append(demo_settings);
+});

Resources/public/vendor/jquery.scrollTo/.bower.json

@@ -1,12 +1,19 @@
 {
   "name": "jquery.scrollTo",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "Easy element scrolling using jQuery.",
   "homepage": "https://github.com/flesler/jquery.scrollTo",
   "main": [
     "./jquery.scrollTo.js",
     "./jquery.scrollTo.min.js"
   ],
+  "ignore": [
+    "**/.*",
+    "demo",
+    "tests",
+    "changes.txt",
+    "composer.json"
+  ],
   "dependencies": {
     "jquery": ">=1.8"
   },
@@ -23,11 +30,11 @@
     "name": "Ariel Flesler",
     "web": "http://flesler.blogspot.com/"
   },
-  "_release": "1.4.11",
+  "_release": "1.4.12",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.11",
-    "commit": "05035fc5cc591ecdb08c914ec8f231b99af55800"
+    "tag": "1.4.12",
+    "commit": "cb88f0b9ca64d806957139df93934b2f3ff6417f"
   },
   "_source": "git://github.com/flesler/jquery.scrollTo.git",
   "_target": "~1.4.11",

Resources/public/vendor/jquery.scrollTo/.gitignore

@@ -1,16 +0,0 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
-logs
-results
-
-node_modules
-npm-debug.log
-.DS_Store

Resources/public/vendor/jquery.scrollTo/README.md

@@ -6,6 +6,21 @@ Using [bower](https://github.com/twitter/bower):
 ```bash
 bower install jquery.scrollTo
 ```
+Using [composer](http://getcomposer.org/download/):
+
+Either run
+
+```
+php composer.phar require --prefer-dist flesler/jquery.scrollto "*"
+```
+
+or add
+
+```
+"flesler/jquery.scrollto": "*"
+```
+
+to the require section of your composer.json.
 
 ### Downloading Manually
 
@@ -35,7 +50,7 @@ If you want the latest stable version, get the latest release from the [releases
 
 * If 2 axis are scrolled, there's an option to queue the animations, so that the second will start once the first ended ('xy' and 'yx' will have different effects)
 
-* The option 'margin' can be setted to true, then the margin of the target element, will be taken into account and will be deducted.
+* The option 'margin' can be set to true, then the margin of the target element, will be taken into account and will be deducted.
 
 * 'margin' will only be valid, if the target is a selector, a DOM element, or a jQuery Object.
 
@@ -47,6 +62,6 @@ If you want the latest stable version, get the latest release from the [releases
 
 * If the first axis to be scrolled, is already positioned, that animation will be skipped, to avoid a delay in the animation.
 
-* The call to the plugin can be made in 2 different ways: $().scrollTo( target, duration, settings ) or $().scrollTo( target, settings ). Where one of the settings is 'duration'.
+* The call to the plugin can be made in 2 different ways: $(...).scrollTo( target, duration, settings ) or $(...).scrollTo( target, settings ). Where one of the settings is 'duration'.
 
 * If you find any bug, or you have any advice, don't hesitate to open an issue. 

Resources/public/vendor/jquery.scrollTo/bower.json

@@ -1,12 +1,19 @@
 {
   "name": "jquery.scrollTo",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "Easy element scrolling using jQuery.",
   "homepage": "https://github.com/flesler/jquery.scrollTo",
   "main": [
     "./jquery.scrollTo.js",
     "./jquery.scrollTo.min.js"
   ],
+  "ignore": [
+    "**/.*",
+    "demo",
+    "tests",
+    "changes.txt",
+    "composer.json"
+  ],
   "dependencies": {
     "jquery": ">=1.8"
   },

Resources/public/vendor/jquery.scrollTo/changes.txt

@@ -1,138 +0,0 @@
-1.4.11
-[Misc]
-- Reverted changes from 1.4.10
-
-1.4.10
-[Enhancement]
-- Giving the plugin an AMD module id so it can be required (f.e by localScroll)
-
-1.4.9
-[Enhancement]
-- "offset" setting can now be a function as well (#60)
-
-1.4.8
-[Enhancement]
-- Added support for AMD
-
-1.4.7
-[Misc]
-- Changed spacing
-- Changed licensing to MIT
-- Repo is compliant with official jquery plugins repository
-
-1.4.6
-[Fix]
-- Fixed first argument of onAfter and onAfterFirst was original target and should be "parsed" target
-
-1.4.5
-[Fix]
-- Fixed passing a negative scroll value crashes
-
-1.4.4
-[Change]
-- Re-released as 1.4.4 to avoid issues with bower
-
-1.4.3.1
-[Fix]
-- Fixed $.scrollTo(0) broken on 1.4.3
-
-1.4.3
-[Enhancement]
-- Limit calculations can be disabled by setting the option 'limit' to false.
-- Null target or unmatching selector don't break and fail silently
-[Misc]
-- Removed support for the deprecated setting 'speed'
-[Fix]
-- Removed $.browser.webkit so the plugin works with jQuery +1.8
-
-1.4.2
-[Feature]
-- The plugin support percentages as target ('50%' or {top:'50%', left:'45%'})
-- Exposed the max() calculation as $.scrollTo.max
-[Enhancement]
-- Renamed $.fn.scrollable to $.fn._scrollable to avoid conflicts with other plugins
-[Fix]
-- Fixing max calculations for regular DOM elements
-
-1.4.1
-[Feature]
-- The target can be 'max' to scroll to the end while keeping it elegant.
-[Enhancement]
-- Default duration is 0 for jquery +1.3. Means sync animation
-- The plugin works on all major browsers, on compat & quirks modes, including iframes.
-- In addition to window/document, if html or body are received, the plugin will choose the right one.
-[Fix]
-- The plugin accepts floating numbers, Thanks Ramin
-- Using jQuery.nodeName where neccessary so that this works on xml+xhtml
-- The max() internal function wasn't completely accurrate, now it is 98% (except for IE on quirks mode and it's not too noticeable).
-
-1.4
-[Fix]
-- Fixed the problem when scrolling the window to absolute positioned elements on Safari.
-- Fixed the problem on Opera 9.5 when scrolling the window. That it always scrolls to 0.
-[Feature]
-- Added the settings object as 2nd argument to the onAfter callback.
-- The 3rd argument of scrollTo can be just a function and it's used as the onAfter.
-- Added full support for iframes (even max scroll calculation).
-- Instead of $.scrollTo, $(window).scrollTo() and $(document).scrollTo() can be used.
-- Added $().scrollable() that returns the real element to scroll, f.e: $(window).scrollable() == [body|html], works for iframes.
-[Enhancement]
-- Cleaned the code a bit, specially the comments
-
-1.3.3
-[Change]
-- Changed the licensing from GPL to GPL+MIT.
-
-1.3.2
-[Enhancement]
-- Small improvements to make the code shorter.
-[Change]
-- Removed the last argument received by onAfter as it was the same as the 'this' but jqueryfied.
-
-1.3.1
-[Feature]
-- Exposed $.scrollTo.window() to get the element that needs to be animated, to scroll the window.
-- Added option 'over'.
-[Enhancement]
-- Made the code as short as possible.
-[Change]
-- Changed the arguments received by onAfter
-
-1.3
-[Enhancement]
-- Added semicolon to the start, for safe file concatenation
-- Added a limit check, values below 0 or over the maximum are fixed.
-- Now it should work faster, only one of html or body go through all the processing, instead of both for all browsers.
-[Fix]
-- Fixed the behavior for Opera, which seemed to react to both changes on <html> and <body>.
-- The border is also reduced, when 'margin' is set to true.
-[Change]
-- The option speed has been renamed to duration.
-[Feature]
-- The duration can be specified with a number as 2nd argument, and the rest of the settings as the third ( like $().animate )
-- Remade the demo
-
-1.2.4
-[Enhancement]
-- The target can be in the form of { top:x, left:y } allowing different position for each axis.
-[Feature]
-- The option 'offset' has been added, to scroll behind or past the target. Can be a number(both axes) or { top:x, left:y }.
-
-1.2.3
-[Feature]
-- Exposed the defaults.
-[Enhancement]
-- Made the callback functions receive more parameters.
-
-1.2.2
-[Fix]
-- Fixed a bug, I didn't have to add the scrolled amount if it was body or html.
-
-1.2
-[Change]
-- The option 'onafter' is now called 'onAfter'.
-[Feature]
-- Two axes can be scrolled together, this is set with the option 'axis'.
-- In case 2 axes are chosen, the scrolling can be queued: one scrolls, and then the other.
-- There's an intermediary event, 'onAfterFirst' called in case the axes are queued, after the first ends.
-- If the option 'margin' is set to true, the plugin will take in account, the margin of the target(no use if target is a value).

Resources/public/vendor/jquery.scrollTo/jquery.scrollTo.js

@@ -5,7 +5,7 @@
  * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
  * @projectDescription Easy element scrolling using jQuery.
  * @author Ariel Flesler
- * @version 1.4.11
+ * @version 1.4.12
  */
 
 ;(function(plugin) {
@@ -92,8 +92,8 @@
 						// We are done
 						break;
 					}
-					// Relative selector, no break!
-					targ = $(targ,this);
+					// Relative/Absolute selector, no break!
+					targ = win ? $(targ) : $(targ, this);
 					if (!targ.length) return;
 				case 'object':
 					// DOMElement / jQuery

Resources/public/vendor/jquery.scrollTo/scrollTo.jquery.json

@@ -3,7 +3,7 @@
 	"title": "Ariel Flesler's jQuery scrollTo",
 	"description": "Easy element scrolling using jQuery.",
 	"keywords": ["browser", "animated", "animation", "scrolling", "scroll", "links", "anchors"],
-	"version": "1.4.11",
+	"version": "1.4.12",
 	"author": {
 		"name": "Ariel Flesler",
 		"email": "aflesler@gmail.com",

bower.json

@@ -11,7 +11,7 @@
         "jqueryui": "~1.10.4",
         "x-editable": "~1.5.1",
         "select2": "https://github.com/ivaynberg/select2.git#3.4.6",
-        "AdminLTE": "https://github.com/almasaeed2010/AdminLTE.git#1.2",
+        "AdminLTE": "https://github.com/almasaeed2010/AdminLTE.git#master",
         "jquery.scrollTo": "~1.4.11"
     },
     "license": "MIT",