diff options
| author | Nick White <git@njw.me.uk> | 2011-06-16 22:30:23 +0100 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2011-06-16 22:30:23 +0100 |
| commit | 2b76a1dcb056720641b0a1b2002c7c63329dfa92 (patch) | |
| tree | d03f0f3f2f8d2de5a7beb1ace75473933c265309 | |
| parent | 04dabf5ef4c5ec9b09e78d4adf9a3ff8051be43d (diff) | |
Improve webpage, specify javascript (as that's the ecmascript variant we're using)
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | Makefile | 30 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | web/doap-src.ttl | 2 | ||||
| -rw-r--r-- | web/websummary.sh (renamed from websummary.sh) | 15 | ||||
| -rw-r--r-- | webheader.html | 15 |
7 files changed, 31 insertions, 40 deletions
@@ -1,4 +1,4 @@ -SimplyRead is written in ECMAScript, and how to launch it varies a +SimplyRead is written in JavaScript, and how to launch it varies a little depending on browser. # Firefox @@ -37,20 +37,28 @@ web/gecko-updates.rdf: $(NAME)-$(VERSION).xpi web/chromium-updates.xml: chromium/updates.xml sed -e "s/VERSION/$(VERSION)/g" -e "s|WEBSITE|$(WEBSITE)|g" < $< > $@ -web/index.html: web/doap-src.ttl README webheader.html +web/doap.ttl: web/doap-src.ttl + sed -e "s|FOAF|$(AUTHORFOAF)|g" -e "s|AUTHORNAME|$(AUTHORNAME)|g" \ + -e "s|AUTHORHOME|$(AUTHORHOME)|g" -e "s|WEBSITE|$(WEBSITE)|g" \ + -e "s|REPOURL|$(REPOURL)|g" < $< > $@ + +web/index.html: web/doap.ttl README echo making webpage - cat < webheader.html > $@ + echo "<!DOCTYPE html><html><head><title>$(NAME)</title>" > $@ + echo '<link rel="alternate" type="text/turtle" title="rdf" href="doap.ttl" />' >> $@ + echo '<style type="text/css">' >> $@ + echo "body {font-family:sans-serif; width:38em; margin:auto; max-width:94%;}" >> $@ + echo "h1 {font-size:1.6em; text-align:center;}" >> $@ + echo "a {text-decoration:none; border-bottom-width:thin; border-bottom-style:dotted;}" >> $@ + echo "</style></head><body>" >> $@ smu < README >> $@ - echo '<h3><a href="$(NAME)-$(VERSION).tar.bz2">Download SimplyRead $(VERSION)</a><br />' >> $@ - echo '<a href="$(NAME)-$(VERSION).tar.bz2.sig">GPG signature</a></h3>' >> $@ - echo '<h3><a href="$(NAME)-$(VERSION).xpi">SimplyRead $(VERSION) for Firefox</a><br />' >> $@ - echo '<a href="$(NAME)-$(VERSION).xpi.sig">GPG signature</a></h3>' >> $@ - echo '<h3><a href="$(NAME)-$(VERSION).crx">SimplyRead $(VERSION) for Chromium</a><br />' >> $@ - echo '<a href="$(NAME)-$(VERSION).xpi.crx">GPG signature</a></h3>' >> $@ + echo "[$(NAME) $(VERSION) source]($(NAME)-$(VERSION).tar.bz2) ([sig]($(NAME)-$(VERSION).tar.bz2.sig))" | smu >> $@ + + echo "[$(NAME) $(VERSION) for Firefox]($(NAME)-$(VERSION).xpi) ([sig]($(NAME)-$(VERSION).xpi.sig))" | smu >> $@ + + echo "[$(NAME) $(VERSION) for Chromium]($(NAME)-$(VERSION).crx) ([sig]($(NAME)-$(VERSION).crx.sig))" | smu >> $@ + echo '<hr />' >> $@ - sed -e "s|FOAF|$(AUTHORFOAF)|g" -e "s|AUTHORNAME|$(AUTHORNAME)|g" \ - -e "s|AUTHORHOME|$(AUTHORHOME)|g" -e "s|WEBSITE|$(WEBSITE)|g" \ - -e "s|REPOURL|$(REPOURL)|g" < web/doap-src.ttl > web/doap.ttl sh web/websummary.sh web/doap.ttl | smu >> $@ echo '</body></html>' >> $@ @@ -7,8 +7,8 @@ removes everything but the article from a webpage, displaying it simply and attractively. The program is packaged as an extension for several web -browsers, or as a standalone ECMAScript program to integrate -into other browsers. Read the INSTALL file for details. +browsers, or as a standalone JavaScript program to integrate +into other browsers. Running it multiple times switches between showing the original page and the simple version. @@ -6,9 +6,6 @@ gecko: https://developer.mozilla.org/en/Extension_Versioning,_Update_and_Compatibility#Update_RDF_Format openssl dgst -sha512 -binary -sign private.pem web/gecko-updates.rdf i'm pretty sure generates the correct signature. however it then has to be encoded, using asn1/der & base64. also, according to the docs only the hash is signed/hashed, whereas it looks like the whole (particularly serialised) rdf is used by uhura -web: - change 'download simplyread' button to 'simplyread 0.4 source' - test: current tests test the keyboard shortcut, by sending an event; diff --git a/web/doap-src.ttl b/web/doap-src.ttl index 770e4ed..a0ad5e6 100644 --- a/web/doap-src.ttl +++ b/web/doap-src.ttl @@ -9,7 +9,7 @@ doap:shortdesc "Stop browsing, start reading"; doap:homepage <WEBSITE/>; doap:repository :repo; - doap:programming-language "ECMAScript"; + doap:programming-language "JavaScript"; doap:license <http://www.gnu.org/licenses/agpl.html>; doap:release :v0dot1, :v0dot2, :v0dot3, :v0dot4, :v0dot5; doap:maintainer <FOAF>. diff --git a/websummary.sh b/web/websummary.sh index c274443..8da2790 100644 --- a/websummary.sh +++ b/web/websummary.sh @@ -22,16 +22,16 @@ WHERE { roqet -q -r csv -e "$q" -D /dev/stdin < $rdf | sed '/^Result/d' \ | while read r; do - home=`echo $r | awk -F , '{print $2}'| sed -e 's/uri(\(.*\))/\1/'` - repo=`echo $r | awk -F , '{print $3}'| sed -e 's/uri(\(.*\))/\1/'` - licenseuri=`echo $r | awk -F , '{print $4}'| sed -e 's/uri(\(.*\))/\1/'` - maint=`echo $r | awk -F , '{print $5}'| sed -e 's/"\(.*\)"/\1/'` - mainthome=`echo $r | awk -F , '{print $6}'| sed -e 's/uri(\(.*\))/\1/'` - lang=`echo $r | awk -F , '{print $7}'| sed -e 's/"\(.*\)"/\1/'` + home=`echo $r | awk -F , '{print $2}'| sed -e 's/uri\(//' -e 's/\)//'` + repo=`echo $r | awk -F , '{print $3}'| sed -e 's/uri\(//' -e 's/\)//'` + licenseuri=`echo $r | awk -F , '{print $4}'| sed -e 's/uri\(//' -e 's/\)//'` + maint=`echo $r | awk -F , '{print $5}'| sed -e 's/"//g'` + mainthome=`echo $r | awk -F , '{print $6}'| sed -e 's/uri\(//' -e 's/\)//'` + lang=`echo $r | awk -F , '{print $7}'| sed -e 's/"//g'` test "$licenseuri" = "http://www.gnu.org/licenses/gpl.html" && license="GPL" test "$licenseuri" = "http://www.gnu.org/licenses/agpl.html" && license="AGPL" test "$licenseuri" = "http://creativecommons.org/licenses/MIT/" && license="MIT" - repotype=`echo $r | awk -F , '{print $8}'| sed -e 's/uri(\(.*\))/\1/'` + repotype=`echo $r | awk -F , '{print $8}'| sed -e 's/uri\(//' -e 's/\)//'` test "$repotype" = "http://usefulinc.com/ns/doap#GitRepository" && repocmd="git clone" cat <<- _EOF_ @@ -40,5 +40,6 @@ roqet -q -r csv -e "$q" -D /dev/stdin < $rdf | sed '/^Result/d' \ - Maintainer: [$maint]($mainthome) - Language: $lang - License: [$license]($licenseuri) +- DOAP: [${home}doap.ttl](${home}doap.ttl) _EOF_ done diff --git a/webheader.html b/webheader.html deleted file mode 100644 index 7d73833..0000000 --- a/webheader.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html><html><head> -<style type="text/css"> -body { font-family: sans-serif; width: 75%; margin: auto; } -h1 { font-size: 1.6em; text-align: center; margin-bottom: 0.2em; } -h2 { font-size: 1.2em; border-bottom: thin solid black; margin-top: 0.1em; } -h3 { border: thin solid black; margin: auto; background: #cd2f2f; - width: 19em; text-align: center; padding: 0.2em; margin-bottom: 0.3em; } -h3:hover { background: #ff9657; } -h3 a { color: black; text-decoration: none } -h3 a:hover { text-decoration: underline } -img { display: block; margin: auto; } -</style> -<link rel="alternate" type="text/turtle" title="rdf" href="doap.ttl" /> -<title>SimplyRead - Stop browsing, start reading</title> -</head><body> |