版本號改為 3 ，並加入「說明」按鈕

6 files changed, 72 insertions, 2 deletions

diff --git a/app.yaml b/app.yaml
index 306714f..dd9a562 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,5 +1,5 @@
 application: inccalender
-version: 2
+version: 3
 runtime: python27
 api_version: 1
 threadsafe: false
@@ -32,6 +32,10 @@ handlers:
   script: gcal.fetchgooglecal.app
   secure: always
 
+- url: /help.*
+  script: help.app
+  secure: optional
+
 - url: /port.*
   script: port.app
   secure: always
diff --git a/help.py b/help.py
new file mode 100644
index 0000000..8204fe7
--- /dev/null
+++ b/help.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+import cgi
+import os
+import jinja2
+import webapp2
+
+from google.appengine.api import users
+
+class HelpPage(webapp2.RedirectHandler):
+	def get(self):
+		guserid = users.get_current_user()
+		productname = cgi.escape(u'#include <行事曆.h>')
+		myurl = self.request.uri
+		myhost = self.request.host_url
+		page = self.request.get('page')
+		if page == "":
+			page = 'index'
+
+		if guserid:
+			logouturl = cgi.escape(users.create_logout_url(myurl))
+			jintemvar = {
+				'logouturl': logouturl,
+				'logouttext': u'登出',
+				'productname': productname,
+				'googleuser': guserid,
+				'myhost': myhost
+			}
+			
+		else:
+			logouturl = cgi.escape(users.create_login_url(myurl))
+			jintemvar = {
+				'logouturl': logouturl,
+				'logouttext': u'登入',
+				'productname': productname,
+				'googleuser': u'未登入',
+				'myhost': myhost
+			}
+		
+		jinhtml = jinenv.get_template('help/' + page + '.html')
+		self.response.out.write(jinhtml.render(jintemvar))
+		
+
+jinenv = jinja2.Environment(
+	loader = jinja2.FileSystemLoader(os.path.dirname(__file__)))
+
+app = webapp2.WSGIApplication([('/help', HelpPage)])
diff --git a/help/index.html b/help/index.html
new file mode 100644
index 0000000..b69cc95
--- /dev/null
+++ b/help/index.html
@@ -0,0 +1,12 @@
+{% extends "jinhtml/skel.html" %}
+{% block headcss %}
+{% endblock %}
+
+{% block onload %}
+{% endblock %}
+
+{% block headjs %}
+{% endblock %}
+
+{% block body %}
+{% endblock %}
diff --git a/jinhtml/skel.html b/jinhtml/skel.html
index b9c071c..f9152d0 100644
--- a/jinhtml/skel.html
+++ b/jinhtml/skel.html
@@ -27,6 +27,9 @@
 	function switch_export(){
 		window.location = "{{ myhost }}/port?function=export"
 	}
+	function switch_doc(){
+		window.location = "{{ myhost }}/help"
+	}
 	window.onload = function(){
 		status_bar_init();
 		{% block onload %}{% endblock %}
@@ -46,7 +49,8 @@
     <div id="controlright">
       <input type="button" value="匯入" id="buttonimport" onclick="switch_import()">
       <input type="button" value="匯出" id="buttonexport" onclick="switch_export()">
-      <input type="button" value="登出" id="googlelogout" onclick="google_logout()" style="background-color: darkgray">
+	  <input type="button" value="說明" id="aboutandhelp" onclick="switch_doc()" style="background-color: firebrick;">
+      <input type="button" value="{{ logouttext }}" id="googlelogout" onclick="google_logout()" style="background-color: darkgray">
     </div>
   </div>
   <div id="statusbar">
diff --git a/main.py b/main.py
index 1d2c6c3..a26c5b5 100644
--- a/main.py
+++ b/main.py
@@ -19,6 +19,7 @@ class MainPage(webapp2.RedirectHandler):
 			logouturl = cgi.escape(users.create_logout_url(myurl))
 			jintemvar = {
 				'logouturl': logouturl,
+				'logouttext': u'登出',
 				'productname': productname,
 				'googleuser': guserid,
 				'myhost': myhost
diff --git a/port.py b/port.py
index a270ca3..50535e1 100644
--- a/port.py
+++ b/port.py
@@ -20,6 +20,7 @@ class PortPage(webapp2.RedirectHandler):
 			logouturl = cgi.escape(users.create_logout_url(myurl))
 			jintemvar = {
 				'logouturl': logouturl,
+				'logouttext': u'登出',
 				'productname': productname,
 				'googleuser': guserid,
 				'myhost': myhost