diff --git a/dist/files_opds-0.8.8-NC.tar.gz b/dist/files_opds-0.8.8-NC.tar.gz
new file mode 100644
index 0000000..da624e0
Binary files /dev/null and b/dist/files_opds-0.8.8-NC.tar.gz differ
diff --git a/dist/files_opds-0.8.8-OC.tar.gz b/dist/files_opds-0.8.8-OC.tar.gz
new file mode 100644
index 0000000..df5f7ba
Binary files /dev/null and b/dist/files_opds-0.8.8-OC.tar.gz differ
diff --git a/files_opds/CHANGELOG.md b/files_opds/CHANGELOG.md
index a1c2d75..a87fedb 100644
--- a/files_opds/CHANGELOG.md
+++ b/files_opds/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.8.8 - 2018-01-31
+### Changed
+ - some minor changes to the preference sections
+
+## 0.8.5 - 0.8.7
+### Changed
+ - debugging NC and OC package signing collision
+
## 0.8.4 - 2018-01-19
### Changed
- signed package for publication in Owncloud marketplace
diff --git a/files_opds/appinfo/info.xml b/files_opds/appinfo/info.xml
index 10a9a1d..699df24 100644
--- a/files_opds/appinfo/info.xml
+++ b/files_opds/appinfo/info.xml
@@ -19,7 +19,7 @@ See [README] for more information on (mis)features of this app.
]]>
AGPL
- 0.8.7
+ 0.8.8
Frank de Lange
tools
files
diff --git a/files_opds/appinfo/signature.json b/files_opds/appinfo/signature.json
index 5e7a621..4f3cc20 100644
--- a/files_opds/appinfo/signature.json
+++ b/files_opds/appinfo/signature.json
@@ -1,6 +1,6 @@
{
"hashes": {
- "CHANGELOG.md": "c3273ec77ed1ba9d9a5f5df7a7849da0c47afd1b0ad40dae3dca912c91fccd499837e5a2bc63dd5e4b267294f8b39dbda2bce71c9e96c850120a86d4dd52fbb9",
+ "CHANGELOG.md": "368a70fbb8187bb132e3dcf85b29d1f8b637ccfb8a993ec3a3a89db742549915dd5b305d626719c06caa5fb38e8d87e7ce99aa2876d90836de20db67ed3f50fa",
"README.md": "1ec77886ea45e2887bebaa5f83d055c18e9857e16c25415930de84710b3ecd78f26c9ce8faa024cb871960f705a97ade3333eaaed03e024545f258d08bc5fccb",
"admin.php": "b2b68146af126e7cca529853fc228072aabe6e53ca46a21461c8e51304566196438067873befd15afa68cc7ff7b5d9eab4b2dab8ca21901ffa61daf0297a0c23",
"ajax\/admin.php": "41e6500e1f066c0285c171197d0a8c953584603447620e04384bf04ab459db4dc18ba45acf8eef92887b556b159c892efcbed5d47cffdc661b23f2e3cd7c036a",
@@ -9,10 +9,10 @@
"ajax\/schedule_rescan.php": "876591efaf712e356f0a01f01e89673980715789ca365ad7afc14f79eee5447fa11f0dba095d738d8200f1840ca564c2a5a68b7d8fca2886b597bd471a6cd30b",
"appinfo\/app.php": "785be08e5107e30eac9800ccb080d9b27a762f42b51034ff399c7a23534278fc1cacfb2e332e5e6854b5f8f4e07df1149dc37fa10abb1c97df3be096d66a579f",
"appinfo\/database.xml": "010b78a70f71f6e5bfc566325b310013bdfe1efd74bbcf3416ebb1fd19d033f6736918df72d7c4389645cc018d653b00791b849306a9983de79a5bc7f994bd2e",
- "appinfo\/info.xml": "1367e2dc1bcc9a1cfe2ebd6c501ac41aadf71592e124e48ca8835fef2a1f1ae07be63e95fe6d31668471d5f3ac5c3083df37448458045b5873a1ce02b14d6483",
+ "appinfo\/info.xml": "5df94f018a9299527ffeb6a244f8ea9b0bee0937b1dc04aa22cbdb3b0b15727c4db773bd95459cf356cd0cf39c5efb57fe0dfe4904c2615782a72a467db6d3d7",
"appinfo\/routes.php": "0b2e8d1ab81907421c98f620644e1482c25e2b9bbbcca2111218307ee7db027123ba23ab6a5afe51c393943cd3ca05d7eceb28645cc5eeeaf363d7e8cc535fde",
- "css\/settings.css": "b697ffbe3151d13d324fb8666c5c7d165820842f81245cde8719852ed58ac7ce473288747ea353827b66e66528bb6543fbddbd2dda76676f4740094a44b8edb0",
- "img\/app.svg": "5057300b0689688be83c4b040c76e7b3c85d665f301e51b122c2aeaf9fecbefe82c917352c2dbac6eb468d7d77df99a70d5ade7f20055bd8a6f67e5656432902",
+ "css\/settings.css": "0bd4d6d40a0f57b2fd44dc140008a1a6536c9261393d6a444bfaf30911311a79ac0702c817cf46c1612312856e170cb8be1c20bb5140b645bb8674e981850e50",
+ "img\/app.svg": "abf3b69397362d34721fe6f22712e9c221bd3e83164be7bbf1701a543671887d504e2f82157d89a9bfc69b9afbd95b5ca318311ab86076bb029238d39e7d6b65",
"index.php": "96d7ce53f7ed0127092a14e80678c8b2e86785ceee9a87675c47d2503f0d4d241a2868ada852f2072260ca12374d588e1f6dc8a9edd60aa47b9ccab0b85e637f",
"js\/admin.js": "cc0eea17c59cda1d20b054cfb9c67af96913d68f1d12d0c1e05f11035a350302c4b8cab9dbd4b64da666230b93530c85eeae7a193c1012fbe922cdabb4bda0a0",
"js\/personal.js": "9c0953632e2c470a0c51ede34c570a0011ac48c41a709466753f9356389c7c5f4a6ba2c421d66bf6d680e7939c85045d2f3b6660938cdf643c37f9e8370d5f33",
@@ -30,15 +30,15 @@
"lib\/isbndb.php": "9a0a150c983624ae8daf7bf08e3e4d37348ed3b70a96b87b4032335eed7139c6f5eac048ee20d1e8447f6dd58dbea602bd3c41ad91494829f55287b87b66a857",
"lib\/meta.php": "97d1dcf02704dc05068d24ddcefad721c806f1feb1971b3cecda5ff1e17383cbd37e5690c947ddaa7aeab012a7623379cf90dc32d3206173193311ea77549b41",
"lib\/util.php": "74e636ad6a5023711c4539dc287b42129cb5df6e8a8717614f236fbd32134a648b26e7291db68d9d9a831a97d936c5b3e8347b69b220ada90c097505eeaad28e",
- "personal.php": "7184f7908e1ddfbb4a7f2d3dd48f46c4d82911ce802be635430d09f80ea511244f784fa06f94cf12551d1a49db25a8a5942cfa585454c976c47f402bdf1e7f5e",
- "templates\/admin.php": "a60fe76b3bdf4a9007578143cba59cd90aa070dea439d195cee849b85cf7057e50fda391eb86b5f4252c0dba13fa6ecab7b3465d88f0f38acca26950b29f6dc9",
+ "personal.php": "11491586e243defd4253f5ad6a47aba977ae14f62f0cc486b03e6684da1c487c39430ded2414960ce6148374029707baa550e77f1a510f103c0935e582217170",
+ "templates\/admin.php": "7d2c148143a91033e424e325ce0df7726f14d13ca86e7aa8588e883ae32a1d82d56bd9fc0bb8fa3055ba48f73523c535e9532b2e10da4d6dd6467efba2dbf1e4",
"templates\/feed.php": "35f2066a623144bdcc959dcba21129685ad18dd07642ee8cfb1e66f21268996e246d86ec3c9dff0f5f6cfcebe6f5f31418284422b15a80fa6302ed2579f37d87",
"templates\/part.feed.acquisition.php": "db543db58993cd17742f04d27ea2e1b609d5ca5afb7be2f10450593582b5d517cc6ad531a7ea1a03bea2a3050cfdb456bba57ace5b90955610a5c241ee652f1d",
"templates\/part.feed.navigation.php": "956d32d3c5bc96a704e6b842bf80a2f3ed1cfd5c2e879d29873a635a198a27a3adab6fd1ad31a91b364fbf46643340af1a0ec501ead312aa0c43ad01272f1894",
"templates\/part.feed.root.php": "74e72cc83d5c046f9e3e381ffce76d7b98dfd45fe069d007abae6ca45fb9f9359f244db1b183a875eacb642ac9cc3d1813b9f229f98cd3b4ae3dbf568ccff0e6",
- "templates\/personal.php": "4a9d0f34660bc3b6915c81c2b4f0ef14e83cac342eda03d4219de917852d621f525045bcac5c7bf4d22ebe3d0c40418ed433f456fb4900360c05c32cc7e550ee",
+ "templates\/personal.php": "ac4066bc34bf719d8e0a6a93458f2cc736754591575725836a17f40d988347d29e437abd8bf4a14f0ea29eacd8521ee7fec9c8408bf5dd33b08f55ed3ba485d6",
"templates\/search.php": "9b290d549c98834c92bb98049dac81223400a165f86c394191285f1c5a794bb3c6fa033d19cff21b7f47750ea748859f1c253023f9538bf8dc69cd70b0cafe4c"
},
- "signature": "vBJyRyHecHmFiCxEaOmu28lAOV909Qgv1bRIwtQk7JLW717C7CozVSdghwUoQ9Q5YpM701LNHmYJ6gImKrpelgOVwr+AFkR1LMgGqWJaQ\/pJ7mfIKQSE1zFxVRTaOu6RfWiH7c4w\/aF3uUhRuvYlnEjLlVp6qS\/xekflmwt\/tbSqHj1xrh0miZzXbz3MLVGSsojf1JmJuNgv8FUiZLL4XLqR+cpuiGijg8hjC\/4kPPyPzi4zg73TG3GxuijZMXKseLl\/Wn4NGyyW3bZV+1wJnu5f7l9DPGgHJVmbXm7owjd2\/jFFgFMXsWMcQgzsR7hoRcQUifLiXEhvWI3VAHT2LtI9ZhICkAQjUxTCIJ0qBT3yediVlMdn1jwPZQO4lvidNpiRmKVkUEEo+FSyuu76f8lHI2UzUTYrGxORtti3u2776BcqqDUN729RbQE3IcwyjxcEaYXezSn81Zjteeg+MvgyFCS9y6THGb2WlSB5eoHjZ70kT3kUQ\/aUd\/\/fWnmoXaarQ9VT26YGsUDvAxTeDf8eo+qGKBJ1XdIq3j0\/VDltekBNUN1WBDdJnAeYb3TOm\/xT5DkpKoIJM7MWUkoxCl1zqOx\/bFBnK1CQiF1u1G4zeLEUNd70\/7v+qJrmwPRjeP1fjWx7dRcPyaWaqa5\/aZ\/mw67QNP2X62Qrdtq08eA=",
+ "signature": "iYU2O6E15MOwA9VTm4ZzVOPWs2a0GD5wyfyGwTxMJv2MELlp96tJ196mqfQZlDUcVYLXltl4gWO1gB7W0nGrc0a5hf5NwZkwmDQLuXryteP43B7KdBzx9qpr5\/AFkIvXd8+\/ItuYRrAkc6LCXqkzXYhxsTdobBu91due0ZNPwu9Gj5Nf+4\/ka2GQo0\/WxbLxwkMjez5k3V8jpGQer2gfYPgwTAfgF0GYFkgb32dPr5ycRI\/mZ3EuYz0kPLkJcpDrv7YAHeq89+f8v+eVchL0X+9GsJvHVtqWKxTp+xDhSgNSAB9xOPBQDW54Y\/pKz8IDqJ2D77oQGUykIwF5MwjAAE18xQX5LsXNO9WWj6hAZRyu4yyJaltRsne0WEt8ZeL+F6cQ+hlg9Bnm+8os6zbPkeoSZYVwfMSxBSx6beQYVVh0OHpI7gQZsN6Yk4Ybq8nHyFdut3lX94mlyKpkaU1ZGtT5ELu1weFajhIjoQVbS0OwLYLNNQ6q8Uifkx3I\/+kmr5Bwc+HhRLryIxI7ERttTO8aQkP1vsw4EuFNc+JGdo5lsxuh8zuTlFsa6qo5d9HhbGeDmPSU7SWMhDxxlrIssSGFI8oba8IUdmai1\/5N3dwdltt67Nb8yfLGvFd26+d\/KpEFyLHiatOIHY2ale+9EbORCKn4HUkgvKPmLlCBOcY=",
"certificate": "-----BEGIN CERTIFICATE-----\r\nMIIE9zCCAt8CAhBOMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD\r\nVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93\r\nbkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE4\r\nMDExODIxMzI0NFoXDTI4MDExNjIxMzI0NFowFTETMBEGA1UEAwwKZmlsZXNfb3Bk\r\nczCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAND\/ZZATXas40Gv5RSGI\r\n3iiLtjmZMREy791rlbdN2k5Yfo2MtQePJLaaJPkrQ5uHNKTu0TkgTrAxzCV5tNVZ\r\nB+UTun6+kPowjcyQN7zhQt2m+4wtmmRvKr\/\/lb4wZfORjClbVKfSYjO+D\/cQ+k4m\r\ngsntBqoUUUZ7D8TN7M9gFTyK9m9reUEWZDEUdu9iuNRE3fGh7tiJnRpkYtoZPm+R\r\nhv5S3ni2m47848L3VvAfVBirD0OQfCWJZnxMmRkMztT5F66lnrETGE1dROxFpM8+\r\nd9HwE5r0pmPR7L3bEZ23axwiHgJH7nBypqUtQM5foMYb\/T6Rm\/+Pjbq1AvcuN4wg\r\nolBXlG45nEdEjxKjsJcKdzGipTEnpAwSYtZ1WGjh5Ph3cv2f++fIphqZ1UjohMbR\r\nJvloeiPAliITFPBUlqJjaXowCzHko1XVyL5DBCZ38xQKIYa8A3mQQJucm2gxSP5z\r\npW0u8VxDCSleaG7waBGDVU+v5u3X1U9q2Bzeflk5jVjUe2rsVIXW1YyXBNLEbYkh\r\nS9+1qKuyuL58gZ\/JTGVqdJkSHQX+Pcq4RgUljzybeU38PtFYB9mNW1LBJvuwHAVB\r\nnmBpcJH7eSZuaeAez4Ta1cJnKcXgPvrSNeYJ5iZOSFFwdVo2SWmRq7UI\/LsBOThU\r\nPqKwVFHvCkQYi5G10ka+AdAzAgMBAAEwDQYJKoZIhvcNAQELBQADggIBALQhLQrF\r\nsUZDJS6S95sr5kJgUIGSwxx27jbCxSCl1lMg7Nnlf9eQnfB6BNtKhmiQ7K45lwae\r\n5rfs4L\/SEv0uQVhLTM42Jkj9WmfhF8kXrhuwaYZKFg+sI2c5roY2xtHmnVWZlYnk\r\nnMa45iI0XccSBSX4pFR\/H6Wi4\/cXAENG44XqmPh7+FSC0kaVy1f0VDTd87tw8cRB\r\nenWJXn9fTh5RscM7eFeq3VdzL8baFSaJwj+vlgOTT7SpzzRdO6ujWfgGY9MrAj1C\r\nYfP78OHgk6oO4iAbOkpDPfdXimW\/uQs6UZbQKWorh8kxSNUnKOWgvVSYb6MzYYfd\r\nLn+\/NDrHfGTTuupjbkLC8B9ZdcisOhYQ3bVN18iNQTmeTMSP3r2H1T+RyE0lWyVr\r\nPeD1ZSV5MaYSA7IfSrUEkYHf4\/VCcI8OGVdNBbkjq1LrZ4SQvNkvn0wEVgPiy5qR\r\nS+k6GDFjlxL6cdaFRFjvfD8xvUG2aXEBBpp9lqVPdH7t5fAnlcqcN\/MKHGSWlZ+n\r\nurMpIEEi\/JmVvXJO+BmZUq8RHf0YITu+qBoH69A6TPO1e4qeZdZEJBorEPr2b5OU\r\nA5lveN6B+NxrtgQ8kV5zz9qRDzcLFeq31Iv4Puep5JGx1C6Zoac9rKfbzXu1Pd3V\r\n6Xa9917Q9zAakEzBfKFY0c4cVKw0Z+miT0mB\r\n-----END CERTIFICATE-----"
}
\ No newline at end of file
diff --git a/files_opds/css/settings.css b/files_opds/css/settings.css
index 54893a9..b6b7ac7 100644
--- a/files_opds/css/settings.css
+++ b/files_opds/css/settings.css
@@ -5,3 +5,7 @@
#opds .double-indent {
padding-left: 2em;
}
+
+.nav-icon-opds {
+ background-image: url('../img/app.svg?v=1');
+}
diff --git a/files_opds/img/app.svg b/files_opds/img/app.svg
index 7dd7a20..e554ba9 100644
--- a/files_opds/img/app.svg
+++ b/files_opds/img/app.svg
@@ -5,134 +5,108 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg5261"
version="1.1"
- id="svg4096"
viewBox="0 0 32 32"
- height="32"
width="32"
- inkscape:version="0.91 r13725"
- sodipodi:docname="app.svg">
-
-
+ height="32">
+ id="metadata5267">
image/svg+xml
-
+
+
+ transform="translate(1.4457782,-1020.2752)">
+ style="fill:#060000;fill-opacity:1" />
+ y="11.710122"
+ x="6.2117367"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve">
+ transform="matrix(0.01369405,0.00618385,0,0.01584184,5.2784422,6.7218015)">
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3675">
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3677">
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3679">
+ d="m 829.2,664.9 c -36.4,0 -69.8,12.2 -96.8,32.6 l -401.2,-193.9 0.4,-7.3 400.8,-193.7 c 26.9,20.4 60.3,32.6 96.8,32.6 88.9,0 160.9,-72 160.9,-160.9 0,-88.9 -72,-160.9 -160.8,-160.9 -88.9,0 -160.9,72 -160.9,160.9 v 0.1 L 271,366.4 C 243.5,344.5 208.7,331.2 170.9,331.2 82,331.3 10,403.3 10,492.2 10,581 82,653 170.9,653 c 32.1,0 62,-9.5 87.1,-25.7 l 410.3,198.3 v 0.2 c 0,88.8 72,160.9 160.9,160.9 88.9,0 160.8,-72 160.8,-160.9 0,-88.9 -72,-160.9 -160.8,-160.9 z" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3683" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3685" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3687" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3689" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3691" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3693" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3695" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3697" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3699" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3701" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3703" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3705" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3707" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3709" />
+ style="fill:#fcfcfc;fill-opacity:1"
+ id="g3711" />
diff --git a/files_opds/personal.php b/files_opds/personal.php
index 0ca2465..5fac311 100644
--- a/files_opds/personal.php
+++ b/files_opds/personal.php
@@ -14,7 +14,7 @@ use OCP\Util;
$l = \OC::$server->getL10N('files_opds');
-\OCP\Util::addScript('files_opds', 'personal');
+#\OCP\Util::addScript('files_opds', 'personal');
$tmpl = new \OCP\Template('files_opds', 'personal');
$opdsEnable = Config::get('enable', false);
diff --git a/files_opds/templates/admin.php b/files_opds/templates/admin.php
index bd5bf91..cbeb75c 100644
--- a/files_opds/templates/admin.php
+++ b/files_opds/templates/admin.php
@@ -14,7 +14,7 @@ $l = \OC::$server->getL10N('files_opds');
function checkBox($format) {
foreach($format as $name => $enabled) {
- echo '' : '>');
+ echo '' : '>');
echo '';
}
}
diff --git a/files_opds/templates/personal.php b/files_opds/templates/personal.php
index 3916c54..ac1823d 100644
--- a/files_opds/templates/personal.php
+++ b/files_opds/templates/personal.php
@@ -10,6 +10,9 @@
* later.
*/
+script('files_opds', 'personal');
+style('files_opds', 'settings');
+
?>