Skip to content

Commit

Permalink
Merge pull request #9946 from nextcloud/bugfix/noid/files-external-se…
Browse files Browse the repository at this point in the history
…ttings-layout

Fix files_external settings layout
  • Loading branch information
skjnldsv authored Jun 21, 2018
2 parents f996da4 + effee32 commit a10690c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
4 changes: 0 additions & 4 deletions apps/files_external/css/settings.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#global_credentials {
padding: 0 30px;
}

#files_external {
margin-bottom: 0px;
}
Expand Down
7 changes: 4 additions & 3 deletions apps/files_external/templates/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ function writeParameterInput($parameter, $options, $classes = []) {
<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>

<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
<?php p($l->t('Allow users to mount the following external storage')); ?><br />
<?php
$userBackends = array_filter($_['backends'], function($backend) {
return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
Expand All @@ -189,9 +188,10 @@ function writeParameterInput($parameter, $options, $classes = []) {
</form>

<?php if ($canCreateMounts): ?>
<form autocomplete="false" class="section" action="#"
<div class="followupsection">
<form autocomplete="false" action="#"
id="global_credentials">
<p><?php p($l->t('Global credentials')); ?></p>
<h2><?php p($l->t('Global credentials')); ?></h2>
<input type="text" name="username"
autocomplete="false"
value="<?php p($_['globalCredentials']['user']); ?>"
Expand All @@ -204,4 +204,5 @@ function writeParameterInput($parameter, $options, $classes = []) {
value="<?php p($_['globalCredentialsUid']); ?>"/>
<input type="submit" value="<?php p($l->t('Save')) ?>"/>
</form>
</div>
<?php endif; ?>

0 comments on commit a10690c

Please sign in to comment.