[Pkg-owncloud-commits] [owncloud] 136/223: Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 01de7b8b9e9227503390aff0d9eea1b6151c8453
Merge: db9ac13 dc2212c
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Sat Jun 14 13:08:58 2014 +0200

    Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
    
    migrate table layout to paragraph layout for HTTPS setting

 settings/templates/admin.php | 54 ++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --cc settings/templates/admin.php
index 1db89ee,2edb458..5a00320
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@@ -313,38 -313,34 +313,34 @@@ if (!$_['internetconnectionworking']) 
  
  <div class="section" id="security">
  	<h2><?php p($l->t('Security'));?></h2>
- 	<table>
- 		<tr>
- 			<td id="enable">
- 				<input type="checkbox" name="forcessl"  id="forcessl"
- 					<?php if ($_['enforceHTTPSEnabled']) {
- 						print_unescaped('checked="checked" ');
- 						print_unescaped('value="false"');
- 					}  else {
- 						print_unescaped('value="true"');
- 					}
- 					?>
- 					<?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> />
- 				<label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/>
- 				<em><?php p($l->t(
- 					'Forces the clients to connect to %s via an encrypted connection.',
- 					$theme->getName()
- 				)); ?></em>
- 				<?php if (!$_['isConnectedViaHTTPS']) {
- 					print_unescaped("<br/><em>");
- 					p($l->t(
- 						'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.',
- 						$theme->getName()
- 					));
- 					print_unescaped("</em>");
- 				}
- 				?>
- 			</td>
- 		</tr>
- 	</table>
+ 	<p>
+ 		<input type="checkbox" name="forcessl"  id="forcessl"
+ 			<?php if ($_['enforceHTTPSEnabled']) {
+ 				print_unescaped('checked="checked" ');
+ 				print_unescaped('value="false"');
+ 			}  else {
+ 				print_unescaped('value="true"');
+ 			}
+ 			?>
+ 			<?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> />
+ 		<label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/>
+ 		<em><?php p($l->t(
+ 			'Forces the clients to connect to %s via an encrypted connection.',
+ 			$theme->getName()
+ 		)); ?></em>
+ 		<?php if (!$_['isConnectedViaHTTPS']) {
+ 			print_unescaped("<br/><em>");
+ 			p($l->t(
+ 				'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.',
+ 				$theme->getName()
+ 			));
+ 			print_unescaped("</em>");
+ 		}
+ 		?>
+ 	</p>
  </div>
  
 -<div id="mail_settings" class="section">
 +<div class="section"><form id="mail_settings">
  	<h2><?php p($l->t('Email Server'));?></h2>
  
  	<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git