From f08cfcecec4d9f9ff9d6524236a0f1384e9afaee Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 22 Apr 2012 03:59:28 +0200
Subject: [PATCH] Personal settings: Emphasized labels etc, mono-spaced
generated paths and moved text formatting to style sheet.
---
apps/calendar/templates/settings.php | 4 ++--
apps/contacts/templates/settings.php | 12 ++++++------
apps/media/templates/settings.php | 2 +-
core/css/styles.css | 2 ++
settings/templates/personal.php | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index fb2a04a649..3488fec018 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -9,7 +9,7 @@
?>
<form id="calendar">
<fieldset class="personalblock">
- <strong><?php echo $l->t('Calendar'); ?></strong>
+ <legend><?php echo $l->t('Calendar'); ?></legend>
<table class="nostyle">
<tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
<?php
@@ -47,6 +47,6 @@
</table>
<?php echo $l->t('Calendar CalDAV syncing address:');?>
- <?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?><br />
+ <code><?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?></code><br />
</fieldset>
</form>
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index ff1cab0c8d..8a24a91e95 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -1,12 +1,12 @@
<form id="contacts">
<fieldset class="personalblock">
- <strong><?php echo $l->t('Contacts'); ?></strong><br />
- <?php echo $l->t('CardDAV syncing addresses:'); ?>
+ <legend><?php echo $l->t('Contacts'); ?></legend>
+ <?php echo $l->t('CardDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
<dl>
- <dt><b><?php echo $l->t('Primary address (Kontact et al)'); ?></b></dt>
- <dd><code><i><?php echo OC_Helper::linkToAbsolute('contacts', 'carddav.php'); ?>/</i></code></dd>
- <dt><b><?php echo $l->t('iOS/OS X'); ?></b></dt>
- <dd><code><i><?php echo OC_Helper::linkToAbsolute('contacts', 'carddav.php'); ?>/principals/<?php echo OC_User::getUser(); ?></i></code>/</dd>
+ <dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
+ <dd><code><?php echo OC_Helper::linkToAbsolute('contacts', 'carddav.php'); ?>/</code></dd>
+ <dt><?php echo $l->t('iOS/OS X'); ?></dt>
+ <dd><code><?php echo OC_Helper::linkToAbsolute('contacts', 'carddav.php'); ?>/principals/<?php echo OC_User::getUser(); ?></code>/</dd>
</dl>
Powered by <a href="http://geonames.org/" target="_blank">geonames.org webservice</a>
</fieldset>
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
index 2907c616cf..941c17ff59 100644
--- a/apps/media/templates/settings.php
+++ b/apps/media/templates/settings.php
@@ -2,6 +2,6 @@
<fieldset class="personalblock">
<strong>Media</strong><br />
Ampache address:
- <?php echo OC_Helper::linkToAbsolute('media', ''); ?><br />
+ <code><?php echo OC_Helper::linkToAbsolute('media', ''); ?></code><br />
</fieldset>
</form>
diff --git a/core/css/styles.css b/core/css/styles.css
index 726427b47a..ccebc984fb 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -121,6 +121,8 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
#body-settings .personalblock#quota { position:relative; padding:0; }
#body-settings #controls+.helpblock { position:relative; margin-top: 3em; }
.personalblock > legend { margin-top:2em; }
+.personalblock > legend, th, dt, label { font-weight: bold; }
+code { font-family: "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
#quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
#quotatext {padding: .6em 1em;}
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index df5791bd52..d460b33202 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -47,7 +47,7 @@
<p class="personalblock">
<strong>WebDAV</strong>
- <?php echo OC_Helper::linkToAbsolute('files', 'webdav.php'); ?><br />
+ <code><?php echo OC_Helper::linkToAbsolute('files', 'webdav.php'); ?></code><br />
<em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
</p>
--
GitLab