OSDN Git Service

(root) / rec10 / rec10-git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e15e0d6)
fix many bugs.
authorgn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Tue, 1 Sep 2009 10:04:53 +0000 (10:04 +0000)
committergn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Tue, 1 Sep 2009 10:04:53 +0000 (10:04 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@141 4e526526-5e11-4fc0-8910-f8fd03428081

Rec10WEB/trunk/src/fin.htm patch | blob | history
Rec10WEB/trunk/src/rec10web.py patch | blob | history
Rec10WEB/trunk/src/schedule.htm patch | blob | history

diff --git a/Rec10WEB/trunk/src/fin.htm b/Rec10WEB/trunk/src/fin.htm
index 16042b2..0a4f985 100644 (file)
--- a/Rec10WEB/trunk/src/fin.htm
+++ b/Rec10WEB/trunk/src/fin.htm
@@ -3,8 +3,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <meta http-equiv="refresh" content="3; url=rec10web.py">
-        <meta http-equiv="refresh" content="3; url=<!--url_for_replace_fin//-->">
+        <meta http-equiv="refresh" content="10; url=<!--url_for_replace_fin//-->">
         <title>Rec10 Simple Web Interface ver.0.7.0</title>
     </head>
     <body>
diff --git a/Rec10WEB/trunk/src/rec10web.py b/Rec10WEB/trunk/src/rec10web.py
index faf4101..7f672b1 100644 (file)
--- a/Rec10WEB/trunk/src/rec10web.py
+++ b/Rec10WEB/trunk/src/rec10web.py
@@ -297,6 +297,7 @@ def mode_recover():
 def mode_normal():
     htmdate=readHtmlSrcSimple()
     htmdate=htmdate.replace("<!--exec-value//-->","yes")
+    return htmdate
 def mode_edit():
     editnum=exect.replace("edit:","")
     htmdate= readHtmlSrcSimple()
@@ -446,7 +447,7 @@ if (chtxt != "")and(title != "")and(btime!="")and(etime!="")and(opts!="")and(re.
         htmdate=mode_recover()
     exect=""
 if mode=="schedule":
-    htmdate=mode_normal()
+    htmdate=mode_schedule()
 elif mode=="edit":
     htmdate=mode_edit()
 elif mode=="iepg-add":
@@ -465,13 +466,13 @@ elif mode=="iepg-show":
 elif mode=="iepg-del":
     s=f.getfirst('iepgdelnum')
     htmdate=""
-    try:
-        for st in s.split(","):
-            if st!="":
-                database.del_by_id_iepg(st)
-        htmdate=mode_iepg_del()
-    except:
-        htmdate=mode_iepg_del_miss()
+    #try:
+    for st in s.split(","):
+        if st!="":
+            database.del_by_id_iepg(st)
+    htmdate=mode_iepg_del()
+    #except:
+    #    htmdate=mode_iepg_del_miss()
 print "Content-Type: text/html"
 print htmdate
 #print exect
diff --git a/Rec10WEB/trunk/src/schedule.htm b/Rec10WEB/trunk/src/schedule.htm
index beecb2c..b9b97c5 100644 (file)
--- a/Rec10WEB/trunk/src/schedule.htm
+++ b/Rec10WEB/trunk/src/schedule.htm
@@ -5,16 +5,24 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <meta http-equiv="Content-Style-Type" content="text/css">
         <meta http-equiv="Content-Script-Type" content="text/javascript">
-        <link href="./dojo/dojox/grid/_grid/Grid.css" rel="stylesheet" type="text/css">
-        <link href="./dojo/dojox/grid/_grid/tundraGrid.css" rel="stylesheet" type="text/css">
         <title>Rec10Web Schedule管理</title>
-        <script type="text/javascript" src="./dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+        <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
+        </script>
+        <!-- テーマの読み込み -->
+        <style type="text/css">
+            @import "./dojo/dojo/resources/dojo.css";
+            @import "./dojo/dijit/themes/tundra/tundra.css";
+            @import "./dojo/dojox/grid/resources/Grid.css";
+            @import "./dojo/dojox/grid/resources/tundraGrid.css";
+        </style>
         <script type="text/javascript">
             <!--
-            dojo.require('dojox.grid.Grid');
+            dojo.require('dojox.grid.DataGrid');
             dojo.require('dojo.data.ItemFileReadStore');
             dojo.require('dojox.data.CsvStore');
             dojo.require('dojo.parser');
+            dojo.require('dijit.form.FilteringSelect');
+            dojo.require('dijit.form.Button');
             // グリッドに表示する元データをロード
             var store = new dojox.data.CsvStore({url:'./recdatum.csv'});
             -->
@@ -24,18 +32,19 @@
     <!-- テーマの読み込み -->
     <body class="tundra">  
         <table
-            dojoType="dojox.grid.Grid"
+            dojoType="dojox.grid.DataGrid"
             store="store"
             query="{id:'*'}"
             autoHeight="true"
             width="100%"
+            autoWidth="true"
             clientSort="true">
             <thead>
                 <tr>
                     <th width="30px" field="id">ID</th>
                     <th width="90px" field="type">タイプ</th>
                     <th width="50px" field="chtxt">チャンネル</th>
-                    <th field="title">タイトル</th>
+                    <th width="150px" field="title">タイトル</th>
                     <th width="100px" field="btime">開始</th>
                     <th width="100px" field="etime">終了</th>
                     <th width="30px" field="opt">オプション</th>
@@ -43,5 +52,14 @@
                 </tr>
             </thead>
         </table>
+        <select name="exec"
+                dojoType="dijit.form.FilteringSelect"
+                autocomplete="false"
+                value="del"
+                onChange="setType">
+            <option value="del">通常予約</option>
+            <option value="change">キーワード予約</option>
+        </select>
+        <div dojoType="dijit.form.Button" type="submit">Submit</div>
     </body>
 </html>
rec10 git
About OSDN
Find Software
Develop Software
Help