diff options
| -rw-r--r-- | lib/plugins/config/admin.php | 7 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 8 | ||||
| -rw-r--r-- | lib/plugins/config/style.css | 18 |
3 files changed, 30 insertions, 3 deletions
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 4cf3ea9b1..1e12df53a 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -152,7 +152,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { $error = $setting->error() ? ' class="value error"' : ' class="value"'; ptln(' <tr'.$class.'>'); - ptln(' <td><span title="$'.$this->_config->_name.'[\''.$setting->_out_key().'\']">'.$label.'</span></td>'); + ptln(' <td class="label">'); + ptln(' <span class="outkey">'.$setting->_out_key(true).'</span>'); + ptln(' '.$label); + ptln(' </td>'); ptln(' <td'.$error.'>'.$input.'</td>'); ptln(' </tr>'); } @@ -178,7 +181,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { $undefined_setting_key = $setting->_key; } ptln(' <tr>'); - ptln(' <td><span title="$meta[\''.$undefined_setting_key.'\']">$'.$this->_config->_name.'[\''.$setting->_out_key().'\']</span></td>'); + ptln(' <td class="label"><span title="$meta[\''.$undefined_setting_key.'\']">$'.$this->_config->_name.'[\''.$setting->_out_key().'\']</span></td>'); ptln(' <td>'.$this->getLang('_msg_'.get_class($setting)).'</td>'); ptln(' </tr>'); } diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 1a116cb34..909cc01de 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -412,7 +412,13 @@ if (!class_exists('setting')) { function is_default() { return !$this->is_protected() && is_null($this->_local); } function error() { return $this->_error; } - function _out_key() { return str_replace(CM_KEYMARKER,"']['",$this->_key); } + function _out_key($pretty=false) { + if($pretty){ + return str_replace(CM_KEYMARKER,"»",$this->_key); + }else{ + return str_replace(CM_KEYMARKER,"']['",$this->_key); + } + } } } diff --git a/lib/plugins/config/style.css b/lib/plugins/config/style.css index 5fbefa41a..291353c53 100644 --- a/lib/plugins/config/style.css +++ b/lib/plugins/config/style.css @@ -32,6 +32,23 @@ /* fixed data column width */ width: 30em; } + +#config__manager td.label { + padding: 0.8em 0 0.6em 1em; + vertical-align: top; +} + +#config__manager td.label span.outkey { + font-size: 70%; + margin-top: -1.7em; + margin-left: -1em; + display: block; + background-color: __background__; + color: __text_neu__; + float: left; + padding: 0 0.1em; +} + #config__manager td input.edit { width: 30em; } @@ -81,6 +98,7 @@ font-size: 90%; } + /* IE6 correction */ * html #config__manager .selection label { padding-top: 2px; |