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

rename account to postInstall

Browse Source 
part of #19
This commit is contained in:
Girish Ramakrishnan
2016-09-07 12:07:49 -07:00
parent 186d0a1156
commit a52f1e07ee
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webadmin/src/views/apps.html
View File

@@ -203,16 +203,16 @@
</div>
</div>
<!-- Modal accounts app -->
<div class="modal fade" id="appAccountsModal" tabindex="-1" role="dialog">
<!-- Modal post install message app -->
<div class="modal fade" id="appPostInstallModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Account information for {{ appAccounts.app.fqdn }}</h4>
<h4 class="modal-title">{{ appPostInstall.app.fqdn }}</h4>
</div>
<div class="modal-body">
<div class="appstore-install-description">
<div ng-bind-html="appAccounts.info | markdown2html"></div>
<div ng-bind-html="appPostInstall.message | markdown2html"></div>
</div>
</div>
<div class="modal-footer">
@@ -401,8 +401,8 @@
<a href="" ng-click="showConfigure(app)" title="Configure App"><i class="fa fa-wrench scale"></i></a>
</div>
<div ng-show="hasAccountInfo(app)">
<a href="" ng-click="showAccounts(app)">
<div ng-show="hasPostInstallMessage(app)">
<a href="" ng-click="showPostInstall(app)">
<i class="fa fa-question scale"></i>
</a>
</div>

16
webadmin/src/views/apps.js
View File

@@ -65,9 +65,9 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
password: ''
};
$scope.appAccounts = {
$scope.appPostInstall = {
app: {},
info: ''
message: ''
};
$scope.appError = {
@@ -280,13 +280,13 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
});
};
$scope.showAccounts = function (app) {
$scope.showPostInstall = function (app) {
$scope.reset();
$scope.appAccounts.app = app;
$scope.appAccounts.info = app.manifest.description.match(/### Accounts([\s\S]*?)###/m)[1];
$scope.appPostInstall.app = app;
$scope.appPostInstall.message = app.manifest.postInstallMessage;
$('#appAccountsModal').modal('show');
$('#appPostInstallModal').modal('show');
return false; // prevent propagation and default
};
@@ -481,8 +481,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
window.history.back();
};
$scope.hasAccountInfo = function (app) {
return app.manifest && app.manifest.description.match(/### Accounts/) !== null;
$scope.hasPostInstallMessage = function (app) {
return app.manifest && app.manifest.postInstallMessage;
};
function fetchUsers() {