From 5201ce84818bdc8d4045173eb674314d4850ebb5 Mon Sep 17 00:00:00 2001 From: shizuki Date: Tue, 29 May 2012 13:38:35 +0900 Subject: [PATCH] =?utf8?q?ADD:=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?utf8?q?=E3=83=88=E3=81=AE=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E3=81=8A?= =?utf8?q?=E3=82=88=E3=81=B3=E3=83=96=E3=83=83=E3=82=AF=E3=83=9E=E3=83=BC?= =?utf8?q?=E3=82=AF=E3=83=AC=E3=83=83=E3=83=88=E7=94=A8=E3=82=B9=E3=82=AD?= =?utf8?q?=E3=83=B3=E9=81=B8=E6=8A=9E=E3=83=9C=E3=83=83=E3=82=AF=E3=82=B9?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20=E3=80=8C=E3=82=B0=E3=83=AD?= =?utf8?q?=E3=83=BC=E3=83=90=E3=83=AB=E8=A8=AD=E5=AE=9A=E3=80=8D=E7=94=BB?= =?utf8?q?=E9=9D=A2=E3=81=AB=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88?= =?utf8?q?=E3=81=AE=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E3=81=8A=E3=82=88?= =?utf8?q?=E3=81=B3=E3=83=96=E3=83=83=E3=82=AF=E3=83=9E=E3=83=BC=E3=82=AF?= =?utf8?q?=E3=83=AC=E3=83=83=E3=83=88=E7=94=A8=E3=82=B9=E3=82=AD=E3=83=B3?= =?utf8?q?=E9=81=B8=E6=8A=9E=E7=94=A8=E3=81=AE=E3=82=B9=E3=82=AD=E3=83=B3?= =?utf8?q?=E5=A4=89=E6=95=B0<%defadminskinselect%><%defbookmarkletselect%>?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20=E4=B8=8A=EF=BC=92=E3=81=A4?= =?utf8?q?=E3=81=AE=E8=A1=A8=E7=A4=BA=E7=94=A8=E3=81=AB=E6=97=A5=E6=9C=AC?= =?utf8?q?=E8=AA=9E=E3=81=A8=E8=8B=B1=E8=AA=9E=E3=81=AE=E7=BF=BB=E8=A8=B3?= =?utf8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E7=BF=BB=E8=A8=B3?= =?utf8?q?=E6=96=87=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nucleus/libs/ADMIN.php | 4 ++- nucleus/libs/AdminActions.php | 50 +++++++++++++++++++++++++++++++ nucleus/locales/en_Latn_US.ISO-8859-1.php | 2 ++ nucleus/locales/en_Latn_US.UTF-8.php | 2 ++ nucleus/locales/ja_Jpan_JP.EUC-JP.php | 2 ++ nucleus/locales/ja_Jpan_JP.UTF-8.php | 2 ++ skins/admin/default/skinbackup.xml | 12 +++++--- 7 files changed, 69 insertions(+), 5 deletions(-) diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index 9606792..12d3bab 100644 --- a/nucleus/libs/ADMIN.php +++ b/nucleus/libs/ADMIN.php @@ -4686,7 +4686,9 @@ class Admin self::updateConfig('DebugVars', postVar('DebugVars')); self::updateConfig('DefaultListSize', postVar('DefaultListSize')); self::updateConfig('AdminCSS', postVar('AdminCSS')); - + self::updateConfig('AdminSkin', postVar('adminskin')); + self::updateConfig('BookmarkletSkin', postVar('bookmarklet')); + // load new config and redirect (this way, the new locale will be used is necessary) // note that when changing cookie settings, this redirect might cause the user // to have to log in again. diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php index 8029584..84e8e8d 100644 --- a/nucleus/libs/AdminActions.php +++ b/nucleus/libs/AdminActions.php @@ -472,6 +472,8 @@ class AdminActions extends BaseActions 'editmember', 'localeselectoptions', 'pluginoptions', + 'defadminskinselect', + 'defbookmarkletselect', ); break; case 'forgotpassword': @@ -575,6 +577,8 @@ class AdminActions extends BaseActions 'localeselectoptions', 'mediadirwarning', 'pluginextras', + 'defadminskinselect', + 'defbookmarkletselect', ); break; case 'showlogin': @@ -1173,6 +1177,52 @@ class AdminActions extends BaseActions } return; } + + /** + * AdminActions::parse_defadminskinselect() + * Parse skinvar defadminskinselect + * + * @param string $template_name name of template to use + * @return void + */ + public function parse_defadminskinselect($template_name) + { + global $CONF; + + $query = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%'"; + $query = sprintf($query, sql_table('skin_desc')); + + $template = array( + 'name' => 'adminskin', + 'tabindex' => 10080, + 'selected' => $CONF['AdminSkin'] + ); + $this->parser->parse(showlist($query, 'select', $template, $template_name)); + return; + } + + /** + * AdminActions::parse_defbookmarkletselect() + * Parse skinvar defbookmarkletselect + * + * @param string $template_name name of template to use + * @return void + */ + public function parse_defbookmarkletselect($template_name) + { + global $CONF; + + $query = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%'"; + $query = sprintf($query, sql_table('skin_desc')); + + $template = array( + 'name' => 'bookmarklet', + 'tabindex' => 10085, + 'selected' => $CONF['BookmarkletSkin'] + ); + $this->parser->parse(showlist($query, 'select', $template, $template_name)); + return; + } /** * AdminActions::parse_batchdeletetype() diff --git a/nucleus/locales/en_Latn_US.ISO-8859-1.php b/nucleus/locales/en_Latn_US.ISO-8859-1.php index fe0863a..edfa183 100644 --- a/nucleus/locales/en_Latn_US.ISO-8859-1.php +++ b/nucleus/locales/en_Latn_US.ISO-8859-1.php @@ -32,6 +32,8 @@ define('_LISTS_AUTHOR', 'Author'); define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts'); define('_ERROR_BADADMINSKINNAME', 'the name of skin for admin area must start with \'admin/\'.'); define('_ERROR_BADADMINTEMPLATENAME', 'the name of template for admin area must start with \'admin/\'.'); +define('_SETTINGS_ADMINSKIN', 'default skin for admin area'); +define('_SETTINGS_BKMKLTSKIN', 'default skin for bookmarklet'); /******************************************** * Start New for 3.6x * diff --git a/nucleus/locales/en_Latn_US.UTF-8.php b/nucleus/locales/en_Latn_US.UTF-8.php index d45c3ce..97241fd 100644 --- a/nucleus/locales/en_Latn_US.UTF-8.php +++ b/nucleus/locales/en_Latn_US.UTF-8.php @@ -32,6 +32,8 @@ define('_LISTS_AUTHOR', 'Author'); define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts'); define('_ERROR_BADADMINSKINNAME', 'the name of skin for admin area must start with \'admin/\'.'); define('_ERROR_BADADMINTEMPLATENAME', 'the name of template for admin area must start with \'admin/\'.'); +define('_SETTINGS_ADMINSKIN', 'default skin for admin area'); +define('_SETTINGS_BKMKLTSKIN', 'default skin for bookmarklet'); /******************************************** * Start New for 3.6x * diff --git a/nucleus/locales/ja_Jpan_JP.EUC-JP.php b/nucleus/locales/ja_Jpan_JP.EUC-JP.php index 5988bf9..bbfc124 100644 --- a/nucleus/locales/ja_Jpan_JP.EUC-JP.php +++ b/nucleus/locales/ja_Jpan_JP.EUC-JP.php @@ -39,6 +39,8 @@ define('_LISTS_AUTHOR', ' define('_OVERVIEW_OTHER_DRAFTS', '¤½¤Î¾¤Î¥É¥é¥Õ¥È'); define('_ERROR_BADADMINSKINNAME', '´ÉÍý²èÌÌÍÑ¥¹¥­¥ó̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£'); define('_ERROR_BADADMINTEMPLATENAME', '´ÉÍý²èÌÌÍÑ¥¹¥­¥ó¤Î¥Æ¥ó¥×¥ì¡¼¥È̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£'); +define('_SETTINGS_ADMINSKIN', '¥Ç¥Õ¥©¥ë¥È¤Î´ÉÍý²èÌÌÍÑ¥¹¥­¥ó'); +define('_SETTINGS_BKMKLTSKIN', '¥Ç¥Õ¥©¥ë¥È¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¥ì¥Ã¥ÈÍÑ¥¹¥­¥ó'); /******************************************** * Start New for 3.64 * diff --git a/nucleus/locales/ja_Jpan_JP.UTF-8.php b/nucleus/locales/ja_Jpan_JP.UTF-8.php index 05db2d6..c5e045a 100644 --- a/nucleus/locales/ja_Jpan_JP.UTF-8.php +++ b/nucleus/locales/ja_Jpan_JP.UTF-8.php @@ -39,6 +39,8 @@ define('_LISTS_AUTHOR', '著者'); define('_OVERVIEW_OTHER_DRAFTS', 'その他のドラフト'); define('_ERROR_BADADMINSKINNAME', '管理画面用スキン名は先頭が「admin/」で始まっている必要があります。'); define('_ERROR_BADADMINTEMPLATENAME', '管理画面用スキンのテンプレート名は先頭が「admin/」で始まっている必要があります。'); +define('_SETTINGS_ADMINSKIN', 'デフォルトの管理画面用スキン'); +define('_SETTINGS_BKMKLTSKIN', 'デフォルトのブックマークレット用スキン'); /******************************************** * Start New for 3.64 * diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml index 614058d..f4ad29b 100644 --- a/skins/admin/default/skinbackup.xml +++ b/skins/admin/default/skinbackup.xml @@ -2259,8 +2259,12 @@ ADMIN Area Default skin]]> -<%text(_SETTINGS_ADMINCSS)%> - +<%text(_SETTINGS_ADMINSKIN)%> +<%defadminskinselect(admin/default%> + + +<%text(_SETTINGS_BKMKLTSKIN)%> +<%defbookmarkletselect(admin/default%> <%text(_SETTINGS_MEDIA)%> <%helplink(media)%> @@ -2274,11 +2278,11 @@ ADMIN Area Default skin]]> <%text(_SETTINGS_MEDIAURL)%> - + <%text(_SETTINGS_ALLOWUPLOAD)%> -<%configsettingsyesno(AllowUpload, 10090)%> +<%configsettingsyesno(AllowUpload, 10095)%> <%text(_SETTINGS_ALLOWUPLOADTYPES)%> -- 2.11.0