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

Fix the app info dialog

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-06-24 23:06:12 -07:00
parent de0370011c
commit 2a9d32309e
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/app.html
+4 -1
View File
@@ -631,7 +631,10 @@
<div class="form-group">
<div ng-show="access.ssoAuth">
<label class="control-label">User management</label>
<p class="text-small" ng-show="access.ftp">This setting also controls SFTP access.</p>
<p>
This app is configured to authenticate with the Cloudron User Directory.
<span class="text-small" ng-show="access.ftp">This setting also controls SFTP access.</span>
</p>
</div>
<div ng-show="!access.ssoAuth">
<label class="control-label">Dashboard visibility</label>
src/views/apps.html
+14 -5
View File
@@ -45,11 +45,20 @@
</h5>
</div>
<div class="modal-body">
<p ng-show="appInfo.app.manifest.documentationUrl">Please see the <a target="_blank" ng-href="{{appInfo.app.manifest.documentationUrl}}">documentation</a> for helpful information and common topics for this app.</p>
<p>If you need further help, refer to the <a target="_blank" ng-href="{{ appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io' }}">forum section</a>.</p>
<p>Please see the <a target="_blank" ng-href="{{appInfo.app.manifest.documentationUrl}}">{{ appInfo.app.manifest.title }} documentation</a> for helpful information and common topics on this app.
If you need further help, refer to Cloudron's <a target="_blank" ng-href="{{ appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io' }}">{{ appInfo.app.manifest.title }} forum section</a>.
</p>
<a ng-show="appInfo.app.manifest.postInstallMessage" href="" data-toggle="collapse" data-parent="#accordion" data-target="#appinfo_postinstall_message">
<i class="fa fa-angle-right"></i>
First time setup instructions
</a>
<div id="appinfo_postinstall_message" class="panel-collapse collapse">
<br/>
<div ng-bind-html="appInfo.app.manifest.postInstallMessage | postInstallMessage:appInfo.app | markdown2html"></div>
</div>
<hr ng-show="appInfo.app.manifest.postInstallMessage"/>
<div ng-bind-html="appInfo.app.manifest.postInstallMessage | postInstallMessage:appInfo.app | markdown2html"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
@@ -134,7 +143,7 @@
<div class="grid-item-actions" ng-show="user.isAtLeastAdmin">
<a ng-href="#/app/{{ app.id}}/display" uib-tooltip="Config" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-cogs"></i></a>
<a ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="Logs" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-align-left"></i></a>
<a ng-href="" class="hand" ng-click="appInfo.show(app)" uib-tooltip="Info" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-info-circle"></i></a>
<a ng-href="" ng-show="app.appStoreId" class="hand" ng-click="appInfo.show(app)" uib-tooltip="Info" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-info-circle"></i></a>
<a ng-href="{{ app | applicationLink }}{{ app.manifest.configurePath }}" target="_blank" ng-show="app.manifest.configurePath && (app | applicationLink)" uib-tooltip="Login Page" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-external-link-alt"></i></a>
</div>
src/views/apps.js
+6
View File
@@ -101,5 +101,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
});
});
$('.collapse').on('shown.bs.collapse', function(){
$(this).parent().find('.fa-angle-right').removeClass('fa-angle-right').addClass('fa-angle-down');
}).on('hidden.bs.collapse', function(){
$(this).parent().find('.fa-angle-down').removeClass('fa-angle-down').addClass('fa-angle-right');
});
$('.modal-backdrop').remove();
}]);