From e7b8e89d4dc5848bc82721a161a5ddedcffb9543 Mon Sep 17 00:00:00 2001 From: sakamocchi Date: Sun, 17 Jun 2012 13:19:29 +0900 Subject: [PATCH] =?utf8?q?FIX:=20skinieoverview/templateedit=E3=81=AE?= =?utf8?q?=E3=83=9E=E3=83=BC=E3=82=AF=E3=82=A2=E3=83=83=E3=83=97=E4=BF=AE?= =?utf8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nucleus/libs/AdminActions.php | 20 +- nucleus/libs/showlist.php | 6 +- skins/admin/default/skinbackup.xml | 478 ++++++++++++++++++++++++++----------- 3 files changed, 350 insertions(+), 154 deletions(-) diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php index 5efc9a7..a39c26c 100644 --- 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 = "\n" - . "\n" - . "<%explugtplname%>\n"; + $base = "\n" + . "<%explugtplname%>\n" + . ""; } else { @@ -4108,13 +4108,13 @@ class AdminActions extends BaseActions } if ( !array_key_exists('SKINIE_EXPORT_LIST', $templates) || empty($templates['SKINIE_EXPORT_LIST']) ) { - $template = "" - . "\" id=\"<%expid%>\" />\n" - . "\n" - . "\n" - . "<%expdesc%>\n" - . "\n" - . "\n"; + $template = "\n" + . "" + . "\" id=\"<%expid%>\" />\n" + . "\n" + . "\n" + . "<%expdesc%>\n" + . "\n"; } else { diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php index 31e3665..21648e0 100644 --- a/nucleus/libs/showlist.php +++ b/nucleus/libs/showlist.php @@ -966,8 +966,7 @@ function listplug_templateEditRow($content, $desc, $name, $help = '', $tabindex /* row head */ if ( !array_key_exists('TEMPLATE_EDIT_ROW_HEAD', $templates) || empty($tmplt['TEMPLATE_EDIT_ROW_HEAD']) ) { - $template = "" - . "\n" + $template = "\n" . "<%description%><%help%>\n" . "\">\n" . "\n" - . "\n"; + . "\n" + . "\n"; } else { diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml index faa1f98..4985ca2 100644 --- a/skins/admin/default/skinbackup.xml +++ b/skins/admin/default/skinbackup.xml @@ -312,35 +312,50 @@

<%text(_SKINIE_TITLE_EXPORT)%>

+
-

- - <%ticket%> - <%text(_SKINIE_EXPORT_INTRO)%> -

- +

<%text(_SKINIE_EXPORT_INTRO)%>

+ +
+ - + + <%skinielist(skin,admin/default)%> + +
<%text(_SKINIE_EXPORT_SKINS)%>
+ + + - - + + <%skinielist(template,admin/default)%> + +
<%text(_SKINIE_EXPORT_TEMPLATES)%>
+ + + + + - - - - - - +
<%text(_SKINIE_EXPORT_EXTRA)%>
<%text(_SKINIE_TITLE_EXPORT)%>
+ +

+ + <%ticket%> + +

+ +
<%pagefoot%> ]]> @@ -420,10 +435,14 @@ <%ticket%>

+ + + + @@ -433,17 +452,22 @@ - - - + +
<%text(_TEMPLATE_SETTINGS)%>
<%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%>
<%text(_TEMPLATE_UPDATE)%>
<%text(_TEMPLATE_UPDATE)%>
+ + + + + + <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_HEAD, NORMALSKINLIST_HEAD, ,8)%> <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_BODY, NORMALSKINLIST_BODY, ,9)%> <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_FOOT, NORMALSKINLIST_FOOT, ,10)%> @@ -451,55 +475,118 @@ <%edittemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_BODY, SPECIALSKINLIST_BODY, , 12)%> <%edittemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_FOOT, SPECIALSKINLIST_FOOT, , 13)%> <%edittemplateinfo(row, _ADM_TPLPT_SKINIE_EXPORT_LIST, SKINIE_EXPORT_LIST, , 17)%> - + +
<%text(_QMENU_LAYOUT_SKINS)%>
+ + + + + + <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_EXPLUGNAME, TEMPLATE_EDIT_EXPLUGNAME, , 18)%> <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_HEAD, TEMPLATE_EDIT_ROW_HEAD, , 19)%> <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_TAIL, TEMPLATE_EDIT_ROW_TAIL, , 20)%> - + +
<%text(_QMENU_LAYOUT_TEMPL)%>
+ + + - <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BLOGLINK, ADMIN_BLOGLINK, , 21)%> + + + <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BLOGLINK, ADMIN_BLOGLINK, , 21)%> + +
<%text(_SKINABLEADMIN_ADMINAREAHEADLINK)%>
+ + + - <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BATCHLIST, ADMIN_BATCHLIST, , 22)%> + + + <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BATCHLIST, ADMIN_BATCHLIST, , 22)%> + +
<%text(_SKINABLEADMIN_BATCH)%>
+ + + + + + <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TITLE, ACTIVATE_FORGOT_TITLE, , 23)%> <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TEXT, ACTIVATE_FORGOT_TEXT, , 24)%> <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TITLE, ACTIVATE_REGISTER_TITLE, , 25)%> <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TEXT, ACTIVATE_REGISTER_TEXT, , 26)%> <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TITLE, ACTIVATE_CHANGE_TITLE, , 27)%> <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TEXT, ACTIVATE_CHANGE_TEXT, , 28)%> - + +
<%text(_QMENU_ACTIVATE)%>
+ + + - <%edittemplateinfo(row, _ADM_TPLPT_SYSTEMINFO_GDSETTINGS, SYSTEMINFO_GDSETTINGS, , 29)%> + + + <%edittemplateinfo(row, _ADM_TPLPT_SYSTEMINFO_GDSETTINGS, SYSTEMINFO_GDSETTINGS, , 29)%> + +
<%text(_QMENU_MANAGE_SYSTEM)%>
+ + + - <%edittemplateinfo(row, _ADM_TPLPT_BANLIST_DELETED_LIST, BANLIST_DELETED_LIST, , 30)%> + + + <%edittemplateinfo(row, _ADM_TPLPT_BANLIST_DELETED_LIST, BANLIST_DELETED_LIST, , 30)%> + +
<%text(_BLOGLIST_BANS)%>
+ + + + + + <%edittemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_TITLE, INSERT_PLUGOPTION_TITLE, , 31)%> <%edittemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_BODY, INSERT_PLUGOPTION_BODY, , 32)%> <%edittemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_ADMIN, INPUTYESNO_TEMPLATE_ADMIN, , 33)%> <%edittemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_NORMAL, INPUTYESNO_TEMPLATE_NORMAL, , 34)%> <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ICON, ADMIN_CUSTOMHELPLINK_ICON, , 35)%> <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ANCHOR, ADMIN_CUSTOMHELPLINK_ANCHOR, , 36)%> - + +
<%text(_SKINABLEADMIN_TPLSETTING_INGENERAL)%>
+ + + + + + <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_HEAD, SHOWLIST_LISTPLUG_SELECT_HEAD, , 37)%> <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_BODY, SHOWLIST_LISTPLUG_SELECT_BODY, , 38)%> <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_FOOT, SHOWLIST_LISTPLUG_SELECT_FOOT, , 39)%> - + +
<%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT)%>
+ + + + + + <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_HEAD, SHOWLIST_LISTPLUG_TABLE_HEAD, , 40)%> <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BODY, SHOWLIST_LISTPLUG_TABLE_BODY, , 41)%> <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_FOOT, SHOWLIST_LISTPLUG_TABLE_FOOT, , 42)%> @@ -569,21 +656,41 @@ <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, , 106)%> <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, , 107)%> <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, , 108)%> - + +
<%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE)%>
+ + + + + + <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_TITLE, PLUGIN_QUICKMENU_TITLE, , 109)%> <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_HEAD, PLUGIN_QUICKMENU_HEAD, , 110)%> <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_BODY, PLUGIN_QUICKMENU_BODY, , 111)%> <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_FOOT, PLUGIN_QUICKMENU_FOOT, , 112)%> - + +
<%text(_SKINABLEADMIN_PLUGIN_QUICKMENU)%>
+ + + - <%edittemplateinfo(extratemplate,admin/default)%> + + + <%edittemplateinfo(extratemplate,admin/default)%> + +
<%text(_TEMPLATE_PLUGIN_FIELDS)%>
+ + + + + +
<%text(_TEMPLATE_UPDATE)%>
<%text(_TEMPLATE_UPDATE)%> @@ -591,7 +698,9 @@
+ <%pagefoot%> ]]> @@ -2648,75 +2757,88 @@ <%pagefoot%> ]]> -

(<%text(_BACKTOMANAGE)%>)

-

<%text(_SKINIE_TITLE_IMPORT)%>

-

- -

-<%if(skincandidates)%> -
-

- -<%ticket%> - - - -

-
-<%else%> -

-<%text(_SKINIE_NOCANDIDATES)%> -

-<%endif%> -

<%text(_OR)%>

-
-

-<%ticket%> - - - - - -

-
-

<%text(_SKINIE_TITLE_EXPORT)%>

-
-

- -<%ticket%> -<%text(_SKINIE_EXPORT_INTRO)%> -

- - - - - - - - -<%skinielist(skin,admin/default)%> - - - -<%skinielist(template,admin/default)%> - - - - - - - - - - - -
<%text(_SKINIE_EXPORT_SKINS)%>
<%text(_SKINIE_EXPORT_TEMPLATES)%>
<%text(_SKINIE_EXPORT_EXTRA)%>
<%text(_SKINIE_TITLE_EXPORT)%>
-
- -<%pagefoot%> + <%pagehead%> +

(<%text(_BACKTOMANAGE)%>)

+

<%text(_SKINIE_TITLE_IMPORT)%>

+

+ +

+ <%if(skincandidates)%> +
+

+ + <%ticket%> + + + +

+
+ <%else%> +

+ <%text(_SKINIE_NOCANDIDATES)%> +

+ <%endif%> +

<%text(_OR)%>

+
+

+ <%ticket%> + + + + + +

+
+ +

<%text(_SKINIE_TITLE_EXPORT)%>

+
+ +

<%text(_SKINIE_EXPORT_INTRO)%>

+ + + + + + + + + <%skinielist(skin,admin/default)%> + +
<%text(_SKINIE_EXPORT_SKINS)%>
+ + + + + + + + <%skinielist(template,admin/default)%> + +
<%text(_SKINIE_EXPORT_TEMPLATES)%>
+ + + + + + + + + + + +
<%text(_SKINIE_EXPORT_EXTRA)%>
+ +

+ + <%ticket%> + +

+ +
+ + <%pagefoot%> ]]> @@ -2950,10 +3072,13 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)

- +
+ + + @@ -2963,28 +3088,38 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename) - - - + +
<%text(_TEMPLATE_SETTINGS)%>
<%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%>
<%text(_TEMPLATE_UPDATE)%>
<%text(_TEMPLATE_UPDATE)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_ITEMHEADER,ITEM_HEADER,,8)%> <%edittemplateinfo(row,_TEMPLATE_ITEMBODY,ITEM,,9,1)%> <%edittemplateinfo(row,_TEMPLATE_ITEMFOOTER,ITEM_FOOTER,,10)%> <%edittemplateinfo(row,_TEMPLATE_MORELINK,MORELINK,morelink, 20)%> <%edittemplateinfo(row,_TEMPLATE_EDITLINK, EDITLINK, editlink, 25)%> <%edittemplateinfo(row,_TEMPLATE_NEW, NEW, new, 30)%> - + +
- <%text(_TEMPLATE_ITEMS)%> <%helplink(templateitems)%><%text(_TEMPLATE_ITEMS)%> <%helplink(templateitems)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_CHEADER, COMMENTS_HEADER, commentheaders, 40)%> <%edittemplateinfo(row,_TEMPLATE_CBODY, COMMENTS_BODY, commentbody, 50, 1)%> <%edittemplateinfo(row,_TEMPLATE_CFOOTER, COMMENTS_FOOTER, commentheaders, 60)%> @@ -2992,69 +3127,128 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename) <%edittemplateinfo(row,_TEMPLATE_CMANY, COMMENTS_MANY, commentwords, 80)%> <%edittemplateinfo(row,_TEMPLATE_CMORE, COMMENTS_CONTINUED, commentcontinued, 90)%> <%edittemplateinfo(row,_TEMPLATE_CMEXTRA, COMMENTS_AUTH, memberextra, 100)%> - + +
- <%text(_TEMPLATE_COMMENTS_ANY)%> <%helplink(templatecomments)%><%text(_TEMPLATE_COMMENTS_ANY)%> <%helplink(templatecomments)%>
+ + + - - <%edittemplateinfo(row,_TEMPLATE_CNONE, COMMENTS_NONE, , 110)%> + + + + <%edittemplateinfo(row,_TEMPLATE_CNONE, COMMENTS_NONE, , 110)%> + +
- <%text(_TEMPLATE_COMMENTS_NONE)%> <%helplink(templatecomments)%><%text(_TEMPLATE_COMMENTS_NONE)%> <%helplink(templatecomments)%>
+ + + - - <%edittemplateinfo(row,_TEMPLATE_CTOOMUCH, COMMENTS_TOOMUCH, , 120)%> + + + + <%edittemplateinfo(row,_TEMPLATE_CTOOMUCH, COMMENTS_TOOMUCH, , 120)%> + +
- <%text(_TEMPLATE_COMMENTS_TOOMUCH)%> <%helplink(templatecomments)%><%text(_TEMPLATE_COMMENTS_TOOMUCH)%> <%helplink(templatecomments)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_AHEADER, ARCHIVELIST_HEADER, , 130)%> <%edittemplateinfo(row,_TEMPLATE_AITEM, ARCHIVELIST_LISTITEM, , 140)%> <%edittemplateinfo(row,_TEMPLATE_AFOOTER, ARCHIVELIST_FOOTER, , 150)%> - + +
- <%text(_TEMPLATE_ARCHIVELIST)%> <%helplink(templatearchivelists)%><%text(_TEMPLATE_ARCHIVELIST)%> <%helplink(templatearchivelists)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_BLOGHEADER, BLOGLIST_HEADER, , 160)%> <%edittemplateinfo(row,_TEMPLATE_BLOGITEM, BLOGLIST_LISTITEM, , 170)%> <%edittemplateinfo(row,_TEMPLATE_BLOGFOOTER, BLOGLIST_FOOTER, , 180)%> - + +
- <%text(_TEMPLATE_BLOGLIST)%> <%helplink(templatebloglists)%><%text(_TEMPLATE_BLOGLIST)%> <%helplink(templatebloglists)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_CATHEADER, CATLIST_HEADER, , 190)%> <%edittemplateinfo(row,_TEMPLATE_CATITEM, CATLIST_LISTITEM, , 200)%> <%edittemplateinfo(row,_TEMPLATE_CATFOOTER, CATLIST_FOOTER, , 210)%> - + +
- <%text(_TEMPLATE_CATEGORYLIST)%> <%helplink(templatecategorylists)%><%text(_TEMPLATE_CATEGORYLIST)%> <%helplink(templatecategorylists)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_DHEADER, DATE_HEADER, dateheads, 220)%> <%edittemplateinfo(row,_TEMPLATE_DFOOTER, DATE_FOOTER, dateheads, 230)%> <%edittemplateinfo(row,_TEMPLATE_DFORMAT, FORMAT_DATE, datetime, 240)%> <%edittemplateinfo(row,_TEMPLATE_TFORMAT, FORMAT_TIME, datetime, 250)%> <%edittemplateinfo(row,_TEMPLATE_LOCALE, LOCALE, locale, 260)%> - + +
- <%text(_TEMPLATE_DATETIME)%><%text(_TEMPLATE_DATETIME)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_PCODE, POPUP_CODE, , 270)%> <%edittemplateinfo(row,_TEMPLATE_ICODE, IMAGE_CODE, , 280)%> <%edittemplateinfo(row,_TEMPLATE_MCODE, MEDIA_CODE, , 290)%> - + +
- <%text(_TEMPLATE_IMAGE)%> <%helplink(templatepopups)%><%text(_TEMPLATE_IMAGE)%> <%helplink(templatepopups)%>
+ + + - + + + + <%edittemplateinfo(row,_TEMPLATE_SHIGHLIGHT, SEARCH_HIGHLIGHT, highlight,300)%> <%edittemplateinfo(row,_TEMPLATE_SNOTFOUND, SEARCH_NOTHINGFOUND, nothingfound,310)%> - + +
- <%text(_TEMPLATE_SEARCH)%><%text(_TEMPLATE_SEARCH)%>
+ + + - - <%edittemplateinfo(extratemplate,admin/default)%> + + + + <%edittemplateinfo(extratemplate,admin/default)%> + +
- <%text(_TEMPLATE_PLUGIN_FIELDS)%><%text(_TEMPLATE_PLUGIN_FIELDS)%>
+ + + - + + + +
- <%text(_TEMPLATE_UPDATE)%><%text(_TEMPLATE_UPDATE)%>
<%text(_TEMPLATE_UPDATE)%> @@ -3062,7 +3256,9 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)
+ <%pagefoot%> ]]> @@ -3600,10 +3796,10 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename) ]]> <%expdesc%> - ]]> " tabindex="<%tabindex%>" <%javascript%>> @@ -3655,7 +3851,6 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename) ]]> <%description%><%help%> @@ -3664,12 +3859,13 @@ Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename) + ]]> <%explugtplname%> + ]]>