From b9c25218f177b22ba0590706692d47f54986cd0d Mon Sep 17 00:00:00 2001 From: Samuel FORESTIER Date: Sun, 28 Jul 2019 10:11:07 +0200 Subject: [PATCH 1/2] fix: favicon not being loaded when using Apaxy in a subdirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch moves `apaxy/favicon.ico` to `apaxy/theme/favicon.ico` not to pollute the indexed page root. The new favicon location is indicated through an HTML tag with the help of the `IndexHeadInsert` Apache directive, to automatically deal with processed pages. --- apaxy/htaccess.txt | 10 ++++++---- apaxy/{ => theme}/favicon.ico | Bin 2 files changed, 6 insertions(+), 4 deletions(-) rename apaxy/{ => theme}/favicon.ico (100%) diff --git a/apaxy/htaccess.txt b/apaxy/htaccess.txt index 646d118..2382399 100644 --- a/apaxy/htaccess.txt +++ b/apaxy/htaccess.txt @@ -19,11 +19,13 @@ Options +Indexes # index options IndexOptions +Charset=UTF-8 +FancyIndexing +FoldersFirst +HTMLTable +IconsAreLinks +IgnoreCase +NameWidth=* +SuppressDescription +SuppressRules +XHTML -# meta viewport -IndexHeadInsert "" +# favicon & meta viewport +IndexHeadInsert "\ + \ + " -# hide ".htaccess" file, "favicon.ico" file and "/theme" directory -IndexIgnore .htaccess favicon.ico /theme +# hide ".htaccess" file and "/theme" directory +IndexIgnore .htaccess /theme # diff --git a/apaxy/favicon.ico b/apaxy/theme/favicon.ico similarity index 100% rename from apaxy/favicon.ico rename to apaxy/theme/favicon.ico From 31f0e3658cad30d559605aedefece18d7a2b1bcb Mon Sep 17 00:00:00 2001 From: Samuel FORESTIER Date: Sun, 28 Jul 2019 10:12:11 +0200 Subject: [PATCH 2/2] =?UTF-8?q?style:=20removes=20an=20unnecessary=20trail?= =?UTF-8?q?ing=20space=20in=20`htaccess`=C2=A0documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apaxy/htaccess.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apaxy/htaccess.txt b/apaxy/htaccess.txt index 2382399..9ca2c44 100644 --- a/apaxy/htaccess.txt +++ b/apaxy/htaccess.txt @@ -125,7 +125,7 @@ AddIconByType (audio,{FOLDERNAME}/theme/icons/audio.png) audio/* AddIconByType (playlist,{FOLDERNAME}/theme/icons/video.png) video/vnd.mpegurl # all video -# ext: 3g2 3gp h261 h263 h264 jpgv jpm jpgm mj2 mjp2 mp4 mp4v mpg4 mpeg mpg mpe m1v m2v ogv qt mov uvh uvvh uvm uvvm uvp uvvp uvs uvvs uvv uvvv dvb fvt mxu m4u pyv uvu uvvu viv webm f4v fli flv m4v mkv mk3d mks mng asf asx avi vob wmv wm wmx wvx movie smv +# ext: 3g2 3gp h261 h263 h264 jpgv jpm jpgm mj2 mjp2 mp4 mp4v mpg4 mpeg mpg mpe m1v m2v ogv qt mov uvh uvvh uvm uvvm uvp uvvp uvs uvvs uvv uvvv dvb fvt mxu m4u pyv uvu uvvu viv webm f4v fli flv m4v mkv mk3d mks mng asf asx avi vob wmv wm wmx wvx movie smv AddIconByType (video,{FOLDERNAME}/theme/icons/video.png) video/*