fix bug.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@294 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/Rec10WEB/trunk/src/rec10web.py b/Rec10WEB/trunk/src/rec10web.py
index b12e0cb..cd18438 100644 (file)
--- a/Rec10WEB/trunk/src/rec10web.py
+++ b/Rec10WEB/trunk/src/rec10web.py
@@ -22,6 +22,7 @@ elif (os.path.exists(os.path.join("/etc/rec10",Conf))):
     cpath=os.path.join("/etc/rec10",Conf)
 elif (os.path.exists(os.path.join("/etc",Conf))):
     cpath=os.path.join("/etc",Conf)
+
 confp.read(cpath)
 global f
 f = cgi.FieldStorage()
@@ -294,7 +295,7 @@ def mode_recover():
 def mode_normal():
     htmdate = readHtmlSrcSimple()
     htmdate = htmdate.replace("<!--exec-value//-->", "yes")
-    return htmdate
+    return unicode(htmdate,'utf-8')
 def mode_del():
     s = u"予約を削除しました。"
     u = "rec10web.py?exec=schedule"

diff --git a/Rec10WEB/trunk/src/rswi.htm b/Rec10WEB/trunk/src/rswi.htm
index a5d4328..ca99f05 100644 (file)
--- a/Rec10WEB/trunk/src/rswi.htm
+++ b/Rec10WEB/trunk/src/rswi.htm
@@ -349,7 +349,7 @@
                  regexp="\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}">
             </div>
             <div dojoType="dijit.form.Button" onclick="setetime_now()">一致</div>
-            <div dojoType="dijit.form.Button" onclick="setetime_now(1)">+1m</div>
+            <div dojoType="dijit.form.Button" onclick="add_etimemin(1)">+1m</div>
             <div dojoType="dijit.form.Button" onclick="add_etimemin(5)">+5m</div>
             <div dojoType="dijit.form.Button" onclick="add_etimemin(30)">+30m</div>
             <div dojoType="dijit.form.Button" onclick="add_etimemin(60)">+1h</div>