From 4c49a81c8e7f03e34edf12b876bfeca628fabd93 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Thu, 18 Aug 2011 19:22:39 +0200
Subject: language updates, optimization of Help HTML

---
 settings/templates/help.php     | 34 +++++++++++++++-------------------
 settings/templates/personal.php |  6 +++---
 2 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'settings/templates')

diff --git a/settings/templates/help.php b/settings/templates/help.php
index 3a7edfa9b22..31f6101c1ef 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,25 +1,21 @@
 <?php if(is_null($_["kbe"])):?>
-	Can't connect to Q&amp;A database
+	<div class="personalblock">
+		<p><?php echo $l->t('Problems connecting to help database.');?>
+		<a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a>
+	</div>
 <?php else:?>
-	<table class="help">
-		<tbody>
-			<?php foreach($_["kbe"] as $kb): ?>
-				<tr class="entryrow">
-					<td width="1"><?php if($kb["preview1"] <> "") { echo('<img class="preview" border="0" src="'.$kb["preview1"].'" />'); } ?> </a></td>
-					<td class="entry"><p><strong><?php echo $kb["name"]; ?></strong></p><?php  echo('<span class="type">'.$kb['description'].'</span>'); ?>
-					<?php if($kb['answer']<>'') echo('<br /><span class="type"><b>Answer:</b></span><br /><span class="type">'.$kb['answer'].'</span>');?>
-					<?php if($kb['detailpage']<>'') echo('<br /><a target="_blank" href="'.$kb['detailpage'].'"><b>read more</b></a>')?>
-					<br /></td>
-				</tr>
-			<?php endforeach; ?>
-		</tbody>
-	</table>
+	<?php foreach($_["kbe"] as $kb): ?>
+	<div class="personalblock">
+		<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
+		<p><strong><?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?></strong></p>
+		<p><?php echo $kb['description'];?></p>
+		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
+	</div>
+	<?php endforeach; ?>
+
+	<a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a>
 	<?php
 		$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
 		$pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
 		$pageNavi->printPage();
-	?>
-	<br /><a target="_blank" class="newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new"><?php echo $l->t( 'Ask a question' ); ?></a>
-<?php endif;?>
-
-
+endif?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 95df4d8c712..7278c1221ae 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -16,18 +16,18 @@
 <form>
 	<fieldset class="personalblock">
 		<label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label>
-		<select id="languageinput" name='lang'>
+		<select id="languageinput" name="lang">
 		<?php foreach($_['languages'] as $language):?>
 			<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
 		<?php endforeach;?>
 		</select>
-		<a href="https://www.transifex.net/projects/p/owncloud/"><?php echo $l->t('Help translating');?></a>
+		<a href="https://www.transifex.net/projects/p/owncloud/"><em><?php echo $l->t('Help translating');?></em></a>
 	</fieldset>
 </form>
 
 <p class="personalblock">
 	<label for="webdav"><strong>WebDAV</strong></label>
-	<input id="webdav" type="text" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?>" title="use this address to connect to your ownCloud in your file manager" />
+	<input id="webdav" type="text" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?>" title="<?php echo $l->t('use this address to connect to your ownCloud in your file manager');?>" />
 </p>
 
 <?php foreach($_['forms'] as $form){
-- 
cgit v1.2.3