From 442f26ea80e8736f085adb01ad932449d5ad476d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 16 Sep 2012 17:23:21 +0200
Subject: structure the settings options a bit better.

---
 settings/templates/admin.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'settings/templates')

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4edbe64e967..c4eab07ced4 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -38,7 +38,7 @@ if(!$_['htaccessworking']) {
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-	<legend><strong><?php echo $l->t('Share API');?></strong></legend>
+	<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
 	<table class="shareAPI nostyle">
 		<tr>
 			<td id="enable">
@@ -46,15 +46,19 @@ if(!$_['htaccessworking']) {
 				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
 				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
 			</td>
+		</tr><tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
 				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
 				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
 			</td>
+		</tr><tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
 				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
 				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+			</td>
+		</tr><tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
 				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />
-- 
cgit v1.2.3


From 158af74b3e1fe7bcdeabfffac6b537c32093e908 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sun, 16 Sep 2012 12:40:08 -0400
Subject: makes cron config layout similar to the sharing one

---
 settings/templates/admin.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'settings/templates')

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index c4eab07ced4..35f34489fec 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -29,12 +29,27 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?>">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?>">Cron</label><br />
+	<table class="nostyle">
+		<tr>
+			<td>
+				<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
+				<label for="backgroundjobs_ajax">AJAX</label><br />
+				<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+			</td>
+		</tr><tr>
+			<td>
+				<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
+				<label for="backgroundjobs_webcron">Webcron</label><br />
+				<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+			</td>
+		</tr><tr>
+			<td>
+				<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
+				<label for="backgroundjobs_cron">Cron</label><br />
+				<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+			</td>
+		</tr>
+	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-- 
cgit v1.2.3