diff --git a/README.md b/README.md
index 208825f8..e56b7211 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ h5ai is provided under the terms of the [MIT License](http://github.com/lrsjng/h
* [jQuery](http://jquery.com) (MIT/GPL)
* [jQuery.mousewheel](http://github.com/brandonaaron/jquery-mousewheel) (MIT)
* [modernizr](http://www.modernizr.com) (MIT/BSD)
+* [qrcode](http://www.d-project.com/qrcode/index.html) (MIT)
## Changelog
@@ -30,15 +31,17 @@ h5ai is provided under the terms of the [MIT License](http://github.com/lrsjng/h
### v0.18 - *2012-02-??*
-* updates year in `LICENSE.TXT`
-* updates es translation
+* adds optional QRCode display
+* adds optional filtering for displayed files and folders
+* improves zipped download
* custom headers/footers are now optional and disabled by default
* fixes problems with folder recognition in the JS version
* fixes include problems in PHP version
* fixes path problems on servers running on Windows in PHP version
* fixes broken links in custom headers/footers while zipped download enabled
* fixes problems with thumbnails for files with single or double quotes in filename
-* improves zipped download
+* updates year in `LICENSE.TXT`
+* updates es translation
### v0.17 - *2011-11-28*
diff --git a/build.properties b/build.properties
index d4865527..cecbe82e 100644
--- a/build.properties
+++ b/build.properties
@@ -3,7 +3,7 @@ custom = true
# project
project.name = h5ai
-project.version = 0.18
+project.version = pre0.18
# src
diff --git a/src/_h5ai/config.js b/src/_h5ai/config.js
index ba29658f..df218795 100644
--- a/src/_h5ai/config.js
+++ b/src/_h5ai/config.js
@@ -112,7 +112,20 @@ var H5AI_CONFIG = {
* Requires PHP on the server.
* Enable zipped download of selected entries.
*/
- "zippedDownload": true
+ "zippedDownload": true,
+
+ /*
+ * Show QRCodes on hovering files.
+ * Set this to the desired size in pixel or null to not display QRCodes.
+ * A good size to start with might be 150.
+ */
+ "qrCodesSize": 150,
+
+ /*
+ * Allow filtering the displayed files and folders.
+ * Filters are ment to be JavaScript regular expressions.
+ */
+ "showFilter": true
},
diff --git a/src/_h5ai/css/inc/context.less b/src/_h5ai/css/inc/context.less
new file mode 100644
index 00000000..08c8ecc9
--- /dev/null
+++ b/src/_h5ai/css/inc/context.less
@@ -0,0 +1,21 @@
+
+#context {
+ position: fixed;
+ display: none;
+ right: 16px;
+ bottom: 50px;
+
+ background-color: #fff;
+ border: 2px solid #ddd;
+ padding: 8px;
+
+ span {
+ display: block;
+ }
+
+ .qrcode {
+ canvas {
+ display: block;
+ }
+ }
+}
diff --git a/src/_h5ai/css/inc/main.less b/src/_h5ai/css/inc/main.less
index 55ed8cd1..13baed80 100644
--- a/src/_h5ai/css/inc/main.less
+++ b/src/_h5ai/css/inc/main.less
@@ -42,7 +42,7 @@ body > nav {
padding: 0 10px;
color: #999;
}
- a, a:active, a:visited {
+ a, a:active, a:visited, span.element {
color: #555;
cursor: pointer;
text-decoration: none;
@@ -60,9 +60,11 @@ body > nav {
opacity: 1.0;
}
}
- .current a {
- background-color: rgba(255,255,255,0.5);
- opacity: 1.0;
+ .current {
+ a, span.element {
+ background-color: rgba(255,255,255,0.5);
+ opacity: 1.0;
+ }
}
img {
position: relative;
@@ -70,7 +72,7 @@ body > nav {
width: 16px;
height: 16px;
}
- img + span {
+ img + span, img + input {
margin-left: 6px;
}
.crumb {
@@ -103,6 +105,18 @@ body > nav {
background-color: rgba(255,0,0,0.5);
}
}
+ #filter {
+ float: right;
+ border-left: 1px solid rgb(231,231,231);
+
+ input {
+ border: none;
+ font-family: Ubuntu, sans-serif;
+ color: #555;
+ background-color: rgba(0,0,0,0);
+ width: 100px;
+ }
+ }
}
@@ -128,6 +142,7 @@ body > nav {
@import "table";
@import "extended";
@import "tree";
+@import "context";
body > footer {
diff --git a/src/_h5ai/footer.html b/src/_h5ai/footer.html
index 3f67a409..e8ca080d 100644
--- a/src/_h5ai/footer.html
+++ b/src/_h5ai/footer.html
@@ -29,6 +29,6 @@
-
+