Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

getgrav · May 26, 2017 · 5ec844d · 5ec844d
2 parents 7f3f634 + 0ca5812
commit 5ec844d
Show file tree

Hide file tree

Showing 171 changed files with 64 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 1. [](#new)
     * Added new unified `Utils::getPagePathFromToken()` method which is used by various plugins (Admin, Forms, Downloads, etc.)
+    * Added 165 new thumbnail images for use in `media.yaml`
 1. [](#improved)
     * Optionally remove unpublished pages from the translated languages, move into untranslated list [#1482](https://github.com/getgrav/grav/pull/1482)
     * Improved reliability of `hash` file-check method

diff --git a/system/config/media.yaml b/system/config/media.yaml
@@ -18,7 +18,7 @@ types:
     mime: image/jpeg
   jpeg:
     type: image
-    thumb: media/thumb-jpeg.png
+    thumb: media/thumb-jpg.png
     mime: image/jpeg
   png:
     type: image
@@ -28,12 +28,10 @@ types:
     type: animated
     thumb: media/thumb-gif.png
     mime: image/gif
-
   svg:
     type: vector
-    thumb: media/thumb.png
+    thumb: media/thumb-svg.png
     mime: image/svg+xml
-
   mp4:
     type: video
     thumb: media/thumb-mp4.png
@@ -55,14 +53,13 @@ types:
     thumb: media/thumb-flv.png
     mime: video/x-flv
   webm:
-    type: video
-    thumb: media/thumb.png
+    type: file
+    thumb: media/thumb-webm.png
     mime: video/webm
   ogv:
     type: video
     thumb: media/thumb-ogg.png
     mime: video/ogg
-
   mp3:
     type: audio
     thumb: media/thumb-mp3.png
@@ -85,11 +82,12 @@ types:
     mime: audio/wav
   aiff:
     type: audio
+    thumb: media/thumb-aif.png
     mime: audio/aiff
   aif:
     type: audio
+    thumb: media/thumb-aif.png
     mime: audio/aif
-
   txt:
     type: file
     thumb: media/thumb-txt.png
@@ -104,66 +102,60 @@ types:
     mime: application/msword
   docx:
     type: file
+    thumb: media/thumb-docx.png
     mime: application/msword
   xls:
     type: file
+    thumb: media/thumb-xls.png
     mime: application/vnd.ms-excel
-  xlt:
-    type: file
-    mime: application/vnd.ms-excel
-  xlm:
-    type: file
-    mime: application/vnd.ms-excel
-  xlsm:
-    type: file
-    mime: application/vnd.ms-excel
-  xld:
-    type: file
-    mime: application/vnd.ms-excel
-  xla:
-    type: file
-    mime: application/vnd.ms-excel
-  xlc:
-    type: file
-    mime: application/vnd.ms-excel
-  xlw:
-    type: file
-    mime: application/vnd.ms-excel
-  xll:
+  xlsx:
     type: file
+    thumb: media/thumb-xlsx.png
     mime: application/vnd.ms-excel
   ppt:
     type: file
+    thumb: media/thumb-ppt.png
+    mime: application/vnd.ms-powerpoint
+  pptx:
+    type: file
+    thumb: media/thumb-pptx.png
     mime: application/vnd.ms-powerpoint
   pps:
     type: file
+    thumb: media/thumb-pps.png
     mime: application/vnd.ms-powerpoint
   rtf:
     type: file
+    thumb: media/thumb-rtf.png
     mime: application/rtf
-
   bmp:
     type: file
+    thumb: media/thumb-bmp.png
     mime: image/bmp
   tiff:
     type: file
+    thumb: media/thumb-tiff.png
     mime: image/tiff
   mpeg:
     type: file
+    thumb: media/thumb-mpg.png
     mime: video/mpeg
   mpg:
     type: file
+    thumb: media/thumb-mpg.png
     mime: video/mpeg
   mpe:
     type: file
+    thumb: media/thumb-mpe.png
     mime: video/mpeg
   avi:
     type: file
+    thumb: media/thumb-avi.png
     mime: video/msvideo
   wmv:
     type: file
+    thumb: media/thumb-wmv.png
     mime: video/x-ms-wmv
-
   html:
     type: file
     thumb: media/thumb-html.png
@@ -172,24 +164,37 @@ types:
     type: file
     thumb: media/thumb-html.png
     mime: text/html
+  ics:
+    type: iCal
+    thumb: media/thumb-ics.png
+    mime: text/calendar
   pdf:
     type: file
     thumb: media/thumb-pdf.png
     mime: application/pdf
+  ai:
+    type: file
+    thumb: media/thumb-ai.png
+    mime: image/ai
+  psd:
+    type: file
+    thumb: media/thumb-psd.png
+    mime: image/psd
   zip:
     type: file
     thumb: media/thumb-zip.png
     mime: application/zip
   7z:
     type: file
-    thumb: media/thumb-7zip.png
+    thumb: media/thumb-7z.png
     mime: application/x-7z-compressed
   gz:
     type: file
     thumb: media/thumb-gz.png
     mime: application/gzip
   tar:
     type: file
+    thumb: media/thumb-tar.png
     mime: application/x-tar
   css:
     type: file
@@ -203,4 +208,3 @@ types:
     type: file
     thumb: media/thumb-json.png
     mime: application/json
-
diff --git a/system/images/media/thumb-3dm.png b/system/images/media/thumb-3dm.png
diff --git a/system/images/media/thumb-3ds.png b/system/images/media/thumb-3ds.png
diff --git a/system/images/media/thumb-3g2.png b/system/images/media/thumb-3g2.png
diff --git a/system/images/media/thumb-3gp.png b/system/images/media/thumb-3gp.png
diff --git a/system/images/media/thumb-7z.png b/system/images/media/thumb-7z.png
diff --git a/system/images/media/thumb-aac.png b/system/images/media/thumb-aac.png
diff --git a/system/images/media/thumb-ai.png b/system/images/media/thumb-ai.png
diff --git a/system/images/media/thumb-aif.png b/system/images/media/thumb-aif.png
diff --git a/system/images/media/thumb-apk.png b/system/images/media/thumb-apk.png
diff --git a/system/images/media/thumb-app.png b/system/images/media/thumb-app.png
diff --git a/system/images/media/thumb-asf.png b/system/images/media/thumb-asf.png
diff --git a/system/images/media/thumb-asp.png b/system/images/media/thumb-asp.png
diff --git a/system/images/media/thumb-aspx.png b/system/images/media/thumb-aspx.png
diff --git a/system/images/media/thumb-asx.png b/system/images/media/thumb-asx.png
diff --git a/system/images/media/thumb-avi.png b/system/images/media/thumb-avi.png
diff --git a/system/images/media/thumb-bak.png b/system/images/media/thumb-bak.png
diff --git a/system/images/media/thumb-bat.png b/system/images/media/thumb-bat.png
diff --git a/system/images/media/thumb-bin.png b/system/images/media/thumb-bin.png
diff --git a/system/images/media/thumb-bmp.png b/system/images/media/thumb-bmp.png
diff --git a/system/images/media/thumb-cab.png b/system/images/media/thumb-cab.png
diff --git a/system/images/media/thumb-cad.png b/system/images/media/thumb-cad.png
diff --git a/system/images/media/thumb-cdr.png b/system/images/media/thumb-cdr.png
diff --git a/system/images/media/thumb-cer.png b/system/images/media/thumb-cer.png
diff --git a/system/images/media/thumb-cfg.png b/system/images/media/thumb-cfg.png
diff --git a/system/images/media/thumb-cfm.png b/system/images/media/thumb-cfm.png
diff --git a/system/images/media/thumb-cgi.png b/system/images/media/thumb-cgi.png
diff --git a/system/images/media/thumb-com.png b/system/images/media/thumb-com.png
diff --git a/system/images/media/thumb-cpl.png b/system/images/media/thumb-cpl.png
diff --git a/system/images/media/thumb-cpp.png b/system/images/media/thumb-cpp.png
diff --git a/system/images/media/thumb-crx.png b/system/images/media/thumb-crx.png
diff --git a/system/images/media/thumb-csr.png b/system/images/media/thumb-csr.png
diff --git a/system/images/media/thumb-css.png b/system/images/media/thumb-css.png
diff --git a/system/images/media/thumb-csv.png b/system/images/media/thumb-csv.png
diff --git a/system/images/media/thumb-cue.png b/system/images/media/thumb-cue.png
diff --git a/system/images/media/thumb-cur.png b/system/images/media/thumb-cur.png
diff --git a/system/images/media/thumb-dat.png b/system/images/media/thumb-dat.png
diff --git a/system/images/media/thumb-db.png b/system/images/media/thumb-db.png
diff --git a/system/images/media/thumb-dbf.png b/system/images/media/thumb-dbf.png
diff --git a/system/images/media/thumb-dds.png b/system/images/media/thumb-dds.png
diff --git a/system/images/media/thumb-dem.png b/system/images/media/thumb-dem.png
diff --git a/system/images/media/thumb-dll.png b/system/images/media/thumb-dll.png
diff --git a/system/images/media/thumb-dmg.png b/system/images/media/thumb-dmg.png
diff --git a/system/images/media/thumb-dmp.png b/system/images/media/thumb-dmp.png
diff --git a/system/images/media/thumb-doc.png b/system/images/media/thumb-doc.png
diff --git a/system/images/media/thumb-docx.png b/system/images/media/thumb-docx.png
diff --git a/system/images/media/thumb-drv.png b/system/images/media/thumb-drv.png
diff --git a/system/images/media/thumb-dtd.png b/system/images/media/thumb-dtd.png
diff --git a/system/images/media/thumb-dwg.png b/system/images/media/thumb-dwg.png
diff --git a/system/images/media/thumb-dxf.png b/system/images/media/thumb-dxf.png
diff --git a/system/images/media/thumb-elf.png b/system/images/media/thumb-elf.png
diff --git a/system/images/media/thumb-eot.png b/system/images/media/thumb-eot.png
diff --git a/system/images/media/thumb-eps.png b/system/images/media/thumb-eps.png
diff --git a/system/images/media/thumb-exe.png b/system/images/media/thumb-exe.png
diff --git a/system/images/media/thumb-fla.png b/system/images/media/thumb-fla.png
diff --git a/system/images/media/thumb-flv.png b/system/images/media/thumb-flv.png
diff --git a/system/images/media/thumb-fnt.png b/system/images/media/thumb-fnt.png
diff --git a/system/images/media/thumb-fon.png b/system/images/media/thumb-fon.png
diff --git a/system/images/media/thumb-gam.png b/system/images/media/thumb-gam.png
diff --git a/system/images/media/thumb-gbr.png b/system/images/media/thumb-gbr.png
diff --git a/system/images/media/thumb-ged.png b/system/images/media/thumb-ged.png
diff --git a/system/images/media/thumb-gif.png b/system/images/media/thumb-gif.png
diff --git a/system/images/media/thumb-gpx.png b/system/images/media/thumb-gpx.png
diff --git a/system/images/media/thumb-gz.png b/system/images/media/thumb-gz.png
diff --git a/system/images/media/thumb-gzip.png b/system/images/media/thumb-gzip.png
diff --git a/system/images/media/thumb-hqz.png b/system/images/media/thumb-hqz.png
diff --git a/system/images/media/thumb-html.png b/system/images/media/thumb-html.png
diff --git a/system/images/media/thumb-icns.png b/system/images/media/thumb-icns.png
diff --git a/system/images/media/thumb-ico.png b/system/images/media/thumb-ico.png
diff --git a/system/images/media/thumb-ics.png b/system/images/media/thumb-ics.png
diff --git a/system/images/media/thumb-iff.png b/system/images/media/thumb-iff.png
diff --git a/system/images/media/thumb-indd.png b/system/images/media/thumb-indd.png
diff --git a/system/images/media/thumb-iso.png b/system/images/media/thumb-iso.png
diff --git a/system/images/media/thumb-jar.png b/system/images/media/thumb-jar.png
diff --git a/system/images/media/thumb-jpeg.png b/system/images/media/thumb-jpeg.png
diff --git a/system/images/media/thumb-jpg.png b/system/images/media/thumb-jpg.png
diff --git a/system/images/media/thumb-js.png b/system/images/media/thumb-js.png
diff --git a/system/images/media/thumb-jsp.png b/system/images/media/thumb-jsp.png
diff --git a/system/images/media/thumb-key.png b/system/images/media/thumb-key.png
diff --git a/system/images/media/thumb-kml.png b/system/images/media/thumb-kml.png
diff --git a/system/images/media/thumb-kmz.png b/system/images/media/thumb-kmz.png
diff --git a/system/images/media/thumb-lnk.png b/system/images/media/thumb-lnk.png
diff --git a/system/images/media/thumb-log.png b/system/images/media/thumb-log.png
diff --git a/system/images/media/thumb-lua.png b/system/images/media/thumb-lua.png
diff --git a/system/images/media/thumb-m3u.png b/system/images/media/thumb-m3u.png
diff --git a/system/images/media/thumb-m4a.png b/system/images/media/thumb-m4a.png
diff --git a/system/images/media/thumb-m4v.png b/system/images/media/thumb-m4v.png
diff --git a/system/images/media/thumb-max.png b/system/images/media/thumb-max.png
diff --git a/system/images/media/thumb-mdb.png b/system/images/media/thumb-mdb.png
diff --git a/system/images/media/thumb-mdf.png b/system/images/media/thumb-mdf.png
diff --git a/system/images/media/thumb-mid.png b/system/images/media/thumb-mid.png
diff --git a/system/images/media/thumb-mim.png b/system/images/media/thumb-mim.png
diff --git a/system/images/media/thumb-mov.png b/system/images/media/thumb-mov.png
diff --git a/system/images/media/thumb-mp3.png b/system/images/media/thumb-mp3.png
diff --git a/system/images/media/thumb-mp4.png b/system/images/media/thumb-mp4.png
diff --git a/system/images/media/thumb-mpa.png b/system/images/media/thumb-mpa.png
diff --git a/system/images/media/thumb-mpe.png b/system/images/media/thumb-mpe.png
diff --git a/system/images/media/thumb-mpg.png b/system/images/media/thumb-mpg.png
diff --git a/system/images/media/thumb-msg.png b/system/images/media/thumb-msg.png
diff --git a/system/images/media/thumb-msi.png b/system/images/media/thumb-msi.png
diff --git a/system/images/media/thumb-nes.png b/system/images/media/thumb-nes.png
diff --git a/system/images/media/thumb-obj.png b/system/images/media/thumb-obj.png
diff --git a/system/images/media/thumb-odb.png b/system/images/media/thumb-odb.png
diff --git a/system/images/media/thumb-odc.png b/system/images/media/thumb-odc.png
diff --git a/system/images/media/thumb-odf.png b/system/images/media/thumb-odf.png
diff --git a/system/images/media/thumb-odg.png b/system/images/media/thumb-odg.png
diff --git a/system/images/media/thumb-odi.png b/system/images/media/thumb-odi.png
diff --git a/system/images/media/thumb-odp.png b/system/images/media/thumb-odp.png
diff --git a/system/images/media/thumb-ods.png b/system/images/media/thumb-ods.png
diff --git a/system/images/media/thumb-odt.png b/system/images/media/thumb-odt.png
diff --git a/system/images/media/thumb-odx.png b/system/images/media/thumb-odx.png
diff --git a/system/images/media/thumb-ogg.png b/system/images/media/thumb-ogg.png
diff --git a/system/images/media/thumb-pct.png b/system/images/media/thumb-pct.png
diff --git a/system/images/media/thumb-pdb.png b/system/images/media/thumb-pdb.png
diff --git a/system/images/media/thumb-pdf.png b/system/images/media/thumb-pdf.png
diff --git a/system/images/media/thumb-pif.png b/system/images/media/thumb-pif.png
diff --git a/system/images/media/thumb-pkg.png b/system/images/media/thumb-pkg.png
diff --git a/system/images/media/thumb-pl.png b/system/images/media/thumb-pl.png
diff --git a/system/images/media/thumb-png.png b/system/images/media/thumb-png.png
diff --git a/system/images/media/thumb-pps.png b/system/images/media/thumb-pps.png
diff --git a/system/images/media/thumb-ppt.png b/system/images/media/thumb-ppt.png
diff --git a/system/images/media/thumb-pptx.png b/system/images/media/thumb-pptx.png
diff --git a/system/images/media/thumb-ps.png b/system/images/media/thumb-ps.png
diff --git a/system/images/media/thumb-psd.png b/system/images/media/thumb-psd.png
diff --git a/system/images/media/thumb-pub.png b/system/images/media/thumb-pub.png
diff --git a/system/images/media/thumb-py.png b/system/images/media/thumb-py.png
diff --git a/system/images/media/thumb-ra.png b/system/images/media/thumb-ra.png
diff --git a/system/images/media/thumb-rar.png b/system/images/media/thumb-rar.png
diff --git a/system/images/media/thumb-raw.png b/system/images/media/thumb-raw.png
diff --git a/system/images/media/thumb-rm.png b/system/images/media/thumb-rm.png
diff --git a/system/images/media/thumb-rom.png b/system/images/media/thumb-rom.png
diff --git a/system/images/media/thumb-rpm.png b/system/images/media/thumb-rpm.png
diff --git a/system/images/media/thumb-rss.png b/system/images/media/thumb-rss.png
diff --git a/system/images/media/thumb-rtf.png b/system/images/media/thumb-rtf.png
diff --git a/system/images/media/thumb-sav.png b/system/images/media/thumb-sav.png
diff --git a/system/images/media/thumb-sdf.png b/system/images/media/thumb-sdf.png
diff --git a/system/images/media/thumb-sql.png b/system/images/media/thumb-sql.png
diff --git a/system/images/media/thumb-srt.png b/system/images/media/thumb-srt.png
diff --git a/system/images/media/thumb-svg.png b/system/images/media/thumb-svg.png
diff --git a/system/images/media/thumb-swf.png b/system/images/media/thumb-swf.png
diff --git a/system/images/media/thumb-sys.png b/system/images/media/thumb-sys.png
diff --git a/system/images/media/thumb-tar.png b/system/images/media/thumb-tar.png
diff --git a/system/images/media/thumb-tex.png b/system/images/media/thumb-tex.png
diff --git a/system/images/media/thumb-tga.png b/system/images/media/thumb-tga.png
diff --git a/system/images/media/thumb-thm.png b/system/images/media/thumb-thm.png
diff --git a/system/images/media/thumb-tiff.png b/system/images/media/thumb-tiff.png
diff --git a/system/images/media/thumb-tmp.png b/system/images/media/thumb-tmp.png
diff --git a/system/images/media/thumb-ttf.png b/system/images/media/thumb-ttf.png
diff --git a/system/images/media/thumb-txt.png b/system/images/media/thumb-txt.png
diff --git a/system/images/media/thumb-uue.png b/system/images/media/thumb-uue.png
diff --git a/system/images/media/thumb-vb.png b/system/images/media/thumb-vb.png
diff --git a/system/images/media/thumb-vcd.png b/system/images/media/thumb-vcd.png
diff --git a/system/images/media/thumb-vcf.png b/system/images/media/thumb-vcf.png
diff --git a/system/images/media/thumb-wav.png b/system/images/media/thumb-wav.png
diff --git a/system/images/media/thumb-webm.png b/system/images/media/thumb-webm.png
diff --git a/system/images/media/thumb-wma.png b/system/images/media/thumb-wma.png
diff --git a/system/images/media/thumb-wmv.png b/system/images/media/thumb-wmv.png
diff --git a/system/images/media/thumb-woff.png b/system/images/media/thumb-woff.png
diff --git a/system/images/media/thumb-woff2.png b/system/images/media/thumb-woff2.png
diff --git a/system/images/media/thumb-wpd.png b/system/images/media/thumb-wpd.png
diff --git a/system/images/media/thumb-wps.png b/system/images/media/thumb-wps.png
diff --git a/system/images/media/thumb-wsf.png b/system/images/media/thumb-wsf.png
diff --git a/system/images/media/thumb-xls.png b/system/images/media/thumb-xls.png
diff --git a/system/images/media/thumb-xlsx.png b/system/images/media/thumb-xlsx.png
diff --git a/system/images/media/thumb-xml.png b/system/images/media/thumb-xml.png
diff --git a/system/images/media/thumb-yuv.png b/system/images/media/thumb-yuv.png
diff --git a/system/images/media/thumb-zip.png b/system/images/media/thumb-zip.png
diff --git a/system/images/media/thumb.png b/system/images/media/thumb.png
diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
@@ -178,4 +178,14 @@ protected function init()
             $this->add($name, $medium);
         }
     }
+
+    /**
+     * Enable accessing the media path
+     *
+     * @return mixed
+     */
+    function path()
+    {
+        return $this->path;
+    }
 }
diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php
@@ -146,6 +146,21 @@ public function path($reset = true)
         return $this->get('filepath');
     }
 
+    /**
+     * Return the relative path to file
+     *
+     * @param bool $reset
+     * @return mixed
+     */
+    public function relativePath($reset = true)
+    {
+        if ($reset) {
+            $this->reset();
+        }
+
+        return str_replace(GRAV_ROOT, '', $this->get('filepath'));
+    }
+
     /**
      * Return URL to file.
      *