make it to rec10 0.6.0

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

diff --git a/Rec10WEB/trunk/src/readme.txt b/Rec10WEB/trunk/src/readme.txt
index bee9b6d..4309413 100644 (file)
--- a/Rec10WEB/trunk/src/readme.txt
+++ b/Rec10WEB/trunk/src/readme.txt
@@ -4,13 +4,15 @@ Rec10Web is Web Interface for Rec10
 Copyright (C) 2009 Yukikaze
 
 rec10webはrec10の録画予約をweb上から行うために作られた補助ツールです。
-rec10web.pyと同じフォルダ内にrec10が作ったch.dbへのリンクを張ってください。
+rec10web.pyと同じフォルダ内にrec10が作ったconfig.iniへのリンクを張ってください。
 表示にはDojoが必要です。Dojoを設置した上でrswi.htmのdojo関連のパスを書き換えてください。
 LicenseはLGPL v3に準拠します
 yukikaze
 
 dbMySQLパッケージおよびpython2.4以上が必要です。
 
+
+同梱のdojoToolkitはBSDライセンスであり、
 history
 
 0.6.0
@@ -19,3 +21,33 @@ Rec10WEBのみpython2.4以上で動作するように
 
 0.4.1a
 曜日検索ができるようになった
+
+dojo　ライセンス
+The "New" BSD License:
+**********************
+
+Copyright (c) 2005-2009, The Dojo Foundation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  * Neither the name of the Dojo Foundation nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

diff --git a/Rec10WEB/trunk/src/rswi.htm b/Rec10WEB/trunk/src/rswi.htm
index 887d6a5..e299d7c 100644 (file)
--- a/Rec10WEB/trunk/src/rswi.htm
+++ b/Rec10WEB/trunk/src/rswi.htm
@@ -5,12 +5,12 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title>Rec10 Simple Web Interface ver.0.6.0</title>
         <!-- dojo.jsの読み込み -->
-        <script src="../dojo/dojo.js" djConfig="parseOnLoad:true">
+        <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
         </script>
         <!-- テーマの読み込み -->
         <style type="text/css">
-            @import "../dojo/resources/dojo.css";
-            @import "../dijit/themes/tundra/tundra.css";
+            @import "./dojo/dojo/resources/dojo.css";
+            @import "./dojo/dijit/themes/tundra/tundra.css";
 
 
         </style>

diff --git a/Rec10WEB/trunk/src/rswi_edit.htm b/Rec10WEB/trunk/src/rswi_edit.htm
index 3709154..8c21b0f 100644 (file)
--- a/Rec10WEB/trunk/src/rswi_edit.htm
+++ b/Rec10WEB/trunk/src/rswi_edit.htm
@@ -4,12 +4,12 @@
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title>Rec10 Simple Web Interface ver.0.6.0　編集画面</title>
         <!-- dojo.jsの読み込み -->
-        <script src="../dojo/dojo.js" djConfig="parseOnLoad:true">
+        <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
         </script>
         <!-- テーマの読み込み -->
         <style type="text/css">
-            @import "../dojo/resources/dojo.css";
-            @import "../dijit/themes/tundra/tundra.css";
+            @import "./dojo/dojo/resources/dojo.css";
+            @import "./dojo/dijit/themes/tundra/tundra.css";
 
 
         </style>

diff --git a/Rec10WEB/trunk/src/schedule.htm b/Rec10WEB/trunk/src/schedule.htm
index 6c1924a..93486a9 100644 (file)
--- a/Rec10WEB/trunk/src/schedule.htm
+++ b/Rec10WEB/trunk/src/schedule.htm
@@ -5,8 +5,8 @@
         <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="../dojox/grid/_grid/Grid.css" rel="stylesheet" type="text/css">
-        <link href="../dojox/grid/_grid/tundraGrid.css" rel="stylesheet" type="text/css">
+        <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 type="text/javascript">