From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 3 Jun 2014 18:41:12 +0000 (+0200)
Subject: improve share settings working
X-Git-Tag: v7.0.0alpha2~95^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c991e148a6a50cefcf7cff3a9b0aa911c398dede;p=nextcloud-server.git

improve share settings working
---

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 8ed22e98b52..e6438da7988 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -237,15 +237,14 @@ if (!$_['internetconnectionworking']) {
 			<td id="enable">
 				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
 					   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="shareAPIEnabled"><?php p($l->t('Enable Share API'));?></label><br/>
-				<em><?php p($l->t('Allow apps to use the Share API')); ?></em>
+				<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
 			</td>
 		</tr>
 		<tr>
 			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
 					   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
+				<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
 				<div <?php ($_['allowLinks'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?> id="publicLinkSettings">
 				<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword"
 						   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
@@ -268,7 +267,6 @@ if (!$_['internetconnectionworking']) {
 				</div>
 
 				</div>
-				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
 			</td>
 		</tr>
 		<tr>
@@ -276,7 +274,6 @@ if (!$_['internetconnectionworking']) {
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
 					   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
-				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
 				<div id="resharingSettings" <?php ($_['allowResharing'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?>>
 					<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
 						    value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />