Merge branch 'master' into stable18

README.md

@@ -5,15 +5,17 @@
 
 
 Nextcloud app for viewing Google PhotoSphere 360° images (panorama-images). This app is based on 
-the [photo-sphere-viewer.js](https://photo-sphere-viewer.js.org/) library.
+the [photo-sphere-viewer.js](https://photo-sphere-viewer.js.org/) library. For 
+360° videos the library [marzipano](https://www.marzipano.net/) is used.
 
 **This version is tested for Nextcloud 18.**
 
 ## Features
 * Interactive viewer to view PhotoSphere images in your Nextcloud instance
 * When clicking on an image it automaticlly detects the presence of XMP-data tags (which are used in photospheres).
 * Compatible with the "normal" user-view, single-file share and directory share.
-* Seamless integration with other file-viewer apps 
+* Seamless integration with other file-viewer apps.
+* Supports viewing of 360° videos in "normal" user-view via context menu. 
 
 ## Setup
 ### Install through the app store
@@ -34,3 +36,5 @@ After installing the app you can view your PhotoSphere 360° images by clicking
 ## Caveats
 * It is not possible to open the photosphere viewer from the Gallery. You must use the file browser.
 * `WebGL`-support must be activated in your browser.
+* 360° videos can not be shown in shared views. It is only possible to open them by context menu 
+therefore the `files_rightclick` app has to be installed (see https://github.com/nextcloud/files_rightclick).

appinfo/info.xml

@@ -9,7 +9,7 @@
         integrating the photo-sphere-viewer.js component
         into your nextcloud instance.
     ]]></description>
-    <version>1.0.7</version>
+    <version>1.0.9</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >Robin Windey</author>
     <namespace>Files_PhotoSpheres</namespace>

appinfo/routes.php

@@ -11,7 +11,8 @@
 return [
     'routes' => [
         // Controllers
-        ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'page#image', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'page#video', 'url' => '/video', 'verb' => 'GET'],
         ['name' => 'userfiles#get_xmp_data', 'url' => '/userfiles/xmpdata/{fileId}', 'verb' => 'GET'],
         ['name' => 'sharefiles#get_xmp_data', 'url' => '/sharefiles/xmpdata/{shareToken}', 'verb' => 'GET'],
     ]

css/marzipano/reset.css

@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}