From 806e1100dd6274d54b9cfb5d8d3a83008ece7725 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 23 Feb 2018 02:24:50 +0800 Subject: [PATCH] style: Improve coding style --- apache-config.conf | 6 +- apaxy/htaccess.txt | 122 ++++++++++++++++---------------- apaxy/theme/apaxy.js | 14 ++-- apaxy/theme/footer.html | 8 +-- apaxy/theme/header.html | 2 +- apaxy/theme/htaccess.txt | 2 +- apaxy/theme/style.css | 146 +++++++++++++++++++++++---------------- 7 files changed, 163 insertions(+), 137 deletions(-) diff --git a/apache-config.conf b/apache-config.conf index 03c2f98..4cf1103 100644 --- a/apache-config.conf +++ b/apache-config.conf @@ -1,10 +1,10 @@ DocumentRoot /var/www/html - + Options Indexes FollowSymLinks MultiViews AllowOverride All Order deny,allow Allow from all - - + + diff --git a/apaxy/htaccess.txt b/apaxy/htaccess.txt index a24660a..eba6998 100644 --- a/apaxy/htaccess.txt +++ b/apaxy/htaccess.txt @@ -5,17 +5,17 @@ # http://apache.org/docs/2.2/mod/mod_autoindex.html # - # ENABLE INDEXING - Options +Indexes +# ENABLE INDEXING +Options +Indexes - # INDEX OPTIONS - IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks +# INDEX OPTIONS +IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks - # META VIEWPORT - IndexHeadInsert "" +# META VIEWPORT +IndexHeadInsert "" - # HIDE /theme DIRECTORY - IndexIgnore .htaccess /theme +# HIDE /theme DIRECTORY +IndexIgnore .htaccess /theme # # GENERAL ICONS (BLANK, DIRECTORY, PARENT DIRECTORY) @@ -29,66 +29,66 @@ # 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,/{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/* +AddIcon /{FOLDERNAME}/theme/icons/blank.png ^^BLANKICON^^ +AddIcon /{FOLDERNAME}/theme/icons/folder.png ^^DIRECTORY^^ +AddIcon /{FOLDERNAME}/theme/icons/folder-home.png .. + +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 /{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 +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 /{FOLDERNAME}/theme/header.html - ReadmeName /{FOLDERNAME}/theme/footer.html - IndexStyleSheet "/{FOLDERNAME}/theme/style.css" +HeaderName /{FOLDERNAME}/theme/header.html +ReadmeName /{FOLDERNAME}/theme/footer.html +IndexStyleSheet "/{FOLDERNAME}/theme/style.css" diff --git a/apaxy/theme/apaxy.js b/apaxy/theme/apaxy.js index 763198f..2c6a4a1 100644 --- a/apaxy/theme/apaxy.js +++ b/apaxy/theme/apaxy.js @@ -2,11 +2,11 @@ document.getElementsByTagName('tr')[1].className = 'parent'; // fix links when not adding a / at the end of the URI var uri = window.location.pathname.substr(1); -if (uri.substring(uri.length-1) != '/'){ - var indexes = document.getElementsByClassName('indexcolname'), - i = indexes.length; - while (i--){ - var a = indexes[i].getElementsByTagName('a')[0]; - a.href = '/' + uri + '/' + a.getAttribute('href',2); - } +if (uri.substring(uri.length - 1) != '/') { + var indexes = document.getElementsByClassName('indexcolname'); + var i = indexes.length; + while (i--) { + var a = indexes[i].getElementsByTagName('a')[0]; + a.href = '/' + uri + '/' + a.getAttribute('href', 2); + } } diff --git a/apaxy/theme/footer.html b/apaxy/theme/footer.html index f52c2a4..a149eea 100644 --- a/apaxy/theme/footer.html +++ b/apaxy/theme/footer.html @@ -1,10 +1,10 @@ -
- You can add your own HTML above or below the directory listing. Simply explore the header.html and footer.html files. -
+
+ You can add your own HTML above or below the directory listing. Simply explore the header.html and footer.html files. +
diff --git a/apaxy/theme/header.html b/apaxy/theme/header.html index 16c8877..7652c27 100644 --- a/apaxy/theme/header.html +++ b/apaxy/theme/header.html @@ -1,2 +1,2 @@
- \ No newline at end of file + diff --git a/apaxy/theme/htaccess.txt b/apaxy/theme/htaccess.txt index ae9f015..f9e5472 100644 --- a/apaxy/theme/htaccess.txt +++ b/apaxy/theme/htaccess.txt @@ -6,4 +6,4 @@ # # Don't index this folder -Options -Indexes \ No newline at end of file +Options -Indexes diff --git a/apaxy/theme/style.css b/apaxy/theme/style.css index 66744eb..fc4ee82 100644 --- a/apaxy/theme/style.css +++ b/apaxy/theme/style.css @@ -10,121 +10,147 @@ button,hr,input{overflow:visible}audio,canvas,progress,video{display:inline-bloc \*------------------------------------*/ @import url('//fonts.googleapis.com/css?family=Open+Sans'); + /* Have to use @import for the font, as you can only specify a single stylesheet */ * { - margin:0; - padding:0; - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - box-sizing: border-box; + margin: 0; + padding: 0; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; } html { - min-height:100%; - border-top:10px solid #ECEEF1; - border-bottom:10px solid #ECEEF1; - color:#61666c; - font-weight:400; - font-size:1em; - font-family:'Open Sans', sans-serif; - line-height:2em; + min-height: 100%; + border-top: 10px solid #ECEEF1; + border-bottom: 10px solid #ECEEF1; + color: #61666c; + font-weight: 400; + font-size: 1em; + font-family: 'Open Sans', sans-serif; + line-height: 2em; } + body { - padding:20px; - -webkit-backface-visibility:hidden; + padding: 20px; + -webkit-backface-visibility: hidden; } + code { - font-family:consolas,monospace; + font-family: consolas,monospace; } + a { - color:#61666c; - text-decoration:none; + color: #61666c; + text-decoration: none; } + a, img { - border:none; - outline:none + border: none; + outline: none; } + a:hover { - color:#2a2a2a; + color: #2a2a2a; } + /*------------------------------------*\ Wrapper \*------------------------------------*/ + .wrapper { - margin:0 auto; - padding-top:20px; - max-width:80%; + margin: 0 auto; + padding-top: 20px; + max-width: 80%; } + /*------------------------------------*\ Demo block \*------------------------------------*/ + .block { - font-size:.875em; - margin:20px 0; - padding:20px; - color:#9099A3; + font-size: .875em; + margin: 20px 0; + padding: 20px; + color: #9099A3; } + /*------------------------------------*\ Table (directory listing) \*------------------------------------*/ + table { - width:100%; - border-collapse:collapse; - font-size:.875em; + width: 100%; + border-collapse: collapse; + font-size: .875em; } + tr { - outline:0; - border:0; + outline: 0; + border: 0; } + tr:hover td { - background:#f6f6f6; + background: #f6f6f6; } + th { - text-align:left; - font-size:.75em; - padding-right:20px; + text-align: left; + font-size: .75em; + padding-right: 20px; } + /* 2nd Column: Filename */ + th + th { - width:65%; + width: 65%; } + /* 3rd Column: Last Modified */ th + th + th { } + /* 4th Column: Size */ th + th + th + th { - width:5%; + width: 5%; } + tr td:first-of-type { - padding-left:10px; - padding-right:10px; + padding-left: 10px; + padding-right: 10px; } + td { - padding:5px 0; - outline:0; - border:0; - border-bottom:1px solid #edf1f5; - vertical-align:middle; - text-align:left; - -webkit-transition:background 300ms ease; - -moz-transition:background 300ms ease; - -ms-transition:background 300ms ease; - -o-transition:background 300ms ease; - transition:background 300ms ease; + padding: 5px 0; + outline: 0; + border: 0; + border-bottom: 1px solid #edf1f5; + vertical-align: middle; + text-align: left; + transition: background 300ms ease; + -o-transition: background 300ms ease; + -ms-transition: background 300ms ease; + -moz-transition: background 300ms ease; + -webkit-transition: background 300ms ease; } -td a{ - display: block; + +td a { + display: block; } + tr.parent a[href^="/"] { - color:#9099A3; + color: #9099A3; } - .parent a[href^="/"]:hover { - color:#2281d0; - } + +.parent a[href^="/"]:hover { + color: #2281d0; +} + /*------------------------------------*\ Footer \*------------------------------------*/ + .footer { - text-align:center; - font-size:.75em; + text-align: center; + font-size: .75em; }