Merge pull request #78 from oupala/develop

Develop

3 files changed, 75 insertions, 57 deletions

diff --git a/README.md b/README.md
index 2aaae25..fb573da 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,17 @@ Let's assume you have a folder named `share` in your server root directory (the
 
 * [Download](https://github.com/AdamWhitcroft/Apaxy/archive/master.zip) and unzip Apaxy
 * Copy and paste the contents of the `/apaxy` folder to your `/share` folder.
-* Rename `htaccess.txt` to `.htaccess` in both the `/share` and `/share/theme` folders.
+* Edit `htaccess.txt` (now in the `/share` folder) and update all instances of paths marked with *{FOLDERNAME}* to point to your site root.
+
+So...
+
+    AddIcon /{FOLDERNAME}/theme/icons/gif.png .gif
+
+Should be changed to...
+
+    AddIcon /share/theme/icons/gif.png .gif
+
+* Once done, rename `htaccess.txt` to `.htaccess` in both the `/share` and `/share/theme` folders.
 * [Treat yo'self](http://25.media.tumblr.com/tumblr_lw7q28y0Mz1qanm80o1_500.gif), you're done.
 
 ## Docker images
@@ -45,15 +55,15 @@ Edit these as you would any other HTML or CSS file.
 
 Adding your own icons is a little more involved. You'll need to edit the main Apaxy `.htaccess` file. Look for the following as an example:
 
-    AddIcon theme/icons/gif.png .gif
+    AddIcon /{FOLDERNAME}/theme/icons/gif.png .gif
 
-The above rule will assign an icon named `gif.png` from the directory `theme/icons/` to any file with the `.gif` extension.
+The above rule will assign an icon named `gif.png` from the directory `/{FOLDERNAME}/theme/icons/` to any file with the `.gif` extension.
 
 This URL path is relative to your site's root.
 
 ## Mime Types
 
-The default Apaxy theme `theme/apaxy` has icons in place for the following mime types:
+The default Apaxy theme `/themes/apaxy` has icons in place for the following mime types:
 
     .aif .aif .asf .asx .avi .bin .c .css .csv .dmg .doc .docm .docx .dot .dotm .eps .flv .gif 
     .htm .html .ico .iff .jar .jpeg .jpg .js .json .log .m3u .m4a .md .mid .mov .mp3 .mp4 .mpa 
diff --git a/apaxy/htaccess.txt b/apaxy/htaccess.txt
index 5b64fff..a24660a 100644
--- a/apaxy/htaccess.txt
+++ b/apaxy/htaccess.txt
@@ -21,66 +21,74 @@
 # GENERAL ICONS (BLANK, DIRECTORY, PARENT DIRECTORY)
 #
 
-	AddIcon /theme/icons/blank.png ^^BLANKICON^^
-	AddIcon /theme/icons/folder.png ^^DIRECTORY^^
-	AddIcon /theme/icons/folder-home.png ..
+#
+# Replace {FOLDERNAME} with your directory URL eg:
+# If your directory is http://mywebsite.com/share/
+# you would change to:
+#
+# AddIcon /share/theme/icons/blank.png ^^BLANKICON^^
+#
+
+	AddIcon /{FOLDERNAME}/theme/icons/blank.png ^^BLANKICON^^
+	AddIcon /{FOLDERNAME}/theme/icons/folder.png ^^DIRECTORY^^
+	AddIcon /{FOLDERNAME}/theme/icons/folder-home.png ..
 	
-	AddIconByType (TXT,/theme/icons/text.png) text/*
-	AddIconByType (IMG,/theme/icons/image.png) image/*
-	AddIconByType (SND,/theme/icons/audio.png) audio/*
-	AddIconByType (VID,/theme/icons/video.png) video/*
+	AddIconByType (TXT,/{FOLDERNAME}/theme/icons/text.png) text/*
+	AddIconByType (IMG,/{FOLDERNAME}/theme/icons/image.png) image/*
+	AddIconByType (SND,/{FOLDERNAME}/theme/icons/audio.png) audio/*
+	AddIconByType (VID,/{FOLDERNAME}/theme/icons/video.png) video/*
 
 #
 # EXTENSION SPECIFIC ICONS
 #
 
-	AddIcon /theme/icons/archive.png .7z .bz2 .cab .gz .tar
-	AddIcon /theme/icons/audio.png .aac .aif .aifc .aiff .ape .au .flac .iff .m4a .mid .mp3 .mpa .ra .wav .wma .f4a .f4b .oga .ogg .xm .it .s3m .mod
-	AddIcon /theme/icons/bin.png .bin .hex
-	AddIcon /theme/icons/bmp.png .bmp
-	AddIcon /theme/icons/c.png .c
-	AddIcon /theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv
-	AddIcon /theme/icons/cd.png .iso
-	AddIcon /theme/icons/cpp.png .cpp
-	AddIcon /theme/icons/css.png .css .sass .scss
-	AddIcon /theme/icons/deb.png .deb
-	AddIcon /theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps
-	AddIcon /theme/icons/draw.png .svg .svgz
-	AddIcon /theme/icons/eps.png .ai .eps
-	AddIcon /theme/icons/exe.png .exe
-	AddIcon /theme/icons/gif.png .gif
-	AddIcon /theme/icons/h.png .h
-	AddIcon /theme/icons/html.png .html .xhtml .shtml .htm .URL .url
-	AddIcon /theme/icons/ico.png .ico
-	AddIcon /theme/icons/java.png .jar
-	AddIcon /theme/icons/jpg.png .jpg .jpeg .jpe
-	AddIcon /theme/icons/js.png .js .json
-	AddIcon /theme/icons/markdown.png .md
-	AddIcon /theme/icons/package.png .pkg .dmg .apk .ipa
-	AddIcon /theme/icons/pdf.png .pdf
-	AddIcon /theme/icons/php.png .php .phtml
-	AddIcon /theme/icons/playlist.png .m3u .m3u8 .pls .pls8
-	AddIcon /theme/icons/png.png .png
-	AddIcon /theme/icons/ps.png .ps
-	AddIcon /theme/icons/psd.png .psd
-	AddIcon /theme/icons/py.png .py
-	AddIcon /theme/icons/rar.png .rar
-	AddIcon /theme/icons/rb.png .rb
-	AddIcon /theme/icons/rpm.png .rpm
-	AddIcon /theme/icons/rss.png .rss
-	AddIcon /theme/icons/script.png .bat .cmd .sh
-	AddIcon /theme/icons/sql.png .sql
-	AddIcon /theme/icons/tiff.png .tiff .tif
-	AddIcon /theme/icons/text.png .txt .nfo
-	AddIcon /theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv
-	AddIcon /theme/icons/xml.png .xml
-	AddIcon /theme/icons/zip.png .zip
-	DefaultIcon /theme/icons/default.png
+	AddIcon /{FOLDERNAME}/theme/icons/archive.png .7z .bz2 .cab .gz .tar
+	AddIcon /{FOLDERNAME}/theme/icons/audio.png .aac .aif .aifc .aiff .ape .au .flac .iff .m4a .mid .mp3 .mpa .ra .wav .wma .f4a .f4b .oga .ogg .xm .it .s3m .mod
+	AddIcon /{FOLDERNAME}/theme/icons/bin.png .bin .hex
+	AddIcon /{FOLDERNAME}/theme/icons/bmp.png .bmp
+	AddIcon /{FOLDERNAME}/theme/icons/c.png .c
+	AddIcon /{FOLDERNAME}/theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv
+	AddIcon /{FOLDERNAME}/theme/icons/cd.png .iso
+	AddIcon /{FOLDERNAME}/theme/icons/cpp.png .cpp
+	AddIcon /{FOLDERNAME}/theme/icons/css.png .css .sass .scss
+	AddIcon /{FOLDERNAME}/theme/icons/deb.png .deb
+	AddIcon /{FOLDERNAME}/theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps
+	AddIcon /{FOLDERNAME}/theme/icons/draw.png .svg .svgz
+	AddIcon /{FOLDERNAME}/theme/icons/eps.png .ai .eps
+	AddIcon /{FOLDERNAME}/theme/icons/exe.png .exe
+	AddIcon /{FOLDERNAME}/theme/icons/gif.png .gif
+	AddIcon /{FOLDERNAME}/theme/icons/h.png .h
+	AddIcon /{FOLDERNAME}/theme/icons/html.png .html .xhtml .shtml .htm .URL .url
+	AddIcon /{FOLDERNAME}/theme/icons/ico.png .ico
+	AddIcon /{FOLDERNAME}/theme/icons/java.png .jar
+	AddIcon /{FOLDERNAME}/theme/icons/jpg.png .jpg .jpeg .jpe
+	AddIcon /{FOLDERNAME}/theme/icons/js.png .js .json
+	AddIcon /{FOLDERNAME}/theme/icons/markdown.png .md
+	AddIcon /{FOLDERNAME}/theme/icons/package.png .pkg .dmg
+	AddIcon /{FOLDERNAME}/theme/icons/pdf.png .pdf
+	AddIcon /{FOLDERNAME}/theme/icons/php.png .php .phtml
+	AddIcon /{FOLDERNAME}/theme/icons/playlist.png .m3u .m3u8 .pls .pls8
+	AddIcon /{FOLDERNAME}/theme/icons/png.png .png
+	AddIcon /{FOLDERNAME}/theme/icons/ps.png .ps
+	AddIcon /{FOLDERNAME}/theme/icons/psd.png .psd
+	AddIcon /{FOLDERNAME}/theme/icons/py.png .py
+	AddIcon /{FOLDERNAME}/theme/icons/rar.png .rar
+	AddIcon /{FOLDERNAME}/theme/icons/rb.png .rb
+	AddIcon /{FOLDERNAME}/theme/icons/rpm.png .rpm
+	AddIcon /{FOLDERNAME}/theme/icons/rss.png .rss
+	AddIcon /{FOLDERNAME}/theme/icons/script.png .bat .cmd .sh
+	AddIcon /{FOLDERNAME}/theme/icons/sql.png .sql
+	AddIcon /{FOLDERNAME}/theme/icons/tiff.png .tiff .tif
+	AddIcon /{FOLDERNAME}/theme/icons/text.png .txt .nfo
+	AddIcon /{FOLDERNAME}/theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv
+	AddIcon /{FOLDERNAME}/theme/icons/xml.png .xml
+	AddIcon /{FOLDERNAME}/theme/icons/zip.png .zip
+	DefaultIcon /{FOLDERNAME}/theme/icons/default.png
 
 #
 # THEME FILES
 #
 
-	HeaderName /theme/header.html
-	ReadmeName /theme/footer.html
-	IndexStyleSheet /theme/style.css
+	HeaderName /{FOLDERNAME}/theme/header.html
+	ReadmeName /{FOLDERNAME}/theme/footer.html
+	IndexStyleSheet "/{FOLDERNAME}/theme/style.css"
diff --git a/apaxy/theme/style.css b/apaxy/theme/style.css
index 3f95408..66744eb 100644
--- a/apaxy/theme/style.css
+++ b/apaxy/theme/style.css
@@ -53,7 +53,7 @@ a:hover {
 .wrapper {
 	margin:0 auto;
 	padding-top:20px;
-	max-width:100%;
+	max-width:80%;
 }
 /*------------------------------------*\
     Demo block