diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-24 19:27:33 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-24 19:27:33 +0200 |
| commit | 66813e9df6eb96a960462a3dc8dbe1de4df5314c (patch) | |
| tree | 69985a6adc77d66a5289e321172231f89849a4ec /settings | |
| parent | 54e0f1d739b4b3820cafafca039a3524d3dd28ba (diff) | |
| parent | 3917d18980638e86f5cce9242adeded0ca760260 (diff) | |
| download | nextcloud-server-66813e9df6eb96a960462a3dc8dbe1de4df5314c.tar.gz nextcloud-server-66813e9df6eb96a960462a3dc8dbe1de4df5314c.zip | |
Merge branch 'master' into fix-language-detection
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 4 | ||||
| -rw-r--r-- | settings/js/admin.js | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index b47075241df..6eef96c2dc1 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -58,10 +58,6 @@ tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:h tr:hover>td.remove>a { float:right; } li.selected { background-color:#ddd; } table.grid { width:100%; } -#leftcontent, .leftcontent { - width: 256px; -} -#rightcontent, .rightcontent { top: 80px; left: 336px; } #rightcontent { padding-left: 10px; } div.quota { float: right; diff --git a/settings/js/admin.js b/settings/js/admin.js index f2d6f37a51a..e957bd68f1f 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -32,6 +32,6 @@ $(document).ready(function(){ }); $('#security').change(function(){ - $.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#enforceHTTPSEnabled').val() },function(){} ); + $.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} ); }); }); |