フォトメインウィジェット更新。

diff --git a/widgets/photo_main/include/template/admin_search.tmpl.html b/widgets/photo_main/include/template/admin_search.tmpl.html
index ff0ebcb..7e442c1 100644 (file)
--- a/widgets/photo_main/include/template/admin_search.tmpl.html
+++ b/widgets/photo_main/include/template/admin_search.tmpl.html
@@ -5,7 +5,7 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2016 Magic3 Project.\r
+ * @copyright  Copyright 2006-2017 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
@@ -24,52 +24,17 @@ function updateItem(){
 // カテゴリ項目を追加\r
 function addLine()\r
 {\r
-       var lineText = '<tr class="m3drag_row"><td class="m3drag_handle"></td><td align="center"><span class="m3drag_rowno"></span></td>';\r
+       var lineText = '<tr class="m3drag_row"><td class="m3drag_handle"></td><td><span class="m3drag_rowno"></span></td>';\r
        lineText += '<td><select name="item_type[]"><patTemplate:tmpl name="item_type_list"><option value="{VALUE}" {SELECTED}>{NAME}</option></patTemplate:tmpl></select></td>';\r
        lineText += '<td><select name="item_sel_type[]"><patTemplate:tmpl name="sel_type_list"><option value="{VALUE}" {SELECTED}>{NAME}</option></patTemplate:tmpl></select>';\r
        lineText += '<select name="item_category[]"><patTemplate:tmpl name="category_list"><option value="{VALUE}" {SELECTED}>{NAME}</option></patTemplate:tmpl></select></td>';\r
-       lineText += '<td><input type="text" class="replaceTag" style="width:100%;" readonly /></td>';\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
+       lineText += '<td><input type="text" class="replaceTag" readonly /></td>';\r
+       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>';\r
        $('#field_list').append(lineText);\r
        \r
        // 項目一覧を再設定\r
-       //setupList();\r
        m3SetDragDropTable('field_list', reorder_callback);\r
 }\r
-/*\r
-function setupList()\r
-{\r
-       $("#field_list").tableDnD({\r
-               onDrop: function(table, row){\r
-                       setupNo();\r
-               },\r
-               dragHandle: ".m3drag_handle"\r
-       });\r
-       $("#field_list tr").hover(function(){\r
-               $(this.cells[0]).addClass('m3drag_current');\r
-       }, function() {\r
-               $(this.cells[0]).removeClass('m3drag_current');\r
-       });\r
-       // 項目削除処理\r
-       $("#field_list tr .m3drag_delrow").click(function(){\r
-               $(this).parents('.m3drag_row').remove();\r
-               setupNo();\r
-       });\r
-       // インデックスNo再設定\r
-       setupNo();\r
-}*/\r
-/*\r
-function setupNo()\r
-{\r
-       // インデックスNo再設定\r
-       $("#field_list tr .m3drag_rowno").each(function(index){\r
-               $(this).text(index + 1);\r
-       });\r
-       $("#field_list tr .replaceTag").each(function(index){\r
-               var replaceTag = '{TAG_START}' + (index + 1) + '{TAG_END}';\r
-               $(this).val(replaceTag);\r
-       });\r
-}*/\r
 // 項目順変更時処理\r
 function reorder_callback()\r
 {\r
@@ -79,39 +44,38 @@ function reorder_callback()
        });\r
 }\r
 $(function(){\r
+       // テーブルを作成\r
+       m3SetConfigTable('mainconfig');\r
+       \r
        // WYSIWYGエディター作成\r
-       //m3_setHtmlEditor('item_html');\r
        m3SetWysiwygEditor('item_html', 200, false, 'layout');\r
        \r
        // カテゴリ項目作成\r
-       //setupList();\r
        m3SetDragDropTable('field_list', reorder_callback);\r
 });\r
 //]]>\r
 </script>\r
 <div class="m3config_container">\r
-{MENU_ITEMS}\r
 <!-- m3:ErrorMessage -->\r
 <form method="post" name="main" class="form">\r
 <input type="hidden" name="task" value="search" />\r
 <input type="hidden" name="act" />\r
 <input type="hidden" name="fieldcount" />\r
-<table>\r
-<tr><td colspan="2"><label>検索条件</label></td></tr>\r
-<tr><td colspan="2">\r
-<table class="simple-table" style="margin:0 auto;width:950px;">\r
+<h3 class="m3config_h">検索条件</h3>\r
+\r
+<table id="mainconfig">\r
     <tbody>\r
-        <tr class="even">\r
-           <td class="table-headside" width="150"><span {_HELP_IMAGE_FILE}>追加検索条件</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGE_FILE}>追加検索条件</span></th>\r
            <td>\r
-           <table id="field_list" class="simple-table-inner" width="100%">\r
+           <table id="field_list" class="simple-table-inner">\r
            <thead>\r
-           <tr><th width="35">移動</th><th width="30">No</th><th width="150">種別</th><th width="300">選択方法/親カテゴリー</th><th width="100">埋め込みタグ</th><th>操作</th></tr>\r
+           <tr><th style="width:35px;">移動</th><th style="width:35px;">No</th><th>種別</th><th>選択方法/親カテゴリー</th><th>埋め込みタグ</th><th style="width:35px;">操作</th></tr>\r
            </thead><tbody>\r
            <patTemplate:tmpl name="field_list">\r
             <tr class="m3drag_row">\r
            <td class="m3drag_handle"></td>\r
-           <td align="center"><span class="m3drag_rowno"></span></td>\r
+           <td><span class="m3drag_rowno"></span></td>\r
            <td><select name="item_type[]">\r
               <patTemplate:tmpl name="item_type_list2">\r
                <option value="{VALUE}" {SELECTED}>{NAME}</option>\r
@@ -127,32 +91,27 @@ $(function(){
                <option value="{VALUE}" {SELECTED}>{NAME}</option>\r
               </patTemplate:tmpl>\r
             </select></td>\r
-           <td><input type="text" class="replaceTag" style="width:100%;" readonly /></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
+           <td><input type="text" class="replaceTag" readonly /></td>\r
+           <td><a class="m3drag_delrow" href="#"><img src="{ROOT_URL}/images/system/delete32.png" width="32" height="32" alt="削除" title="削除" rel="m3help" /></a></td>\r
            </tr>\r
            </patTemplate:tmpl>\r
            </tbody></table>\r
            <div><input type="button" class="button" onclick="addLine();" value="追加" />&nbsp;&nbsp;{USER_CONTENT_MESSAGE}</div>\r
            </td>\r
        </tr>\r
-        <tr>\r
-           <td class="table-headside">規定タグID</td>\r
+    <tr>\r
+           <th>規定タグID</th>\r
            <td>{TAG_ID_STR}</td>\r
        </tr>\r
-        <tr class="even">\r
-           <td class="table-headside"><span {_HELP_TAB_TEMPLATE}>テンプレート</span></td>\r
-           <td><textarea name="item_html">{HTML}</textarea></td>\r
-       </tr>\r
-       <tr>\r
-           <td align="right" colspan="2">\r
-               <input type="button" class="button" onclick="updateItem();" value="更新" />\r
-           </td>\r
+    <tr>\r
+           <th><span {_HELP_TAB_TEMPLATE}>テンプレート</span></th>\r
+           <td class="ckeditor"><textarea name="item_html">{HTML}</textarea></td>\r
        </tr>\r
     </tbody>\r
 </table>\r
-</td></tr>\r
-</table>\r
-\r
+<div class="well m3config_update_buttons">\r
+<input type="button" class="button" onclick="updateItem();" value="更新" />\r
+</div>\r
 </form>\r
 </div>\r
 </patTemplate:tmpl>\r