summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-08-10 01:01:39 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-08-17 10:40:59 +0200
commit27796a4077065f9b75fc8331c87f399fadc2c851 (patch)
treeb35de13cec6e7838ae66fa5db94e59aeb5882b93 /apps
parent644770c950c73bf23b818a9e7ba71d3a739aad0b (diff)
downloadnextcloud-server-27796a4077065f9b75fc8331c87f399fadc2c851.tar.gz
nextcloud-server-27796a4077065f9b75fc8331c87f399fadc2c851.zip
layout refinements
Diffstat (limited to 'apps')
-rw-r--r--apps/files_external/css/settings.css11
-rw-r--r--apps/files_external/lib/config.php12
-rw-r--r--apps/files_external/templates/settings.php2
3 files changed, 16 insertions, 9 deletions
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 43bbb080d7e..38e497eebe6 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -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 {
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index cd3b4d9f3cb..7a10d4bbc24 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -285,7 +285,7 @@ class OC_Mount_Config {
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;
}
@@ -294,9 +294,9 @@ class OC_Mount_Config {
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;
@@ -313,11 +313,11 @@ class OC_Mount_Config {
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));
}
}
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 2581259c4ca..636877e1fa0 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -160,10 +160,8 @@
</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>