'.
- '
'.
-
- '
'.__('Time format:').
+ '
'.
+
+ '
'.__('Time format:').''.
form::field('time_format',30,255,html::escapeHTML($blog_settings->system->time_format)).
- '
'.
+ ''.
'
'.
@@ -500,11 +500,11 @@
''.__('Default image insertion attributes').'
'.
- ''.__('Image size:').
+ ''.__('Image size:').''.
form::combo('media_img_default_size',$img_default_size_combo,
(html::escapeHTML($blog_settings->system->media_img_default_size) != '' ? html::escapeHTML($blog_settings->system->media_img_default_size) : 'm')).
- '
'.
- ''.__('Image alignment').
+ '
'.
+ ''.__('Image alignment').''.
form::combo('media_img_default_alignment',$img_default_alignment_combo,html::escapeHTML($blog_settings->system->media_img_default_alignment)).
- '
'.
+ ''.
'
'.
form::checkbox('media_img_default_link','1',$blog_settings->system->media_img_default_link).
Index: admin/blog_theme.php
===================================================================
--- admin/blog_theme.php (revision 1358)
+++ admin/blog_theme.php (revision 1428)
@@ -173,7 +173,7 @@
''.
''.
- '
'.form::radio(array('theme',$radio_id),html::escapeHTML($id),$current,'','',($has_parent && !$is_parent_present)).' '.
+ ''.form::radio(array('theme',$radio_id),html::escapeHTML($id),$current,'','',($has_parent && !$is_parent_present)).' '.
''.
- html::escapeHTML($details['name']).'
'.
+ html::escapeHTML($details['name']).''.
'
'.html::escapeHTML($details['desc']).' '.
''.sprintf(__('by %s'),html::escapeHTML($details['author'])).' '.
@@ -187,5 +187,5 @@
}
if ($has_css) {
- $res .= ''.__('Stylesheet').'';
+ $res .= ''.__('Stylesheet').'';
}
$res .= '
';
@@ -244,18 +244,11 @@
}
- if ($can_install) {
- echo
- '
'.sprintf(__('You can find additional themes for your blog on %s.'),
- 'Dotaddict').' '.
- __('To install or upgrade a theme you generally just need to upload it '.
- 'in "Install or upgrade a theme" section.').'
';
- }
-
# Themes list
- echo '
';
+ echo '
'.
+ '
'.__('Available themes in your installation').'
';
$themes = $core->themes->getModules();
if (isset($themes[$core->blog->settings->system->theme])) {
- echo '
'.sprintf(__('You are currently using "%s"'),$themes[$core->blog->settings->system->theme]['name']).'
';
+ echo '
'.sprintf(__('You are currently using "%s"'),$themes[$core->blog->settings->system->theme]['name']).'.
';
}
@@ -279,13 +272,12 @@
echo
- '
'.
- $core->formNonce().
- '
';
-
+ '
'.
''.
@@ -296,9 +288,12 @@
{
echo
- '
';
+ '
'.
+ '
'.__('Add themes to your installation').'
'.
+ '
'.sprintf(__('You can find additional themes for your blog on %s.'),
+ 'Dotaddict').'
';
if ($is_writable)
{
- echo '
'.__('You can install themes by uploading or downloading zip files.').'
';
+ echo '
'.__('You can also install themes by uploading or downloading zip files.').'
';
# 'Upload theme' form
@@ -307,8 +302,8 @@
'