Merge branch 'master' into files_encryption_check_private_key

Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php

3 files changed, 121 insertions, 77 deletions

diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index def4e60d74d..a2d1b20d3a5 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -1,84 +1,105 @@
-/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net
- This file is licensed under the Affero General Public License version 3 or later.
- See the COPYING-README file. */
+/* Copyright (c) 2011, Jan-Christoph Borchardt, http: //jancborchardt.net
+This file is licensed under the Affero General Public License version 3 or later.
+See the COPYING-README file. */
 
- ul.multiselectoptions {
- 	background-color:#fff;
- 	border:1px solid #ddd;
- 	border-top:none;
- 	box-shadow:0 1px 1px #ddd;
- 	padding-top:.5em;
- 	position:absolute;
-	max-height: 20em;
-	overflow-y: auto;
- 	z-index:49;
- }
+ul.multiselectoptions {
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-top: none;
+	box-shadow: 0 1px 1px #ddd;
+	padding-top: .5em;
+	position: absolute;
+	max-height:  20em;
+	overflow-y:  auto;
+	z-index: 49;
+}
 
- ul.multiselectoptions.down {
- 	border-bottom-left-radius:.5em;
- 	border-bottom-right-radius:.5em;
- }
+ul.multiselectoptions.down {
+	border-bottom-left-radius: .5em;
+	border-bottom-right-radius: .5em;
+	width: 100%; /* do not cut off group names */
+	-webkit-box-shadow: 0px 0px 20px rgba(29,45,68,.4);
+	-moz-box-shadow: 0px 0px 20px rgba(29,45,68,.4);
+	box-shadow: 0px 0px 20px rgba(29,45,68,.4);
+}
 
- ul.multiselectoptions.up {
- 	border-top-left-radius:.5em;
- 	border-top-right-radius:.5em;
- }
+ul.multiselectoptions.up {
+	border-top-left-radius: .5em;
+	border-top-right-radius: .5em;
+}
 
- ul.multiselectoptions>li {
- 	overflow:hidden;
- 	white-space:nowrap;
- }
+ul.multiselectoptions>li {
+	overflow: hidden;
+	white-space: nowrap;
+}
 
- ul.multiselectoptions>li>input[type="checkbox"] {
-	margin-top: 3px;
-	margin-right: 5px;
-	margin-left: 3px;
- }
+ul.multiselectoptions > li > input[type="checkbox"] {
+	margin: 10px 7px;
+	vertical-align: middle;
+}
+ul.multiselectoptions > li input[type='checkbox']+label {
+	font-weight: normal;
+	display: inline-block;
+	width: 100%;
+	padding: 5px 27px;
+	margin-left: -27px; /* to have area around checkbox clickable as well */
+}
+ul.multiselectoptions > li input[type='checkbox']:checked+label {
+	font-weight: bold;
+}
 
- div.multiselect {
- 	display:inline-block;
- 	max-width:400px;
- 	min-width:100px;
- 	padding-right:.6em;
- 	position:relative;
- 	vertical-align:bottom;
- }
+div.multiselect {
+	display: inline-block;
+	max-width: 400px;
+	min-width: 150px;
+	padding-right: .6em;
+	position: relative;
+	vertical-align: bottom;
+}
 
- div.multiselect.active {
- 	background-color:#fff;
- 	position:relative;
- 	z-index:50;
- }
+div.multiselect.active {
+	background-color: #fff;
+	position: relative;
+	z-index: 50;
+}
 
- div.multiselect.up {
- 	border-top:0 none;
- 	border-top-left-radius:0;
- 	border-top-right-radius:0;
- }
+div.multiselect.up {
+	border-top: 0 none;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+}
 
- div.multiselect.down {
- 	border-bottom:none;
- 	border-bottom-left-radius:0;
- 	border-bottom-right-radius:0;
- }
+div.multiselect.down {
+	border-bottom: none;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
 
- div.multiselect>span:first-child {
- 	float:left;
- 	margin-right:2em;
- 	overflow:hidden;
- 	text-overflow:ellipsis;
- 	width:90%;
- }
+div.multiselect>span:first-child {
+	float: left;
+	margin-right: 2em;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: 90%;
+}
 
- div.multiselect>span:last-child {
- 	position:absolute;
- 	right:.8em;
- }
+div.multiselect>span:last-child {
+	position: absolute;
+	right: .8em;
+}
 
- ul.multiselectoptions input.new {
- 	border-top-left-radius:0;
- 	border-top-right-radius:0;
- 	padding-bottom:.2em;
- 	padding-top:.2em;
- 	margin:0;
- }
+ul.multiselectoptions input.new {
+	padding-bottom: .2em;
+	padding-top: .2em;
+	margin: 0;
+}
+
+ul.multiselectoptions > li.creator {
+	padding: 10px;
+	font-weight: bold;
+}
+ul.multiselectoptions > li.creator > input {
+	width: 95% !important; /* do not constrain size of text input */
+	padding: 5px;
+	margin: -5px;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 313f89195df..58e750da4fa 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -141,7 +141,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 	padding:0 70px 0 0.5em; margin:0;
 	-moz-box-sizing:border-box; box-sizing:border-box;
 	-moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000;
-	background:#f7f7f7; border-bottom:1px solid #eee;  z-index:50;
+	background:#eee; border-bottom:1px solid #e7e7e7; z-index:50;
 }
 #controls .button { display:inline-block; }
 
@@ -355,14 +355,27 @@ tr .action { width:16px; height:16px; }
 tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
 
-#body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+#body-settings .personalblock, #body-settings .helpblock {
+	padding: .5em 1em;
+	margin: 1em;
+	background-color: rgb(240,240,240);
+	color: #555;
+	text-shadow: #fff 0 1px 0;
+	-moz-border-radius: .5em; -webkit-border-radius: .5em; border-radius: .5em;
+}
 #body-settings .personalblock#quota { position:relative; padding:0; }
 #body-settings #controls+.helpblock { position:relative; margin-top:3em; }
 .personalblock > legend { margin-top:2em; }
 .personalblock > legend, th, dt, label { font-weight:bold; }
 code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
 
-#quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
+#quota div, div.jp-play-bar, div.jp-seek-bar {
+	padding: 0;
+	background-color: rgb(220,220,220);
+	font-weight: normal;
+	white-space: nowrap;
+	-moz-border-radius-bottomleft: .4em; -webkit-border-bottom-left-radius: .4em; border-bottom-left-radius:.4em;
+	-moz-border-radius-topleft: .4em; -webkit-border-top-left-radius: .4em; border-top-left-radius: .4em; }
 #quotatext {padding:.6em 1em;}
 div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
@@ -427,12 +440,22 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 .help-includes {overflow: hidden; width: 100%; height: 100%; -moz-box-sizing: border-box;	box-sizing: border-box;	padding-top: 2.8em; }
 .help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;}
 
+
 /* ---- BREADCRUMB ---- */
 div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em;  -moz-box-sizing:border-box; box-sizing:border-box; }
 div.crumb:first-child { padding:10px 20px 10px 5px; }
 div.crumb.last { font-weight:bold; background:none; padding-right:10px; }
 div.crumb a{ padding: 0.9em 0 0.7em 0; }
 
+/* some feedback for hover/tap on breadcrumbs */
+div.crumb:hover,
+div.crumb:focus,
+div.crumb:active {
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	filter:alpha(opacity=70);
+	opacity:.7;
+}
+
 
 
 /* ---- APP STYLING ---- */
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 463c397d8cd..48d521e1856 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -176,10 +176,10 @@
 			});
 			button.parent().data('preventHide',false);
 			if(settings.createText){
-				var li=$('<li class="creator">+ <em>'+settings.createText+'<em></li>');
+				var li=$('<li class="creator">+ '+settings.createText+'</li>');
 				li.click(function(event){
 					li.empty();
-					var input=$('<input class="new">');
+					var input=$('<input type="text" class="new">');
 					li.append(input);
 					input.focus();
 					input.css('width',button.innerWidth());