dotclear
/
dotclear
mirror of https://git.dotclear.org/dev/dotclear
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Let fieldsets be fieldsets (work in progress): blogpref, category, blogtheme, langs, media, plugins, user actions, antispam, importexport.

2.6
Anne Kozlika 2013-08-20 16:47:16 +02:00
parent 606e9ccdb7
commit 936e9dafe9
74 changed files with 204 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
admin/blog_pref.php
View File

@ -302,7 +302,7 @@ if ($blog_id)
'<form action="'.$action.'" method="post" id="blog-form">'; '<form action="'.$action.'" method="post" id="blog-form">';
echo echo
'<fieldset><legend>'.__('Blog details').'</legend>'. '<div class="fieldset"><h4>'.__('Blog details').'</h4>'.
$core->formNonce(); $core->formNonce();
if ($core->auth->isSuperAdmin()) if ($core->auth->isSuperAdmin())
@ -334,11 +334,11 @@ if ($blog_id)
echo echo
'<p class="area"><label for="blog_desc">'.__('Blog description:').'</label>'. '<p class="area"><label for="blog_desc">'.__('Blog description:').'</label>'.
form::textarea('blog_desc',60,5,html::escapeHTML($blog_desc)).'</p>'. form::textarea('blog_desc',60,5,html::escapeHTML($blog_desc)).'</p>'.
'</fieldset>'; '</div>';
echo echo
'<fieldset><legend>'.__('Blog configuration').'</legend>'. '<div class="fieldset"><h4>'.__('Blog configuration').'</h4>'.
'<div class="two-cols">'. '<div class="two-cols">'.
'<div class="col">'. '<div class="col">'.
'<p><label for="editor">'.__('Blog editor name:').'</label>'. '<p><label for="editor">'.__('Blog editor name:').'</label>'.
@ -392,25 +392,24 @@ if ($blog_id)
'</div>'. '</div>'.
'</div>'. '</div>'.
'<br class="clear" />'. //Opera sucks '<br class="clear" />'. //Opera sucks
'</fieldset>'; '</div>';
echo echo
'<fieldset><legend>'.__('Comments and trackbacks').'</legend>'. '<div class="fieldset"><h4>'.__('Comments and trackbacks').'</h4>'.
'<div class="two-cols">'. '<div class="two-cols">'.
'<div class="col">'. '<div class="col">'.
'<p><label for="allow_comments" class="classic">'. '<p><label for="allow_comments" class="classic">'.
form::checkbox('allow_comments','1',$blog_settings->system->allow_comments). form::checkbox('allow_comments','1',$blog_settings->system->allow_comments).
__('Accept comments').'</label></p>'. __('Accept comments').'</label></p>'.
'<p><label for="comments_pub" class="classic">'. '<p><label for="comments_pub" class="classic">'.
form::checkbox('comments_pub','1',!$blog_settings->system->comments_pub). form::checkbox('comments_pub','1',!$blog_settings->system->comments_pub).
__('Moderate comments').'</label></p>'. __('Moderate comments').'</label></p>'.
'<p><label for="comments_ttl" class="classic">'.sprintf(__('Leave comments open for %s days'), '<p><label for="comments_ttl" class="classic">'.sprintf(__('Leave comments open for %s days'),
form::field('comments_ttl',2,3,$blog_settings->system->comments_ttl)). form::field('comments_ttl',2,3,$blog_settings->system->comments_ttl)).
'</label></p>'. '</label></p>'.
'<p class="form-note">'.__('Leave blank to disable this feature.').'</p>'. '<p class="form-note">'.__('Leave blank to disable this feature.').'</p>'.
'<p><label for="wiki_comments" class="classic">'. '<p><label for="wiki_comments" class="classic">'.
form::checkbox('wiki_comments','1',$blog_settings->system->wiki_comments). form::checkbox('wiki_comments','1',$blog_settings->system->wiki_comments).
__('Wiki syntax for comments').'</label></p>'. __('Wiki syntax for comments').'</label></p>'.
@ -419,26 +418,25 @@ if ($blog_id)
'<div class="col">'. '<div class="col">'.
'<p><label for="allow_trackbacks" class="classic">'. '<p><label for="allow_trackbacks" class="classic">'.
form::checkbox('allow_trackbacks','1',$blog_settings->system->allow_trackbacks). form::checkbox('allow_trackbacks','1',$blog_settings->system->allow_trackbacks).
__('Accept trackbacks').'</label></p>'. __('Accept trackbacks').'</label></p>'.
'<p><label for="trackbacks_pub" class="classic">'. '<p><label for="trackbacks_pub" class="classic">'.
form::checkbox('trackbacks_pub','1',!$blog_settings->system->trackbacks_pub). form::checkbox('trackbacks_pub','1',!$blog_settings->system->trackbacks_pub).
__('Moderate trackbacks').'</label></p>'. __('Moderate trackbacks').'</label></p>'.
'<p><label for="trackbacks_ttl" class="classic">'.sprintf(__('Leave trackbacks open for %s days'), '<p><label for="trackbacks_ttl" class="classic">'.sprintf(__('Leave trackbacks open for %s days'),
form::field('trackbacks_ttl',2,3,$blog_settings->system->trackbacks_ttl)).'</label></p>'. form::field('trackbacks_ttl',2,3,$blog_settings->system->trackbacks_ttl)).'</label></p>'.
'<p class="form-note">'.__('Leave blank to disable this feature.').'</p>'. '<p class="form-note">'.__('Leave blank to disable this feature.').'</p>'.
'<p><label for="comments_nofollow" class="classic">'. '<p><label for="comments_nofollow" class="classic">'.
form::checkbox('comments_nofollow','1',$blog_settings->system->comments_nofollow). form::checkbox('comments_nofollow','1',$blog_settings->system->comments_nofollow).
__('Add "nofollow" relation on comments and trackbacks links').'</label></p>'. __('Add "nofollow" relation on comments and trackbacks links').'</label></p>'.
'</div>'. '</div>'.
'<br class="clear" />'. //Opera sucks
'</div>'. '</div>'.
'<br class="clear" />'. //Opera sucks '<br class="clear" />'. //Opera sucks
'</fieldset>'; '</div>';
echo echo
'<fieldset><legend>'.__('Blog presentation').'</legend>'. '<div class="fieldset"><h4>'.__('Blog presentation').'</h4>'.
'<div class="two-cols">'. '<div class="two-cols">'.
'<div class="col">'. '<div class="col">'.
'<p><label for="date_format">'.__('Date format:').'</label>'. '<p><label for="date_format">'.__('Date format:').'</label>'.
@ -473,13 +471,13 @@ if ($blog_id)
'</div>'. '</div>'.
'</div>'. '</div>'.
'<br class="clear" />'. //Opera sucks '<br class="clear" />'. //Opera sucks
'</fieldset>'; '</div>';
echo echo
'<fieldset><legend>'.__('Media and images').'</legend>'. '<div class="fieldset"><h4>'.__('Media and images').'</h4>'.
'<div class="two-cols">'. '<div class="two-cols">'.
'<div class="col">'. '<div class="col">'.
'<h4>'.__('Generated image sizes (in pixels)').'</h4>'. '<h5>'.__('Generated image sizes (in pixels)').'</h5>'.
'<p class="field"><label for="media_img_t_size">'.__('Thumbnails:').' '. '<p class="field"><label for="media_img_t_size">'.__('Thumbnails:').' '.
form::field('media_img_t_size',3,3,$blog_settings->system->media_img_t_size).'</label></p>'. form::field('media_img_t_size',3,3,$blog_settings->system->media_img_t_size).'</label></p>'.
@ -491,14 +489,14 @@ if ($blog_id)
'</div>'. '</div>'.
'<div class="col">'. '<div class="col">'.
'<h4><label for="media_img_title_pattern">'.__('Inserted image title').'</label></h4>'. '<h5><label for="media_img_title_pattern">'.__('Inserted image title').'</label></h5>'.
'<p>'.__('This defines image tag title when you insert it in a post from the media manager. It is retrieved from the picture\'s metadata.').'</p>'. '<p>'.__('This defines image tag title when you insert it in a post from the media manager. It is retrieved from the picture\'s metadata.').'</p>'.
'<p>'.form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).'</p>'. '<p>'.form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).'</p>'.
'<p><label for="media_img_use_dto_first" class="classic">'. '<p><label for="media_img_use_dto_first" class="classic">'.
form::checkbox('media_img_use_dto_first','1',$blog_settings->system->media_img_use_dto_first). form::checkbox('media_img_use_dto_first','1',$blog_settings->system->media_img_use_dto_first).
__('Use original media date if possible').'</label></p>'. __('Use original media date if possible').'</label></p>'.
'<h4>'.__('Default image insertion attributes').'</h4>'. '<h5>'.__('Default image insertion attributes').'</h5>'.
'<p><label for="media_img_default_size">'.__('Image size:').'</label>'. '<p><label for="media_img_default_size">'.__('Image size:').'</label>'.
form::combo('media_img_default_size',$img_default_size_combo, 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')). (html::escapeHTML($blog_settings->system->media_img_default_size) != '' ? html::escapeHTML($blog_settings->system->media_img_default_size) : 'm')).
@ -511,11 +509,12 @@ if ($blog_id)
__('As a link to original image').'</label></p>'. __('As a link to original image').'</label></p>'.
'</div>'. '</div>'.
'</div>'. '</div>'.
'<br class="clear" />'. //Opera sucks
'</fieldset>'; '</div>';
echo echo
'<fieldset><legend>'.__('Search engines robots policy').'</legend>'; '<div class="fieldset"><h4>'.__('Search engines robots policy').'</h4>';
$i = 0; $i = 0;
foreach ($robots_policy_options as $k => $v) foreach ($robots_policy_options as $k => $v)
@ -525,7 +524,7 @@ if ($blog_id)
$i++; $i++;
} }
echo '</fieldset>'; echo '</div>';
# --BEHAVIOR-- adminBlogPreferencesForm # --BEHAVIOR-- adminBlogPreferencesForm

22
admin/blog_theme.php
View File

@ -249,7 +249,7 @@ if (!$theme_conf_mode)
$themes = $core->themes->getModules(); $themes = $core->themes->getModules();
if (isset($themes[$core->blog->settings->system->theme])) { if (isset($themes[$core->blog->settings->system->theme])) {
echo '<p>'.sprintf(__('You are currently using "%s"'),$themes[$core->blog->settings->system->theme]['name']).'.</p>'; echo '<p>'.sprintf(__('You are currently using <strong>%s</strong>'),$themes[$core->blog->settings->system->theme]['name']).'.</p>';
} }
echo echo
@ -298,30 +298,26 @@ if (!$theme_conf_mode)
# 'Upload theme' form # 'Upload theme' form
echo echo
'<form method="post" action="blog_theme.php" id="uploadpkg" enctype="multipart/form-data">'. '<form method="post" action="blog_theme.php" id="uploadpkg" enctype="multipart/form-data" class="fieldset">'.
'<fieldset>'. '<h4>'.__('Upload a zip file').'</h4>'.
'<legend>'.__('Upload a zip file').'</legend>'.
'<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Theme zip file:').'</label> '. '<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Theme zip file:').'</label> '.
'<input type="file" name="pkg_file" id="pkg_file" /></p>'. '<input type="file" name="pkg_file" id="pkg_file" /></p>'.
'<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '. '<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
form::password(array('your_pwd','your_pwd1'),20,255).'</p>'. form::password(array('your_pwd','your_pwd1'),20,255).'</p>'.
'<input type="submit" name="upload_pkg" value="'.__('Upload theme').'" />'. '<p><input type="submit" name="upload_pkg" value="'.__('Upload theme').'" />'.
$core->formNonce(). $core->formNonce().'</p>'.
'</fieldset>'.
'</form>'; '</form>';
# 'Fetch theme' form # 'Fetch theme' form
echo echo
'<form method="post" action="blog_theme.php" id="fetchpkg">'. '<form method="post" action="blog_theme.php" id="fetchpkg" class="fieldset">'.
'<fieldset>'. '<h4>'.__('Download a zip file').'</h4>'.
'<legend>'.__('Download a zip file').'</legend>'.
'<p class="field"><label for="pkg_url" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Theme zip file URL:').'</label> '. '<p class="field"><label for="pkg_url" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Theme zip file URL:').'</label> '.
form::field(array('pkg_url','pkg_url'),40,255).'</p>'. form::field(array('pkg_url','pkg_url'),40,255).'</p>'.
'<p class="field"><label for="your_pwd2" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '. '<p class="field"><label for="your_pwd2" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
form::password(array('your_pwd','your_pwd2'),20,255).'</p>'. form::password(array('your_pwd','your_pwd2'),20,255).'</p>'.
'<input type="submit" name="fetch_pkg" value="'.__('Download theme').'" />'. '<p><input type="submit" name="fetch_pkg" value="'.__('Download theme').'" />'.
$core->formNonce(). $core->formNonce().'</p>'.
'</fieldset>'.
'</form>'; '</form>';
} }
else else

10
admin/category.php
View File

@ -225,27 +225,25 @@ if ($cat_id)
'<div class="two-cols">'. '<div class="two-cols">'.
'<div class="col">'. '<div class="col">'.
'<form action="category.php" method="post">'. '<form action="category.php" method="post" class="fieldset">'.
'<fieldset><legend>'.__('Category parent').'</legend>'. '<h4>'.__('Category parent').'</h4>'.
'<p><label for="cat_parent" class="classic">'.__('Parent:').'</label> '. '<p><label for="cat_parent" class="classic">'.__('Parent:').'</label> '.
form::combo('cat_parent',$allowed_parents,$cat_parent).'</p>'. form::combo('cat_parent',$allowed_parents,$cat_parent).'</p>'.
'<p><input type="submit" accesskey="s" value="'.__('Save').'" />'. '<p><input type="submit" accesskey="s" value="'.__('Save').'" />'.
form::hidden(array('id'),$cat_id).$core->formNonce().'</p>'. form::hidden(array('id'),$cat_id).$core->formNonce().'</p>'.
'</fieldset>'.
'</form>'. '</form>'.
'</div>'; '</div>';
if (count($siblings) > 0) { if (count($siblings) > 0) {
echo echo
'<div class="col">'. '<div class="col">'.
'<form action="category.php" method="post">'. '<form action="category.php" method="post" class="fieldset">'.
'<fieldset><legend>'.__('Category sibling').'</legend>'. '<h4>'.__('Category sibling').'</h4>'.
'<p><label class="classic" for="cat_sibling">'.__('Move current category').'</label> '. '<p><label class="classic" for="cat_sibling">'.__('Move current category').'</label> '.
form::combo('cat_move',array(__('before')=>'before',__('after')=>'after'),'','','',false,'title="'.__('position: ').'"').' '. form::combo('cat_move',array(__('before')=>'before',__('after')=>'after'),'','','',false,'title="'.__('position: ').'"').' '.
form::combo('cat_sibling',$siblings).'</p>'. form::combo('cat_sibling',$siblings).'</p>'.
'<p><input type="submit" accesskey="s" value="'.__('Save').'" />'. '<p><input type="submit" accesskey="s" value="'.__('Save').'" />'.
form::hidden(array('id'),$cat_id).$core->formNonce().'</p>'. form::hidden(array('id'),$cat_id).$core->formNonce().'</p>'.
'</fieldset>'.
'</form>'. '</form>'.
'</div>'; '</div>';
} }

5
admin/index.php
View File

@ -325,8 +325,8 @@ if ($core->auth->user_prefs->dashboard->quickentry) {
echo echo
'<div id="quick">'. '<div id="quick">'.
'<h3>'.__('Quick entry').'</h3>'. '<h3>'.__('Quick entry').'</h3>'.
'<form id="quick-entry" action="post.php" method="post">'. '<form id="quick-entry" action="post.php" method="post" class="fieldset">'.
'<fieldset><legend>'.__('New entry').'</legend>'. '<h4>'.__('New entry').'</h4>'.
'<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'. '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
form::field('post_title',20,255,'','maximal'). form::field('post_title',20,255,'','maximal').
'</p>'. '</p>'.
@ -357,7 +357,6 @@ if ($core->auth->user_prefs->dashboard->quickentry) {
form::hidden('post_lang',$core->auth->getInfo('user_lang')). form::hidden('post_lang',$core->auth->getInfo('user_lang')).
form::hidden('post_notes',''). form::hidden('post_notes','').
'</p>'. '</p>'.
'</fieldset>'.
'</form>'. '</form>'.
'</div>'; '</div>';
} }

14
admin/langs.php
View File

@ -221,9 +221,8 @@ if (!empty($dc_langs) && $is_writable)
} }
echo echo
'<form method="post" action="langs.php" enctype="multipart/form-data">'. '<form method="post" action="langs.php" enctype="multipart/form-data" class="fieldset">'.
'<fieldset>'. '<h4>'.__('Available languages').'</h4>'.
'<legend>'.__('Available languages').'</legend>'.
'<p>'.sprintf(__('You can download and install a additional language directly from Dotclear.net. '. '<p>'.sprintf(__('You can download and install a additional language directly from Dotclear.net. '.
'Proposed languages are based on your version: %s.'),'<strong>'.DC_VERSION.'</strong>').'</p>'. 'Proposed languages are based on your version: %s.'),'<strong>'.DC_VERSION.'</strong>').'</p>'.
'<p class="field"><label for="pkg_url" class="classic">'.__('Language:').'</label> '. '<p class="field"><label for="pkg_url" class="classic">'.__('Language:').'</label> '.
@ -232,7 +231,7 @@ if (!empty($dc_langs) && $is_writable)
form::password(array('your_pwd','your_pwd1'),20,255).'</p>'. form::password(array('your_pwd','your_pwd1'),20,255).'</p>'.
'<p><input type="submit" value="'.__('Install language').'" />'. '<p><input type="submit" value="'.__('Install language').'" />'.
$core->formNonce(). $core->formNonce().
'</p></fieldset>'. '</p>'.
'</form>'; '</form>';
} }
@ -240,9 +239,8 @@ if ($is_writable)
{ {
# 'Upload language pack' form # 'Upload language pack' form
echo echo
'<form method="post" action="langs.php" enctype="multipart/form-data">'. '<form method="post" action="langs.php" enctype="multipart/form-data" class="fieldset">'.
'<fieldset>'. '<h4>'.__('Upload a zip file').'</h4>'.
'<legend>'.__('Upload a zip file').'</legend>'.
'<p>'.__('You can install languages by uploading zip files.').'</p>'. '<p>'.__('You can install languages by uploading zip files.').'</p>'.
'<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Language zip file:').'</label> '. '<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Language zip file:').'</label> '.
'<input type="file" id="pkg_file" name="pkg_file" /></p>'. '<input type="file" id="pkg_file" name="pkg_file" /></p>'.
@ -250,7 +248,7 @@ if ($is_writable)
form::password(array('your_pwd','your_pwd2'),20,255).'</p>'. form::password(array('your_pwd','your_pwd2'),20,255).'</p>'.
'<p><input type="submit" name="upload_pkg" value="'.__('Upload language').'" />'. '<p><input type="submit" name="upload_pkg" value="'.__('Upload language').'" />'.
$core->formNonce(). $core->formNonce().
'</p></fieldset>'. '</p>'.
'</form>'; '</form>';
} }

8
admin/media.php
View File

@ -394,15 +394,15 @@ if ($core_media_writable)
echo echo
'<div class="col">'. '<div class="col">'.
'<form class="clear" action="'.html::escapeURL($page_url).'" method="post">'. '<form class="clear fieldset" action="'.html::escapeURL($page_url).'" method="post">'.
'<fieldset id="new-dir-f">'. '<div id="new-dir-f">'.
'<legend>'.__('New directory').'</legend>'. '<h3>'.__('New directory').'</h3>'.
$core->formNonce(). $core->formNonce().
'<p><label for="newdir">'.__('Directory Name:').'</label>'. '<p><label for="newdir">'.__('Directory Name:').'</label>'.
form::field(array('newdir','newdir'),35,255).'</p>'. form::field(array('newdir','newdir'),35,255).'</p>'.
'<p><input type="submit" value="'.__('Create').'" />'. '<p><input type="submit" value="'.__('Create').'" />'.
form::hidden(array('d'),html::escapeHTML($d)).'</p>'. form::hidden(array('d'),html::escapeHTML($d)).'</p>'.
'</fieldset>'. '</div>'.
'</form></div>'; '</form></div>';
echo '</div>'; echo '</div>';

26
admin/media_item.php
View File

@ -488,18 +488,20 @@ if ($file->type == 'image/jpeg')
echo '</div>'; echo '</div>';
echo '<h3>'.__('Updates and modifications').'</h3>';
if ($file->editable && $core_media_writable) if ($file->editable && $core_media_writable)
{ {
if ($file->media_type == 'image') if ($file->media_type == 'image')
{ {
echo echo
'<form class="clear" action="'.html::escapeURL($page_url).'" method="post">'. '<form class="clear fieldset" action="'.html::escapeURL($page_url).'" method="post">'.
'<fieldset><legend>'.__('Update thumbnails').'</legend>'. '<h4>'.__('Update thumbnails').'</h4>'.
'<p>'.__('This will create or update thumbnails for this image.').'</p>'. '<p>'.__('This will create or update thumbnails for this image.').'</p>'.
'<p><input type="submit" name="thumbs" value="'.__('Update thumbnails').'" />'. '<p><input type="submit" name="thumbs" value="'.__('Update thumbnails').'" />'.
form::hidden(array('id'),$id). form::hidden(array('id'),$id).
$core->formNonce().'</p>'. $core->formNonce().'</p>'.
'</fieldset></form>'; '</form>';
} }
if ($file->type == 'application/zip') if ($file->type == 'application/zip')
@ -510,8 +512,8 @@ if ($file->editable && $core_media_writable)
); );
echo echo
'<form class="clear" id="file-unzip" action="'.html::escapeURL($page_url).'" method="post">'. '<form class="clear fieldset" id="file-unzip" action="'.html::escapeURL($page_url).'" method="post">'.
'<fieldset><legend>'.__('Extract archive').'</legend>'. '<h4>'.__('Extract archive').'</h4>'.
'<ul>'. '<ul>'.
'<li><strong>'.__('Extract in a new directory').'</strong> : '. '<li><strong>'.__('Extract in a new directory').'</strong> : '.
__('This will extract archive in a new directory that should not exist yet.').'</li>'. __('This will extract archive in a new directory that should not exist yet.').'</li>'.
@ -523,12 +525,12 @@ if ($file->editable && $core_media_writable)
'<input type="submit" name="unzip" value="'.__('Extract').'" />'. '<input type="submit" name="unzip" value="'.__('Extract').'" />'.
form::hidden(array('id'),$id). form::hidden(array('id'),$id).
$core->formNonce().'</p>'. $core->formNonce().'</p>'.
'</fieldset></form>'; '</form>';
} }
echo echo
'<form class="clear" action="'.html::escapeURL($page_url).'" method="post">'. '<form class="clear fieldset" action="'.html::escapeURL($page_url).'" method="post">'.
'<fieldset><legend>'.__('Change media properties').'</legend>'. '<h4>'.__('Change media properties').'</h4>'.
'<p><label for="media_file">'.__('File name:').'</label>'. '<p><label for="media_file">'.__('File name:').'</label>'.
form::field('media_file',30,255,html::escapeHTML($file->basename)).'</p>'. form::field('media_file',30,255,html::escapeHTML($file->basename)).'</p>'.
'<p><label for="media_title">'.__('File title:').'</label>'. '<p><label for="media_title">'.__('File title:').'</label>'.
@ -542,11 +544,11 @@ if ($file->editable && $core_media_writable)
'<p><input type="submit" accesskey="s" value="'.__('Save').'" />'. '<p><input type="submit" accesskey="s" value="'.__('Save').'" />'.
form::hidden(array('id'),$id). form::hidden(array('id'),$id).
$core->formNonce().'</p>'. $core->formNonce().'</p>'.
'</fieldset></form>'; '</form>';
echo echo
'<form class="clear" action="'.html::escapeURL($page_url).'" method="post" enctype="multipart/form-data">'. '<form class="clear fieldset" action="'.html::escapeURL($page_url).'" method="post" enctype="multipart/form-data">'.
'<fieldset><legend>'.__('Change file').'</legend>'. '<h4>'.__('Change file').'</h4>'.
'<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).'</div>'. '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).'</div>'.
'<p><label for="upfile">'.__('Choose a file:'). '<p><label for="upfile">'.__('Choose a file:').
' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).') '. ' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).') '.
@ -555,7 +557,7 @@ if ($file->editable && $core_media_writable)
'<p><input type="submit" value="'.__('Send').'" />'. '<p><input type="submit" value="'.__('Send').'" />'.
form::hidden(array('id'),$id). form::hidden(array('id'),$id).
$core->formNonce().'</p>'. $core->formNonce().'</p>'.
'</fieldset></form>'; '</form>';
if ($file->del) { if ($file->del) {
echo echo

12
admin/plugins.php
View File

@ -353,23 +353,21 @@ if ($is_writable)
# 'Upload plugin' form # 'Upload plugin' form
echo echo
'<form method="post" action="plugins.php" id="uploadpkg" enctype="multipart/form-data">'. '<form method="post" action="plugins.php" id="uploadpkg" enctype="multipart/form-data" class="fieldset">'.
'<fieldset>'. '<h3>'.__('Upload a zip file').'</h3>'.
'<legend>'.__('Upload a zip file').'</legend>'.
'<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file:').'</label> '. '<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file:').'</label> '.
'<input type="file" id="pkg_file" name="pkg_file" /></p>'. '<input type="file" id="pkg_file" name="pkg_file" /></p>'.
'<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '. '<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
form::password(array('your_pwd','your_pwd1'),20,255).'</p>'. form::password(array('your_pwd','your_pwd1'),20,255).'</p>'.
'<p><input type="submit" name="upload_pkg" value="'.__('Upload plugin').'" />'. '<p><input type="submit" name="upload_pkg" value="'.__('Upload plugin').'" />'.
$core->formNonce(). $core->formNonce().
'</p></fieldset>'. '</p>'.
'</form>'; '</form>';
# 'Fetch plugin' form # 'Fetch plugin' form
echo echo
'<form method="post" action="plugins.php" id="fetchpkg">'. '<form method="post" action="plugins.php" id="fetchpkg" class="fieldset">'.
'<fieldset>'. '<h3>'.__('Download a zip file').'</h3>'.
'<legend>'.__('Download a zip file').'</legend>'.
'<p class="field"><label for="pkg_url" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file URL:').'</label> '. '<p class="field"><label for="pkg_url" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file URL:').'</label> '.
form::field(array('pkg_url','pkg_url'),40,255).'</p>'. form::field(array('pkg_url','pkg_url'),40,255).'</p>'.
'<p class="field"><label for="your_pwd2" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '. '<p class="field"><label for="your_pwd2" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.

29
admin/style/default.css
View File

@ -813,24 +813,27 @@ li.media-action input {
#theme-box { #theme-box {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
padding: 1rem 0; padding: 0;
width: 312px; width: 312px;
background: #eef;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 3px; border-radius: 3px;
} }
#theme-box div.theme-shot img { #theme-box .theme-shot,
#theme-box .theme-info,
#theme-box .theme-actions {
background: #eef;
padding: 1em 16px;
margin: 0;
}
#theme-box .theme-shot img {
display: block; display: block;
margin: 0 16px;
width: 280px; width: 280px;
height: 245px; height: 245px;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
#theme-box div.theme-info {
margin: 1em 16px;
}
#theme-box h4 { #theme-box h4 {
color: #000; color: #000;
background: #eef;
} }
#theme-box span.theme-version { #theme-box span.theme-version {
color: #666; color: #666;
@ -842,10 +845,10 @@ li.media-action input {
color: #c00; color: #c00;
font-weight:bold; font-weight:bold;
} }
#theme-box div.theme-actions { #theme-box .theme-actions {
padding: 0 16px; border-bottom: 1px solid #ccc;
} }
#themes div.theme-details-js { #themes .theme-details-js {
float: left; float: left;
width: 120px; width: 120px;
height: 150px; height: 150px;
@ -857,14 +860,14 @@ li.media-action input {
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
} }
#themes div.theme-details-js label { #themes .theme-details-js label {
cursor: pointer; cursor: pointer;
} }
#themes div.theme-details-js.theme-selected { #themes .theme-details-js.theme-selected {
background: #ddd; background: #ddd;
border: 1px solid #999; border: 1px solid #999;
} }
#themes div.theme-details-js div.theme-shot img { #themes .theme-details-js .theme-shot img {
width: 120px; width: 120px;
height: 105px; height: 105px;
border: 1px solid #fff; border: 1px solid #fff;

11
admin/users_actions.php
View File

@ -178,6 +178,8 @@ else
form::hidden(array('nb'),$_POST['nb']); form::hidden(array('nb'),$_POST['nb']);
} }
echo '<p><a class="back" href="'.html::escapeURL($redir).'">'.__('Back to user profile').'</a></p>';
# --BEHAVIOR-- adminUsersActionsContent # --BEHAVIOR-- adminUsersActionsContent
$core->callBehavior('adminUsersActionsContent',$core,$action,$hidden_fields); $core->callBehavior('adminUsersActionsContent',$core,$action,$hidden_fields);
@ -262,7 +264,7 @@ elseif (!empty($blogs) && !empty($users) && $action == 'perms')
foreach ($blogs as $b) foreach ($blogs as $b)
{ {
echo '<h3><a href="blog.php?id='.html::escapeHTML($b).'">'.html::escapeHTML($b).'</a>'. echo '<h3>'.('Blog:').' <a href="blog.php?id='.html::escapeHTML($b).'">'.html::escapeHTML($b).'</a>'.
form::hidden(array('blogs[]'),$b).'</h3>'; form::hidden(array('blogs[]'),$b).'</h3>';
foreach ($core->auth->getPermissionsTypes() as $perm_id => $perm) foreach ($core->auth->getPermissionsTypes() as $perm_id => $perm)
@ -282,18 +284,17 @@ elseif (!empty($blogs) && !empty($users) && $action == 'perms')
} }
echo echo
'<fieldset><legend>'.__('Validate permissions').'</legend>'. '<div class="fieldset">'.
'<h3>'.__('Validate permissions').'</h3>'.
'<p><label for="your_pwd">'.__('Your password:').'</label>'. '<p><label for="your_pwd">'.__('Your password:').'</label>'.
form::password('your_pwd',20,255).'</p>'. form::password('your_pwd',20,255).'</p>'.
'</fieldset>'.
'<p><input type="submit" accesskey="s" value="'.__('Save').'" />'. '<p><input type="submit" accesskey="s" value="'.__('Save').'" />'.
$hidden_fields. $hidden_fields.
form::hidden(array('action'),'updateperm'). form::hidden(array('action'),'updateperm').
$core->formNonce().'</p>'. $core->formNonce().'</p>'.
'</div>'.
'</form>'; '</form>';
} }
echo '<p><a class="back" href="'.html::escapeURL($redir).'">'.__('back').'</a></p>';
dcPage::close(); dcPage::close();
?> ?>

2
locales/bn/main.po
View File

@ -458,7 +458,7 @@ msgid "Themes"
msgstr "থিমসমূহ" msgstr "থিমসমূহ"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "আপনি বর্তমানে ব্যবহার করছেন \"%s\"" msgstr "আপনি বর্তমানে ব্যবহার করছেন \"%s\""
#, fuzzy #, fuzzy

2
locales/bn/plugins.po
View File

@ -837,7 +837,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/ca/main.po
View File

@ -467,7 +467,7 @@ msgid "Themes"
msgstr "Temes" msgstr "Temes"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
#, fuzzy #, fuzzy

2
locales/ca/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/cs/main.po
View File

@ -456,7 +456,7 @@ msgid "Themes"
msgstr "Vzhledy" msgstr "Vzhledy"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Používáte \"%s\" vzhled" msgstr "Používáte \"%s\" vzhled"
#, fuzzy #, fuzzy

2
locales/cs/plugins.po
View File

@ -842,7 +842,7 @@ msgid "Import a single blog"
msgstr "Importovat jeden blog" msgstr "Importovat jeden blog"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Tímto naimportujete zálohu jednoho blogu jako nový obsah tohoto blogu: %s." msgstr "Tímto naimportujete zálohu jednoho blogu jako nový obsah tohoto blogu: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/da/main.po
View File

@ -458,7 +458,7 @@ msgid "Themes"
msgstr "Temaer" msgstr "Temaer"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Du bruger lige nu \"%s\"" msgstr "Du bruger lige nu \"%s\""
#, fuzzy #, fuzzy

2
locales/da/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/de/main.po
View File

@ -456,7 +456,7 @@ msgid "Themes"
msgstr "Themes" msgstr "Themes"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Du verwendest gerade \"%s\"" msgstr "Du verwendest gerade \"%s\""
#, fuzzy #, fuzzy

2
locales/de/plugins.po
View File

@ -842,7 +842,7 @@ msgid "Import a single blog"
msgstr "Importiere einen einzelnen Blog" msgstr "Importiere einen einzelnen Blog"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Dies wird einen einzelnen Blog als neuen Inhalt in den aktuellen Blog importieren: %s." msgstr "Dies wird einen einzelnen Blog als neuen Inhalt in den aktuellen Blog importieren: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/en/main.po
View File

@ -452,7 +452,7 @@ msgid "Themes"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
msgid "Use selected theme" msgid "Use selected theme"

2
locales/en/plugins.po
View File

@ -851,7 +851,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/eo/main.po
View File

@ -452,7 +452,7 @@ msgid "Themes"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
msgid "Use selected theme" msgid "Use selected theme"

2
locales/eo/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/es-ar/main.po
View File

@ -459,7 +459,7 @@ msgid "Themes"
msgstr "Temas" msgstr "Temas"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Actualmente usas \"%s\"" msgstr "Actualmente usas \"%s\""
#, fuzzy #, fuzzy

2
locales/es-ar/plugins.po
View File

@ -843,7 +843,7 @@ msgid "Import a single blog"
msgstr "Importar un blig individual" msgstr "Importar un blig individual"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Esto importará un archivo de resguardo de un blog individual como contenido nuevo del actual blog: %s." msgstr "Esto importará un archivo de resguardo de un blog individual como contenido nuevo del actual blog: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/es/main.po
View File

@ -461,7 +461,7 @@ msgid "Themes"
msgstr "Temas" msgstr "Temas"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Actualmente está usando «%s»" msgstr "Actualmente está usando «%s»"
#, fuzzy #, fuzzy

2
locales/es/plugins.po
View File

@ -848,7 +848,7 @@ msgid "Import a single blog"
msgstr "Importar un blog" msgstr "Importar un blog"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Esto importará una copia de respaldo de un único blog como nuevo contenido del blog en uso: %s." msgstr "Esto importará una copia de respaldo de un único blog como nuevo contenido del blog en uso: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/eu/main.po
View File

@ -452,7 +452,7 @@ msgid "Themes"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
msgid "Use selected theme" msgid "Use selected theme"

2
locales/eu/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

15
locales/fr/main.po
View File

@ -480,8 +480,8 @@ msgid "Themes"
msgstr "Thèmes" msgstr "Thèmes"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Vous utilisez actuellement \"%s\"" msgstr "Vous utilisez actuellement <strong>%s</strong>"
msgid "Use selected theme" msgid "Use selected theme"
msgstr "Utiliser le thème sélectionné" msgstr "Utiliser le thème sélectionné"
@ -3127,4 +3127,13 @@ msgid "Finish the update"
msgstr "Finir la mise à jour" msgstr "Finir la mise à jour"
msgid "Information about this version" msgid "Information about this version"
psgstr "Informations sur cette version" msgstr "Informations sur cette version"
msgid "Updates and modifications"
msgstr "Mises à jour et modifications"
msgid "Back to user profile"
msgstr "Retour au profil utilisateur"
msgid "Back to Blog themes"
msgstr "Retour à Apparence du blog"

4
locales/fr/plugins.po
View File

@ -960,10 +960,10 @@ msgstr "Êtes-vous sûr de vouloir importer un fichier de sauvegarde complet ?"
#, php-format #, php-format
msgid "" msgid ""
"This will import a single blog backup as new content in the current blog: %s." "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
"Cela importera une sauvegarde d'un blog comme nouveau contenu du blog " "Cela importera une sauvegarde d'un blog comme nouveau contenu du blog "
"courant : %s." "courant : <strong>%s</strong>."
msgid "Upload a backup file" msgid "Upload a backup file"
msgstr "Téléversez un fichier de sauvegarde" msgstr "Téléversez un fichier de sauvegarde"

2
locales/hu/main.po
View File

@ -464,7 +464,7 @@ msgid "Themes"
msgstr "Témák" msgstr "Témák"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "A \"%s\"-t használod" msgstr "A \"%s\"-t használod"
#, fuzzy #, fuzzy

2
locales/hu/plugins.po
View File

@ -844,7 +844,7 @@ msgid "Import a single blog"
msgstr "Egyedüli blog importálása" msgstr "Egyedüli blog importálása"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Ezzel egy egyedüli blogot fogok importálni új tartalomként ide: %s" msgstr "Ezzel egy egyedüli blogot fogok importálni új tartalomként ide: %s"
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/it/main.po
View File

@ -455,7 +455,7 @@ msgid "Themes"
msgstr "Temi" msgstr "Temi"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Attualmente è in uso \"%s\"" msgstr "Attualmente è in uso \"%s\""
#, fuzzy #, fuzzy

2
locales/it/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/ja/main.po
View File

@ -464,7 +464,7 @@ msgid "Themes"
msgstr "テーマ" msgstr "テーマ"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "現在使用中のテーマ： %s" msgstr "現在使用中のテーマ： %s"
#, fuzzy #, fuzzy

2
locales/ja/plugins.po
View File

@ -845,7 +845,7 @@ msgid "Import a single blog"
msgstr "単独ブログのインポート" msgstr "単独ブログのインポート"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "これは単独ブログのバックアップを、現在のブログ「%s」の新しいコンテンツとしてインポートします。" msgstr "これは単独ブログのバックアップを、現在のブログ「%s」の新しいコンテンツとしてインポートします。"
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/ko/main.po
View File

@ -463,7 +463,7 @@ msgid "Themes"
msgstr "테마" msgstr "테마"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "현재 사용 중인 테마 : \"%s\"" msgstr "현재 사용 중인 테마 : \"%s\""
#, fuzzy #, fuzzy

2
locales/ko/plugins.po
View File

@ -845,7 +845,7 @@ msgid "Import a single blog"
msgstr "단일 블로그 가져오기" msgstr "단일 블로그 가져오기"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "이 과정은, 백업된 단일 블로그 내용을 현재 블로그 (%s) 의 새 내용으로 가져옵니다." msgstr "이 과정은, 백업된 단일 블로그 내용을 현재 블로그 (%s) 의 새 내용으로 가져옵니다."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/lt/main.po
View File

@ -431,7 +431,7 @@ msgid "Themes"
msgstr "Temos" msgstr "Temos"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Šiuo metu jūs naudojate \"%s\"" msgstr "Šiuo metu jūs naudojate \"%s\""
msgid "use selected theme" msgid "use selected theme"

2
locales/lt/plugins.po
View File

@ -807,7 +807,7 @@ msgid "Import a single blog"
msgstr "Importuoti vieną blogą" msgstr "Importuoti vieną blogą"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Importuojama viena blogo atsarginė kopija kaip naujas turinys jūsų bloge: %s." msgstr "Importuojama viena blogo atsarginė kopija kaip naujas turinys jūsų bloge: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/nl/main.po
View File

@ -453,7 +453,7 @@ msgid "Themes"
msgstr "Thema's" msgstr "Thema's"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Je gebruikt nu \"%s\"" msgstr "Je gebruikt nu \"%s\""
#, fuzzy #, fuzzy

2
locales/nl/plugins.po
View File

@ -835,7 +835,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/oc/main.po
View File

@ -454,7 +454,7 @@ msgid "Themes"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
msgid "Use selected theme" msgid "Use selected theme"

2
locales/oc/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/pl/main.po
View File

@ -454,7 +454,7 @@ msgid "Themes"
msgstr "Motywy" msgstr "Motywy"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Aktualnie używasz \"%s\"" msgstr "Aktualnie używasz \"%s\""
#, fuzzy #, fuzzy

2
locales/pl/plugins.po
View File

@ -839,7 +839,7 @@ msgid "Import a single blog"
msgstr "Importuj pojedynczy blog" msgstr "Importuj pojedynczy blog"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Zaimportuje kopię zapasową pojedynczego bloga jako nową zawartość w aktualnym blogu: %s." msgstr "Zaimportuje kopię zapasową pojedynczego bloga jako nową zawartość w aktualnym blogu: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/pt-br/main.po
View File

@ -469,7 +469,7 @@ msgid "Themes"
msgstr "Temas" msgstr "Temas"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
#, fuzzy #, fuzzy

2
locales/pt-br/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/pt/main.po
View File

@ -460,7 +460,7 @@ msgid "Themes"
msgstr "Temas" msgstr "Temas"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Você está a usar \"%s\"" msgstr "Você está a usar \"%s\""
#, fuzzy #, fuzzy

2
locales/pt/plugins.po
View File

@ -848,7 +848,7 @@ msgid "Import a single blog"
msgstr "Importar um blog simples" msgstr "Importar um blog simples"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Isto irá importar uma copia de simples blog como novo conteúdo no blog actual: %s." msgstr "Isto irá importar uma copia de simples blog como novo conteúdo no blog actual: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/ro/main.po
View File

@ -454,7 +454,7 @@ msgid "Themes"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
msgid "Use selected theme" msgid "Use selected theme"

2
locales/ro/plugins.po
View File

@ -844,7 +844,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/ru/main.po
View File

@ -459,7 +459,7 @@ msgid "Themes"
msgstr "Темы" msgstr "Темы"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "В данный момент вы используете \"%s\"" msgstr "В данный момент вы используете \"%s\""
#, fuzzy #, fuzzy

2
locales/ru/plugins.po
View File

@ -840,7 +840,7 @@ msgid "Import a single blog"
msgstr "Импортировать один блог" msgstr "Импортировать один блог"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Это импортирует резервный файл одного блога как новое содержимое в текущий блог: %s." msgstr "Это импортирует резервный файл одного блога как новое содержимое в текущий блог: %s."
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/sr/main.po
View File

@ -459,7 +459,7 @@ msgid "Themes"
msgstr "Thèmes" msgstr "Thèmes"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Vous utilisez actuellement \"%s\"" msgstr "Vous utilisez actuellement \"%s\""
msgid "Use selected theme" msgid "Use selected theme"

2
locales/sr/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/sv/main.po
View File

@ -452,7 +452,7 @@ msgid "Themes"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "" msgstr ""
msgid "Use selected theme" msgid "Use selected theme"

2
locales/sv/plugins.po
View File

@ -834,7 +834,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/te/main.po
View File

@ -457,7 +457,7 @@ msgid "Themes"
msgstr "అలంకారాలు" msgstr "అలంకారాలు"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "మీరు ప్రస్తుతం \"%s\" ని వాడుతున్నారు" msgstr "మీరు ప్రస్తుతం \"%s\" ని వాడుతున్నారు"
#, fuzzy #, fuzzy

2
locales/te/plugins.po
View File

@ -837,7 +837,7 @@ msgid "Import a single blog"
msgstr "" msgstr ""
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/tr/main.po
View File

@ -459,7 +459,7 @@ msgid "Themes"
msgstr "Temalar" msgstr "Temalar"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "Şimdi \"%s\" kullanıyorsunuz." msgstr "Şimdi \"%s\" kullanıyorsunuz."
#, fuzzy #, fuzzy

2
locales/tr/plugins.po
View File

@ -838,7 +838,7 @@ msgid "Import a single blog"
msgstr "Tek bir blog içe aktar." msgstr "Tek bir blog içe aktar."
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "" msgstr ""
msgid "Upload a backup file" msgid "Upload a backup file"

2
locales/zh-cn/main.po
View File

@ -457,7 +457,7 @@ msgid "Themes"
msgstr "主题" msgstr "主题"
#, php-format #, php-format
msgid "You are currently using \"%s\"" msgid "You are currently using <strong>%s</strong>"
msgstr "您正在使用“%s”" msgstr "您正在使用“%s”"
#, fuzzy #, fuzzy

2
locales/zh-cn/plugins.po
View File

@ -846,7 +846,7 @@ msgid "Import a single blog"
msgstr "导入单一博客" msgstr "导入单一博客"
#, php-format #, php-format
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "这将会把一个单一博客的备份作为新内容导入到当前博客：%s。" msgstr "这将会把一个单一博客的备份作为新内容导入到当前博客：%s。"
msgid "Upload a backup file" msgid "Upload a backup file"

4
plugins/antispam/_admin.php
View File

@ -67,12 +67,12 @@ class antispamBehaviors
{ {
$ttl = $settings->antispam->antispam_moderation_ttl; $ttl = $settings->antispam->antispam_moderation_ttl;
echo echo
'<fieldset><legend>Antispam</legend>'. '<div class="fieldset"><h4>Antispam</h4>'.
'<p><label for="antispam_moderation_ttl" class="classic">'.__('Delete junk comments older than').' '. '<p><label for="antispam_moderation_ttl" class="classic">'.__('Delete junk comments older than').' '.
form::field('antispam_moderation_ttl', 3, 3, $ttl). form::field('antispam_moderation_ttl', 3, 3, $ttl).
' '.__('days'). ' '.__('days').
'</label></p>'. '</label></p>'.
'</fieldset>'; '</div>';
} }
public static function adminBeforeBlogSettingsUpdate($settings) public static function adminBeforeBlogSettingsUpdate($settings)

5
plugins/antispam/filters/class.dc.filter.iplookup.php
View File

@ -75,14 +75,13 @@ class dcFilterIpLookup extends dcSpamFilter
$res = ''; $res = '';
$res .= $res .=
'<form action="'.html::escapeURL($url).'" method="post">'. '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'.
'<fieldset><legend>' . __('IP Lookup servers') . '</legend>'. '<h3>' . __('IP Lookup servers') . '</h3>'.
'<p><label for="bls">'.__('Add here a coma separated list of servers.').'</label>'. '<p><label for="bls">'.__('Add here a coma separated list of servers.').'</label>'.
form::textarea('bls',40,3,html::escapeHTML($bls),'maximal'). form::textarea('bls',40,3,html::escapeHTML($bls),'maximal').
'</p>'. '</p>'.
'<p><input type="submit" value="'.__('Save').'" /></p>'. '<p><input type="submit" value="'.__('Save').'" /></p>'.
$this->core->formNonce().'</p>'. $this->core->formNonce().'</p>'.
'</fieldset>'.
'</form>'; '</form>';
return $res; return $res;

4
plugins/blowupConfig/config.js
View File

@ -48,7 +48,7 @@ $(function() {
} }
$('#theme_config').prepend(styles_combo); $('#theme_config').prepend(styles_combo);
$(styles_combo).wrap('<fieldset></fieldset>').before('<legend>' + dotclear.msg.predefined_styles + '</legend>').wrap('<p></p>'); $(styles_combo).wrap('<div class="fieldset"></div>').before('<h3>' + dotclear.msg.predefined_styles + '</h3>').wrap('<p></p>');
$(styles_combo).change(function() { $(styles_combo).change(function() {
if (this.value == 'none') { if (this.value == 'none') {
@ -61,7 +61,7 @@ $(function() {
}); });
// Code import // Code import
var e = $('#bu_export ~ fieldset:first'); var e = $('#bu_export_content');
e.toggle(); e.toggle();
var img = document.createElement('img'); var img = document.createElement('img');

42
plugins/blowupConfig/index.php
View File

@ -234,7 +234,7 @@ echo dcPage::breadcrumb(
)); ));
echo echo
'<p><a class="back" href="blog_theme.php">'.__('back').'</a></p>'; '<p><a class="back" href="blog_theme.php">'.__('Back to Blog themes').'</a></p>';
if (!$can_write_images) { if (!$can_write_images) {
@ -248,7 +248,8 @@ if (!empty($_GET['upd'])) {
echo '<form id="theme_config" action="'.$p_url.'" method="post" enctype="multipart/form-data">'; echo '<form id="theme_config" action="'.$p_url.'" method="post" enctype="multipart/form-data">';
echo '<fieldset><legend>'.__('General').'</legend>'; echo '<div class="fieldset"><h3>'.__('Customization').'</h3>'.
'<h4>'.__('General').'</h4>';
if ($can_write_images) { if ($can_write_images) {
echo echo
@ -271,9 +272,8 @@ form::field('body_txt_c',7,7,$blowup_user['body_txt_c'],'colorpicker').'</p>'.
'<p class="field"><label for="body_line_height">'.__('Text line height:').'</label> '. '<p class="field"><label for="body_line_height">'.__('Text line height:').'</label> '.
form::field('body_line_height',7,7,$blowup_user['body_line_height']).'</p>'. form::field('body_line_height',7,7,$blowup_user['body_line_height']).'</p>'.
'</fieldset>'.
'<fieldset><legend>'.__('Links').'</legend>'. '<h4 class="border-top">'.__('Links').'</h4>'.
'<p class="field"><label for="body_link_c">'.__('Links color:').'</label> '. '<p class="field"><label for="body_link_c">'.__('Links color:').'</label> '.
form::field('body_link_c',7,7,$blowup_user['body_link_c'],'colorpicker').'</p>'. form::field('body_link_c',7,7,$blowup_user['body_link_c'],'colorpicker').'</p>'.
@ -282,9 +282,8 @@ form::field('body_link_v_c',7,7,$blowup_user['body_link_v_c'],'colorpicker').'</
'<p class="field"><label for="body_link_f_c">'.__('Focus links color:').'</label> '. '<p class="field"><label for="body_link_f_c">'.__('Focus links color:').'</label> '.
form::field('body_link_f_c',7,7,$blowup_user['body_link_f_c'],'colorpicker').'</p>'. form::field('body_link_f_c',7,7,$blowup_user['body_link_f_c'],'colorpicker').'</p>'.
'</fieldset>'.
'<fieldset><legend>'.__('Page top').'</legend>'; '<h4 class="border-top">'.__('Page top').'</h4>';
if ($can_write_images) { if ($can_write_images) {
echo echo
@ -309,8 +308,7 @@ form::field('blog_title_c',7,7,$blowup_user['blog_title_c'],'colorpicker').'</p>
form::combo('blog_title_a',array(__('center')=>'center',__('left')=>'left',__('right')=>'right'),$blowup_user['blog_title_a']).'</p>'. form::combo('blog_title_a',array(__('center')=>'center',__('left')=>'left',__('right')=>'right'),$blowup_user['blog_title_a']).'</p>'.
'<p class="field"><label for="blog_title_p">'.__('Main title position (x:y)').'</label> '. '<p class="field"><label for="blog_title_p">'.__('Main title position (x:y)').'</label> '.
form::field('blog_title_p',7,7,$blowup_user['blog_title_p']).'</p>'. form::field('blog_title_p',7,7,$blowup_user['blog_title_p']).'</p>';
'</fieldset>';
if ($can_write_images) { if ($can_write_images) {
if ($blowup_user['top_image'] == 'custom' && $blowup_user['uploaded']) { if ($blowup_user['top_image'] == 'custom' && $blowup_user['uploaded']) {
@ -320,7 +318,7 @@ if ($can_write_images) {
} }
echo echo
'<fieldset><legend>'.__('Top image').'</legend>'. '<h4 class="border-top">'.__('Top image').'</h4>'.
'<p class="field"><label for="top_image">'.__('Top image').'</label> '. '<p class="field"><label for="top_image">'.__('Top image').'</label> '.
form::combo('top_image',$top_images,($blowup_user['top_image'] ? $blowup_user['top_image'] : 'default')).'</p>'. form::combo('top_image',$top_images,($blowup_user['top_image'] ? $blowup_user['top_image'] : 'default')).'</p>'.
'<p>'.__('Choose "Custom..." to upload your own image.').'</p>'. '<p>'.__('Choose "Custom..." to upload your own image.').'</p>'.
@ -330,15 +328,14 @@ if ($can_write_images) {
'<input type="file" name="upfile" id="upfile" size="35" />'. '<input type="file" name="upfile" id="upfile" size="35" />'.
'</p>'. '</p>'.
'<h3>'.__('Preview').'</h3>'. '<h5>'.__('Preview').'</h5>'.
'<div class="grid" style="width:800px;border:1px solid #ccc;">'. '<div class="grid" style="width:800px;border:1px solid #ccc;">'.
'<img style="display:block;" src="'.$preview_image.'" alt="" id="image-preview" />'. '<img style="display:block;" src="'.$preview_image.'" alt="" id="image-preview" />'.
'</div>'. '</div>';
'</fieldset>';
} }
echo echo
'<fieldset><legend>'.__('Sidebar').'</legend>'. '<h4 class="border-top">'.__('Sidebar').'</h4>'.
'<p class="field"><label for="sidebar_position">'.__('Sidebar position:').'</label> '. '<p class="field"><label for="sidebar_position">'.__('Sidebar position:').'</label> '.
form::combo('sidebar_position',array(__('right')=>'right',__('left')=>'left'),$blowup_user['sidebar_position']).'</p>'. form::combo('sidebar_position',array(__('right')=>'right',__('left')=>'left'),$blowup_user['sidebar_position']).'</p>'.
@ -382,7 +379,7 @@ form::field('sidebar_link_v_c',7,7,$blowup_user['sidebar_link_v_c'],'colorpicker
form::field('sidebar_link_f_c',7,7,$blowup_user['sidebar_link_f_c'],'colorpicker').'</p>'. form::field('sidebar_link_f_c',7,7,$blowup_user['sidebar_link_f_c'],'colorpicker').'</p>'.
'</fieldset>'. '</fieldset>'.
'<fieldset><legend>'.__('Entries').'</legend>'. '<h4 class="border-top">'.__('Entries').'</h4>'.
'<p class="field"><label for="date_title_f">'.__('Date title font:').'</label> '. '<p class="field"><label for="date_title_f">'.__('Date title font:').'</label> '.
form::combo('date_title_f',blowupConfig::fontsList(),$blowup_user['date_title_f']).'</p>'. form::combo('date_title_f',blowupConfig::fontsList(),$blowup_user['date_title_f']).'</p>'.
@ -420,9 +417,8 @@ if ($can_write_images) {
echo echo
'<p class="field"><label for="post_commentmy_c">'.__('My comment text color:').'</label> '. '<p class="field"><label for="post_commentmy_c">'.__('My comment text color:').'</label> '.
form::field('post_commentmy_c',7,7,$blowup_user['post_commentmy_c'],'colorpicker').'</p>'. form::field('post_commentmy_c',7,7,$blowup_user['post_commentmy_c'],'colorpicker').'</p>'.
'</fieldset>'.
'<fieldset><legend>'.__('Footer').'</legend>'. '<h4 class="border-top">'.__('Footer').'</h4>'.
'<p class="field"><label for="footer_f">'.__('Footer font:').'</label> '. '<p class="field"><label for="footer_f">'.__('Footer font:').'</label> '.
form::combo('footer_f',blowupConfig::fontsList(),$blowup_user['footer_f']).'</p>'. form::combo('footer_f',blowupConfig::fontsList(),$blowup_user['footer_f']).'</p>'.
@ -436,15 +432,14 @@ form::field('footer_c',7,7,$blowup_user['footer_c'],'colorpicker').'</p>'.
form::field('footer_l_c',7,7,$blowup_user['footer_l_c'],'colorpicker').'</p>'. form::field('footer_l_c',7,7,$blowup_user['footer_l_c'],'colorpicker').'</p>'.
'<p class="field"><label for="footer_bg_c">'.__('Footer background color:').'</label> '. '<p class="field"><label for="footer_bg_c">'.__('Footer background color:').'</label> '.
form::field('footer_bg_c',7,7,$blowup_user['footer_bg_c'],'colorpicker').'</p>'. form::field('footer_bg_c',7,7,$blowup_user['footer_bg_c'],'colorpicker').'</p>';
'</fieldset>';
echo echo
'<fieldset><legend>'.__('Additional CSS').'</legend>'. '<h4 class="border-top">'.__('Additional CSS').'</h4>'.
'<p><label for="extra_css">'.__('Any additional CSS styles (must be written using the CSS syntax):').'</label> '. '<p><label for="extra_css">'.__('Any additional CSS styles (must be written using the CSS syntax):').'</label> '.
form::textarea('extra_css',72,5,html::escapeHTML($blowup_user['extra_css']),'maximal','',false,'title="'.__('Additional CSS').'"'). form::textarea('extra_css',72,5,html::escapeHTML($blowup_user['extra_css']),'maximal','',false,'title="'.__('Additional CSS').'"').
'</p>'. '</p>'.
'</fieldset>'; '</div>';
@ -460,10 +455,13 @@ foreach ($blowup_user as $k => $v) {
} }
} }
echo echo
'<h3 id="bu_export">'.__('Configuration import / export').'</h3><fieldset>'. '<div class="fieldset">'.
'<h3 id="bu_export">'.__('Configuration import / export').'</h3>'.
'<div id="bu_export_content">'.
'<p>'.__('You can share your configuration using the following code. To apply a configuration, paste the code, click on "Apply code" and save.').'</p>'. '<p>'.__('You can share your configuration using the following code. To apply a configuration, paste the code, click on "Apply code" and save.').'</p>'.
'<p>'.form::textarea('export_code',72,5,implode('; ',$tmp_array),'maximal','',false,'title="'.__('Copy this code:').'"').'</p>'. '<p>'.form::textarea('export_code',72,5,implode('; ',$tmp_array),'maximal','',false,'title="'.__('Copy this code:').'"').'</p>'.
'</fieldset>'; '</div>'.
'</div>';
echo echo
'<p class="clear"><input type="submit" value="'.__('Save').'" />'. '<p class="clear"><input type="submit" value="'.__('Save').'" />'.

18
plugins/daInstaller/index.php
View File

@ -297,21 +297,19 @@ echo
'</div>'. '</div>'.
'<!-- Search -->'. '<!-- Search -->'.
'<div class="multi-part" id="search" title="'.__('Search').'">'. '<div class="multi-part" id="search" title="'.__('Search').'">'.
'<fieldset><legend>'.__('Search options'). '<form method="get" action="'.$p_url.'" class="fieldset">'.
'</legend>'. '<h3>'.__('Search').'</h3>'.
'<form method="get" action="'.$p_url.'">'.
'<p>'.form::hidden('p','daInstaller'). '<p>'.form::hidden('p','daInstaller').
'<label for="q" class="classic">'.__('Query:').'&nbsp;</label> '. '<label for="q" class="classic">'.__('Query:').'&nbsp;</label> '.
form::field('q',30,255,html::escapeHTML($q)). form::field('q',30,255,html::escapeHTML($q)).'</p>'.
'<label for="mode" class="classic">'. '<p><label for="mode" class="classic">'.
form::radio(array('mode','mode'),'plugins',$mode == 'plugins'). form::radio(array('mode','mode'),'plugins',$mode == 'plugins').
' '.__('Plugins').'&nbsp;</label> '. ' '.__('Plugins').'&nbsp;</label> '.
'<label for="mode2" class="classic">'. '<label for="mode2" class="classic">'.
form::radio(array('mode','mode2'),'themes',$mode == 'themes') form::radio(array('mode','mode2'),'themes',$mode == 'themes').
.' '.__('Themes').'&nbsp;</label> '. ' '.__('Themes').'&nbsp;</label></p>'.
'<input type="submit" value="'.__('Search').'" /></p>'. '<p><input type="submit" value="'.__('Search').'" /></p>'.
'</form>'. '</form>';
'</fieldset>';
if (!empty($q)) { if (!empty($q)) {
echo '<p><strong>'.sprintf(__('%u %s found'),$s_m_nb,__($mode)).'</strong></p>'; echo '<p><strong>'.sprintf(__('%u %s found'),$s_m_nb,__($mode)).'</strong></p>';
if ($s_m_nb > 0) { if ($s_m_nb > 0) {

10
plugins/importExport/inc/class.dc.export.flat.php
View File

@ -190,8 +190,8 @@ class dcExportFlat extends dcIeModule
public function gui() public function gui()
{ {
echo echo
'<form action="'.$this->getURL(true).'" method="post">'. '<form action="'.$this->getURL(true).'" method="post" class="fieldset">'.
'<fieldset><legend>'.__('Single blog').'</legend>'. '<h3>'.__('Single blog').'</h3>'.
'<p>'.sprintf(__('This will create an export of your current blog: %s'),html::escapeHTML($this->core->blog->name)).'</p>'. '<p>'.sprintf(__('This will create an export of your current blog: %s'),html::escapeHTML($this->core->blog->name)).'</p>'.
'<p><label for="file_name">'.__('File name:').'</label>'. '<p><label for="file_name">'.__('File name:').'</label>'.
@ -210,14 +210,13 @@ class dcExportFlat extends dcIeModule
form::hidden(array('do'),'export_blog'). form::hidden(array('do'),'export_blog').
$this->core->formNonce().'</p>'. $this->core->formNonce().'</p>'.
'</fieldset>'.
'</form>'; '</form>';
if ($this->core->auth->isSuperAdmin()) if ($this->core->auth->isSuperAdmin())
{ {
echo echo
'<form action="'.$this->getURL(true).'" method="post">'. '<form action="'.$this->getURL(true).'" method="post" class="fieldset">'.
'<fieldset><legend>'.__('Multiple blogs').'</legend>'. '<h3>'.__('Multiple blogs').'</h3>'.
'<p>'.__('This will create an export of all the content of your database.').'</p>'. '<p>'.__('This will create an export of all the content of your database.').'</p>'.
'<p><label for="file_name2">'.__('File name:').'</label>'. '<p><label for="file_name2">'.__('File name:').'</label>'.
@ -233,7 +232,6 @@ class dcExportFlat extends dcIeModule
form::hidden(array('do'),'export_all'). form::hidden(array('do'),'export_all').
$this->core->formNonce().'</p>'. $this->core->formNonce().'</p>'.
'</fieldset>'.
'</form>'; '</form>';
} }
} }

12
plugins/importExport/inc/class.dc.import.flat.php
View File

@ -179,9 +179,9 @@ class dcImportFlat extends dcIeModule
"</script>\n"; "</script>\n";
echo echo
'<form action="'.$this->getURL(true).'" method="post" enctype="multipart/form-data">'. '<form action="'.$this->getURL(true).'" method="post" enctype="multipart/form-data" class="fieldset">'.
'<fieldset><legend>'.__('Single blog').'</legend>'. '<h3>'.__('Single blog').'</h3>'.
'<p>'.sprintf(__('This will import a single blog backup as new content in the current blog: %s.'),html::escapeHTML($this->core->blog->name)).'</p>'. '<p>'.sprintf(__('This will import a single blog backup as new content in the current blog: <strong>%s</strong>.'),html::escapeHTML($this->core->blog->name)).'</p>'.
'<p><label for="up_single_file" class="classic">'.__('Upload a backup file'). '<p><label for="up_single_file" class="classic">'.__('Upload a backup file').
' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'. ' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'.
@ -202,14 +202,13 @@ class dcImportFlat extends dcIeModule
form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE). form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
'<input type="submit" value="'.__('Import').'" /></p>'. '<input type="submit" value="'.__('Import').'" /></p>'.
'</fieldset>'.
'</form>'; '</form>';
if ($this->core->auth->isSuperAdmin()) if ($this->core->auth->isSuperAdmin())
{ {
echo echo
'<form action="'.$this->getURL(true).'" method="post" enctype="multipart/form-data" id="formfull">'. '<form action="'.$this->getURL(true).'" method="post" enctype="multipart/form-data" id="formfull" class="fieldset">'.
'<fieldset><legend>'.__('Multiple blogs').'</legend>'. '<h3>'.__('Multiple blogs').'</h3>'.
'<p class="warning">'.__('This will reset all the content of your database, except users.').'</p>'. '<p class="warning">'.__('This will reset all the content of your database, except users.').'</p>'.
'<p><label for="up_full_file" class="classic">'.__('Upload a backup file').' '. '<p><label for="up_full_file" class="classic">'.__('Upload a backup file').' '.
@ -234,7 +233,6 @@ class dcImportFlat extends dcIeModule
form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE). form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
'<input type="submit" value="'.__('Import').'" /></p>'. '<input type="submit" value="'.__('Import').'" /></p>'.
'</fieldset>'.
'</form>'; '</form>';
} }
} }

2
plugins/importExport/locales/fr/main.po
View File

@ -222,7 +222,7 @@ msgid "Are you sure you want to import a full backup file?"
msgstr "Êtes-vous certain de vouloir charger un fichier de sauvegarde complet ?" msgstr "Êtes-vous certain de vouloir charger un fichier de sauvegarde complet ?"
#: inc/class.dc.import.flat.php:184 #: inc/class.dc.import.flat.php:184
msgid "This will import a single blog backup as new content in the current blog: %s." msgid "This will import a single blog backup as new content in the current blog: <strong>%s</strong>."
msgstr "Ceci va charger une sauvegarde de blog comme un nouveau contenu dans le blog en cours : %s." msgstr "Ceci va charger une sauvegarde de blog comme un nouveau contenu dans le blog en cours : %s."
#: inc/class.dc.import.flat.php:186 #: inc/class.dc.import.flat.php:186