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

Move sftp login details to help dialog

Browse Source
This commit is contained in:
Johannes Zellner
2021-09-22 22:28:05 +02:00
parent ad7afe8646
commit db3df9a3ea
3 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/views/app.html
View File

@@ -23,6 +23,52 @@
</div>
</div>
<!-- Modal sftpInfo -->
<div class="modal fade" id="sftpInfoModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4>{{ 'app.accessControl.sftp.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#ftp-access" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></h4>
</div>
<div class="modal-body">
<p class="text-small text-warning text-bold" ng-show="location.domain.provider === 'cloudflare'">{{ 'appstore.installDialog.cloudflarePortWarning' | tr }} </p>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.accessControl.sftp.server' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ config.adminFqdn }}</span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.accessControl.sftp.port' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>222</span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.accessControl.sftp.username' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ user.username }}@{{ app.fqdn }}</span>
</div>
</div>
<br/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
</div>
</div>
</div>
</div>
<!-- Modal uninstall app -->
<div class="modal fade" id="uninstallModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
@@ -477,6 +523,7 @@
<li ng-class="{ 'disabled': !app.manifest.postInstallMessage }"><a href="" ng-click="postInstallMessage.show(false)">{{ 'app.firstTimeSetupAction' | tr }}</a></li>
<li ng-class="{ 'disabled': !app.manifest.documentationUrl }"><a ng-href="{{ app.manifest.documentationUrl }}" target="_blank">{{ 'app.docsAction' | tr }}</a></li>
<li ng-class="{ 'disabled': (!app.manifest.configurePath || !(app | applicationLink)) }"><a ng-href="{{ (app.manifest.configurePath && (app | applicationLink)) ? ((app | applicationLink) + app.manifest.configurePath) : ''}}" target="_blank">{{ 'app.adminPageAction' | tr }}</a></li>
<li ng-class="{ 'disabled': !app.manifest.addons.localstorage.ftp }"><a href="" ng-click="sftpInfo.show()">{{ 'app.sftpInfoAction' | tr }}</a></li>
<li role="separator" class="divider"></li>
<li ng-class="{ 'disabled': !app.manifest.website }"><a ng-href="{{ app.manifest.website }}" target="_blank">{{ 'app.projectWebsiteAction' | tr }}</a></li>
</ul>
@@ -758,40 +805,6 @@
<button class="btn btn-outline btn-primary pull-right" ng-click="access.submit()" ng-disabled="(access.accessRestrictionOption === 'groups' && !access.isAccessRestrictionValid()) || access.$invalid || access.busy"><i class="fa fa-circle-notch fa-spin" ng-show="access.busy"></i> {{ 'main.dialog.save' | tr }}</button>
</div>
</div>
<div class="row" ng-show="app.manifest.addons.localstorage.ftp">
<hr/>
<div class="col-md-12">
<label>{{ 'app.accessControl.sftp.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#ftp-access" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
<p class="text-small text-warning text-bold" ng-show="location.domain.provider === 'cloudflare'">{{ 'appstore.installDialog.cloudflarePortWarning' | tr }} </p>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.accessControl.sftp.server' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ config.adminFqdn }}</span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.accessControl.sftp.port' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>222</span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.accessControl.sftp.username' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ user.username }}@{{ app.fqdn }}</span>
</div>
</div>
</div>
</div>
</div>
<div class="card" ng-show="view === 'resources'">