Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

2 files changed, 199 insertions, 0 deletions

diff --git a/mod/lightpics/vendors/jquery-file-upload/css/jquery.fileupload-ui.css b/mod/lightpics/vendors/jquery-file-upload/css/jquery.fileupload-ui.css
new file mode 100644
index 000000000..bb706ff06
--- /dev/null
+++ b/mod/lightpics/vendors/jquery-file-upload/css/jquery.fileupload-ui.css
@@ -0,0 +1,107 @@
+@charset 'UTF-8';
+/*
+ * jQuery File Upload UI Plugin CSS 6.3
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2010, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+.fileinput-button {
+  position: relative;
+  overflow: hidden;
+  float: left;
+  margin-right: 5px;
+}
+.fileinput-button input {
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 0;
+  border: solid transparent;
+  border-width: 0 0 100px 200px;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  -moz-transform: translate(-300px, 0) scale(4);
+  direction: ltr;
+  cursor: pointer;
+}
+.fileupload-buttonbar .ui-button,
+.fileupload-buttonbar .toggle {
+  margin-bottom: 5px;
+}
+.files .progress {
+  width: 200px;
+}
+.files .progress,
+.fileupload-buttonbar .progress {
+  height: 20px;
+}
+.files .ui-progressbar-value,
+.fileupload-buttonbar .ui-progressbar-value {
+  background: url(../img/progressbar.gif);
+}
+.fileupload-buttonbar .fade,
+.files .fade {
+  display: none;
+}
+.fileupload-loading {
+  position: absolute;
+  left: 50%;
+  width: 128px;
+  height: 128px;
+  background: url(../img/loading.gif) center no-repeat;
+  display: none;
+}
+.fileupload-processing .fileupload-loading {
+  display: block;
+}
+
+/* Fix for IE 6: */
+*html .fileinput-button {
+  margin-right: -2px;
+}
+*html .fileinput-button .ui-button-text {
+  line-height: 24px;
+}
+*html .fileupload-buttonbar .ui-button {
+  margin-left: 3px;
+}
+
+/* Fix for IE 7: */
+*+html .fileinput-button {
+  margin-right: 1px;
+}
+*+html .fileinput-button .ui-button-text {
+  line-height: 24px;
+}
+*+html .fileupload-buttonbar .ui-button {
+  margin-left: 3px;
+}
+
+@media (max-width: 480px) {
+  .files .preview * {
+    width: 40px;
+  }
+  .files .name * {
+    width: 80px;
+    display: inline-block;
+    word-wrap: break-word;
+  }
+  .files .progress {
+    width: 20px;
+  }
+  .files .delete {
+    width: 60px;
+  }
+}
+
+/* Fix for Webkit (Safari, Chrome) */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  .fileinput-button {
+    margin-top: 2px;
+  }
+}
diff --git a/mod/lightpics/vendors/jquery-file-upload/css/style.css b/mod/lightpics/vendors/jquery-file-upload/css/style.css
new file mode 100644
index 000000000..6ed82e679
--- /dev/null
+++ b/mod/lightpics/vendors/jquery-file-upload/css/style.css
@@ -0,0 +1,92 @@
+@charset 'UTF-8';
+/*
+ * jQuery File Upload Plugin CSS Example 1.1
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2012, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+body {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  width: 960px;
+  margin: 10px auto;
+}
+a {
+  color: #08C;
+  text-decoration: none;
+}
+a:hover,
+.active a {
+  color: #005580;
+  text-decoration: underline;
+}
+td {
+  padding: 5px;
+}
+img {
+  border: 0;
+}
+.nav-collapse,
+ul.nav,
+ul.nav li {
+  display: inline-block;
+  margin-right: 10px;
+}
+.navbar .brand {
+  font-size: 16px;
+}
+.row {
+  zoom: 1;
+}
+.row:before, .row:after {
+  display: table;
+  content: "";
+}
+.row:after {
+  clear: both;
+}
+.span5 {
+  width: 400px;
+  float: left;
+}
+.span7 {
+  width: 560px ;
+  float: left;
+}
+
+/* Fix for IE 6: */
+*html .nav-collapse,
+*html ul.nav,
+*html ul.nav li {
+  display: inline;
+}
+*html .navbar-fixed-top {
+  margin-bottom: 35px;
+}
+
+/* Fix for IE 7: */
+*+html .nav-collapse,
+*+html ul.nav,
+*+html ul.nav li {
+  display: inline;
+}
+*+html .navbar-fixed-top {
+  margin-bottom: 35px;
+}
+
+@media (max-width: 980px) {
+  body {
+    width: auto;
+    padding: 10px;
+  }
+  .span5,
+  .span7 {
+    width: auto;
+  }
+}