FIX: skinieoverview/templateeditのマークアップ修正

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 5efc9a7..a39c26c 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -2628,9 +2628,9 @@ class AdminActions extends BaseActions
                                        /* extra plugin field */
                                        if ( !array_key_exists('TEMPLATE_EDIT_EXPLUGNAME', $tmplt) || empty($tmplt['TEMPLATE_EDIT_EXPLUGNAME']) )
                                        {
-                                               $base = "</tr>\n"
-                                                     . "<tr>\n"
-                                                     . "<th colspan=\"2\"><%explugtplname%></th>\n";
+                                               $base = "<tr>\n"
+                                                     . "<th colspan=\"2\"><%explugtplname%></th>\n"
+                                                     . "</tr>";
                                        }
                                        else
                                        {
@@ -4108,13 +4108,13 @@ class AdminActions extends BaseActions
                }
                if ( !array_key_exists('SKINIE_EXPORT_LIST', $templates) || empty($templates['SKINIE_EXPORT_LIST']) )
                {
-                       $template = "<td>"
-                       . "<input type=\"checkbox\" name=\"<%typeid%>\" id=\"<%expid%>\" />\n"
-                       . "<label for=\"<%expid%>\"><%expname%></label>\n"
-                       . "</td>\n"
-                       . "<td><%expdesc%></td>\n"
-                       . "</tr>\n"
-                       . "<tr>\n";
+                       $template = "<tr>\n"
+                                 . "<td>"
+                                 . "<input type=\"checkbox\" name=\"<%typeid%>\" id=\"<%expid%>\" />\n"
+                                 . "<label for=\"<%expid%>\"><%expname%></label>\n"
+                                 . "</td>\n"
+                                 . "<td><%expdesc%></td>\n"
+                                 . "</tr>\n";
                }
                else
                {

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index 31e3665..21648e0 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -966,8 +966,7 @@ function listplug_templateEditRow($content, $desc, $name, $help = '', $tabindex
        /* row head */\r
        if ( !array_key_exists('TEMPLATE_EDIT_ROW_HEAD', $templates) || empty($tmplt['TEMPLATE_EDIT_ROW_HEAD']) )\r
        {\r
-               $template = "</tr>"\r
-                         . "<tr>\n"\r
+               $template = "<tr>\n"\r
                          . "<td><%description%><%help%></td>\n"\r
                          . "<td id=\"td<%count%>\">\n"\r
                          . "<textarea class=\"templateedit\" name=\"<%name%>\" tabindex=\"<%tabindex%>\" cols=\"50\" rows=\"<%rows%>\" id=\"textarea<%count%>\">";\r
@@ -985,7 +984,8 @@ function listplug_templateEditRow($content, $desc, $name, $help = '', $tabindex
        if ( !array_key_exists('TEMPLATE_EDIT_ROW_TAIL', $templates) || empty($tmplt['TEMPLATE_EDIT_ROW_TAIL']) )\r
        {\r
                $template = "</textarea>\n"\r
-                         . "</td>\n";\r
+                         . "</td>\n"\r
+                         . "</tr>\n";\r
        }\r
        else\r
        {\r

diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml
index faa1f98..4985ca2 100644 (file)
--- a/skins/admin/default/skinbackup.xml
+++ b/skins/admin/default/skinbackup.xml
@@ -312,35 +312,50 @@
        </form>\r
        \r
        <h2><%text(_SKINIE_TITLE_EXPORT)%></h2>\r
+       \r
        <form method="post" action="<%adminurl%>index.php">\r
-       <p>\r
-       <input type="hidden" name="action" value="adminskinieexport" />\r
-       <%ticket%>\r
-       <%text(_SKINIE_EXPORT_INTRO)%>\r
-       </p>\r
        \r
-       <table frame="box" rules="all" summary="<%text(_SKINIE_TITLE_EXPORT)%>">\r
+       <p><%text(_SKINIE_EXPORT_INTRO)%></p>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINIE_EXPORT_SKINS)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_SKINIE_EXPORT_SKINS)%></th>\r
        </tr>\r
-       <tr>\r
+       </thead>\r
+       <tbody>\r
        <%skinielist(skin,admin/default)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINIE_EXPORT_TEMPLATES)%>">\r
+       <thead>\r
        <th colspan="2"><%text(_SKINIE_EXPORT_TEMPLATES)%></th>\r
-       </tr>\r
-       <tr>\r
+       </thead>\r
+       <tbody>\r
        <%skinielist(template,admin/default)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINIE_EXPORT_EXTRA)%>">\r
+       <thead>\r
        <th colspan="2"><%text(_SKINIE_EXPORT_EXTRA)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
        <tr>\r
        <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
        </tr>\r
-       <tr>\r
-       <th colspan="2"><%text(_SKINIE_TITLE_EXPORT)%></th>\r
-       </tr>\r
-       <tr>\r
-       <td colspan="2"><input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" /></td>\r
-       </tr>\r
+       </tbody>\r
        </table>\r
+       \r
+       <p>\r
+       <input type="hidden" name="action" value="adminskinieexport" />\r
+       <%ticket%>\r
+       <input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" />\r
+       </p>\r
+       \r
+       \r
        </form>\r
        <%pagefoot%>\r
 ]]></part>\r
@@ -420,10 +435,14 @@
        <%ticket%>\r
        <input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
        </p>\r
+       \r
        <table frame="box" rules="all" summary="<%text(_TEMPLATE_EDIT_TITLE)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_TEMPLATE_SETTINGS)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
        <tr>\r
        <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
        <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<%edittemplateinfo(name)%>" /></td>\r
@@ -433,17 +452,22 @@
        <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<%edittemplateinfo(desc)%>" /></td>\r
        </tr>\r
        <tr>\r
-       <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
-       </tr>\r
-       <tr>\r
        <td><%text(_TEMPLATE_UPDATE)%></td>\r
        <td>\r
        <input type="submit" tabindex="6" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
        <input type="reset" tabindex="7" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
        </td>\r
        </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_QMENU_LAYOUT_SKINS)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_QMENU_LAYOUT_SKINS)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_HEAD, NORMALSKINLIST_HEAD, ,8)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_BODY, NORMALSKINLIST_BODY, ,9)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_FOOT, NORMALSKINLIST_FOOT, ,10)%>\r
@@ -451,55 +475,118 @@
        <%edittemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_BODY, SPECIALSKINLIST_BODY, , 12)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_FOOT, SPECIALSKINLIST_FOOT, , 13)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SKINIE_EXPORT_LIST, SKINIE_EXPORT_LIST, , 17)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_QMENU_LAYOUT_TEMPL)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_QMENU_LAYOUT_TEMPL)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_EXPLUGNAME, TEMPLATE_EDIT_EXPLUGNAME, , 18)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_HEAD, TEMPLATE_EDIT_ROW_HEAD, , 19)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_TAIL, TEMPLATE_EDIT_ROW_TAIL, , 20)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINABLEADMIN_ADMINAREAHEADLINK)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_SKINABLEADMIN_ADMINAREAHEADLINK)%></th>\r
-       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BLOGLINK, ADMIN_BLOGLINK, , 21)%>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BLOGLINK, ADMIN_BLOGLINK, , 21)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINABLEADMIN_BATCH)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_SKINABLEADMIN_BATCH)%></th>\r
-       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BATCHLIST, ADMIN_BATCHLIST, , 22)%>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BATCHLIST, ADMIN_BATCHLIST, , 22)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_QMENU_ACTIVATE)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_QMENU_ACTIVATE)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TITLE, ACTIVATE_FORGOT_TITLE, , 23)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TEXT, ACTIVATE_FORGOT_TEXT, , 24)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TITLE, ACTIVATE_REGISTER_TITLE, , 25)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TEXT, ACTIVATE_REGISTER_TEXT, , 26)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TITLE, ACTIVATE_CHANGE_TITLE, , 27)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TEXT, ACTIVATE_CHANGE_TEXT, , 28)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_QMENU_MANAGE_SYSTEM)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_QMENU_MANAGE_SYSTEM)%></th>\r
-       <%edittemplateinfo(row, _ADM_TPLPT_SYSTEMINFO_GDSETTINGS, SYSTEMINFO_GDSETTINGS, , 29)%>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SYSTEMINFO_GDSETTINGS, SYSTEMINFO_GDSETTINGS, , 29)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_BLOGLIST_BANS)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_BLOGLIST_BANS)%></th>\r
-       <%edittemplateinfo(row, _ADM_TPLPT_BANLIST_DELETED_LIST, BANLIST_DELETED_LIST, , 30)%>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_BANLIST_DELETED_LIST, BANLIST_DELETED_LIST, , 30)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINABLEADMIN_TPLSETTING_INGENERAL)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_SKINABLEADMIN_TPLSETTING_INGENERAL)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_TITLE, INSERT_PLUGOPTION_TITLE, , 31)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_BODY, INSERT_PLUGOPTION_BODY, , 32)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_ADMIN, INPUTYESNO_TEMPLATE_ADMIN, , 33)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_NORMAL, INPUTYESNO_TEMPLATE_NORMAL, , 34)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ICON, ADMIN_CUSTOMHELPLINK_ICON, , 35)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ANCHOR, ADMIN_CUSTOMHELPLINK_ANCHOR, , 36)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_HEAD, SHOWLIST_LISTPLUG_SELECT_HEAD, , 37)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_BODY, SHOWLIST_LISTPLUG_SELECT_BODY, , 38)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_FOOT, SHOWLIST_LISTPLUG_SELECT_FOOT, , 39)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_HEAD, SHOWLIST_LISTPLUG_TABLE_HEAD, , 40)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BODY, SHOWLIST_LISTPLUG_TABLE_BODY, , 41)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_FOOT, SHOWLIST_LISTPLUG_TABLE_FOOT, , 42)%>\r
@@ -569,21 +656,41 @@
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, , 106)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, , 107)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, , 108)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINABLEADMIN_PLUGIN_QUICKMENU)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_SKINABLEADMIN_PLUGIN_QUICKMENU)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_TITLE, PLUGIN_QUICKMENU_TITLE, , 109)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_HEAD, PLUGIN_QUICKMENU_HEAD, , 110)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_BODY, PLUGIN_QUICKMENU_BODY, , 111)%>\r
        <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_FOOT, PLUGIN_QUICKMENU_FOOT, , 112)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_PLUGIN_FIELDS)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_TEMPLATE_PLUGIN_FIELDS)%></th>\r
-       <%edittemplateinfo(extratemplate,admin/default)%>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(extratemplate,admin/default)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_UPDATE)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
        <tr>\r
        <td><%text(_TEMPLATE_UPDATE)%></td>\r
        <td>\r
@@ -591,7 +698,9 @@
        <input type="reset" tabindex="810" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
        </td>\r
        </tr>\r
+       </tbody>\r
        </table>\r
+       \r
        </form>\r
        <%pagefoot%>\r
 ]]></part>\r
@@ -2648,75 +2757,88 @@
 <%pagefoot%>\r
 ]]></part>\r
 <part name="skinieoverview"><![CDATA[\r
-<%pagehead%>\r
-<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-<h2><%text(_SKINIE_TITLE_IMPORT)%></h2>\r
-<p>\r
-<label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>\r
-</p>\r
-<%if(skincandidates)%>\r
-<form method="post" action="<%adminurl%>index.php">\r
-<p>\r
-<input type="hidden" name="action" value="skinieimport" />\r
-<%ticket%>\r
-<input type="hidden" name="mode" value="file" />\r
-<select name="skinfile" id="skinie_import_local">\r
-<%selectlocalskinfiles%>\r
-</select>\r
-<input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
-</p>\r
-</form>\r
-<%else%>\r
-<p>\r
-<%text(_SKINIE_NOCANDIDATES)%>\r
-</p>\r
-<%endif%>\r
-<p><em><%text(_OR)%></em></p>\r
-<form method="post" action="<%adminurl%>index.php">\r
-<p>\r
-<%ticket%>\r
-<input type="hidden" name="action" value="skinieimport" />\r
-<input type="hidden" name="mode" value="url" />\r
-<label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>\r
-<input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />\r
-<input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
-</p>\r
-</form>\r
-<h2><%text(_SKINIE_TITLE_EXPORT)%></h2>\r
-<form method="post" action="<%adminurl%>index.php">\r
-<p>\r
-<input type="hidden" name="action" value="skinieexport" />\r
-<%ticket%>\r
-<%text(_SKINIE_EXPORT_INTRO)%>\r
-</p>\r
-\r
-<table frame="box" rules="all" summary="<%text(_SKINIE_TITLE_EXPORT)%>">\r
-<thead>\r
-<tr>\r
-<th colspan="2"><%text(_SKINIE_EXPORT_SKINS)%></th>\r
-</tr>\r
-<thead>\r
-<tr>\r
-<%skinielist(skin,admin/default)%>\r
-<th colspan="2"><%text(_SKINIE_EXPORT_TEMPLATES)%></th>\r
-</tr>\r
-<tr>\r
-<%skinielist(template,admin/default)%>\r
-<th colspan="2"><%text(_SKINIE_EXPORT_EXTRA)%></th>\r
-</tr>\r
-<tr>\r
-<td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
-</tr>\r
-<tr>\r
-<th colspan="2"><%text(_SKINIE_TITLE_EXPORT)%></th>\r
-</tr>\r
-<tr>\r
-<td colspan="2"><input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" /></td>\r
-</tr>\r
-</table>\r
-</form>\r
-\r
-<%pagefoot%>\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       <h2><%text(_SKINIE_TITLE_IMPORT)%></h2>\r
+       <p>\r
+       <label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>\r
+       </p>\r
+       <%if(skincandidates)%>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="skinieimport" />\r
+       <%ticket%>\r
+       <input type="hidden" name="mode" value="file" />\r
+       <select name="skinfile" id="skinie_import_local">\r
+       <%selectlocalskinfiles%>\r
+       </select>\r
+       <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
+       </p>\r
+       </form>\r
+       <%else%>\r
+       <p>\r
+       <%text(_SKINIE_NOCANDIDATES)%>\r
+       </p>\r
+       <%endif%>\r
+       <p><em><%text(_OR)%></em></p>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <%ticket%>\r
+       <input type="hidden" name="action" value="skinieimport" />\r
+       <input type="hidden" name="mode" value="url" />\r
+       <label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>\r
+       <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />\r
+       <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
+       </p>\r
+       </form>\r
+       \r
+       <h2><%text(_SKINIE_TITLE_EXPORT)%></h2>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       \r
+       <p><%text(_SKINIE_EXPORT_INTRO)%></p>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINIE_EXPORT_SKINS)%>">\r
+       <thead>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINIE_EXPORT_SKINS)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%skinielist(skin,admin/default)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINIE_EXPORT_TEMPLATES)%>">\r
+       <thead>\r
+       <th colspan="2"><%text(_SKINIE_EXPORT_TEMPLATES)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%skinielist(template,admin/default)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINIE_EXPORT_SKINS)%>">\r
+       <thead>\r
+       <th colspan="2"><%text(_SKINIE_EXPORT_EXTRA)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
+       <tr>\r
+       <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
+       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <p>\r
+       <input type="hidden" name="action" value="skinieexport" />\r
+       <%ticket%>\r
+       <input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" />\r
+       </p>\r
+       \r
+       </form>\r
+       \r
+       <%pagefoot%>\r
 ]]></part>\r
 <part name="skinoverview"><![CDATA[\r
        <%pagehead%>\r
@@ -2950,10 +3072,13 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
        <input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
        </p>\r
        \r
-       <table frame="box" rules="all" summary="<%text(_TEMPLATE_EDIT_TITLE)%>">\r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_SETTINGS)%>">\r
+       <thead>\r
        <tr>\r
        <th colspan="2"><%text(_TEMPLATE_SETTINGS)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
        <tr>\r
        <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
        <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<%edittemplateinfo(name)%>" /></td>\r
@@ -2963,28 +3088,38 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
        <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<%edittemplateinfo(desc)%>" /></td>\r
        </tr>\r
        <tr>\r
-       <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
-       </tr>\r
-       <tr>\r
        <td><%text(_TEMPLATE_UPDATE)%></td>\r
        <td>\r
        <input type="submit" tabindex="6" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
        <input type="reset" tabindex="7" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
        </td>\r
        </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_ITEMS)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_ITEMS)%> <%helplink(templateitems)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_ITEMS)%> <%helplink(templateitems)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_ITEMHEADER,ITEM_HEADER,,8)%>\r
        <%edittemplateinfo(row,_TEMPLATE_ITEMBODY,ITEM,,9,1)%>\r
        <%edittemplateinfo(row,_TEMPLATE_ITEMFOOTER,ITEM_FOOTER,,10)%>\r
        <%edittemplateinfo(row,_TEMPLATE_MORELINK,MORELINK,morelink, 20)%>\r
        <%edittemplateinfo(row,_TEMPLATE_EDITLINK, EDITLINK, editlink, 25)%>\r
        <%edittemplateinfo(row,_TEMPLATE_NEW, NEW, new, 30)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_COMMENTS_ANY)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_COMMENTS_ANY)%> <%helplink(templatecomments)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_COMMENTS_ANY)%> <%helplink(templatecomments)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_CHEADER, COMMENTS_HEADER, commentheaders, 40)%>\r
        <%edittemplateinfo(row,_TEMPLATE_CBODY, COMMENTS_BODY, commentbody, 50, 1)%>\r
        <%edittemplateinfo(row,_TEMPLATE_CFOOTER, COMMENTS_FOOTER, commentheaders, 60)%>\r
@@ -2992,69 +3127,128 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
        <%edittemplateinfo(row,_TEMPLATE_CMANY, COMMENTS_MANY, commentwords, 80)%>\r
        <%edittemplateinfo(row,_TEMPLATE_CMORE, COMMENTS_CONTINUED, commentcontinued, 90)%>\r
        <%edittemplateinfo(row,_TEMPLATE_CMEXTRA, COMMENTS_AUTH, memberextra, 100)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_COMMENTS_NONE)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_COMMENTS_NONE)%> <%helplink(templatecomments)%></th>\r
-       <%edittemplateinfo(row,_TEMPLATE_CNONE, COMMENTS_NONE, , 110)%>\r
+       <th colspan="2"><%text(_TEMPLATE_COMMENTS_NONE)%> <%helplink(templatecomments)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(row,_TEMPLATE_CNONE, COMMENTS_NONE, , 110)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_COMMENTS_TOOMUCH)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_COMMENTS_TOOMUCH)%> <%helplink(templatecomments)%></th>\r
-       <%edittemplateinfo(row,_TEMPLATE_CTOOMUCH, COMMENTS_TOOMUCH, , 120)%>\r
+       <th colspan="2"><%text(_TEMPLATE_COMMENTS_TOOMUCH)%> <%helplink(templatecomments)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(row,_TEMPLATE_CTOOMUCH, COMMENTS_TOOMUCH, , 120)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_ARCHIVELIST)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_ARCHIVELIST)%> <%helplink(templatearchivelists)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_ARCHIVELIST)%> <%helplink(templatearchivelists)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_AHEADER, ARCHIVELIST_HEADER, , 130)%>\r
        <%edittemplateinfo(row,_TEMPLATE_AITEM, ARCHIVELIST_LISTITEM, , 140)%>\r
        <%edittemplateinfo(row,_TEMPLATE_AFOOTER, ARCHIVELIST_FOOTER, , 150)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_BLOGLIST)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_BLOGLIST)%> <%helplink(templatebloglists)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_BLOGLIST)%> <%helplink(templatebloglists)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_BLOGHEADER, BLOGLIST_HEADER, , 160)%>\r
        <%edittemplateinfo(row,_TEMPLATE_BLOGITEM, BLOGLIST_LISTITEM, , 170)%>\r
        <%edittemplateinfo(row,_TEMPLATE_BLOGFOOTER, BLOGLIST_FOOTER, , 180)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_CATEGORYLIST)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_CATEGORYLIST)%> <%helplink(templatecategorylists)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_CATEGORYLIST)%> <%helplink(templatecategorylists)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_CATHEADER, CATLIST_HEADER, , 190)%>\r
        <%edittemplateinfo(row,_TEMPLATE_CATITEM, CATLIST_LISTITEM, , 200)%>\r
        <%edittemplateinfo(row,_TEMPLATE_CATFOOTER, CATLIST_FOOTER, , 210)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_DATETIME)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_DATETIME)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_DATETIME)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_DHEADER, DATE_HEADER, dateheads, 220)%>\r
        <%edittemplateinfo(row,_TEMPLATE_DFOOTER, DATE_FOOTER, dateheads, 230)%>\r
        <%edittemplateinfo(row,_TEMPLATE_DFORMAT, FORMAT_DATE, datetime, 240)%>\r
        <%edittemplateinfo(row,_TEMPLATE_TFORMAT, FORMAT_TIME, datetime, 250)%>\r
        <%edittemplateinfo(row,_TEMPLATE_LOCALE, LOCALE, locale, 260)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_IMAGE)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_IMAGE)%> <%helplink(templatepopups)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_IMAGE)%> <%helplink(templatepopups)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_PCODE, POPUP_CODE, , 270)%>\r
        <%edittemplateinfo(row,_TEMPLATE_ICODE, IMAGE_CODE, , 280)%>\r
        <%edittemplateinfo(row,_TEMPLATE_MCODE, MEDIA_CODE, , 290)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_SEARCH)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_SEARCH)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_SEARCH)%></th>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
        <%edittemplateinfo(row,_TEMPLATE_SHIGHLIGHT, SEARCH_HIGHLIGHT, highlight,300)%>\r
        <%edittemplateinfo(row,_TEMPLATE_SNOTFOUND, SEARCH_NOTHINGFOUND, nothingfound,310)%>\r
-       </tr>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_PLUGIN_FIELDS)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_PLUGIN_FIELDS)%></th>\r
-       <%edittemplateinfo(extratemplate,admin/default)%>\r
+       <th colspan="2"><%text(_TEMPLATE_PLUGIN_FIELDS)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
+       <%edittemplateinfo(extratemplate,admin/default)%>\r
+       </tbody>\r
+       </table>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_UPDATE)%>">\r
+       <thead>\r
        <tr>\r
-       <th colspan="2">\r
-       <%text(_TEMPLATE_UPDATE)%></th>\r
+       <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
        </tr>\r
+       </thead>\r
+       <tbody>\r
        <tr>\r
        <td><%text(_TEMPLATE_UPDATE)%></td>\r
        <td>\r
@@ -3062,7 +3256,9 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
        <input type="reset" tabindex="810" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
        </td>\r
        </tr>\r
+       </tbody>\r
        </table>\r
+       \r
        </form>\r
        <%pagefoot%>\r
 ]]></part>\r
@@ -3600,10 +3796,10 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
        </tr>\r
 ]]></part>\r
 <part name="SKINIE_EXPORT_LIST"><![CDATA[\r
+       <tr>\r
        <td><input type="checkbox" name="<%typeid%>"  id="<%expid%>" /><label for="<%expid%>"><%expname%></label></td>\r
        <td><%expdesc%></td>\r
        </tr>\r
-       <tr>\r
 ]]></part>\r
 <part name="SHOWLIST_LISTPLUG_SELECT_HEAD"><![CDATA[\r
        <select name="<%name%>" tabindex="<%tabindex%>" <%javascript%>>\r
@@ -3655,7 +3851,6 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
 ]]></part>\r
 \r
 <part name="TEMPLATE_EDIT_ROW_HEAD"><![CDATA[\r
-       </tr>\r
        <tr>\r
        <td><%description%><%help%></td>\r
        <td id="td<%count%>">\r
@@ -3664,12 +3859,13 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
 <part name="TEMPLATE_EDIT_ROW_TAIL"><![CDATA[\r
        </textarea>\r
        </td>\r
+       </tr>\r
 ]]></part>\r
 \r
 <part name="TEMPLATE_EDIT_EXPLUGNAME"><![CDATA[\r
-       </tr>\r
        <tr>\r
        <th colspan="2"><%explugtplname%></th>\r
+       </tr>\r
 ]]></part>\r
 \r
 <part name="ADMIN_BATCHLIST"><![CDATA[\r