Skip to content

Commit

Permalink
Update to v8.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nul800sebastiaan committed Jul 10, 2019
1 parent 3186d4f commit 8c4fd19
Show file tree
Hide file tree
Showing 2,609 changed files with 332,326 additions and 534,396 deletions.
10 changes: 0 additions & 10 deletions App_Browsers/Form.browser

This file was deleted.

26 changes: 0 additions & 26 deletions App_Browsers/w3cvalidator.browser

This file was deleted.

35 changes: 21 additions & 14 deletions App_Plugins/ModelsBuilder/modelsbuilder.controller.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
function modelsBuilderController($scope, umbRequestHelper, $log, $http, modelsBuilderResource) {
function modelsBuilderController($scope, $http, umbRequestHelper, modelsBuilderResource) {

$scope.generate = function() {
$scope.generating = true;
var vm = this;

vm.reload = reload;
vm.generate = generate;
vm.dashboard = null;

function generate() {
vm.generating = true;
umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
'Failed to generate.')
.then(function (result) {
$scope.generating = false;
$scope.dashboard = result;
vm.generating = false;
vm.dashboard = result;
});
};
}

$scope.reload = function () {
$scope.ready = false;
function reload() {
vm.loading = true;
modelsBuilderResource.getDashboard().then(function (result) {
$scope.dashboard = result;
$scope.ready = true;
vm.dashboard = result;
vm.loading = false;
});
};
}

function init() {
modelsBuilderResource.getDashboard().then(function(result) {
$scope.dashboard = result;
$scope.ready = true;
vm.loading = true;
modelsBuilderResource.getDashboard().then(function (result) {
vm.dashboard = result;
vm.loading = false;
});
}

Expand Down
41 changes: 0 additions & 41 deletions App_Plugins/ModelsBuilder/modelsbuilder.htm

This file was deleted.

44 changes: 44 additions & 0 deletions App_Plugins/ModelsBuilder/modelsbuilder.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<div id="modelsBuilder" ng-controller="Umbraco.Dashboard.ModelsBuilderController as vm">

<umb-box>
<umb-box-content>

<div ng-show="!vm.loading" class="pull-right">
<button type="button" class="btn" ng-click="vm.reload()"><span>Reload</span></button>
</div>

<h3 class="bold">Models Builder</h3>

<umb-load-indicator ng-show="vm.loading"></umb-load-indicator>

<div ng-show="!vm.loading && vm.dashboard">
<div ng-bind-html="vm.dashboard.text"></div>

<div ng-if="vm.dashboard.outOfDateModels">
<p>Models are <strong>out-of-date</strong>.</p>
</div>

<div ng-if="vm.dashboard.canGenerate">
<div ng-if="vm.dashboard.generateCausesRestart">
<p style="color: red; font-weight: bold;">Generating models will restart the application.</p>
</div>
<div ng-show="!vm.generating">
<button type="button" ng-click="vm.generate()" class="btn btn-danger">
<span>Generate models</span>
</button>
</div>
<div class="umb-loader-wrapper" ng-show="vm.generating">
<div class="umb-loader"></div>
</div>
</div>

<div ng-if="vm.dashboard.lastError" style="margin-top: 32px;" ng-show="!vm.generating">
<span style="color: red; font-weight: bold;">Last generation failed with the following error:</span>
<pre style="width: 80%; white-space: pre-line; background: #f8f8f8; padding: 4px; font-size: small;">{{vm.dashboard.lastError}}</pre>
</div>
</div>

</umb-box-content>
</umb-box>

</div>
19 changes: 15 additions & 4 deletions App_Plugins/ModelsBuilder/package.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
{
//array of files we want to inject into the application on app_start
javascript: [
'~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js',
'~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js'
// array of files we want to inject into the application
"javascript": [
"~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js",
"~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js"
],

// models builder dashboard
"dashboards": [
{
"alias": "settingsModelsBuilder",
"name": "Models Builder",
"view": "/App_Plugins/ModelsBuilder/modelsbuilder.html",
"sections": [ "settings" ],
"weight": 40
}
]
}
7 changes: 0 additions & 7 deletions Config/404handlers.config

This file was deleted.

Loading

0 comments on commit 8c4fd19

Please sign in to comment.