Skip to content

Commit

Permalink
layout refinements
Browse files Browse the repository at this point in the history
  • Loading branch information
MorrisJobke committed Aug 17, 2016
1 parent 644770c commit 27796a4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
11 changes: 10 additions & 1 deletion apps/files_external/css/settings.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
#global_credentials {
padding-top: 0;
padding: 0 30px;
margin-bottom: 0px;
}

#files_external {
margin-bottom: 0px;
}

#externalStorage {
margin: 15px 0 20px 0;
}

#externalStorage td.status {
Expand Down
12 changes: 6 additions & 6 deletions apps/files_external/lib/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ public static function dependencyMessage($backends) {
foreach ($backends as $backend) {
foreach ($backend->checkDependencies() as $dependency) {
if ($message = $dependency->getMessage()) {
$message .= '<br />' . $l->t('<b>Note:</b> ') . $message;
$message .= '<p>' . $message . '</p>';
} else {
$dependencyGroups[$dependency->getDependency()][] = $backend;
}
Expand All @@ -294,9 +294,9 @@ public static function dependencyMessage($backends) {

foreach ($dependencyGroups as $module => $dependants) {
$backends = implode(', ', array_map(function($backend) {
return '<i>' . $backend->getText() . '</i>';
return '"' . $backend->getText() . '"';
}, $dependants));
$message .= '<br />' . OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends);
$message .= '<p>' . OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends) . '</p>';
}

return $message;
Expand All @@ -313,11 +313,11 @@ public static function dependencyMessage($backends) {
private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
switch (strtolower($module)) {
case 'curl':
return (string)$l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
return (string)$l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
case 'ftp':
return (string)$l->t('<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
return (string)$l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
default:
return (string)$l->t('<b>Note:</b> "%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
return (string)$l->t('"%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
}
}

Expand Down
2 changes: 0 additions & 2 deletions apps/files_external/templates/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,8 @@ function writeParameterInput($parameter, $options, $classes = []) {
</tr>
</tbody>
</table>
<br />

<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
<br />
<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
Expand Down

0 comments on commit 27796a4

Please sign in to comment.