ENH: reuse header/trailer of the main page as the wrap for mirrors-status.html

diff --git a/Makefile b/Makefile
index cf3899471a2864bdf335316887c9c980c5005fd0..9b90a01b5e16ac23b2d600082b1b74c60463b1b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@
 WWW_UPLOAD_URI = ../www
 WWW_DIR = build/html/
 
+WWW_UPLOAD_URI_STATIC=$(WWW_UPLOAD_URI)/_static
+
 # Lentghy one due to updatedb
 all: updatedb upload-website mirmon
 # Quick one -- just rebuilds html if new changes and adjusts the status of the mirrors
@@ -20,7 +22,9 @@ html: pics source
        mv $(WWW_DIR)/_static/robots.txt $(WWW_DIR)/
        cp -r build/src/lists $(WWW_DIR)/
        cp -r sphinx/survey/2011/figures/* $(WWW_DIR)/_images/
-
+       @echo "I: extracting header/trailer to be reused in non-sphinx pages"
+       sed -ne '1,/<!-- HEADNOTES -->/p' $(WWW_DIR)/index.html >| $(WWW_DIR)/_static/index-header.ihtml
+       sed -ne '/<h2>Comments<\/h2>/,$p' $(WWW_DIR)/index.html >| $(WWW_DIR)/_static/index-trailer.ihtml
 
 clean:
        -rm html-stamp source-stamp upload-website-stamp
@@ -77,6 +81,10 @@ upload-website-stamp: .git/index
 mirmon:
        # update and generate mirrors report
        [ -x /usr/bin/mirmon ] && mirmon -q -get update -c mirmon-neurodebian.conf
+       # [ -x $(WWW_UPLOAD_URI_STATIC)/mirrors-check.ihtml ] &&
+       # everything must be in place!
+       cat $(WWW_UPLOAD_URI_STATIC)/{index-header,mirrors-status,index-trailer}.ihtml \
+        >| $(WWW_UPLOAD_URI)/mirrors-status.html
 
 .PHONY: removedb removecache updatedb upload-website clean distclean pics html mirmon
 

diff --git a/mirmon-neurodebian.conf b/mirmon-neurodebian.conf
index a6deab4c8e294dc172e42aedc86d9a07070de677..dcf627eb97c74b094a96d2177a2c54b64f23b75c 100644 (file)
--- a/mirmon-neurodebian.conf
+++ b/mirmon-neurodebian.conf
@@ -8,14 +8,15 @@ timeout 30
 # NeuroDebian mirror settings
 project_name NeuroDebian
 project_url http://neuro.debian.net/
-project_logo http://neuro.debian.net/_static/fmri_w200.png
+# No need to duplicate logo since we reuse entire index page
+#project_logo http://neuro.debian.net/_static/fmri_w200.png
 mirror_list ../www/lists/mirmon-mirrors.txt
 
 probe /usr/bin/wget -q -O - -T %TIMEOUT% -t 1 %URL%/.timestamp
 
 state ../www/_files/mirmon-state
 # web_page /home/neurodebian/www/admin/mirmon/mirror-check.html
-web_page ../www/mirrors-check.html
+web_page ../www/_static/mirrors-status.ihtml
 
 # about icons' location, see sample apache configuration
 icons /mirmon/icons