jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Further remove unused includes in update.html and define background

Browse Source
This commit is contained in:
Johannes Zellner
2015-02-16 09:19:52 +01:00
parent df4683e6d4
commit ee35ec5349
6 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup/splash/website/js/update.js
+1 -1
View File
@@ -3,7 +3,7 @@
'use strict';
// create main application module
angular.module('Application', ['ngAnimate']);
angular.module('Application', []);
var Controller = function ($scope, $http, $interval) {
setup/splash/website/update.html
+16 -17
View File
@@ -1,30 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
<head>
<meta charset="utf-8" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height"/>
<title> Cloudron Update </title>
<title> Cloudron Update </title>
<!-- Bootstrap Core CSS -->
<link href="3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Core CSS -->
<link href="3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
<!-- angularjs scripts -->
<script src="3rdparty/js/angular.min.js"></script>
<script src="3rdparty/js/angular-loader.min.js"></script>
<script src="3rdparty/js/angular-animate.min.js"></script>
<!-- angularjs scripts -->
<script src="3rdparty/js/angular.min.js"></script>
<script src="3rdparty/js/angular-loader.min.js"></script>
<!-- jQuery Version 1.11.0 -->
<script src="3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
<!-- jQuery Version 1.11.0 -->
<script src="3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
<!-- setup application -->
<script src="js/update.js"></script>
<!-- setup application -->
<script src="js/update.js"></script>
</head>
<body ng-app="Application" ng-controller="Controller">
<body ng-app="Application" ng-controller="Controller" style="background-color: #7F7F7F">
<div class="modal show" id="updateProgressModal" tabindex="-1" role="dialog" aria-labelledby="updateProgressModalLabel" aria-hidden="true" data-keyboard="false" data-backdrop="static">
<div class="modal-dialog">
<div class="modal-content">
webadmin/dist/js/update.js
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
'use strict';
// create main application module
angular.module('Application', ['ngAnimate']);
angular.module('Application', []);
var Controller = function ($scope, $http, $interval) {
@@ -29,4 +29,4 @@ var Controller = function ($scope, $http, $interval) {
fetchProgress();
};
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInVwZGF0ZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJ1cGRhdGUuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBleHBvcnRlZCBDb250cm9sbGVyICovXG5cbid1c2Ugc3RyaWN0JztcblxuLy8gY3JlYXRlIG1haW4gYXBwbGljYXRpb24gbW9kdWxlXG5hbmd1bGFyLm1vZHVsZSgnQXBwbGljYXRpb24nLCBbJ25nQW5pbWF0ZSddKTtcblxudmFyIENvbnRyb2xsZXIgPSBmdW5jdGlvbiAoJHNjb3BlLCAkaHR0cCwgJGludGVydmFsKSB7XG5cbiAgICBmdW5jdGlvbiBsb2FkV2ViYWRtaW4oKSB7XG4gICAgICAgIHdpbmRvdy5sb2NhdGlvbi5ocmVmID0gJy8nO1xuICAgIH1cblxuICAgIGZ1bmN0aW9uIGZldGNoUHJvZ3Jlc3MoKSB7XG4gICAgICAgICRodHRwLmdldCgnL2FwaS92MS9jbG91ZHJvbi9wcm9ncmVzcycpLnN1Y2Nlc3MoZnVuY3Rpb24oZGF0YSwgc3RhdHVzKSB7XG4gICAgICAgICAgICBpZiAoc3RhdHVzID09PSA0MDQpIHJldHVybjsgLy8ganVzdCB3YWl0IHVudGlsIHdlIGNyZWF0ZSB0aGUgcHJvZ3Jlc3MuanNvbiBvbiB0aGUgc2VydmVyIHNpZGVcbiAgICAgICAgICAgIGlmIChzdGF0dXMgIT09IDIwMCB8fCB0eXBlb2YgZGF0YSAhPT0gJ29iamVjdCcpIHJldHVybiBjb25zb2xlLmVycm9yKHN0YXR1cywgZGF0YSk7XG4gICAgICAgICAgICBpZiAoZGF0YS51cGRhdGUgPT09IG51bGwpIHJldHVybiBsb2FkV2ViYWRtaW4oKTtcblxuICAgICAgICAgICAgJCgnI3VwZGF0ZVByb2dyZXNzQmFyJykuY3NzKCd3aWR0aCcsIGRhdGEudXBkYXRlLnBlcmNlbnQgKyAnJScpO1xuICAgICAgICAgICAgJCgnI3VwZGF0ZVByb2dyZXNzTWVzc2FnZScpLmh0bWwoZGF0YS51cGRhdGUubWVzc2FnZSk7XG4gICAgICAgIH0pLmVycm9yKGZ1bmN0aW9uIChkYXRhLCBzdGF0dXMpIHtcbiAgICAgICAgICAgIGNvbnNvbGUuZXJyb3Ioc3RhdHVzLCBkYXRhKTtcbiAgICAgICAgfSk7XG4gICAgfVxuXG4gICAgJGludGVydmFsKGZldGNoUHJvZ3Jlc3MsIDIwMDApO1xuXG4gICAgZmV0Y2hQcm9ncmVzcygpO1xufTtcbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInVwZGF0ZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJ1cGRhdGUuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBleHBvcnRlZCBDb250cm9sbGVyICovXG5cbid1c2Ugc3RyaWN0JztcblxuLy8gY3JlYXRlIG1haW4gYXBwbGljYXRpb24gbW9kdWxlXG5hbmd1bGFyLm1vZHVsZSgnQXBwbGljYXRpb24nLCBbXSk7XG5cbnZhciBDb250cm9sbGVyID0gZnVuY3Rpb24gKCRzY29wZSwgJGh0dHAsICRpbnRlcnZhbCkge1xuXG4gICAgZnVuY3Rpb24gbG9hZFdlYmFkbWluKCkge1xuICAgICAgICB3aW5kb3cubG9jYXRpb24uaHJlZiA9ICcvJztcbiAgICB9XG5cbiAgICBmdW5jdGlvbiBmZXRjaFByb2dyZXNzKCkge1xuICAgICAgICAkaHR0cC5nZXQoJy9hcGkvdjEvY2xvdWRyb24vcHJvZ3Jlc3MnKS5zdWNjZXNzKGZ1bmN0aW9uKGRhdGEsIHN0YXR1cykge1xuICAgICAgICAgICAgaWYgKHN0YXR1cyA9PT0gNDA0KSByZXR1cm47IC8vIGp1c3Qgd2FpdCB1bnRpbCB3ZSBjcmVhdGUgdGhlIHByb2dyZXNzLmpzb24gb24gdGhlIHNlcnZlciBzaWRlXG4gICAgICAgICAgICBpZiAoc3RhdHVzICE9PSAyMDAgfHwgdHlwZW9mIGRhdGEgIT09ICdvYmplY3QnKSByZXR1cm4gY29uc29sZS5lcnJvcihzdGF0dXMsIGRhdGEpO1xuICAgICAgICAgICAgaWYgKGRhdGEudXBkYXRlID09PSBudWxsKSByZXR1cm4gbG9hZFdlYmFkbWluKCk7XG5cbiAgICAgICAgICAgICQoJyN1cGRhdGVQcm9ncmVzc0JhcicpLmNzcygnd2lkdGgnLCBkYXRhLnVwZGF0ZS5wZXJjZW50ICsgJyUnKTtcbiAgICAgICAgICAgICQoJyN1cGRhdGVQcm9ncmVzc01lc3NhZ2UnKS5odG1sKGRhdGEudXBkYXRlLm1lc3NhZ2UpO1xuICAgICAgICB9KS5lcnJvcihmdW5jdGlvbiAoZGF0YSwgc3RhdHVzKSB7XG4gICAgICAgICAgICBjb25zb2xlLmVycm9yKHN0YXR1cywgZGF0YSk7XG4gICAgICAgIH0pO1xuICAgIH1cblxuICAgICRpbnRlcnZhbChmZXRjaFByb2dyZXNzLCAyMDAwKTtcblxuICAgIGZldGNoUHJvZ3Jlc3MoKTtcbn07XG4iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
webadmin/dist/update.html
Vendored
+16 -17
View File
@@ -1,30 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
<head>
<meta charset="utf-8" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height"/>
<title> Cloudron Update </title>
<title> Cloudron Update </title>
<!-- Bootstrap Core CSS -->
<link href="3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Core CSS -->
<link href="3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
<!-- angularjs scripts -->
<script src="3rdparty/js/angular.min.js"></script>
<script src="3rdparty/js/angular-loader.min.js"></script>
<script src="3rdparty/js/angular-animate.min.js"></script>
<!-- angularjs scripts -->
<script src="3rdparty/js/angular.min.js"></script>
<script src="3rdparty/js/angular-loader.min.js"></script>
<!-- jQuery Version 1.11.0 -->
<script src="3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
<!-- jQuery Version 1.11.0 -->
<script src="3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
<!-- setup application -->
<script src="js/update.js"></script>
<!-- setup application -->
<script src="js/update.js"></script>
</head>
<body ng-app="Application" ng-controller="Controller">
<body ng-app="Application" ng-controller="Controller" style="background-color: #7F7F7F">
<div class="modal show" id="updateProgressModal" tabindex="-1" role="dialog" aria-labelledby="updateProgressModalLabel" aria-hidden="true" data-keyboard="false" data-backdrop="static">
<div class="modal-dialog">
<div class="modal-content">
webadmin/src/js/update.js
+1 -1
View File
@@ -3,7 +3,7 @@
'use strict';
// create main application module
angular.module('Application', ['ngAnimate']);
angular.module('Application', []);
var Controller = function ($scope, $http, $interval) {
webadmin/src/update.html
+16 -17
View File
@@ -1,30 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
<head>
<meta charset="utf-8" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height"/>
<title> Cloudron Update </title>
<title> Cloudron Update </title>
<!-- Bootstrap Core CSS -->
<link href="3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Core CSS -->
<link href="3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
<!-- angularjs scripts -->
<script src="3rdparty/js/angular.min.js"></script>
<script src="3rdparty/js/angular-loader.min.js"></script>
<script src="3rdparty/js/angular-animate.min.js"></script>
<!-- angularjs scripts -->
<script src="3rdparty/js/angular.min.js"></script>
<script src="3rdparty/js/angular-loader.min.js"></script>
<!-- jQuery Version 1.11.0 -->
<script src="3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
<!-- jQuery Version 1.11.0 -->
<script src="3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
<!-- setup application -->
<script src="js/update.js"></script>
<!-- setup application -->
<script src="js/update.js"></script>
</head>
<body ng-app="Application" ng-controller="Controller">
<body ng-app="Application" ng-controller="Controller" style="background-color: #7F7F7F">
<div class="modal show" id="updateProgressModal" tabindex="-1" role="dialog" aria-labelledby="updateProgressModalLabel" aria-hidden="true" data-keyboard="false" data-backdrop="static">
<div class="modal-dialog">
<div class="modal-content">