OSDN Git Service

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

Rec10WEB/trunk/src/fin.htm patch | blob | history
Rec10WEB/trunk/src/iepg_add.htm patch | blob | history
Rec10WEB/trunk/src/readme.txt patch | blob | history
Rec10WEB/trunk/src/rswi.htm 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 0a4f985..5d9219d 100644 (file)
--- a/Rec10WEB/trunk/src/fin.htm
+++ b/Rec10WEB/trunk/src/fin.htm
@@ -7,9 +7,9 @@
         <title>Rec10 Simple Web Interface ver.0.7.0</title>
     </head>
     <body>
-    <h1>Rec10 Simple Web Interface ver.0.7.0</h1><br>
-    <br>
-    <!--text_for_replace_fin//-->
-    予約が終了しました。移動します。
+        <h1>Rec10 Simple Web Interface ver.0.7.0</h1><br>
+        <br>
+        <!--text_for_replace_fin//-->
+        予約が終了しました。移動します。
     </body>
 </html>
diff --git a/Rec10WEB/trunk/src/iepg_add.htm b/Rec10WEB/trunk/src/iepg_add.htm
index 71b4439..60b5193 100644 (file)
--- a/Rec10WEB/trunk/src/iepg_add.htm
+++ b/Rec10WEB/trunk/src/iepg_add.htm
@@ -1,10 +1,10 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ追加</title>
-    <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ追加</title>
+        <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
         </script>
         <!-- テーマの読み込み -->
         <style type="text/css">
@@ -20,29 +20,29 @@
             dojo.require("dijit.form.ValidationTextBox");
             dojo.require("dijit.form.FilteringSelect");
         </script>
-  </head>
-  <body class="tundra">
-    <div dojoType="dijit.form.Form" action="rec10web.py" onExecute="this.submit()">
-        <h1>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ追加</h1><br>
-        <input type="text"
+    </head>
+    <body class="tundra">
+        <div dojoType="dijit.form.Form" action="rec10web.py" onExecute="this.submit()">
+            <h1>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ追加</h1><br>
+            <input type="text"
                    length="40"
                    dojoType="dijit.form.TextBox"
                    value="<!--iepg_title-value//-->"
                    id="iepg_station"
-        name="iepg_station">
-        <select name="iepg_chtxt"
+                   name="iepg_station">
+            <select name="iepg_chtxt"
                     dojoType="dijit.form.FilteringSelect"
                     autocomplete="false"
                     value="<!--ch-value//-->"
                     onChange="setType">
                 <!--text_for_replace_chtxt_input//-->
-        </select>
-        <div dojoType="dijit.form.Button" type="submit">追加</div>
-        <div name="exec"
+            </select>
+            <div dojoType="dijit.form.Button" type="submit">追加</div>
+            <div name="exec"
                  dojoType="dijit.form.ValidationTextBox"
                  value="iepg-add_yes"
                  style="display:none">
+            </div>
         </div>
-    </div>
-  </body>
+    </body>
 </html>
diff --git a/Rec10WEB/trunk/src/readme.txt b/Rec10WEB/trunk/src/readme.txt
index 4309413..1b58f10 100644 (file)
--- a/Rec10WEB/trunk/src/readme.txt
+++ b/Rec10WEB/trunk/src/readme.txt
@@ -12,8 +12,12 @@ yukikaze
 dbMySQLパッケージおよびpython2.4以上が必要です。
 
 
-同梱のdojoToolkitはBSDライセンスであり、
+同梱のdojoToolkitはBSDライセンスであり、本文の最後に記載されたライセンスに従い再配布が可能です。
+
 history
+0.7.0
+SQLiteのサポート終了。
+大幅な仕様変更
 
 0.6.0
 データーベースにMySQLサポートを追加
diff --git a/Rec10WEB/trunk/src/rswi.htm b/Rec10WEB/trunk/src/rswi.htm
index a010ddd..895d90e 100644 (file)
--- a/Rec10WEB/trunk/src/rswi.htm
+++ b/Rec10WEB/trunk/src/rswi.htm
@@ -277,142 +277,142 @@
     <!-- テーマの読み込み -->
     <body class="tundra">
         <div dojoType="dijit.form.Form" action="rec10web.py" onExecute="this.submit()">
-        <h1>Rec10 Simple Web Interface ver.0.7.0</h1><br>
-        <select name="type"
-                dojoType="dijit.form.FilteringSelect"
-                autocomplete="false"
-                value="<!--type-value//-->"
-                onChange="setType">
-            <option value="res">通常予約</option>
-            <option value="key">キーワード予約</option>
-            <option value="keyday">曜日予約</option>
-            <option value="keyevery">隔日予約</option>
-            <option value="rec">最終予約</option>
-            <option value="ts2avi">エンコード予約</option>
-            <option value="b252ts">復号化予約</option>
-        </select>番組名/キーワード
-        <input type="text"
-               length="40"
-               dojoType="dijit.form.TextBox"
-               value="<!--title-value//-->"
-               id="title"
-               name="title">チャンネル
-        <select name="chtxt"
-                dojoType="dijit.form.FilteringSelect"
-                autocomplete="false"
-                value="<!--ch-value//-->"
-                onChange="setType">
-            <!--text_for_replace_chtxt_input//-->
-        </select>
-        <br><br>開始時刻
-        <div name="btime"
-             id="btime"
-             dojoType="dijit.form.ValidationTextBox"
-             promptmessage="年-月-日 時間:分:秒"
-             value="<!--btime-value//-->"
-             regexp="\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}">
-        </div>
-        <div dojoType="dijit.form.Button" onclick="setbtime_now()">現在</div>
-        <div dojoType="dijit.form.Button" onclick="add_btimemin(30)">+30m</div>
-        <div dojoType="dijit.form.Button" onclick="add_btimemin(180)">+3h</div>
-        <div dojoType="dijit.form.Button" onclick="add_btimemin(720)">+12h</div>
-        終了時刻
-        <div name="etime"
-             id="etime"
-             dojoType="dijit.form.ValidationTextBox"
-             promptmessage="年-月-日 時間:分:秒"
-             value="<!--etime-value//-->"
-             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="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>
-        <br>
-        <br>隔日周期(days)
-        <input dojoType="dijit.form.NumberSpinner"
-               value="7"
-               smallDelta="1"
-               largeDelta="10"
-               constraints="{min:0,max:24,places:0}"
-               maxlength="2"
-               id="deltaday"
-               name="deltaday">
-        キーワード録画許容誤差(hours)
-        <input dojoType="dijit.form.NumberSpinner"
-               value="3"
-               smallDelta="1"
-               largeDelta="10"
-               constraints="{min:0,max:24,places:0}"
-               maxlength="2"
-               id="deltahour"
-               name="deltahour"><br><br>
+            <h1>Rec10 Simple Web Interface ver.0.7.0</h1><br>
+            <select name="type"
+                    dojoType="dijit.form.FilteringSelect"
+                    autocomplete="false"
+                    value="<!--type-value//-->"
+                    onChange="setType">
+                <option value="res">通常予約</option>
+                <option value="key">キーワード予約</option>
+                <option value="keyday">曜日予約</option>
+                <option value="keyevery">隔日予約</option>
+                <option value="rec">最終予約</option>
+                <option value="ts2avi">エンコード予約</option>
+                <option value="b252ts">復号化予約</option>
+            </select>番組名/キーワード
+            <input type="text"
+                   length="40"
+                   dojoType="dijit.form.TextBox"
+                   value="<!--title-value//-->"
+                   id="title"
+                   name="title">チャンネル
+            <select name="chtxt"
+                    dojoType="dijit.form.FilteringSelect"
+                    autocomplete="false"
+                    value="<!--ch-value//-->"
+                    onChange="setType">
+                <!--text_for_replace_chtxt_input//-->
+            </select>
+            <br><br>開始時刻
+            <div name="btime"
+                 id="btime"
+                 dojoType="dijit.form.ValidationTextBox"
+                 promptmessage="年-月-日 時間:分:秒"
+                 value="<!--btime-value//-->"
+                 regexp="\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}">
+            </div>
+            <div dojoType="dijit.form.Button" onclick="setbtime_now()">現在</div>
+            <div dojoType="dijit.form.Button" onclick="add_btimemin(30)">+30m</div>
+            <div dojoType="dijit.form.Button" onclick="add_btimemin(180)">+3h</div>
+            <div dojoType="dijit.form.Button" onclick="add_btimemin(720)">+12h</div>
+            終了時刻
+            <div name="etime"
+                 id="etime"
+                 dojoType="dijit.form.ValidationTextBox"
+                 promptmessage="年-月-日 時間:分:秒"
+                 value="<!--etime-value//-->"
+                 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="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>
+            <br>
+            <br>隔日周期(days)
+            <input dojoType="dijit.form.NumberSpinner"
+                   value="7"
+                   smallDelta="1"
+                   largeDelta="10"
+                   constraints="{min:0,max:24,places:0}"
+                   maxlength="2"
+                   id="deltaday"
+                   name="deltaday">
+            キーワード録画許容誤差(hours)
+            <input dojoType="dijit.form.NumberSpinner"
+                   value="3"
+                   smallDelta="1"
+                   largeDelta="10"
+                   constraints="{min:0,max:24,places:0}"
+                   maxlength="2"
+                   id="deltahour"
+                   name="deltahour"><br><br>
 
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Mon" name="day_Mon" value="1">月曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Tue" name="day_Tue" value="2">火曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Wed" name="day_Wed" value="3">水曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Thu" name="day_Thu" value="4">木曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Fri" name="day_Fri" value="5">金曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Sat" name="day_Sat" value="6">土曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Sun" name="day_Sun" value="7">日曜</input>
-        <br><br>
-        録画サイズ
-        <select name="size"
-                dojoType="dijit.form.FilteringSelect"
-                autocomplete="false"
-                value="<!--size-value//-->"
-                id="size"
-                onChange="changeSize">
-            <option selected="selected" value="S">SD画質(720x480)</option>
-            <option value="H">HD画質(1280x720)</option>
-            <option value="Q">WQVG画質(400x240)</option>
-            <option value="F">FULLHD画質(1920x1080)</option>
             <input type="checkbox"
                    dojoType="dijit.form.CheckBox"
-                   id="anime" name="anime" value="a"
-                   onClick="setOpts(this)">アニメ</input>
+                   id="day_Mon" name="day_Mon" value="1">月曜</input>
+            <input type="checkbox"
+                   dojoType="dijit.form.CheckBox"
+                   id="day_Tue" name="day_Tue" value="2">火曜</input>
             <input type="checkbox"
                    dojoType="dijit.form.CheckBox"
-                   id="dualaudio" name="dualaudio" value="d"
-                   onClick="setOpts(this)">二ヶ国語放送</input>
+                   id="day_Wed" name="day_Wed" value="3">水曜</input>
             <input type="checkbox"
                    dojoType="dijit.form.CheckBox"
-                   id="pentaaudio" name="pentaaudio" value="5"
-                   onClick="setOpts(this)">5.1ch放送</input>
+                   id="day_Thu" name="day_Thu" value="4">木曜</input>
             <input type="checkbox"
                    dojoType="dijit.form.CheckBox"
-                   id="2pass" name="2pass" value="2"
-                   onClick="setOpts(this)">2passモード</input>
+                   id="day_Fri" name="day_Fri" value="5">金曜</input>
             <input type="checkbox"
                    dojoType="dijit.form.CheckBox"
-                   id="xvid" name="xvid" value="x"
-                   onClick="setOpts(this)">Xvidモード</input>
-        </select>
-        Options
-        <div name="opts"
-             dojoType="dijit.form.ValidationTextBox"
-             value="<!--opts-value//-->"
-             onChange="changeOpts"
-             id="opts">
-        </div><div dojoType="dijit.form.Button" type="submit">予約</div>
-        <div name="exec"
-             dojoType="dijit.form.ValidationTextBox"
-             value="<!--exec-value//-->"
-             style="display:none";>
-             </div>
-    </body>
+                   id="day_Sat" name="day_Sat" value="6">土曜</input>
+            <input type="checkbox"
+                   dojoType="dijit.form.CheckBox"
+                   id="day_Sun" name="day_Sun" value="7">日曜</input>
+            <br><br>
+            録画サイズ
+            <select name="size"
+                    dojoType="dijit.form.FilteringSelect"
+                    autocomplete="false"
+                    value="<!--size-value//-->"
+                    id="size"
+                    onChange="changeSize">
+                <option selected="selected" value="S">SD画質(720x480)</option>
+                <option value="H">HD画質(1280x720)</option>
+                <option value="Q">WQVG画質(400x240)</option>
+                <option value="F">FULLHD画質(1920x1080)</option>
+                <input type="checkbox"
+                       dojoType="dijit.form.CheckBox"
+                       id="anime" name="anime" value="a"
+                       onClick="setOpts(this)">アニメ</input>
+                <input type="checkbox"
+                       dojoType="dijit.form.CheckBox"
+                       id="dualaudio" name="dualaudio" value="d"
+                       onClick="setOpts(this)">二ヶ国語放送</input>
+                <input type="checkbox"
+                       dojoType="dijit.form.CheckBox"
+                       id="pentaaudio" name="pentaaudio" value="5"
+                       onClick="setOpts(this)">5.1ch放送</input>
+                <input type="checkbox"
+                       dojoType="dijit.form.CheckBox"
+                       id="2pass" name="2pass" value="2"
+                       onClick="setOpts(this)">2passモード</input>
+                <input type="checkbox"
+                       dojoType="dijit.form.CheckBox"
+                       id="xvid" name="xvid" value="x"
+                       onClick="setOpts(this)">Xvidモード</input>
+            </select>
+            Options
+            <div name="opts"
+                 dojoType="dijit.form.ValidationTextBox"
+                 value="<!--opts-value//-->"
+                 onChange="changeOpts"
+                 id="opts">
+            </div><div dojoType="dijit.form.Button" type="submit">予約</div>
+            <div name="exec"
+                 dojoType="dijit.form.ValidationTextBox"
+                 value="<!--exec-value//-->"
+                 style="display:none";>
+        </div>
+</body>
 </html>
diff --git a/Rec10WEB/trunk/src/schedule.htm b/Rec10WEB/trunk/src/schedule.htm
index b9b97c5..f45989d 100644 (file)
--- a/Rec10WEB/trunk/src/schedule.htm
+++ b/Rec10WEB/trunk/src/schedule.htm
@@ -25,6 +25,15 @@
             dojo.require('dijit.form.Button');
             // グリッドに表示する元データをロード
             var store = new dojox.data.CsvStore({url:'./recdatum.csv'});
+            function click(){
+                var items=dijit.byId("grid").selection.getSelected();
+                var str="";
+                for (i=0;i<items.length;i++){
+                    var s=dijit.byId("grid").store.getValue(items[i],"id");
+                    str=str+s+",";
+                }
+                dijit.byId("tasknum").setValue(str);
+            }
             -->
         </script>
     </head>
@@ -32,13 +41,16 @@
     <!-- テーマの読み込み -->
     <body class="tundra">  
         <table
+            id="grid"
+            name="grid"
             dojoType="dojox.grid.DataGrid"
             store="store"
             query="{id:'*'}"
             autoHeight="true"
             width="100%"
             autoWidth="true"
-            clientSort="true">
+            clientSort="true"
+            onClick="click">
             <thead>
                 <tr>
                     <th width="30px" field="id">ID</th>
@@ -57,9 +69,15 @@
                 autocomplete="false"
                 value="del"
                 onChange="setType">
-            <option value="del">通常予約</option>
-            <option value="change">キーワード予約</option>
+            <option value="del">削除(複数同時可能)</option>
+            <option value="change">変更(最後に選択したもの)</option>
         </select>
-        <div dojoType="dijit.form.Button" type="submit">Submit</div>
+        <div dojoType="dijit.form.Button" type="submit">実行</div>
+        <div dojoType="dijit.form.TextBox"
+             name="tasknum"
+             id="tasknum"
+             value=""
+             style="display:none">
+        </div>
     </body>
 </html>
rec10 git
About OSDN
Find Software
Develop Software
Help