From: sakamocchi Date: Mon, 21 May 2012 14:13:40 +0000 (+0900) Subject: FIX: 通常/管理画面共に、スキンの編集・複製・削除ページのURLが固定だったのを修正 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49fc547715c44916b4b183c357454c047dd82ddb;p=nucleus-jp%2Fnucleus-next.git FIX: 通常/管理画面共に、スキンの編集・複製・削除ページのURLが固定だったのを修正 listplug_table_skinlist()、listplug_table_adminskinlist()で<%editurl%>、<%cloneurl%>、<%deleteurl%>が使えるように修正。合わせてスキンファイルも修正。 --- diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php index 0d37d8d..5a09e7e 100644 --- a/nucleus/libs/showlist.php +++ b/nucleus/libs/showlist.php @@ -1537,10 +1537,10 @@ function listplug_table_templatelist($vars, $type, $templateName = '') $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY']; } - $deleteurl = $CONF['AdminURL'] . "index.php?action=templatedelete&templateid={$current->tdnumber}"; - $editurl = $CONF['AdminURL'] . "index.php?action=templateedit&templateid={$current->tdnumber}"; - $cloneurl = $CONF['AdminURL'] . "index.php?action=templateclone&templateid={$current->tdnumber}"; - $url = "index.php?action=templateclone&templateid={$current->tdnumber}"; + $deleteurl = "{$CONF['AdminURL']}index.php?action=templatedelete&templateid={$current->tdnumber}"; + $editurl = "{$CONF['AdminURL']}index.php?action=templateedit&templateid={$current->tdnumber}"; + $cloneurl = "{$CONF['AdminURL']}index.php?action=templateclone&templateid={$current->tdnumber}"; + $data = array( 'templatename' => Entity::hsc($current->tdname), 'templatedesc' => Entity::hsc($current->tddesc), @@ -1625,7 +1625,10 @@ function listplug_table_skinlist($vars, $type, $templateName = '') $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY']; } - $url = $manager->addTicketToUrl('index.php?action=skinclone&skinid=' . intval($current->sdnumber)); + $editurl = "{$CONF['AdminURL']}index.php?action=skinedit&skinid={$current->sdnumber}"; + $cloneurl = "{$CONF['AdminURL']}index.php?action=skinclone&skinid={$current->sdnumber}"; + $deleteurl = "{$CONF['AdminURL']}index.php?action=skindelete&skinid={$current->sdnumber}"; + $data = array( 'skintypelabel' => _LISTS_TYPE, 'skintype' => Entity::hsc($current->sdtype), @@ -1636,7 +1639,9 @@ function listplug_table_skinlist($vars, $type, $templateName = '') 'skindesc' => Entity::hsc($current->sddesc), 'skinid' => (integer) $current->sdnumber, 'tabindex' => $vars['tabindex'], - 'cloneurl' => Entity::hsc($url), + 'editurl' => Entity::hsc($manager->addTicketToUrl($editurl)), + 'cloneurl' => Entity::hsc($manager->addTicketToUrl($cloneurl)), + 'deleteurl' => Entity::hsc($manager->addTicketToUrl($deleteurl)), 'editbtn' => _LISTS_EDIT, 'clonebtn' => _LISTS_CLONE, 'delbtn' => _LISTS_DELETE, @@ -2036,7 +2041,10 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '') $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY']; } - $url = $manager->addTicketToUrl('index.php?action=adminskinclone&skinid=' . intval($current->sdnumber)); + $editurl = "{$CONF['AdminURL']}index.php?action=adminskinedit&skinid={$current->sdnumber}"; + $cloneurl = "{$CONF['AdminURL']}index.php?action=adminskinclone&skinid={$current->sdnumber}"; + $deleteurl = "{$CONF['AdminURL']}index.php?action=adminskindelete&skinid={$current->sdnumber}"; + $data = array( 'skintypelabel' => _LISTS_TYPE, 'skintype' => Entity::hsc($current->sdtype), @@ -2047,7 +2055,9 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '') 'skindesc' => Entity::hsc($current->sddesc), 'skinid' => (integer) $current->sdnumber, 'tabindex' => $vars['tabindex'], - 'cloneurl' => Entity::hsc($url), + 'editurl' => Entity::hsc($manager->addTicketToUrl($editurl)), + 'cloneurl' => Entity::hsc($manager->addTicketToUrl($cloneurl)), + 'deleteurl' => Entity::hsc($manager->addTicketToUrl($deleteurl)), 'editbtn' => _LISTS_EDIT, 'clonebtn' => _LISTS_CLONE, 'delbtn' => _LISTS_DELETE, @@ -2183,9 +2193,9 @@ function listplug_table_admintemplatelist($vars, $type, $templateName = '') { $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY']; } - $deleteurl = $CONF['AdminURL'] . "index.php?action=admintemplatedelete&templateid={$current->tdnumber}"; - $editurl = $CONF['AdminURL'] . "index.php?action=admintemplateedit&templateid={$current->tdnumber}"; - $cloneurl = $CONF['AdminURL'] . "index.php?action=admintemplateclone&templateid={$current->tdnumber}"; + $deleteurl = "{$CONF['AdminURL']}index.php?action=admintemplatedelete&templateid={$current->tdnumber}"; + $editurl = "{$CONF['AdminURL']}index.php?action=admintemplateedit&templateid={$current->tdnumber}"; + $cloneurl = "{$CONF['AdminURL']}index.php?action=admintemplateclone&templateid={$current->tdnumber}"; $data = array( 'templatename' => Entity::hsc($current->tdname), 'templatedesc' => Entity::hsc($current->tddesc), diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml index 68f136c..9cf771e 100644 --- a/skins/admin/default/skinbackup.xml +++ b/skins/admin/default/skinbackup.xml @@ -2573,24 +2573,34 @@ selector(); <%reason%> <%delbtn%> ]]> - <%colname%><%coldesc%><%colact%> -]]> - <%skinname%>

-<%skintypelabel%> <%skintype%>
-<%incmodelabel%> <%incmode%>
-<%incpreflabel%> <%incpref%>
-<%skinthumb%> -<%readme%> -<%skindesc%><%skinparts%> - -<%editbtn%> - - -<%clonebtn%> - - -<%delbtn%> - +<%colname%> + <%coldesc%> + <%colact%> +]]> +<%skinname%>

+ <%skintypelabel%> <%skintype%>
+ <%incmodelabel%> <%incmode%>
+ <%incpreflabel%> <%incpref%>
+ <%skinthumb%> + <%readme%> + <%skindesc%><%skinparts%> + + + <%editbtn%> + + + + + <%clonebtn%> + + + + + <%delbtn%> + + ]]> <%settingtext%>