From d8c86a2ad60db241bad4d7e43c54ef5157d8fdb8 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Wed, 3 Aug 2011 05:09:42 +0200
Subject: [PATCH] cleaned up settings a bit

---
 admin/templates/app.php      |  9 ++-------
 admin/templates/apps.php     |  8 --------
 admin/templates/appsinst.php | 11 ++---------
 core/css/styles.css          |  1 +
 help/templates/index.php     |  5 +----
 5 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/admin/templates/app.php b/admin/templates/app.php
index c8989e323c..06896121d0 100644
--- a/admin/templates/app.php
+++ b/admin/templates/app.php
@@ -1,9 +1,4 @@
-<?php
-/*
- * Template for Apps
- */
-$app=$_['app'];
-?>
+<?php $app=$_['app']; ?>
 <h1><?php echo $app["name"]; ?></h1>
 <?php  echo('<span class="type">'.$app['typename'].'</span>'); ?><br />
 <span class="date"><?php echo $l->l('datetime', $app["changed"]); ?></span><br />
@@ -21,7 +16,7 @@ $app=$_['app'];
 		<br />
 		<?php  echo('<a class="description" target="_blank" href="'.$app["detailpage"].'">'.$l->t( 'read more' ).'</a><br />');  ?>
 		</td>
-		<td width="1" valign="top"><a class="prettybutton" href=""><?php echo $l->t( 'INSTALL' ); ?></a></td>
+		<td width="1" valign="top"><a class="prettybutton" href=""><?php echo $l->t( 'Install' ); ?></a></td>
 	</tr>
 </table>
 
diff --git a/admin/templates/apps.php b/admin/templates/apps.php
index 50dd497c33..732326f659 100644
--- a/admin/templates/apps.php
+++ b/admin/templates/apps.php
@@ -1,11 +1,3 @@
-<?php
-/*
- * Template for Apps
- */
-?>
-<h1><?php echo $l->t( 'Apps Repository' ); ?></h1>
-
-
 <table cellspacing="0">
 	<thead>
 		<tr>
diff --git a/admin/templates/appsinst.php b/admin/templates/appsinst.php
index 0e97df6add..d1adb5f45a 100644
--- a/admin/templates/appsinst.php
+++ b/admin/templates/appsinst.php
@@ -1,10 +1,3 @@
-<?php
-/*
- * Template for Installed Apps
- */
-?>
-<h1><?php echo $l->t( 'Installed Applications' ); ?></h1>
-
 <table>
 	<thead>
 		<tr>
@@ -20,8 +13,8 @@
 				<td class="name" width="200"><?php echo($app['name']); ?></td>
 				<td class="version"><?php echo($app['version']); ?></td>
 				<td><?php echo($app['author']); ?></td>
-				<td><input x-use="appenablebutton" type='button' value='<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>' class='appbutton prettybutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>'/></td>
+				<td><input x-use="appenablebutton" type="button" value="<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" class="appbutton prettybutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" /></td>
 			</tr>
 		<?php endforeach; ?>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/core/css/styles.css b/core/css/styles.css
index fa7421e094..eb3c8b7654 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -93,6 +93,7 @@ input[type="search"] { font-size:1em; padding-left:2em; background:#eee url('../
 
 /* CONTENT ------------------------------------------------------------------ */
 #content { margin:3.5em 0 0 12.5em; }
+#body-settings #content { padding:1em; }
 
 /* USER SETTINGS ------------------------------------------------------------ */
 #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ddd; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; }
diff --git a/help/templates/index.php b/help/templates/index.php
index f239de217d..82ab224d49 100644
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -1,6 +1,3 @@
-
-<h1><?php echo $l->t( 'Questions and Answers' ); ?></h1>
-
 <?php if(is_null($_["kbe"])):?>
 	Can't connect to Q&amp;A database
 <?php else:?>
@@ -21,7 +18,7 @@
 		$pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
 		$pageNavi->printPage();
 	?>
-	<a target="_blank" class="prettybutton" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new"><?php echo $l->t( 'ASK A QUESTION' ); ?></a>
+	<a target="_blank" class="prettybutton" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new"><?php echo $l->t( 'Ask a question' ); ?></a>
 <?php endif;?>