From f9b50c7ebbc90b612c198b23abd41be9c09c1df6 Mon Sep 17 00:00:00 2001
From: LAN-TW <lantw44@gmail.com>
Date: Tue, 25 Dec 2012 18:39:35 +0800
Subject: 加入「關於本站」說明訊息
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/format.css    | 13 ++++++++++++-
 css/help.css      |  9 +++++++++
 help.py           |  9 +++++++--
 help/about.html   | 24 ++++++++++++++++++++++++
 help/index.html   |  1 +
 jinhtml/skel.html |  5 +++++
 6 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 css/help.css
 create mode 100644 help/about.html

diff --git a/css/format.css b/css/format.css
index d0bac4c..a039704 100644
--- a/css/format.css
+++ b/css/format.css
@@ -40,6 +40,17 @@ div#controlright{
 	right: 2px;
 	text-align: right;
 }
+div#helplinkbar{
+	text-align: center;
+	font-size: x-large;
+}
+div#helplinkbar a{
+	text-decoration: none;
+	border-width: 1px;
+	border-style: solid;
+	margin: 2px;
+	padding: 2px;
+}
 div#statusbar{
 	position: fixed;
 	left: 0px;
@@ -55,4 +66,4 @@ div#statusbar{
 }
 div#bottomemptybar{
 	height: 27px;
-}
\ No newline at end of file
+}
diff --git a/css/help.css b/css/help.css
new file mode 100644
index 0000000..a95a66e
--- /dev/null
+++ b/css/help.css
@@ -0,0 +1,9 @@
+p.helptitle{
+	font-size: x-large;
+}
+div.helpcontent{
+	padding-left: 20px;
+}
+div#helpwholepage{
+	padding-left: 35px;
+}
diff --git a/help.py b/help.py
index 8204fe7..87d95f6 100644
--- a/help.py
+++ b/help.py
@@ -6,6 +6,7 @@ import os
 import jinja2
 import webapp2
 
+from jinja2 import TemplateNotFound
 from google.appengine.api import users
 
 class HelpPage(webapp2.RedirectHandler):
@@ -38,8 +39,12 @@ class HelpPage(webapp2.RedirectHandler):
 				'myhost': myhost
 			}
 		
-		jinhtml = jinenv.get_template('help/' + page + '.html')
-		self.response.out.write(jinhtml.render(jintemvar))
+		try:
+			jinhtml = jinenv.get_template('help/' + page + '.html')
+			self.response.out.write(jinhtml.render(jintemvar))
+		except TemplateNotFound:
+			self.response.set_status(404)
+			self.response.out.write(u'抱歉，查無此文件。')
 		
 
 jinenv = jinja2.Environment(
diff --git a/help/about.html b/help/about.html
new file mode 100644
index 0000000..bd23272
--- /dev/null
+++ b/help/about.html
@@ -0,0 +1,24 @@
+{% extends "jinhtml/skel.html" %}
+{% block headcss %}
+  <link rel="stylesheet" href="css/help.css" type="text/css">
+{% endblock %}
+
+{% block onload %}
+  document.getElementById("helplinkbar").style.display = "block";
+{% endblock %}
+
+{% block headjs %}
+{% endblock %}
+
+{% block body %}
+  <div id="helpwholepage">
+    <p class="helptitle">這個網站的來源</p>
+	<div class="helpcontent">
+	  這個網站原先是「計算機概論」課程的期末作業，而我們決定繼續維護這個程式，因此可能和原先報告時有許多差異。若要存取舊的、已不在維護的版本，請按<a href="https://2.inccalender.appspot.com">這裡</a>。
+	</div>
+	<p class="helptitle">這個網站的程式</p>
+	<div class="helpcontent">
+	  本站的所有程式碼可在 Google code 上的 <a href="http://code.google.com/p/inccalendar/">inccalendar</a> 專案此取得，您可以依據 GNU GPL 第二版或以後發布版本自由散布這個程式。
+	</div>
+  </div>
+{% endblock %}
diff --git a/help/index.html b/help/index.html
index b69cc95..1b2c319 100644
--- a/help/index.html
+++ b/help/index.html
@@ -3,6 +3,7 @@
 {% endblock %}
 
 {% block onload %}
+  document.getElementById("helplinkbar").style.display = "block";
 {% endblock %}
 
 {% block headjs %}
diff --git a/jinhtml/skel.html b/jinhtml/skel.html
index f9152d0..6d99270 100644
--- a/jinhtml/skel.html
+++ b/jinhtml/skel.html
@@ -53,6 +53,11 @@
       <input type="button" value="{{ logouttext }}" id="googlelogout" onclick="google_logout()" style="background-color: darkgray">
     </div>
   </div>
+  <div id="helplinkbar" style="display: none;">
+    <a href="{{ myhost }}/help?page=index">說明首頁</a>
+	<a href="{{ myhost }}/help?page=browser">瀏覽器測試</a>
+	<a href="{{ myhost }}/help?page=about">關於本站</a>
+  </div>
   <div id="statusbar">
   </div>
   {% block body %}{% endblock %}
-- 
cgit