「グローバル設定」画面にデフォルトの管理画面およびブックマークレット用スキン選択用のスキン変数<%defadminskinselect%><%defbookmarkletselect%>を追加
上2つの表示用に日本語と英語の翻訳ファイルに翻訳文を追加
self::updateConfig('DebugVars', postVar('DebugVars'));\r
self::updateConfig('DefaultListSize', postVar('DefaultListSize'));\r
self::updateConfig('AdminCSS', postVar('AdminCSS'));\r
- \r
+ self::updateConfig('AdminSkin', postVar('adminskin'));\r
+ self::updateConfig('BookmarkletSkin', postVar('bookmarklet'));\r
+\r
// load new config and redirect (this way, the new locale will be used is necessary)\r
// note that when changing cookie settings, this redirect might cause the user\r
// to have to log in again.\r
'editmember',
'localeselectoptions',
'pluginoptions',
+ 'defadminskinselect',
+ 'defbookmarkletselect',
);
break;
case 'forgotpassword':
'localeselectoptions',
'mediadirwarning',
'pluginextras',
+ 'defadminskinselect',
+ 'defbookmarkletselect',
);
break;
case 'showlogin':
}
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()
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 *
define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
define('_ERROR_BADADMINSKINNAME', 'the name of skin for admin area must start with \'admin/\'.');\r
define('_ERROR_BADADMINTEMPLATENAME', 'the name of template for admin area must start with \'admin/\'.');\r
+define('_SETTINGS_ADMINSKIN', 'default skin for admin area');
+define('_SETTINGS_BKMKLTSKIN', 'default skin for bookmarklet');
/********************************************
* Start New for 3.6x *
define('_OVERVIEW_OTHER_DRAFTS', '¤½¤Î¾¤Î¥É¥é¥Õ¥È');
define('_ERROR_BADADMINSKINNAME', '´ÉÍý²èÌÌÍÑ¥¹¥¥ó̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£');
define('_ERROR_BADADMINTEMPLATENAME', '´ÉÍý²èÌÌÍÑ¥¹¥¥ó¤Î¥Æ¥ó¥×¥ì¡¼¥È̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£');
+define('_SETTINGS_ADMINSKIN', '¥Ç¥Õ¥©¥ë¥È¤Î´ÉÍý²èÌÌÍÑ¥¹¥¥ó');
+define('_SETTINGS_BKMKLTSKIN', '¥Ç¥Õ¥©¥ë¥È¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¥ì¥Ã¥ÈÍÑ¥¹¥¥ó');
/********************************************
* Start New for 3.64 *
define('_OVERVIEW_OTHER_DRAFTS', 'その他のドラフト');
define('_ERROR_BADADMINSKINNAME', '管理画面用スキン名は先頭が「admin/」で始まっている必要があります。');
define('_ERROR_BADADMINTEMPLATENAME', '管理画面用スキンのテンプレート名は先頭が「admin/」で始まっている必要があります。');
+define('_SETTINGS_ADMINSKIN', 'デフォルトの管理画面用スキン');
+define('_SETTINGS_BKMKLTSKIN', 'デフォルトのブックマークレット用スキン');
/********************************************
* Start New for 3.64 *
<td><input name="DefaultListSize" tabindex="10079" size="40" value="<%configsettingsedit(DefaultListSize)%>" /></td>\r
</tr>\r
<tr>\r
-<td><%text(_SETTINGS_ADMINCSS)%></td>\r
-<td><select name="AdminCSS" tabindex="10080"><%adminstyleselectoptions%></select></td>\r
+<td><%text(_SETTINGS_ADMINSKIN)%></td>\r
+<td><%defadminskinselect(admin/default%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_BKMKLTSKIN)%></td>\r
+<td><%defbookmarkletselect(admin/default%></td>\r
</tr>\r
<tr>\r
<th colspan="2"><%text(_SETTINGS_MEDIA)%> <%helplink(media)%></th>\r
</tr>\r
<tr>\r
<td><%text(_SETTINGS_MEDIAURL)%></td>\r
-<td><input name="MediaURL" tabindex="10080" size="40" value="<%configsettingsedit(MediaURL)%>" /></td>\r
+<td><input name="MediaURL" tabindex="10090" size="40" value="<%configsettingsedit(MediaURL)%>" /></td>\r
</tr>\r
<tr>\r
<td><%text(_SETTINGS_ALLOWUPLOAD)%></td>\r
-<td><%configsettingsyesno(AllowUpload, 10090)%></td>\r
+<td><%configsettingsyesno(AllowUpload, 10095)%></td>\r
</tr>\r
<tr>\r
<td><%text(_SETTINGS_ALLOWUPLOADTYPES)%></td>\r