From 111bd8e57d2ccb7e894e8c3d86daaed62b6fb618 Mon Sep 17 00:00:00 2001
From: Markus Goetz <markus@woboq.com>
Date: Wed, 15 Jun 2016 15:24:01 +0200
Subject: files_external: Keep checkbox and its label on one line #20032 #22655

Else the checkbox and the decription end up on different lines in my Chrome on OS X
---
 apps/files_external/js/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apps/files_external/js/settings.js')

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 2477f513db3..d210c158ec1 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -854,7 +854,7 @@ MountConfigListView.prototype = _.extend({
 		this.configureAuthMechanism($tr, storageConfig.authMechanism, onCompletion);
 
 		if (storageConfig.backendOptions) {
-			$td.children().each(function() {
+			$td.find('input, select').each(function() {
 				var input = $(this);
 				var val = storageConfig.backendOptions[input.data('parameter')];
 				if (val !== undefined) {
@@ -1001,7 +1001,7 @@ MountConfigListView.prototype = _.extend({
 			newElement = $('<input type="password" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" placeholder="'+ trimmedPlaceholder+'" />');
 		} else if (placeholder.type === MountConfigListView.ParameterTypes.BOOLEAN) {
 			var checkboxId = _.uniqueId('checkbox_');
-			newElement = $('<input type="checkbox" id="'+checkboxId+'" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" /><label for="'+checkboxId+'">'+ trimmedPlaceholder+'</label>');
+			newElement = $('<div><label><input type="checkbox" id="'+checkboxId+'" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" />'+ trimmedPlaceholder+'</label></div>');
 		} else if (placeholder.type === MountConfigListView.ParameterTypes.HIDDEN) {
 			newElement = $('<input type="hidden" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" />');
 		} else {
-- 
cgit v1.2.3

value='5.0-stable'>5.0-stable</option>
<option value='5.1-stable'>5.1-stable</option>
<option value='6.0-stable'>6.0-stable</option>
<option value='integration-to-svn-stable-1.0'>integration-to-svn-stable-1.0</option>
<option value='integration-to-svn-trunk'>integration-to-svn-trunk</option>
<option value='master' selected='selected'>master</option>
<option value='nbc'>nbc</option>
<option value='plugin-hooks'>plugin-hooks</option>
<option value='swistak'>swistak</option>
<option value='work'>work</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mirror of redmine code source: https://github.com/redmine/redmine</td><td class='sub right'>www-data</td></tr></table>
<table class='tabs'><tr><td>
<a href='/redmine.git/'>summary</a><a href='/redmine.git/refs/?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>refs</a><a href='/redmine.git/log/app/views/custom_fields/formats/_numeric.html.erb'>log</a><a class='active' href='/redmine.git/tree/app/views/custom_fields/formats/_numeric.html.erb?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>tree</a><a href='/redmine.git/commit/app/views/custom_fields/formats/_numeric.html.erb?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>commit</a><a href='/redmine.git/diff/app/views/custom_fields/formats/_numeric.html.erb?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>diff</a><a href='/redmine.git/stats/app/views/custom_fields/formats/_numeric.html.erb'>stats</a></td><td class='form'><form class='right' method='get' action='/redmine.git/log/app/views/custom_fields/formats/_numeric.html.erb'>
<input type='hidden' name='id' value='258ba9b88ba92bc029f857d06096aa826dc608a4'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/redmine.git/tree/?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>root</a>/<a href='/redmine.git/tree/app?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>app</a>/<a href='/redmine.git/tree/app/views?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>views</a>/<a href='/redmine.git/tree/app/views/custom_fields?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>custom_fields</a>/<a href='/redmine.git/tree/app/views/custom_fields/formats?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>formats</a>/<a href='/redmine.git/tree/app/views/custom_fields/formats/_numeric.html.erb?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>_numeric.html.erb</a></div><div class='content'>blob: cc0c798a6155f6940c3f989756c4358caf1ec7a2 (<a href='/redmine.git/plain/app/views/custom_fields/formats/_numeric.html.erb?id=258ba9b88ba92bc029f857d06096aa826dc608a4'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
</pre></td>
<td class='lines'><pre><code>