From 30b0e8b70c7f3fd4e3357cc25e6e84554ea21b22 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 15 Dec 2012 20:02:16 +0100
Subject: cleaning up the settings. standardize the format, add missing I10N
 and other small things. Yes. This is not perfect. But way better than before
 ;-)

---
 settings/templates/admin.php    |  7 ++++---
 settings/templates/personal.php | 30 +++++++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'settings')

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9c4ee0bf680..a110e09b692 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -100,7 +100,7 @@ if(!$_['internetconnectionworking']) {
 
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Log');?></strong></legend>
-	Log level: <select name='loglevel' id='loglevel'>
+	<?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
 		<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
 		<?php for($i=0;$i<5;$i++):
 			if($i!=$_['loglevel']):?>
@@ -133,8 +133,9 @@ if(!$_['internetconnectionworking']) {
 </fieldset>
 
 
-<p class="personalblock">
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Version');?></strong></legend>
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
     <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
-</p>
+</fieldset>
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d02bcdd7ea5..35eb0ef5e9a 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -8,26 +8,29 @@
 	<p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></p>
 </div></div>
 
-<div class="personalblock">
-	<?php echo $l->t('Desktop and Mobile Syncing Clients');?>
-	<a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download');?></a>
-</div>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Clients');?></strong></legend>
+	<a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
+	<a class="button" href="https://play.google.com/store/apps/details?id=com.owncloud.android" target="_blank"><?php echo $l->t('Download Android Client');?></a>
+	<a class="button" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
+</fieldset>
 
 
 <form id="passwordform">
 	<fieldset class="personalblock">
+		<legend><strong><?php echo $l->t('Password');?></strong></legend>
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
 		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
-		<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label>
+		<input type="checkbox" id="show" name="show" /><label for="show"> <?php echo $l->t('show');?></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	</fieldset>
 </form>
 
 <form id="lostpassword">
 	<fieldset class="personalblock">
-		<label for="email"><strong><?php echo $l->t('Email');?></strong></label>
+		<legend><strong><?php echo $l->t('Email');?></strong></legend>
 		<input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
 		<em><?php echo $l->t('Fill in an email address to enable password recovery');?></em>
 	</fieldset>
@@ -35,7 +38,7 @@
 
 <form>
 	<fieldset class="personalblock">
-		<label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label>
+		<legend><strong><?php echo $l->t('Language');?></strong></legend>
 		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php echo $l->t('Language');?>">
 		<?php foreach($_['languages'] as $language):?>
 			<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
@@ -45,20 +48,21 @@
 	</fieldset>
 </form>
 
-<p class="personalblock">
-	<strong>WebDAV</strong>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('WebDAV');?></strong></legend>
 	<code><?php echo OC_Helper::linkToRemote('webdav'); ?></code><br />
-	<em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
-</p>
+	<em><?php echo $l->t('Use this address to connect to your ownCloud in your file manager');?></em>
+</fieldset>
 
 <?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
 
 
-<p class="personalblock">
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Version');?></strong></legend>
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
     <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
-</p>
+</fieldset>
 
 
-- 
cgit v1.2.3