管理画面用Javascript更新。

diff --git a/scripts/m3admin1.8.7.js b/scripts/m3admin1.8.7.js
index 0b808a5..e259979 100644 (file)
--- a/scripts/m3admin1.8.7.js
+++ b/scripts/m3admin1.8.7.js
@@ -832,6 +832,11 @@ function m3SetDragDropTable(object, reorder_callback)
                tableObj = object;
        }
 
+       // 行のIDを設定
+       tableObj.find('tr').attr('id',function(i){
+               return 'm3drag_rowid_' + i;
+       });
+       
        // ドラッグ&ドロップテーブル作成
        tableObj.tableDnD({
                onDrop: function(table, row){
@@ -882,7 +887,7 @@ function m3SetDragDropTable(object, reorder_callback)
 function _setupDragDropTable(object, callback)
 {
        // インデックスNo再設定
-       object.find('tr .lineNo').each(function(index){
+       object.find('tr .m3drag_rowno').each(function(index){
                $(this).text(index + 1);
        });
        

diff --git a/widgets/pretty_photo/include/template/admin.tmpl.html b/widgets/pretty_photo/include/template/admin.tmpl.html
index 5579c14..609d31c 100644 (file)
--- a/widgets/pretty_photo/include/template/admin.tmpl.html
+++ b/widgets/pretty_photo/include/template/admin.tmpl.html
@@ -89,7 +89,7 @@ function previewInOtherWindow()
 $(function(){\r
        // テーブル作成\r
        m3SetConfigTable('mainconfig');\r
-       m3SetConfigSubTable('field_list');\r
+//     m3SetConfigSubTable('field_list');\r
        \r
        // 画像一覧作成\r
        //setupList();\r

diff --git a/widgets/slide_image/include/template/admin.tmpl.html b/widgets/slide_image/include/template/admin.tmpl.html
index 241ca2d..38ca820 100644 (file)
--- a/widgets/slide_image/include/template/admin.tmpl.html
+++ b/widgets/slide_image/include/template/admin.tmpl.html
@@ -5,7 +5,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2015 Magic3 Project.
+ * @copyright  Copyright 2006-2016 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
@@ -15,14 +15,14 @@
 //<![CDATA[
 function addItem(){
        if (!window.confirm('項目を新規追加しますか?')) return false;
-       document.main.imagecount.value = $('#field_list').find('.dragRow').length;
+       document.main.imagecount.value = $('#field_list').find('.m3drag_row').length;
        document.main.act.value = 'add';
        document.main.submit();
        return true;
 }
 function updateItem(){
        if (!window.confirm('設定を更新しますか?')) return false;
-       document.main.imagecount.value = $('#field_list').find('.dragRow').length;
+       document.main.imagecount.value = $('#field_list').find('.m3drag_row').length;
        document.main.act.value='update';
        document.main.submit();
        return true;
@@ -48,30 +48,32 @@ var SetUrl = function(url)
 {
        var params = url.split('/');
        var filename = params[params.length -1];
-       var lineText = '<tr class="dragRow"><td class="dragHandle"></td><td align="center"><span class="lineNo"></span></td><td><input type="hidden" name="item_url[]" value="' + url + '" />' + filename + '</td>';
+       var lineText = '<tr class="m3drag_row"><td class="m3drag_handle"></td><td align="center"><span class="m3drag_rowno"></span></td><td><input type="hidden" name="item_url[]" value="' + url + '" />' + filename + '</td>';
        lineText += '<td><input type="text" name="item_title[]" maxlength="60" /></td>';
-       lineText += '<td><a class="delImage" href="#"><img src="{_ROOT_URL}/images/system/delete32.png" width="32" height="32" alt="削除" title="削除" rel="m3help" /></a></td></tr>';
+       lineText += '<td><a class="m3drag_delrow" href="#"><img src="{_ROOT_URL}/images/system/delete32.png" width="32" height="32" alt="削除" title="削除" rel="m3help" /></a></td></tr>';
        $('#field_list').append(lineText);
 
        // 画像一覧を再設定
-       setupList();
+//     setupList();
+       m3SetDragDropTable('field_list');
 }
+/*
 function setupList()
 {
        $("#field_list").tableDnD({
                onDrop: function(table, row){
                        setupNo();
                },
-               dragHandle: ".dragHandle"
+               dragHandle: ".m3drag_handle"
        });
        $("#field_list tr").hover(function(){
-               $(this.cells[0]).addClass('currentHandle');
+               $(this.cells[0]).addClass('m3drag_current');
        }, function() {
-               $(this.cells[0]).removeClass('currentHandle');
+               $(this.cells[0]).removeClass('m3drag_current');
        });
        // 画像項目削除処理
-       $("#field_list tr .delImage").click(function(){
-               $(this).parents('.dragRow').remove();
+       $("#field_list tr .m3drag_delrow").click(function(){
+               $(this).parents('.m3drag_row').remove();
                setupNo();
        });
        // インデックスNo再設定
@@ -82,14 +84,14 @@ function setupList()
        
        // HELP追加
        m3SetHelp($("#field_list"));
-}
-function setupNo()
+}*/
+/*function setupNo()
 {
        // インデックスNo再設定
-       $("#field_list tr .lineNo").each(function(index){
+       $("#field_list tr .m3drag_rowno").each(function(index){
                $(this).text(index + 1);
        });
-}
+}*/
 // プレビューを別ウィンドウで表示
 function previewInOtherWindow()
 {
@@ -99,10 +101,11 @@ function previewInOtherWindow()
 $(function(){
        // テーブル作成
        m3SetConfigTable('mainconfig');
-       m3SetConfigSubTable('field_list');
+//     m3SetConfigSubTable('field_list');
        
        // 画像一覧作成
-       setupList();
+       //setupList();
+       m3SetDragDropTable('field_list');
 });
 //]]>
 </script>
@@ -148,12 +151,12 @@ $(function(){
            <tr><th style="width:35px;">移動</th><th style="width:30px;">No</th><th>ファイル名</th><th>タイトル</th><th style="width:50px;">操作</th></tr>
            </thead><tbody>
            <patTemplate:tmpl name="image_list">
-        <tr class="dragRow">
-           <td class="dragHandle"></td>
-               <td align="center"><span class="lineNo"></span></td>
+        <tr class="m3drag_row">
+           <td class="m3drag_handle"></td>
+               <td align="center"><span class="m3drag_rowno"></span></td>
            <td><input type="hidden" name="item_url[]" value="{URL}" />{FILENAME}</td>
            <td><input type="text" name="item_title[]" value="{TITLE}" maxlength="60" /></td>
-           <td><a class="delImage" href="#"><img src="{ROOT_URL}/images/system/delete32.png" width="32" height="32" alt="削除" title="削除" rel="m3help" /></a></td>
+           <td><a class="m3drag_delrow" href="#"><img src="{ROOT_URL}/images/system/delete32.png" width="32" height="32" alt="削除" title="削除" rel="m3help" /></a></td>
            </tr>
            </patTemplate:tmpl>
            </tbody></table>

diff --git a/widgets/youtube_player/include/template/admin.tmpl.html b/widgets/youtube_player/include/template/admin.tmpl.html
index f4e6404..f79459c 100644 (file)
--- a/widgets/youtube_player/include/template/admin.tmpl.html
+++ b/widgets/youtube_player/include/template/admin.tmpl.html
@@ -1,16 +1,28 @@
+/**\r
+ * 表示データ作成用テンプレート(patTemplate)\r
+ *\r
+ * LICENSE: This source file is licensed under the terms of the GNU General Public License.\r
+ *\r
+ * @package    Magic3 Framework\r
+ * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
+ * @copyright  Copyright 2006-2016 Magic3 Project.\r
+ * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
+ * @version    SVN: $Id$\r
+ * @link       http://www.magic3.org\r
+ */\r
 <patTemplate:tmpl name="_widget">\r
 <script type="text/javascript">\r
 //<![CDATA[\r
 function addItem(){\r
        if (!window.confirm('項目を新規追加しますか?')) return false;\r
-       document.main.fieldcount.value = $('#field_list').find('.dragRow').length;\r
+       document.main.fieldcount.value = $('#field_list').find('.m3drag_row').length;\r
        document.main.act.value = 'add';\r
        document.main.submit();\r
        return true;\r
 }\r
 function updateItem(){\r
        if (!window.confirm('設定を更新しますか?')) return false;\r
-       document.main.fieldcount.value = $('#field_list').find('.dragRow').length;\r
+       document.main.fieldcount.value = $('#field_list').find('.m3drag_row').length;\r
        document.main.act.value = 'update';\r
        document.main.submit();\r
        return true;\r
@@ -29,43 +41,46 @@ function listItem(){
 // 動画項目を追加\r
 function addLine()\r
 {\r
-       var lineText = '<tr class="dragRow"><td class="dragHandle"></td><td align="center"><span class="lineNo"></span></td>';\r
+       var lineText = '<tr class="m3drag_row"><td class="m3drag_handle"></td><td align="center"><span class="m3drag_rowno"></span></td>';\r
        lineText += '<td><input type="text" name="item_name[]" size="20" maxlength="60" style="width:100%" /></td>';\r
        lineText += '<td><input type="text" name="item_movieid[]" size="30" maxlength="100" style="width:100%" /></td>';\r
-       lineText += '<td align="center"><a class="delLine" href="#"><img src="{_ROOT_URL}/images/system/delete.png" width="16" height="16" border="0" alt="削除" title="削除" /></a></td></tr>';\r
+       lineText += '<td align="center"><a class="m3drag_delrow" href="#"><img src="{_ROOT_URL}/images/system/delete.png" width="16" height="16" border="0" alt="削除" title="削除" /></a></td></tr>';\r
        $('#field_list').append(lineText);\r
        \r
        // 項目一覧を再設定\r
-       setupList();\r
+       //setupList();\r
+       m3SetDragDropTable('field_list');\r
 }\r
+/*\r
 function setupList()\r
 {\r
        $("#field_list").tableDnD({\r
                onDrop: function(table, row){\r
                        setupNo();\r
                },\r
-               dragHandle: ".dragHandle"\r
+               dragHandle: ".m3drag_handle"\r
        });\r
        $("#field_list tr").hover(function(){\r
-               $(this.cells[0]).addClass('currentHandle');\r
+               $(this.cells[0]).addClass('m3drag_current');\r
        }, function() {\r
-               $(this.cells[0]).removeClass('currentHandle');\r
+               $(this.cells[0]).removeClass('m3drag_current');\r
        });\r
        // 項目削除処理\r
-       $("#field_list tr .delLine").click(function(){\r
-               $(this).parents('.dragRow').remove();\r
+       $("#field_list tr .m3drag_delrow").click(function(){\r
+               $(this).parents('.m3drag_row').remove();\r
                setupNo();\r
        });\r
        // インデックスNo再設定\r
        setupNo();\r
-}\r
+}*/\r
+/*\r
 function setupNo()\r
 {\r
        // インデックスNo再設定\r
-       $("#field_list tr .lineNo").each(function(index){\r
+       $("#field_list tr .m3drag_rowno").each(function(index){\r
                $(this).text(index + 1);\r
        });\r
-}\r
+}*/\r
 // プレビューを別ウィンドウで表示\r
 function previewInOtherWindow()\r
 {\r
@@ -76,8 +91,13 @@ function viewWidget(widgetId){
        window.open("?cmd=showwidget&widget=" + widgetId,"","toolbar=no,menubar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=800,height=600");\r
        return false;\r
 }\r
-$(document).ready(function(){\r
-       setupList();\r
+$(function(){\r
+       // テーブル作成\r
+//     m3SetConfigTable('mainconfig');\r
+       \r
+       // 画像一覧作成\r
+       //setupList();\r
+       m3SetDragDropTable('field_list');\r
 });\r
 //]]>\r
 </script>\r
@@ -123,12 +143,12 @@ $(document).ready(function(){
            <tr><th width="35">移動</th><th width="30">No</th><th width="60%">名前</th><th>動画ID</th><th width="40">操作</th></tr>\r
            </thead><tbody>\r
            <patTemplate:tmpl name="field_list">\r
-            <tr class="dragRow">\r
-           <td class="dragHandle"></td>\r
-           <td align="center"><span class="lineNo"></span></td>\r
+            <tr class="m3drag_row">\r
+           <td class="m3drag_handle"></td>\r
+           <td align="center"><span class="m3drag_rowno"></span></td>\r
            <td><input type="text" name="item_name[]" value="{NAME}" size="20" maxlength="60" style="width:100%" /></td>\r
            <td><input type="text" name="item_movieid[]" value="{MOVIEID}" size="30" maxlength="100" style="width:100%" /></td>\r
-           <td align="center"><a class="delLine" href="#"><img src="{ROOT_URL}/images/system/delete.png" width="16" height="16" border="0" alt="削除" title="削除" /></a></td>\r
+           <td align="center"><a class="m3drag_delrow" href="#"><img src="{ROOT_URL}/images/system/delete.png" width="16" height="16" border="0" alt="削除" title="削除" /></a></td>\r
            </tr>\r
            </patTemplate:tmpl>\r
            </tbody></table>\r