diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-07-16 16:52:08 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-07-16 16:52:08 +0200 |
| commit | 7a43c623ae3273c2f43955091cb73f728f063cbb (patch) | |
| tree | c9d1bbd0855d8b38c3ae5bcc249e9235aaa82be3 /apps | |
| parent | d58c8d72cf8c0f6784bdec1f054c24a78ff131b6 (diff) | |
| parent | 384be680bef4effdab1decca5a445cfaba2b1475 (diff) | |
| download | nextcloud-server-7a43c623ae3273c2f43955091cb73f728f063cbb.tar.gz nextcloud-server-7a43c623ae3273c2f43955091cb73f728f063cbb.zip | |
Merge pull request #9653 from owncloud/fix-9590
external storage table layout fixes
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/css/settings.css | 15 | ||||
| -rw-r--r-- | apps/files_external/js/settings.js | 12 | ||||
| -rw-r--r-- | apps/files_external/templates/settings.php | 14 |
3 files changed, 27 insertions, 14 deletions
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 758c52ae852..0da769d992b 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -10,7 +10,20 @@ td.remove>img { visibility:hidden; padding-top:7px; } tr:hover>td.remove>img { visibility:visible; cursor:pointer; } #addMountPoint>td { border:none; } #addMountPoint>td.applicable { visibility:hidden; } -#selectBackend { margin-left:-10px; } + +#selectBackend { + margin-left: -10px; + width: 150px; +} + +#externalStorage td.configuration, +#externalStorage td.backend { + white-space: normal; +} + +#externalStorage td.configuration input.added { + margin-right: 6px; +} #externalStorage label > input[type="checkbox"] { margin-right: 3px; diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index be6860bab63..8a1bb2bec6f 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -192,15 +192,15 @@ $(document).ready(function() { placeholder = placeholder.substring(1); } if (placeholder.indexOf('*') === 0) { - var class_string = is_optional ? ' class="optional"' : ''; - td.append('<input type="password"' + class_string + ' data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />'); + var class_string = is_optional ? ' optional' : ''; + td.append('<input type="password" class="added' + class_string + '" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />'); } else if (placeholder.indexOf('!') === 0) { - td.append('<label><input type="checkbox" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>'); + td.append('<label><input type="checkbox" class="added" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>'); } else if (placeholder.indexOf('#') === 0) { - td.append('<input type="hidden" data-parameter="'+parameter+'" />'); + td.append('<input type="hidden" class="added" data-parameter="'+parameter+'" />'); } else { - var class_string = is_optional ? ' class="optional"' : ''; - td.append('<input type="text"' + class_string + ' data-parameter="'+parameter+'" placeholder="'+placeholder+'" />'); + var class_string = is_optional ? ' optional' : ''; + td.append('<input type="text" class="added' + class_string + '" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />'); } }); if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass.replace(/\\/g, '\\\\')).length == 1) { diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index dcf3938b894..14f8ebc8000 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -8,12 +8,11 @@ <th><?php p($l->t('Folder name')); ?></th> <th><?php p($l->t('External storage')); ?></th> <th><?php p($l->t('Configuration')); ?></th> - <!--<th><?php p($l->t('Options')); ?></th> --> <?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?> <th> </th> </tr> </thead> - <tbody width="100%"> + <tbody> <?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?> <?php foreach ($_['mounts'] as $mount): ?> <tr <?php print_unescaped(isset($mount['mountpoint']) ? 'class="'.OC_Util::sanitizeHTML($mount['class']).'"' : 'id="addMountPoint"'); ?>> @@ -25,7 +24,8 @@ <td class="mountPoint"><input type="text" name="mountPoint" value="<?php p(isset($mount['mountpoint']) ? $mount['mountpoint'] : ''); ?>" data-mountpoint="<?php p(isset($mount['mountpoint']) ? $mount['mountpoint'] : ''); ?>" - placeholder="<?php p($l->t('Folder name')); ?>" /></td> + placeholder="<?php p($l->t('Folder name')); ?>" /> + </td> <?php if (!isset($mount['mountpoint'])): ?> <td class="backend"> <select id="selectBackend" data-configurations='<?php p(json_encode($_['backends'])); ?>'> @@ -37,10 +37,10 @@ </select> </td> <?php else: ?> - <td class="backend" - data-class="<?php p($mount['class']); ?>"><?php p($mount['backend']); ?></td> + <td class="backend" data-class="<?php p($mount['class']); ?>"><?php p($mount['backend']); ?> + </td> <?php endif; ?> - <td class ="configuration" width="100%"> + <td class ="configuration"> <?php if (isset($mount['options'])): ?> <?php foreach ($mount['options'] as $parameter => $value): ?> <?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?> @@ -150,7 +150,7 @@ action="<?php p(OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php')); ?>"> <h2><?php p($l->t('SSL root certificates'));?></h2> <table id="sslCertificate" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'> - <tbody width="100%"> + <tbody> <?php foreach ($_['certs'] as $rootCert): ?> <tr id="<?php p($rootCert) ?>"> <td class="rootCert"><?php p($rootCert) ?></td> |