Index: .hgsubstate =================================================================== --- .hgsubstate (revision 1387) +++ .hgsubstate (revision 1385) Index: .hgtags =================================================================== --- .hgtags (revision 1351) +++ .hgtags (revision 1280) @@ -12,4 +12,2 @@ 6fce226121140735a51a8f447c80f1dacd2974ea 2.4.4 514d5121a12586b7ff320924d44028b677a01020 2.4.4 -baf879af43beea9764d920c2facd7226e90c5cf3 2.5.1 -cfad9f2a9f6ec03206ff5db91985208e833a7528 2.5.2 Index: CHANGELOG =================================================================== --- CHANGELOG (revision 1350) +++ CHANGELOG (revision 1216) @@ -1,19 +1,2 @@ -Dotclear 2.5.2 - 2013-08-14 -=========================================================== -* Security fix: Fixed potential XSS -* Bugfix: l10n Clearbricks library -* now works -* Dotclear update check may now be forced (ignoring cache) -* Enforce integration of daInstaller plugin -* Tags link button is now available on page editor -* Default cache age is now 1 week instead of 2 hours -* Quick entry dashboard module is not activated by default on new installation -* New template {{tpl:BlogParentThemeURL}} (return URL of parent theme of blog's theme if any, URL of blog's theme otherwise) -* Fix post comments number on comments deletion -* Fix order of backup files -* Minor enhancements -* Various bug fixes -* Various cosmetic adjustments - Dotclear 2.5.1 - 2013-07-20 =========================================================== Index: admin/auth.php =================================================================== --- admin/auth.php (revision 1179) +++ admin/auth.php (revision 1310) @@ -265,4 +265,5 @@ + <?php echo html::escapeHTML(DC_VENDOR_NAME); ?> @@ -394,5 +395,5 @@ __('Remember my ID on this computer').'

'. - '

'; + '

'; if (!empty($_REQUEST['blog'])) { Index: admin/blog.php =================================================================== --- admin/blog.php (revision 1277) +++ admin/blog.php (revision 1399) @@ -67,28 +67,32 @@ else { - dcPage::open(__('New blog'),dcPage::jsConfirmClose('blog-form')); + dcPage::open(__('New blog'),dcPage::jsConfirmClose('blog-form'), + dcPage::breadcrumb( + array( + __('System') => '', + __('Blogs') => 'blogs.php', + ''.__('New blog').'' => '' + )) + ); echo - '

'.__('Blogs').''.__('New blog').'

'. + '
'. - ''. - - '

'. + $core->formNonce(). + '

'. + form::field('blog_id',30,32,html::escapeHTML($blog_id)).'

'. '

'.__('At least 2 characters using letters, numbers or symbols.').'

'. '

'.__('Please note that changing your blog ID may require changes in your public index.php file.').'

'. - '

'. + '

'. + form::field('blog_name',30,255,html::escapeHTML($blog_name)).'

'. - '

'. + '

'. + form::field('blog_url',30,255,html::escapeHTML($blog_url)).'

'. '

'. form::textarea('blog_desc',60,5,html::escapeHTML($blog_desc)).'

'. - '

'. - $core->formNonce(). - '

'. + '

'. '
'; Index: admin/blog_del.php =================================================================== --- admin/blog_del.php (revision 1288) +++ admin/blog_del.php (revision 1399) @@ -49,10 +49,16 @@ } -dcPage::open(__('Delete a blog')); +dcPage::open(__('Delete a blog'),'', + dcPage::breadcrumb( + array( + __('System') => '', + __('Blogs') => 'blogs.php', + ''.__('Delete a blog').'' => '' + )) +); if (!$core->error->flag()) { echo - '

'.__('Delete a blog').'

'. '

'.__('Warning').'

'. '

'.sprintf(__('You are about to delete the blog %s. Every entry, comment and category will be deleted.'), @@ -63,6 +69,6 @@ '

'. '
'.$core->formNonce().'
'. - '

'. + '

'. + form::password('pwd',20,255).'

'. '

'. form::hidden('blog_id',$blog_id).'

'. Index: admin/blog_pref.php =================================================================== --- admin/blog_pref.php (revision 1179) +++ admin/blog_pref.php (revision 1399) @@ -252,4 +252,19 @@ } +if ($standalone) { + $breadcrumb = dcPage::breadcrumb( + array( + html::escapeHTML($blog_name) => '', + ''.__('Blog settings').'' => '' + )); +} else { + $breadcrumb = dcPage::breadcrumb( + array( + __('System') => '', + __('Blogs') => 'blogs.php', + ''.__('Blog settings').' : '.html::escapeHTML($blog_name).'' => '' + )); +} + dcPage::open(__('Blog settings'), '\n". dcPage::jsPageTabs($default_tab). dcPage::jsConfirmClose('user-form'). # --BEHAVIOR-- adminPreferencesHeaders - $core->callBehavior('adminPreferencesHeaders') + $core->callBehavior('adminPreferencesHeaders'), + + dcPage::breadcrumb( + array( + html::escapeHTML($core->auth->userID()) => '', + ''.$page_title.'' => '' + )) ); @@ -382,6 +375,4 @@ dcPage::message(__('Default favorites have been successfully updated.')); } - -echo '

'.html::escapeHTML($core->blog->name).' › '.$page_title.'

'; # User profile @@ -393,18 +384,18 @@ '
'. '
'. -'

'. - -'

'. - -'

'. - -'

'. - -'

'. +'

'. +form::field('user_name',20,255,html::escapeHTML($user_name)).'

'. + +'

'. +form::field('user_firstname',20,255,html::escapeHTML($user_firstname)).'

'. + +'

'. +form::field('user_displayname',20,255,html::escapeHTML($user_displayname)).'

'. + +'

'. +form::field('user_email',20,255,html::escapeHTML($user_email)).'

'. + +'

'. +form::field('user_url',30,255,html::escapeHTML($user_url)).'

'. '
'. @@ -412,9 +403,9 @@ '
'. -'

'. - -'

'. +'

'. +form::combo('user_lang',$lang_combo,$user_lang,'l10n').'

'. + +'

'. +form::combo('user_tz',dt::getZones(true,true),$user_tz).'

'. '
'. @@ -429,12 +420,6 @@ ''.__('Change your password').''. - '
'. - '

'. - form::password('new_pwd',20,255,'','','',false,' data-indicator="pwindicator" ').'

'. - '
'. - '
'. - '

'. - '
'. - '
'. + '

'. + form::password('new_pwd',20,255).'

'. '

'. @@ -462,12 +447,12 @@ '

'.__('My options').''. -'

'. - -'

'. - -'

'. +'

'. +form::combo('user_post_format',$formaters_combo,$user_options['post_format']).'

'. + +'

'. +form::combo('user_post_status',$status_combo,$user_post_status).'

'. + +'

'. +form::field('user_edit_size',5,4,(integer) $user_options['edit_size']).'

'. '

'; + '

'. + form::combo('user_ui_iconset',$iconsets_combo,$user_ui_iconset).'

'; } else { form::hidden('user_ui_iconset',''); Index: admin/search.php =================================================================== --- admin/search.php (revision 1276) +++ admin/search.php (revision 1358) @@ -70,13 +70,18 @@ -dcPage::open(__('Search'),$starting_scripts); +dcPage::open(__('Search'),$starting_scripts, + dcPage::breadcrumb( + array( + html::escapeHTML($core->blog->name) => '', + ''.__('Search').'' => '' + )) +); echo -'

'.html::escapeHTML($core->blog->name).' › '.__('Search').'

'. ''. '

'.__('Search options').'

'. '

'.form::field('q',30,255,html::escapeHTML($q)).'

'. -'

'. -'

'. +'

'. +'

'. '

'. '
'. Index: admin/style/date-picker.css =================================================================== --- admin/style/date-picker.css (revision 0) +++ admin/style/date-picker.css (revision 1330) @@ -1,35 +1,35 @@ .date-picker { - border-collapse : collapse; - background : #fff; - color : #fff; + border-collapse: collapse; + background: #fff; + color: #fff; border: 1px solid #666; - border-width : 1px 2px 2px 1px; + border-width: 1px 2px 2px 1px; } .date-picker th { - border : none; - color : #000; - text-align : center; + border: none; + color: #000; + text-align: center; } .date-picker td { - border : 1px solid #666; - text-align : center; + border: 1px solid #666; + text-align: center; padding : 4px 6px; } th.date-picker-month { - text-align : left; + text-align: left; } th.date-picker-year { - text-align : right; + text-align: right; } .date-picker-control, th.date-picker-control { - color : #06c; - cursor : pointer; + color: #06c; + cursor: pointer; } .date-picker-day, .date-picker-today { - color : #000; - background : #eee; - cursor : pointer; + color: #000; + background: #eee; + cursor: pointer; } .date-picker-today { - background : #ccc; + background: #ccc; } Index: admin/style/default.css =================================================================== --- admin/style/default.css (revision 1375) +++ admin/style/default.css (revision 1420) @@ -13,13 +13,13 @@ /* ------------------------------------------------------------------ html */ +html { + font-size: 62.5%; +} body { - font: 75%/1.5em Helvetica,Arial,sans-serif; + font: 1.2rem/1.5 Arial,Helvetica,sans-serif; color: #333; - background: #f5f5f5; - margin: 0; - padding: 0; -} -body.auth { background: #fff; + margin: 0; + padding: 0; } @@ -36,19 +36,41 @@ } -h1, h2, h3, h4, h5, h6, p { +h1, h2, h3, .as_h3, h4, h5, h6, p { margin-top: 0; - margin-bottom: 0.6em; + margin-bottom: 1rem; } h2 { color: #666; - font-size: 1.4em; - padding: 4px 0; + font-size: 1.8rem; + padding: 0 0 1.8rem; + font-weight: normal; +} +h2 a:link, h2 a:visited { + color: #666; + border-color: #000; } .page-title { color: #d30e60; } -h3 { +#content > h2 { + padding: 0 1.8rem .6rem; + margin: 0 -1.8rem 1rem; + background: #fff url(bg_h2.png) repeat-x center bottom; +} +h3, .as_h3 { + color: #575859; + font-size: 1.4rem; +} +h4 { + font-size: 1.1em; + color: #575859; +} +h5 { + font-size: 1em; + color: #575859; +} +#entry-sidebar h5 { + font-weight: normal; color: #333; - font-size: 1.2em; } p, div.p { @@ -57,5 +79,5 @@ hr { height: 1px; - border-width: 1px 0 0 0; + border-width: 1px 0 0; border-color: #999; border-style: solid; @@ -83,29 +105,34 @@ #header { background: #575859; - height: 3em; position: relative; + border-bottom: 4px solid #A2CBE9; + width: 100%; } #prelude { - background: #575859; - line-height: 1.5em; - margin: 0; - padding: 0 1.7em 0 1em; + line-height: 1.9; + margin: 0; + padding: 0; overflow: hidden; position: absolute; - top: 1.2em; + top: 3em; left: 0; + background: #A2CBE9; + width: 14.5em; } #prelude li { list-style-type: none; - margin: 0 1em 0 0; + margin: 0; background:transparent; - } +} #prelude li a { - color:#fff; - } + padding-left: 1.6rem; + background: #A2CBE9; + color: #000; + border-bottom-color: #A2CBE9; +} #top { margin: 0; padding: 0; - width: 13em; + width: 14.5em; float: left; } @@ -113,38 +140,38 @@ padding: 0; margin: 0; - height: 3em; + height: 3.6rem; text-indent: -1000px; - background: transparent url(dc_logo.png) no-repeat 0 50%; } #top h1 a { position: absolute; - top: 3px; + top: 0; left: 0; - width: 130px; - height: 60px; + width: 17.4rem; + height: 3.6rem; border: none; - outline: none; color: #fff; } +#top h1 a:link { + background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 6px; +} +#top h1 a:hover, #top h1 a:focus { + background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 -94px; +} #info-boxes { - background: #575859; - font-size: .95em; - height: 3em; + font-size: 1em; + line-height: 3em; } #info-box1 { margin: 0; - padding: .5em 3px 4px 0; + padding: 0 3px 0 1.8rem; color: #fff; - float: left; - background: #575859; + display: inline-block; } #info-box2 { - margin: .1em 0 0 0; - padding: .5em 1.3em 4px 0; + margin: 0; + padding: 0 1.3em 0 0; color: #fff; float: right; text-align: right; - background: #575859; - height: 2em; } #info-box1 p { @@ -153,5 +180,5 @@ } #info-box1 select { - width: 15em; + width: 14.5em; } #info-box1 a img, #info-box2 a img { @@ -159,6 +186,5 @@ padding-left: .3em; } -#info-box1 a, #info-box2 a { - background: #575859; +#info-boxes a { font-weight: bold; color: #fff; @@ -173,15 +199,15 @@ } #info-box2 a.active { - border-bottom-color: #f5f5f5; + border-bottom-color: #fff; margin: 0; padding: 1.2em .5em; - background-color: #f5f5f5; + background-color: #fff; color: #333; font-weight: bold; } #info-box2 span { - color: #575859; -} -/* prelude */ + color: #999; +} +/* main blocks */ #wrapper { width: 100%; @@ -190,13 +216,12 @@ width: 100%; float: right; - margin-left: -13em; + margin-left: -14.5em; margin-top: 0; + background: #fff url(bg_menu.png); } #content { - margin: 1.5em 1.5em .5em 13em; - padding: 1em; + margin: 0 0 0 14.5em; + padding: .9rem 1.8rem 1.8rem; background: #fff; - border-radius: .5em; - border: 1px solid #ddd; } /* Micro clearfix thx to Nicolas Gallagher */ @@ -239,6 +264,6 @@ /* -------------------------------------------------------------- layout - onglets */ .part-tabs ul { - padding: .3em 0 1px 1em; - border-bottom: 1px solid #999; + padding: .5em 0 .3em 1.2rem; + border-bottom: 1px solid #ddd; } .part-tabs li { @@ -248,16 +273,11 @@ } .part-tabs li a { - padding: .3em 0.5em; - margin-right: .5em; - border: 1px solid #999; + padding: .5em 2em; + margin-right: -1px; + border: 1px solid #ccc; border-bottom: none; - background: #dfdfdf; text-decoration: none; - border-top-left-radius: .3em; - border-top-right-radius: .3em; - color: #000; -} -.part-tabs li.part-tabs-link a { - background: #ffe; + color: #333; + background-color:#eef; } .part-tabs li a:hover, .part-tabs li a:focus { @@ -268,25 +288,28 @@ .part-tabs li.part-tabs-active a { background: #fff; - border-bottom: 1px solid #fff; - color: #000; font-weight: bold; + border-bottom-color: #fff; } /* ------------------------------------------------------------------ main-menu */ #main-menu { - width: 13em; + width: 14.5em; float: left; - margin-top: 1.2em; - margin-bottom: .5em; + margin:0; + padding-top: .5em; + padding-bottom: 1em; + background: #f7f7f7; } #main-menu h3 { - margin: 0 0 0.5em; - padding: .5em 0 0 .5em; - text-transform: uppercase; + margin: 0; + padding: 1.2rem 0 1rem 2.2rem; + text-indent: -1.6rem; color: #666; - font-size: 1.1em; + font-size: 1.4rem; +} +#main-menu h3 img[alt="cacher"] { + vertical-align: top; } #main-menu ul { - font-size: .95em; - margin: 0 0 1em 0; + margin: 0 0 1.8rem 0; padding: 0; list-style: none; @@ -295,57 +318,86 @@ display: block; margin: 0.5em 0 0; - padding: .2em 0 0 32px; + padding: .3rem 0 0 30px; background-repeat: no-repeat; - background-position: 12px .4em; + background-position: 8px .3em; +} +#main-menu li.active { + background-color: #fff; } #main-menu a { - font-weight: bold; + color: #333; + border-bottom-color: #ccc; } #main-menu .active a { border-bottom: none; - color: #333; + color: #d30e60; } #main-menu .active { - background-color: #fff; - padding: .4em 0 .1em 32px; - background-position: 12px .4em; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin-right: -1px; -} -#favorites-menu { - margin: 0 0 2em; + font-weight: bolder; +} +#search-menu { + padding: .3rem .4rem 0; + font-size: 100% +} +#search-menu p { + display: inline-block; + border: 1px solid #999; + border-radius: .6em; + position: relative; + height: 2rem; + overflow: hidden; +} +#search-menu #q { + width: 12rem; + border-bottom-left-radius: .6em; + border-top-left-radius: .6em; + background: transparent url(search.png) no-repeat 4px center; + text-indent: 18px; + height: 2rem; + padding: 0 2px; + border: none; +} +#search-menu input[type="submit"] { + padding: 0 0.3rem; + background: #dfdfdf; + border-color: #999; + color: #444; + border-bottom-right-radius: .6em; + border-top-right-radius: .6em; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + text-shadow: none; + height: 2rem; + border: none; + border-left: 1px solid #aaa; + font-size: 1rem; +} +#search-menu input[type="submit"]:hover, +#search-menu input[type="submit"]:focus { + background: #575859; + color: #fff; +} +#favorites-menu, #blog-menu, #system-menu, #plugins-menu { + border-bottom: 1px dashed #A2CBE9; } #favorites-menu h3 { - color: #333; - text-transform: none; -} -#favorites-menu a { - color: #333; -} -#favorites-menu .active { - background-color: transparent; - border: none; -} -#favorites-menu .active a { - font-weight: bold; - color: #666; + color: #000; + font-variant: small-caps; + padding-top: .6rem; } /* ------------------------------------------------------------------ footer */ #footer { clear: both; - padding: .75em .75em 0 0; + padding: .6rem 1.2rem .6rem 0; text-align: right; + border-top: .1rem solid #ccc; } #footer p { margin: 0; padding: 0 1em; - text-align: center; - font-size: 1.1em; -} -#footer a { + font-size: 1em; } #footer p span.credit { - font-size: .85em; + font-size: 1rem; font-weight: normal; } @@ -355,17 +407,21 @@ width: 18em; margin: 1.5em auto 0; - font-size: 1.1em; + font-size: 1.4rem; } #login-screen h1 { text-indent: -2000px; - background: transparent url(dotclear-logo2.png) no-repeat top left; - height: 50px; + background: transparent url(dc_logos/w-dotclear240.png) no-repeat top left; + height: 66px; margin-bottom: .5em; - margin-left: .5em; + margin-left: 0; } #login-screen fieldset, #login-screen .fieldset { - border: 1px solid #999; + border: 1px solid #A8DC26; padding: 1em 1em 0 1em; border-radius: 4px; + background: #fff; +} +#login-screen legend { + border: 1px solid #A8DC26; } #login-screen input[type=text], #login-screen input[type=password], #login-screen input[type=submit] { @@ -373,6 +429,6 @@ } #login-screen #issue { - margin-left: 1em; - font-size: 1em; + margin-left: 1.5rem; + font-size: 1.2rem; } #login-screen #issue strong {font-weight: normal;} @@ -381,13 +437,5 @@ /* ------------------------------------------------------------------ dashboard */ #dashboard-main { - float: left; - overflow: hidden; - padding: 1em 2% 1em 0; - width: 70%; -} -#dashboard-main.fullwidth { - width: 100%; padding: 1em 0; - float: none; } #icons { @@ -399,6 +447,8 @@ width: 210px; text-align: center; - margin: 2em 0 0 0; + margin: 1em 0 2em; + padding: 1em 0; display:inline-block; + vertical-align: top; } #icons a, @@ -412,4 +462,15 @@ #icons a span { border-bottom: 1px dotted #f90; + color: #333; +} +#icons a img { + padding: 2em; + background: #eee; + border-radius: 1.6rem; + box-shadow: 0 3px 3px 0 #ccc; + margin-bottom: .6rem; +} +#icons a img:hover, #icons a:focus img { + background-color: #BBDB58; } #icons a:focus span, #icons a:hover span { @@ -417,5 +478,4 @@ } #quick { - clear: left; margin-top: 2em; } @@ -432,9 +492,14 @@ } #dashboard-items { - float: left; - width: 27%; - overflow: hidden; - padding-bottom: 1em; - padding-top: 3em; + margin: 3em auto; + display: table; + width: 100%; + border-collapse: collapse; +} +.db-item { + display: table-cell; + padding: 1em 3em; + vertical-align: top; + border: 1px solid #ccc; } #dashboard-items img { @@ -476,9 +541,26 @@ } #entry-content { - margin-right: 18em; + margin-right: 19em; + margin-left: 0; +} +.multi-part { + padding-left: 1.2rem; +} +#entry-content label { + text-transform: uppercase; + font-weight: bold; + margin-top: 2em; } #entry-sidebar { width: 17em; float: right; +} +#entry-sidebar input[type="text"], +#entry-sidebar select { + width: 14em; /* to prevent inline with label */ +} +.box { + border-bottom: 1px solid #ddd; + margin-bottom: 1em; } #comments { @@ -662,5 +744,5 @@ } #themes div.theme-details:hover { - background: #eee; + background: #f0f0f0; } #themes div.theme-details div.theme-shot { @@ -776,22 +858,21 @@ /* ------------------------------------------------------------------ contextual help */ #help { - margin-top: 2em; + margin-top: 4em; background: #f5f5f5; z-index: 100; } #help-button { - position: fixed; - top: 3.2em; + background: transparent url(../images/page_help.png) no-repeat 6px center; + position: absolute; + top: 3.6rem; right: 0px; + padding: 0 2rem 0 3rem; cursor: pointer; - background: #fc3; - border: 1px solid #dde; - border-right: none; - font-size: 1.1em; - font-weight: bold; - text-transform: capitalize; - padding: .33em .75em .33em 1em; - border-radius: 1em 0 0 1em; - color: #444; + color: #2373A8; + line-height: 4.2rem; +} +#help-button span { + padding: .6rem 0 .1rem 0; + border-bottom: 1px solid #2373A8; } .help-box { @@ -803,13 +884,21 @@ } #content.with-help #help-button { - right: 282px; + right: 28.2rem; + background-color: #f5f5f5; + position: fixed; + border-top: 2px solid #FFD478; + border-left: 2px solid #FFD478; + border-bottom: 2px solid #FFD478; + border-bottom-left-radius: 1rem; + border-top-left-radius: 1rem; } #content.with-help #help { display: block; position: absolute; - top: 40px; + top: 3.6rem; right: 0; - width: 280px; - border-left: 2px solid #fc3; + width: 28rem; + border-left: 2px solid #FFD478; + border-top: 2px solid #FFD478; margin-top: 0; padding: 10px 0 0 0; @@ -829,23 +918,33 @@ /* ------------------------------------------------------------------ popups */ body.popup #wrapper, body.popup #top { - margin-top: -1.5em; + width: 100%; + padding: 0; +} +body.popup #wrapper { float: none; -} -body.popup #top h1 { - background: transparent; + margin:0; + display: block; +} +body.popup h1, body.popup #top { + margin: 0; + border-bottom: 1px solid; + font-weight: normal; + color: #fff; + background: #575859; + font-size: 1.5em; + text-indent: .6rem; + line-height: 1.3em; } body.popup #main { - margin-left: -35px; - margin-bottom: 1em; + margin-bottom: 1em 0; } body.popup #content { - margin-left: 35px; - margin-left: 2em; /* 3.2 */ -} -body.popup #footer { - display: none; /* 3.2 */ + margin: 0; + padding: .6rem 0 !important; +} +body.popup #content h2 { + margin: 0 0 1em; } body.popup #footer p { - margin-left: 35px; border: none; } @@ -859,6 +958,6 @@ } p.error, p.message, p.static-msg { - padding-top: 1em; - padding-bottom: 1em; + padding-top: 1rem; + padding-bottom: 1rem; } div.error, p.error { @@ -874,4 +973,32 @@ div.static-msg a, p.static-msg a { color: #fff; +} +/* ------------------------------------------------------------------ navigation */ +.anchor-nav { + background: #575859; + color: #fff; + padding: .4rem 1.2rem; + float: right; +} +.nav_prevnext { + margin-bottom: 2em; + color: #fff; +} +.nav_prevnext a, a.back { + border: 1px solid #ddd; + padding: .2rem 2rem; + border-radius: 1rem; + background-color: #f0f0f0; +} +a.back:before { + content: "\ab\a0"; +} +a.onblog_link { + color: #333; + float: right; + border: 1px solid #eee; + padding: .2rem 2rem; + border-radius: 1rem; + background-color: #ffe; } /* ------------------------------------------------------------------ debug */ @@ -898,6 +1025,11 @@ /* -------------------------------------------------------------------- CLASSES COMMUNES */ -.no-margin { - margin: 0; +.no-margin, #entry-content label.no-margin { + margin: 0; +} +.border-top { + border-top: 1px solid #999; + padding-top: 1em; + margin-top: 1em; } /* paragraphe pour bouton Nouveau bidule */ @@ -991,14 +1123,13 @@ -------------------------------------------------------- */ table { - font-size: 1em; + font-size: 1.2rem; border-collapse: collapse; margin: 0 0 1em 0; } tr.line:hover { - background: #ddd; + background: #f3f3f3; } caption { color: #333; - font-size: 1.2em; font-weight: bold; text-align: left; @@ -1009,11 +1140,11 @@ border-width: 0 0 1px 0; border-style: solid; - border-color: #ccc; - padding: 3px 5px; + border-color: #e3e3e3; + padding: .4rem .5rem; vertical-align: top; } th { text-align: left; - border-bottom-color: #666; + border-bottom-color: #aaa; } .noborder td, td.noborder, .noborder th, th.noborder { @@ -1032,4 +1163,9 @@ table.settings, table.prefs { width: 80%; + border: 1px solid #999; + margin-bottom: 3em; +} +table.settings th, table.prefs th { + background: #eef; } table.settings th:first-child, table.prefs th:first-child { @@ -1045,5 +1181,4 @@ width: 40%; } - td.status { vertical-align: middle; @@ -1084,5 +1219,4 @@ padding-left: 15px; } - /* ----------------------------------------------------------------- FORMS */ form { @@ -1100,4 +1234,7 @@ background: #f5f5f5; } +.fieldset { + background: #eef; +} legend { font-weight: bold; @@ -1106,5 +1243,5 @@ border-style: solid; border-color: #ccc; - background: #f5f5f5; + background: #eef; margin-bottom: 0.5em; } @@ -1121,5 +1258,5 @@ border-width: 1px; border-style: solid; - border-color: #000 #ccc #ccc #000; + border-color: #666 #ccc #ccc #999; } input.invalid, textarea.invalid, select.invalid { @@ -1130,5 +1267,5 @@ } input, textarea, select, option { - font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif; + font: 100% "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif; } input[type=text], input[type=password], textarea { @@ -1136,12 +1273,9 @@ margin-right: .3em; } -input[type=checkbox], input[type=radio] { - border: none; -} textarea { padding: 2px 0; } - -input[type=checkbox], input[type=radio] { +input[type=checkbox], input[type=radio], input[type=file] { + border: none; margin: 0; padding: 0; @@ -1162,4 +1296,5 @@ font-style:italic; font-weight: normal; + text-transform: none; color: #666; } @@ -1178,4 +1313,7 @@ .form-note a {border-bottom: 1px solid #99f;} +label.ib { + display: inline-block; +} label.classic { display: inline; @@ -1214,5 +1352,5 @@ display: inline; position: absolute; - left: 15em; + left: 14.5em; top: 0; } @@ -1226,8 +1364,7 @@ a.form-control { display: none; - font-weight: bold; - background: url(magnifier.png) no-repeat 0 0; - color: green; + background: url(../images/expand.png) no-repeat .4rem center; padding-left: 20px; + color: #000; } .constrained { @@ -1239,10 +1376,4 @@ /* --------------------------------------------------------------- buttons */ -h2 a.button { - color: #333; - font-weight: normal; - font-size: .75em; - vertical-align: middle; -} /* commun */ input[type=submit], @@ -1250,5 +1381,4 @@ input[type=button], a.button, -a.back, a.submit { display: inline-block; @@ -1257,9 +1387,11 @@ text-align: center; text-decoration: none; - padding: .1em .5em 0 .5em; + padding: .1em .5em; text-shadow: 0 1px 1px rgba(0,0,0,.3); border-radius: .2em; margin-bottom: .1em; } +h4 a.button {font-weight: normal;} + /* validation */ input[type=submit], @@ -1286,5 +1418,4 @@ /* suppression et reset */ a.button, -a.back, input[type=submit].reset, input[type=submit].delete { @@ -1297,10 +1428,8 @@ } a.button:hover, -a.back:hover, input[type=reset]:hover, input[type=submit].reset:hover, input[type=submit].delete:hover, a.button:focus, -a.back:focus, input[type=reset]:focus, input[type=submit].reset:focus, @@ -1315,5 +1444,5 @@ input[type=submit].delete { color: #c00; - padding-bottom: .1em; + padding-bottom: .2rem; } #entry-content .delete { @@ -1336,17 +1465,25 @@ margin-left: 2em; } -a.back:before { - content: "\ab\a0"; -} -a.button.add { - border-radius: .5em; - margin-bottom: .1em; - background: #2C8FD1 url(../images/add.png) no-repeat 6px center; - color: #fff; - padding: .2em 16px .2em 30px; - border: 1px solid #2373A8; -} -a.button.add:hover, a.button.add:focus { - background-color: #2373A8; +.button.add { + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) ); + background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b'); + background-color:#9dce2c; + border:1px solid #83c41a; + padding:.6rem 1.8rem; + color: #000; + text-shadow: 1px 1px 0 #BBDB58; + font-weight: normal; + font-size: 1.4rem; +} +.button.add:hover, .button.add:focus { + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) ); + background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c'); + background-color:#8cb82b; + border:1px solid #83c41a; +} +.button-add:focus { + outline: dotted 1px; } @@ -1384,41 +1521,119 @@ } -/* --------------------------------------------------------------- password indcator */ -.pw-table { +/* ------------------------------------------------------- Filters */ +#filters-form { + border: 1px dashed #999; + border-radius: .6rem; + margin-bottom: 2em; + padding: .5em 1em 0; +} +#filters-form .table { display: table; + width: 100%; + padding: 0; margin-bottom: 1em; -} -.pw-cell { + margin-top: 1.5em; +} +#filters-form .cell { + padding: 0 2em 0 0; display: table-cell; - margin-bottom: 1em; -} -#pwindicator { - display: table-cell; - vertical-align: bottom; - padding-left: 1.5em; - height: 3.8em; -} -#pwindicator .bar { - height: 6px; - margin-bottom: 4px; -} -.pw-very-weak .bar { - background: #900; - width: 30px; -} -.pw-weak .bar { - background: #c00; - width: 60px; -} -.pw-mediocre .bar { - background: #f60; - width: 90px; -} -.pw-strong .bar { - background: #060; - width: 120px; -} -.pw-very-strong .bar { - background: #0c0; - width: 150px; -} + vertical-align: top; +} +#filters-form .filters-options { + padding-left: 2em; + border-left: 1px solid #ccc; +} +#filters-form label.ib, span.ib { + width:7em; + display: inline-block; +} +#filters-form label.ibw, span.ibw { + width: 9em; + display: inline-block; +} +#filters-form select { + width: 14em; +} + +/* ---------------------------------------------------- Pagination */ +.pagination { + height: 22px; + margin-top: 1em; + line-height: 22px; + padding: 0 1rem; + border: 1px solid #ddd; + overflow: hidden; + background: #e1e1e1; + background: -moz-linear-gradient(center top , #f2f2f2, #e1e1e1); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e1e1e1)); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} +.pagination a, .pagination strong { + height: 20px; + border: none; + padding: 2px 6px; + background-color : transparent; + background-position : 50% 50%; + background-repeat: no-repeat; +} +.pagination a:hover, .pagination strong { + border-color : #ccc; + background-color: #fff; +} + +/* --------------------------------------------------------------------------- + Media queries vite fait en attendant la reprise complète du layout +---------------------------------------------------------------------------- */ +@media screen and (max-width: 920px) { + #top, #top h1 a {width: 42px !important; height:100%; overflow: hidden; +} + #top h1 a:link { + background: transparent url(dc_logos/b-dotclear120.png) no-repeat -180px 6px; + border-right: 1px solid #ccc; + } + #top h1 a:hover, #top h1 a:focus { + background: url(dc_logos/b-dotclear120.png) no-repeat -180px -94px; + border-right: 1px solid #A2CBE9; + } +} +@media screen and (max-width: 800px) { + #top, #info-boxes, #info-box1, #info-box2 { + display:inline-block; + vertical-align:middle; + margin:0; + padding:0; + line-height: 3.2rem; + } + #info-box1 {margin-left: 1rem;} + #info-box1 select {width: 14rem;} + #main-menu, #main, #content, #content h2, #entry-wrapper, #entry-sidebar, #entry-content, .two-cols .col, .two-cols .col:first-child { + display:block; + width: 98%; + margin:0 auto; + padding:0; + float:none; + text-align: left; + clear: both; + } + #content { + width: 100%; + padding-top: .5em; + } +} +@media screen and (max-width: 720px) { + .smallscreen {display: none;} + #help-button {width:20px; overflow: hidden;} + #info-box2 {float:none;} + #dashboard-items div {display: block;margin-bottom: 1em; padding: 0 1em;} +} +@media screen and (max-width: 492px) { + #header {height:3.6rem;} + #wrapper {font-size: 1.6rem;} + .page-title, #info-boxes, .media-item {display: inline-block;} + div.media-list .media-item {width: 90%; float: none} + #info-box1 select {width: 12rem; margin-right: .6rem;} + #info-box1 p.nomobile, label.nomobile {display: none;} + #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px} +} Index: admin/style/install.css =================================================================== --- admin/style/install.css (revision 1065) +++ admin/style/install.css (revision 1330) @@ -6,9 +6,13 @@ Please see http://dotclear.net/ for more details. */ +html { + font-size: 62.5%; +} body.install { - font: 0.875em Helvetica,Arial,sans-serif; - color: #000; - background-color: #fff; - line-height: 1.5em; + font: 1.2rem/1.5 Arial,Helvetica,sans-serif; + color: #333; + background: #fff; + margin: 0; + padding: 0; } body.install #content { @@ -22,5 +26,5 @@ } body.install h1,h2 { - font-family: Helvetica,arial,sans-serif; + font-family: arial,Helvetica,sans-serif; } body.install h1 { Index: admin/style/jsToolBar/jsToolBar.css =================================================================== --- admin/style/jsToolBar/jsToolBar.css (revision 1065) +++ admin/style/jsToolBar/jsToolBar.css (revision 1399) @@ -2,6 +2,5 @@ border-width : 0 1px 1px 1px; border-style : solid; - border-color : #000 #ccc #ccc #000; - padding-left: 5px; + border-color : #ccc; background : #f9f9f9; } @@ -9,6 +8,10 @@ margin: 0; border: 0; + padding: 0; } - +.jstEditor textarea { + width: 99%; + padding: 1rem 0 0 1%; +} .jstHandle { height: 8px; @@ -22,9 +25,17 @@ .jstElements { - padding: 3px 3px; - border-width: 1px 1px 0 1px; - border-style: solid; - border-color: #000 #ccc #ccc #000; - background: #dfdfdf; + height: 28px; + padding: 0 1rem; + border: 1px solid #ccc; + overflow: hidden; + background: #e1e1e1; + background: -moz-linear-gradient(center top , #f2f2f2, #e1e1e1); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e1e1e1)); + -moz-border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; + -webkit-box-shadow: 0 1px 0 #FFF inset; + -moz-box-shadow: 0 1px 0 #FFF inset; + box-shadow: 0 1px 0 #FFF inset; } @@ -34,13 +45,12 @@ .jstElements select { width: 12em; + margin-right: .6rem; } .jstElements button { - margin-right : 2px; - width : 20px; - height: 20px; - padding: 0; - border-style: solid; - border-width: 1px; - border-color: #dfdfdf; + width : 30px; + height: 28px; + border-style: groove; + border-width: 0 1px 0 0; + border-color: #666; background-color : transparent; background-position : 50% 50%; @@ -55,11 +65,16 @@ } .jstElements span { - display : inline; + display : inline-block; + vertical-align: top; + background: #dfdfdf; } .jstSpacer { - width : 0px; - font-size: 1px; - margin-right: 4px; + width : 2px; + height: 28px; + margin-right: 0; + border-style: groove; + border-width: 0 1px 0 0; + border-color: #666; } Index: admin/style/jsUpload/style.css =================================================================== --- admin/style/jsUpload/style.css (revision 1209) +++ admin/style/jsUpload/style.css (revision 1325) @@ -76,5 +76,5 @@ } -.button.clean, .button.cancel, .button.add, .enhanced_uploader .fileupload-buttonbar .button.start { +.button.clean, .button.cancel, .button.add { display: none; } @@ -170,2 +170,7 @@ clear: both; } + +.queue-message { + font-weight: bold; + margin: 0 0 1em 16px; +} Index: admin/trackbacks.php =================================================================== --- admin/trackbacks.php (revision 1179) +++ admin/trackbacks.php (revision 1399) @@ -83,5 +83,15 @@ /* DISPLAY -------------------------------------------------------- */ -dcPage::open($page_title,dcPage::jsLoad('js/_trackbacks.js')); +if ($can_view_page) { + $breadcrumb = dcPage::breadcrumb( + array( + html::escapeHTML($core->blog->name) => '', + html::escapeHTML($post->post_title) => $core->getPostAdminURL($post->post_type,$id), + ''.$page_title.'' => '' + )); +} else { + $breadcrumb = ''; +} +dcPage::open($page_title,dcPage::jsLoad('js/_trackbacks.js'),$breadcrumb); # Exit if we cannot view page @@ -94,6 +104,4 @@ dcPage::message(__('All pings sent.')); } - -echo '

'.html::escapeHTML($core->blog->name).' › '.$page_title.'

'; echo '

'. @@ -119,10 +127,10 @@ '

'.__('Ping blogs').'

'. ''. -'

'. form::textarea('tb_urls',60,5,$tb_urls). -'

'. +'

'. -'

'. +'

'. +form::textarea('tb_excerpt',60,3,$tb_excerpt).'

'. '

'.form::hidden('id',$id). Index: admin/update.php =================================================================== --- admin/update.php (revision 1287) +++ admin/update.php (revision 1358) @@ -27,5 +27,5 @@ $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions'); -$new_v = $updater->check(DC_VERSION, !empty($_GET['nocache'])); +$new_v = $updater->check(DC_VERSION); $zip_file = $new_v ? DC_BACKUP_PATH.'/'.basename($updater->getFileURL()) : ''; $version_info = $new_v ? $updater->getInfoURL() : ''; @@ -168,14 +168,11 @@ -------------------------------------------------------- */ dcPage::open(__('Dotclear update'), - (!$step ? dcPage::jsPageTabs($default_tab) : '') + (!$step ? dcPage::jsPageTabs($default_tab) : ''), + dcPage::breadcrumb( + array( + __('System') => '', + ''.__('Dotclear update').'' => '' + )) ); - -if (!$core->error->flag()) { - echo '

'.__('Dotclear update').'

'; - - if (!empty($_GET['nocache'])) { - dcPage::message(__('Manual checking of update done successfully.')); - } -} if (!$step) @@ -184,9 +181,5 @@ if (empty($new_v)) { - echo '

'.__('No newer Dotclear version available.').'

'. - ''. - '

'. - '

'. - ''; + echo '

'.__('No newer Dotclear version available.').'

'; } else Index: admin/user.php =================================================================== --- admin/user.php (revision 1179) +++ admin/user.php (revision 1399) @@ -15,5 +15,5 @@ dcPage::checkSuper(); -$page_title = __('new user'); +$page_title = __('New user'); $user_id = ''; @@ -174,5 +174,12 @@ # --BEHAVIOR-- adminUserHeaders - $core->callBehavior('adminUserHeaders') + $core->callBehavior('adminUserHeaders'), + + dcPage::breadcrumb( + array( + __('System') => '', + __('Users') => 'users.php', + ''.$page_title.'' => '' + )) ); @@ -184,6 +191,4 @@ dcPage::message(__('User has been successfully created.')); } - -echo '

'.__('Users').''.$page_title.'

'; if ($user_id == $core->auth->userID()) { @@ -198,26 +203,26 @@ '
'. '
'. -'

'. form::field('user_id',20,255,html::escapeHTML($user_id)). -'

'. +'

'. '

'.__('At least 2 characters using letters, numbers or symbols.').'

'. '

'. form::password('new_pwd',20,255). -'

'. +'

'. '

'.__('Password must contain at least 6 characters.').'

'. '

'. form::password('new_pwd_c',20,255). -'

'. - -'

'. + +'

'. form::field('user_name',20,255,html::escapeHTML($user_name)). -'

'. - -'

'. + +'

'. form::field('user_firstname',20,255,html::escapeHTML($user_firstname)). '

'. @@ -225,35 +230,35 @@ '

'. - -'

'. + +'

'. form::field('user_email',20,255,html::escapeHTML($user_email)). -'

'. +'

'. '

'.__('Mandatory for password recovering procedure.').'

'. '
'. '
'. -'

'. form::field('user_url',30,255,html::escapeHTML($user_url)). -'

'. -'

'. +'

'. form::combo('user_post_format',$formaters_combo,$user_options['post_format']). -'

'. - -'

'. + +'

'. form::combo('user_post_status',$status_combo,$user_post_status). -'

'. - -'

'. + +'

'. form::field('user_edit_size',5,4,(integer) $user_options['edit_size']). -'

'. - -'

'. + +'

'. form::combo('user_lang',$lang_combo,$user_lang,'l10n'). -'

'. - -'

'. + +'

'. form::combo('user_tz',dt::getZones(true,true),$user_tz). -'

'; +'

'; if ($core->auth->allowPassChange()) { @@ -278,6 +283,6 @@ echo '

'. +($user_id != '' ? '' : '* ').__('Your password:').''. +form::password('your_pwd',20,255).'

'. '

'. ($user_id != '' ? '' : ' '). Index: admin/users.php =================================================================== --- admin/users.php (revision 1237) +++ admin/users.php (revision 1358) @@ -94,5 +94,11 @@ } -dcPage::open(__('Users'),$starting_script); +dcPage::open(__('Users'),$starting_script, + dcPage::breadcrumb( + array( + __('System') => '', + ''.__('Users').'' => '' + )) +); if (!$core->error->flag()) @@ -105,6 +111,5 @@ } - echo - '

'.__('Users').'

'. + echo '

'.__('Create a new user').'

'; Index: admin/users_actions.php =================================================================== --- admin/users_actions.php (revision 1179) +++ admin/users_actions.php (revision 1399) @@ -131,9 +131,26 @@ /* DISPLAY -------------------------------------------------------- */ +if (!empty($users) && empty($blogs) && $action == 'blogs') { + $breadcrumb = dcPage::breadcrumb( + array( + __('System') => '', + __('Users') => 'users.php', + ''.__('Permissions').'' => '' + )); +} else { + $breadcrumb = dcPage::breadcrumb( + array( + __('System') => '', + __('Users') => 'users.php', + ''.__('Actions').'' => '' + )); +} + dcPage::open( __('Users'), dcPage::jsLoad('js/_users_actions.js'). # --BEHAVIOR-- adminUsersActionsHeaders - $core->callBehavior('adminUsersActionsHeaders') + $core->callBehavior('adminUsersActionsHeaders'), + $breadcrumb ); @@ -177,6 +194,5 @@ } - echo - '

'.__('Users').''.__('Permissions').'

'. + echo '

'.sprintf( __('Choose one or more blogs to which you want to give permissions to users %s.'), @@ -269,6 +285,6 @@ echo '

'.__('Validate permissions').''. - '

'. + '

'. + form::password('your_pwd',20,255).'

'. '
'. '

'. Index: inc/admin/lib.dc.page.php =================================================================== --- inc/admin/lib.dc.page.php (revision 1384) +++ inc/admin/lib.dc.page.php (revision 1395) @@ -49,5 +49,5 @@ # Top of admin page - public static function open($title='', $head='') + public static function open($title='',$head='',$breadcrumb='') { global $core; @@ -73,9 +73,9 @@ } $blog_box = - '

'. $core->formNonce(). form::combo('switchblog',$blogs,$core->blog->id). - '

'. + '

'. ''; } @@ -93,8 +93,9 @@ "\n". ' '."\n". - ' '.$title.' - '.html::escapeHTML($core->blog->name).' - '.html::escapeHTML(DC_VENDOR_NAME).' - '.DC_VERSION.''."\n". - ' '."\n". ' '."\n". + ' '."\n". + ' '.$title.' - '.html::escapeHTML($core->blog->name).' - '.html::escapeHTML(DC_VENDOR_NAME).' - '.DC_VERSION.''."\n". + self::jsLoadIE7(). @@ -133,11 +134,11 @@ '
'. $blog_box. - '

'.__('Go to site').' '. + '

'.__('Go to site').' '. '

'. '
'. ''. '
'. @@ -158,7 +159,10 @@ } + // Display breadcrumb (if given) before any error message + echo $breadcrumb; + if ($core->error->flag()) { echo - '

'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'

'. + '

'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'

'. $core->error->toHTML(). '
'; @@ -176,5 +180,10 @@ "
\n". // End of #main - '\n"; // End of #wrapper @@ -204,5 +213,5 @@ } - public static function openPopup($title='', $head='') + public static function openPopup($title='',$head='',$breadcrumb='') { global $core; @@ -216,4 +225,5 @@ 'xml:lang="'.$core->auth->getInfo('user_lang').'" '. 'lang="'.$core->auth->getInfo('user_lang').'">'."\n". + ''."\n". "\n". ' '."\n". @@ -241,5 +251,5 @@ ''."\n". - '

'.DC_VENDOR_NAME.'

'."\n"; + '

'.DC_VENDOR_NAME.'

'."\n"; echo @@ -247,4 +257,7 @@ '
'."\n". '
'."\n"; + + // display breadcrumb if given + echo $breadcrumb; if ($core->error->flag()) { @@ -264,4 +277,23 @@ "
\n". // End of #wrapper ''; + } + + public static function breadcrumb($elements=null,$with_home_link=true,$echo=false) + { + // First item of array elements should be blog's name, System or Plugins + $res = '

'.($with_home_link ? + ''.__('Go to dashboard').'' : + ''); + $index = 0; + foreach ($elements as $element => $url) { + $res .= ($with_home_link ? ($index == 1 ? ' : ' : ' › ') : ($index == 0 ? ' ' : ' › ')). + ($url ? '' : '').$element.($url ? '' : ''); + $index++; + } + $res .= '

'; + if ($echo) { + echo $res; + } + return $res; } @@ -411,5 +443,7 @@ self::jsVar('dotclear.msg.help', - __('help')). + __('Help about this page')). + self::jsVar('dotclear.msg.help_hide', + __('Hide')). self::jsVar('dotclear.msg.no_selection', __('no selection')). @@ -436,4 +470,6 @@ self::jsVar('dotclear.msg.confirm_delete_post', __("Are you sure you want to delete this entry?")). + self::jsVar('dotclear.msg.click_to_unlock', + __("Click here to unlock the field")). self::jsVar('dotclear.msg.confirm_spam_delete', __('Are you sure you want to delete all spams?')). @@ -476,6 +512,4 @@ self::jsVar('dotclear.msg.confirm_change_post_format', __('You have unsaved changes. Switch post format will loose these changes. Proceed anyway?')). - self::jsVar('dotclear.msg.confirm_change_post_format_noconvert', - __("Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?")). self::jsVar('dotclear.msg.load_enhanced_uploader', __('Loading enhanced uploader, please wait.')). Index: inc/admin/lib.pager.php =================================================================== --- inc/admin/lib.pager.php (revision 1364) +++ inc/admin/lib.pager.php (revision 1415) @@ -58,5 +58,5 @@ } - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; $blocks = explode('%s',$html_block); @@ -71,5 +71,5 @@ echo $blocks[1]; - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; } } @@ -87,5 +87,5 @@ html::escapeHTML($this->rs->cat_title)); } else { - $cat_title = __('(No cat)'); + $cat_title = __('None'); } @@ -93,14 +93,14 @@ switch ($this->rs->post_status) { case 1: - $img_status = sprintf($img,__('published'),'check-on.png'); + $img_status = sprintf($img,__('Published'),'check-on.png'); break; case 0: - $img_status = sprintf($img,__('unpublished'),'check-off.png'); + $img_status = sprintf($img,__('Unpublished'),'check-off.png'); break; case -1: - $img_status = sprintf($img,__('scheduled'),'scheduled.png'); + $img_status = sprintf($img,__('Scheduled'),'scheduled.png'); break; case -2: - $img_status = sprintf($img,__('pending'),'check-wrn.png'); + $img_status = sprintf($img,__('Pending'),'check-wrn.png'); break; } @@ -108,10 +108,10 @@ $protected = ''; if ($this->rs->post_password) { - $protected = sprintf($img,__('protected'),'locker.png'); + $protected = sprintf($img,__('Protected'),'locker.png'); } $selected = ''; if ($this->rs->post_selected) { - $selected = sprintf($img,__('selected'),'selected.png'); + $selected = sprintf($img,__('Selected'),'selected.png'); } @@ -170,5 +170,5 @@ } - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; $blocks = explode('%s',$html_block); @@ -183,5 +183,5 @@ echo $blocks[1]; - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; } } @@ -192,14 +192,14 @@ switch ($this->rs->post_status) { case 1: - $img_status = sprintf($img,__('published'),'check-on.png'); + $img_status = sprintf($img,__('Published'),'check-on.png'); break; case 0: - $img_status = sprintf($img,__('unpublished'),'check-off.png'); + $img_status = sprintf($img,__('Unpublished'),'check-off.png'); break; case -1: - $img_status = sprintf($img,__('scheduled'),'scheduled.png'); + $img_status = sprintf($img,__('Scheduled'),'scheduled.png'); break; case -2: - $img_status = sprintf($img,__('pending'),'check-wrn.png'); + $img_status = sprintf($img,__('Pending'),'check-wrn.png'); break; } @@ -207,10 +207,10 @@ $protected = ''; if ($this->rs->post_password) { - $protected = sprintf($img,__('protected'),'locker.png'); + $protected = sprintf($img,__('Protected'),'locker.png'); } $selected = ''; if ($this->rs->post_selected) { - $selected = sprintf($img,__('selected'),'selected.png'); + $selected = sprintf($img,__('Selected'),'selected.png'); } @@ -267,5 +267,5 @@ } - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; $blocks = explode('%s',$html_block); @@ -280,5 +280,5 @@ echo $blocks[1]; - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; } } @@ -306,14 +306,14 @@ switch ($this->rs->comment_status) { case 1: - $img_status = sprintf($img,__('published'),'check-on.png'); + $img_status = sprintf($img,__('Published'),'check-on.png'); break; case 0: - $img_status = sprintf($img,__('unpublished'),'check-off.png'); + $img_status = sprintf($img,__('Unpublished'),'check-off.png'); break; case -1: - $img_status = sprintf($img,__('pending'),'check-wrn.png'); + $img_status = sprintf($img,__('Pending'),'check-wrn.png'); break; case -2: - $img_status = sprintf($img,__('junk'),'junk.png'); + $img_status = sprintf($img,__('Junk'),'junk.png'); break; } @@ -374,5 +374,5 @@ } - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; $blocks = explode('%s',$html_block); @@ -387,5 +387,5 @@ echo $blocks[1]; - echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; + echo '

'.__('Page(s)').' : '.$pager->getLinks().'

'; } } Index: inc/admin/prepend.php =================================================================== --- inc/admin/prepend.php (revision 1179) +++ inc/admin/prepend.php (revision 1337) @@ -284,5 +284,5 @@ # Set menu titles - $_menu['System']->title = __('System'); + $_menu['System']->title = __('System settings'); $_menu['Blog']->title = __('Blog'); $_menu['Plugins']->title = __('Plugins'); Index: inc/core/class.dc.blog.php =================================================================== --- inc/core/class.dc.blog.php (revision 1262) +++ inc/core/class.dc.blog.php (revision 1353) @@ -81,5 +81,5 @@ $this->desc = $b->blog_desc; $this->url = $b->blog_url; - $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url); + $this->host = http::getHostFromURL($this->url); $this->creadt = strtotime($b->blog_creadt); $this->upddt = strtotime($b->blog_upddt); @@ -91,13 +91,13 @@ $this->public_path = path::fullFromRoot($this->settings->system->public_path,DC_ROOT); - $this->post_status['-2'] = __('pending'); - $this->post_status['-1'] = __('scheduled'); - $this->post_status['0'] = __('unpublished'); - $this->post_status['1'] = __('published'); - - $this->comment_status['-2'] = __('junk'); - $this->comment_status['-1'] = __('pending'); - $this->comment_status['0'] = __('unpublished'); - $this->comment_status['1'] = __('published'); + $this->post_status['-2'] = __('Pending'); + $this->post_status['-1'] = __('Scheduled'); + $this->post_status['0'] = __('Unpublished'); + $this->post_status['1'] = __('Published'); + + $this->comment_status['-2'] = __('Junk'); + $this->comment_status['-1'] = __('Pending'); + $this->comment_status['0'] = __('Unpublished'); + $this->comment_status['1'] = __('Published'); # --BEHAVIOR-- coreBlogConstruct @@ -203,26 +203,22 @@ @param ids mixed Comment(s) ID(s) @param del boolean If comment is delete, set this to true - @param affected_posts mixed Posts(s) ID(s) - */ - public function triggerComments($ids, $del=false, $affected_posts=null) + */ + public function triggerComments($ids,$del=false) { $co_ids = dcUtils::cleanIds($ids); - $a_ids = dcUtils::cleanIds($affected_posts); - $a_tbs = array(); # a) Retrieve posts affected by comments edition - if (empty($a_ids)) { - $strReq = - 'SELECT post_id, comment_trackback '. - 'FROM '.$this->prefix.'comment '. - 'WHERE comment_id'.$this->con->in($co_ids). - 'GROUP BY post_id,comment_trackback'; - - $rs = $this->con->select($strReq); - - while ($rs->fetch()) { - $a_ids[] = (integer) $rs->post_id; - $a_tbs[] = (integer) $rs->comment_trackback; - } + $strReq = + 'SELECT post_id, comment_trackback '. + 'FROM '.$this->prefix.'comment '. + 'WHERE comment_id'.$this->con->in($co_ids). + 'GROUP BY post_id,comment_trackback'; + + $rs = $this->con->select($strReq); + + $a_ids = $a_tbs = array(); + while ($rs->fetch()) { + $a_ids[] = (integer) $rs->post_id; + $a_tbs[] = (integer) $rs->comment_trackback; } @@ -259,5 +255,4 @@ { $nb_comment = $nb_trackback = 0; - //$cur->nb_comment = $nb_comment; foreach($b_ids as $b_key => $b_id) { @@ -510,11 +505,5 @@ $this->core->callBehavior('coreBeforeCategoryCreate',$this,$cur); - $id = $this->categories()->addNode($cur,$parent); - # Update category's cursor - $rs = $this->getCategory($id); - if (!$rs->isEmpty()) { - $cur->cat_lft = $rs->cat_lft; - $cur->cat_rgt = $rs->cat_rgt; - } + $this->categories()->addNode($cur,$parent); # --BEHAVIOR-- coreAfterCategoryCreate @@ -2192,19 +2181,6 @@ $co_ids = dcUtils::cleanIds($ids); - if (empty($co_ids)) { + if (empty($ids)) { throw new Exception(__('No such comment ID')); - } - - # Retrieve posts affected by comments edition - $affected_posts = array(); - $strReq = - 'SELECT distinct(post_id) '. - 'FROM '.$this->prefix.'comment '. - 'WHERE comment_id'.$this->con->in($co_ids); - - $rs = $this->con->select($strReq); - - while ($rs->fetch()) { - $affected_posts[] = (integer) $rs->post_id; } @@ -2236,5 +2212,5 @@ $this->con->execute($strReq); - $this->triggerComments($co_ids, true, $affected_posts); + $this->triggerComments($co_ids,true); $this->triggerBlog(); } @@ -2291,8 +2267,6 @@ if ($cur->comment_site !== null && $cur->comment_site != '') { - if (!preg_match('|^http(s?)://|i',$cur->comment_site, $matches)) { + if (!preg_match('|^http(s?)://|',$cur->comment_site)) { $cur->comment_site = 'http://'.$cur->comment_site; - }else{ - $cur->comment_site = strtolower($matches[0]).substr($cur->comment_site, strlen($matches[0])); } } Index: inc/core/class.dc.media.php =================================================================== --- inc/core/class.dc.media.php (revision 1381) +++ inc/core/class.dc.media.php (revision 1280) @@ -30,5 +30,4 @@ public $thumb_tp = '%s/.%s_%s.jpg'; ///< string Thumbnail file pattern - public $thumb_tp_alpha = '%s/.%s_%s.png'; ///< string Thumbnail file pattern (with alpha layer) /** @@ -299,7 +298,6 @@ $f->media_thumb = array(); $p = path::info($f->relname); - $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG'); - $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root.'/'.$p['dirname'],$p['base'],'%s'); - $thumb_url = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root_url.$p['dirname'],$p['base'],'%s'); + $thumb = sprintf($this->thumb_tp,$this->root.'/'.$p['dirname'],$p['base'],'%s'); + $thumb_url = sprintf($this->thumb_tp,$this->root_url.$p['dirname'],$p['base'],'%s'); # Cleaner URLs @@ -499,8 +497,7 @@ @param post_id integer Post ID @param media_id integer Optionnal media ID - @param return_rs boolean Whether to return a resultset (true) or an array (false, default value). - @return array Array or ResultSet of fileItems - */ - public function getPostMedia($post_id,$media_id=null,$return_rs=false) + @return array Array of fileItems + */ + public function getPostMedia($post_id,$media_id=null) { $params = array( @@ -518,9 +515,9 @@ $f = $this->fileRecord($rs); if ($f !== null) { - $res[] = $return_rs ? new ArrayObject($f) : $f; - } - } - - return $return_rs ? staticRecord::newFromArray($res) : $res; + $res[] = $f; + } + } + + return $res; } @@ -923,6 +920,5 @@ $p = path::info($file); - $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG'); - $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s'); + $thumb = sprintf($this->thumb_tp,$p['dirname'],$p['base'],'%s'); try @@ -943,5 +939,5 @@ $rate = ($s[0] < 100 ? 95 : ($s[0] < 600 ? 90 : 85)); $img->resize($s[0],$s[0],$s[1]); - $img->output(($alpha ? 'png' : 'jpeg'),$thumb_file,$rate); + $img->output('jpeg',$thumb_file,$rate); $img->loadImage($file); } @@ -962,10 +958,8 @@ { $p = path::info($file->relname); - $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG'); - $thumb_old = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s'); + $thumb_old = sprintf($this->thumb_tp,$p['dirname'],$p['base'],'%s'); $p = path::info($newFile->relname); - $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG'); - $thumb_new = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s'); + $thumb_new = sprintf($this->thumb_tp,$p['dirname'],$p['base'],'%s'); foreach ($this->thumb_sizes as $suffix => $s) { @@ -980,6 +974,5 @@ { $p = path::info($f); - $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG'); - $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),'',$p['base'],'%s'); + $thumb = sprintf($this->thumb_tp,'',$p['base'],'%s'); foreach ($this->thumb_sizes as $suffix => $s) { Index: inc/core/class.dc.update.php =================================================================== --- inc/core/class.dc.update.php (revision 1231) +++ inc/core/class.dc.update.php (revision 1280) @@ -32,5 +32,4 @@ protected $cache_ttl = '-6 hours'; - protected $nocache_ttl = '-2 mins'; protected $forced_files = array(); @@ -56,10 +55,9 @@ * * @param version string Current version to compare - * @param nocache boolean Force checking * @return string Latest version if available */ - public function check($version, $nocache=false) - { - $this->getVersionInfo($nocache); + public function check($version) + { + $this->getVersionInfo(); $v = $this->getVersion(); if ($v && version_compare($version,$v,'<')) { @@ -70,13 +68,8 @@ } - public function getVersionInfo($nocache=false) - { - # Check minimum time without cache (prevents from server flood) - if ($nocache && is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->nocache_ttl)) { - $nocache = false; - } - + public function getVersionInfo() + { # Check cached file - if (is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->cache_ttl) && !$nocache) + if (is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->cache_ttl)) { $c = @file_get_contents($this->cache_file); Index: inc/load_plugin_file.php =================================================================== --- inc/load_plugin_file.php (revision 1241) +++ inc/load_plugin_file.php (revision 1280) @@ -86,5 +86,5 @@ } -http::$cache_max_age = (!defined('DC_CACHE_MAX_AGE') ? 604800 : DC_CACHE_MAX_AGE); +http::$cache_max_age = 7200; http::cache(array_merge(array($PF),get_included_files())); Index: inc/prepend.php =================================================================== --- inc/prepend.php (revision 1352) +++ inc/prepend.php (revision 1279) @@ -123,5 +123,5 @@ # Constants define('DC_ROOT',path::real(dirname(__FILE__).'/..')); -define('DC_VERSION','2.5.3-dev'); +define('DC_VERSION','2.6-dev'); define('DC_DIGESTS',dirname(__FILE__).'/digests'); define('DC_L10N_ROOT',dirname(__FILE__).'/../locales'); Index: inc/public/class.dc.template.php =================================================================== --- inc/public/class.dc.template.php (revision 1249) +++ inc/public/class.dc.template.php (revision 1280) @@ -67,5 +67,4 @@ $this->addValue('BlogLanguage',array($this,'BlogLanguage')); $this->addValue('BlogThemeURL',array($this,'BlogThemeURL')); - $this->addValue('BlogParentThemeURL',array($this,'BlogParentThemeURL')); $this->addValue('BlogUpdateDate',array($this,'BlogUpdateDate')); $this->addValue('BlogID',array($this,'BlogID')); @@ -840,5 +839,5 @@ /*dtd - + */ public function BlogThemeURL($attr) @@ -846,14 +845,4 @@ $f = $this->getFilters($attr); return 'blog->settings->system->themes_url."/".$core->blog->settings->system->theme').'; ?>'; - } - - /*dtd - - */ - public function BlogParentThemeURL($attr) - { - $f = $this->getFilters($attr); - $parent = '$core->themes->moduleInfo($core->blog->settings->system->theme,\'parent\')'; - return 'blog->settings->system->themes_url."/".('."$parent".' ? '."$parent".' : $core->blog->settings->system->theme)').'; ?>'; } Index: locales/_pot/plugins.pot =================================================================== --- locales/_pot/plugins.pot (revision 963) +++ locales/_pot/plugins.pot (revision 1354) @@ -2311,5 +2311,5 @@ #: plugins/widgets/index.php:250 -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/bn/help/blowupConfig.html =================================================================== --- locales/bn/help/blowupConfig.html (revision 1264) +++ locales/bn/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/bn/plugins.po =================================================================== --- locales/bn/plugins.po (revision 1126) +++ locales/bn/plugins.po (revision 1354) @@ -1540,5 +1540,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/ca/help/blowupConfig.html =================================================================== --- locales/ca/help/blowupConfig.html (revision 1264) +++ locales/ca/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/ca/plugins.po =================================================================== --- locales/ca/plugins.po (revision 1126) +++ locales/ca/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/cs/help/blowupConfig.html =================================================================== --- locales/cs/help/blowupConfig.html (revision 1264) +++ locales/cs/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/cs/plugins.po =================================================================== --- locales/cs/plugins.po (revision 1126) +++ locales/cs/plugins.po (revision 1354) @@ -1565,5 +1565,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/da/help/blowupConfig.html =================================================================== --- locales/da/help/blowupConfig.html (revision 1264) +++ locales/da/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/da/plugins.po =================================================================== --- locales/da/plugins.po (revision 1126) +++ locales/da/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/de/help/blowupConfig.html =================================================================== --- locales/de/help/blowupConfig.html (revision 1264) +++ locales/de/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

Du kannst ein Bild Deiner Wahl statt des Standardbildes einsetzen.

-

Wenn Du "Benutzerdefiniert..." in der Bilderliste auswählst, dann hast Du die Möglichkeit, Dein eigenes Bild upzuloaden. Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.

+

Wenn Du "Benutzerdefiniert..." in der Bilderliste auswählst, dann hast Du die Möglichkeit, Dein eigenes Bild upzuloaden. Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.

Wenn Du ein JPG-Bild uploadest, dann wird automatisch ein Rahmen um das Bild gesetzt. Dies geschieht nicht bei der Verwendung eines PNG-Bildes und die Transparenz wird ebenfalls beibehalten.

Index: locales/de/plugins.po =================================================================== --- locales/de/plugins.po (revision 1126) +++ locales/de/plugins.po (revision 1354) @@ -1569,5 +1569,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/en/main.po =================================================================== --- locales/en/main.po (revision 1364) +++ locales/en/main.po (revision 1280) @@ -2154,7 +2154,4 @@ msgstr "" -msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?" -msgstr "" - msgid "Loading enhanced uploader, please wait." msgstr "" @@ -2790,5 +2787,2 @@ msgid "The following error was encountered while trying to read the database:" msgstr "" - -msgid "(No cat)" -msgstr "(none)" Index: locales/en/plugins.po =================================================================== --- locales/en/plugins.po (revision 1126) +++ locales/en/plugins.po (revision 1354) @@ -1546,5 +1546,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/en/resources.php =================================================================== --- locales/en/resources.php (revision 1179) +++ locales/en/resources.php (revision 1343) @@ -15,9 +15,9 @@ $__resources['doc'] = array( - "Dotclear 2 documentation" => 'http://dotclear.org/documentation/2.0', - 'Dotclear 2 presentation' => 'http://dotclear.org/documentation/2.0/overview/tour', + "Dotclear documentation" => 'http://dotclear.org/documentation/2.0', + 'Dotclear presentation' => 'http://dotclear.org/documentation/2.0/overview/tour', "User manual" => 'http://dotclear.org/documentation/2.0/usage', "Installation and administration guides" => 'http://dotclear.org/documentation/2.0/admin', - "Dotclear 2 support forum" => 'http://forum.dotclear.net/' + "Dotclear support forum" => 'http://forum.dotclear.net/' ); Index: locales/eo/help/blowupConfig.html =================================================================== --- locales/eo/help/blowupConfig.html (revision 1264) +++ locales/eo/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/eo/plugins.po =================================================================== --- locales/eo/plugins.po (revision 1126) +++ locales/eo/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/es-ar/help/blowupConfig.html =================================================================== --- locales/es-ar/help/blowupConfig.html (revision 1264) +++ locales/es-ar/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/es-ar/plugins.po =================================================================== --- locales/es-ar/plugins.po (revision 1126) +++ locales/es-ar/plugins.po (revision 1354) @@ -1572,5 +1572,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/es/help/blowupConfig.html =================================================================== --- locales/es/help/blowupConfig.html (revision 1264) +++ locales/es/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/es/plugins.po =================================================================== --- locales/es/plugins.po (revision 1126) +++ locales/es/plugins.po (revision 1354) @@ -1576,5 +1576,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/eu/help/blowupConfig.html =================================================================== --- locales/eu/help/blowupConfig.html (revision 1264) +++ locales/eu/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

You can choose a header image among the list to use in place of the default one.

-

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

+

When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

Index: locales/eu/plugins.po =================================================================== --- locales/eu/plugins.po (revision 1126) +++ locales/eu/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/fr/help/blowupConfig.html =================================================================== --- locales/fr/help/blowupConfig.html (revision 1264) +++ locales/fr/help/blowupConfig.html (revision 1348) @@ -14,5 +14,5 @@

Quand vous devez indiquer une valeur de couleur, celle-ci doit être au format hexadécimal. Par exemple : "#FF0000" donnera du rouge. Vous pouvez vous aider -de la pipette à côté de chaque champs de couleur.

+de la pipette à côté de chaque champ de couleur.

Si vous manquez d'inspiration vous pouvez consulter :

    @@ -44,5 +44,5 @@

    En choisissant "Personnalisé..." parmi la liste d'images, vous pourrez déposer votre propre image. Celle-ci doit être au format JPG ou PNG et -avoir une largeur exacte de 800 pixels.

    +avoir une largeur exacte de 800 pixels.

    Si vous déposez une image au format JPG, un cadre sera ajouté autours de Index: locales/fr/help/core_blog_pref.html =================================================================== --- locales/fr/help/core_blog_pref.html (revision 990) +++ locales/fr/help/core_blog_pref.html (revision 1354) @@ -13,5 +13,6 @@

    Nom du blog
    -
    Nom du blog, obligatoire.
    +
    Nom du blog, obligatoire. Il peut être modifié à tout moment sans incidence sur + le fonctionnement du blog.
    URL du blog
    @@ -44,5 +45,5 @@
    Nom de l'éditeur du blog
    Nom de la personne responsable du contenu du blog. Peut être le propriétaire - ou le directeur de publication s'il existe. Information affichée dans les + ou le directeur de publication s'il existe. Cette information sera affichée dans les informations du flux de syndication.
    @@ -53,5 +54,5 @@
    Langue de l'interface du blog. Si cette langue existe parmi les traductions, l'interface sera traduite dans celle-ci, sinon elle apparaîtra - en Anglais.
    + en anglais.
    Fuseau horaire du blog
    Index: locales/fr/main.po =================================================================== --- locales/fr/main.po (revision 1397) +++ locales/fr/main.po (revision 1420) @@ -1038,5 +1038,5 @@ #, fuzzy, php-format msgid "Path %s is not writable." -msgstr "Le répertoire %s n'est pas accessible en écriture." +msgstr "Le répertoire de cache %s n'est pas accessible en écriture." #, fuzzy @@ -1123,5 +1123,5 @@ #, php-format msgid "You can change your user language in your preferences or change your blog's main language in your blog settings." -msgstr "Vous pouvez changer votre langue d'utilisateur dans vos préférences ou changer la langue principale de votre blog dans vos paramètres du blog." +msgstr "Vous pouvez changer votre langue d'utilisateur dans vos préférences ou changer la langue principale de votre blog dans vos paramètres de blog." msgid "Installed languages" @@ -1193,10 +1193,4 @@ msgstr "Gestionnaire de médias" -msgid "Go to %s folder" -msgstr "Aller au dossier %s" - -msgid "Media details of %s" -msgstr "Détails du média %s" - msgid "confirm removal" msgstr "Confirmer la suppression" @@ -1490,5 +1484,5 @@ msgid "Plugins" -msgstr "Extensions" +msgstr "Plugins" msgid "Activated plugins" @@ -1568,5 +1562,5 @@ msgid "Search" -msgstr "Recherche" +msgstr "Rechercher" msgid "cancel" @@ -1628,5 +1622,5 @@ msgid "Text formating:" -msgstr "Format du texte :" +msgstr "Syntaxe de saisie :" msgid "Convert to XHTML" @@ -1923,9 +1917,9 @@ msgstr "Requête :" -msgid "Search entries" -msgstr "Rechercher des billets" - -msgid "Search comments" -msgstr "Rechercher des commentaires" +msgid "Search in entries" +msgstr "Rechercher dans les billets" + +msgid "Search in comments" +msgstr "Rechercher dans les commentaires" msgid "schedule" @@ -2000,13 +1994,7 @@ msgstr "Les fichiers suivants de votre installation de Dotclear ne peuvent pas être écrits. Veuillez corriger la situation ou mettre à jour manuellement." -msgid "Manual checking of update done successfully." -msgstr "Vérification manuelle de mise à jour effectuée avec succès." - msgid "No newer Dotclear version available." msgstr "Aucune nouvelle version de Dotclear n'est disponible." -msgid "Force checking update Dotclear" -msgstr "Forcer la vérification de mise à jour de Dotclear" - #, php-format msgid "Dotclear %s is available." @@ -2064,5 +2052,5 @@ msgid "Mandatory for password recovering procedure." -msgstr "Obligatoire pour la procédure de récupération de mot de passe." +msgstr "Indispensable pour la procédure de récupération de mot de passe." msgid "Password change required to connect" @@ -2145,9 +2133,9 @@ #, fuzzy msgid "Go to the content" -msgstr "Aller au contenu" +msgstr "Voir ce billet sur le site" #, fuzzy msgid "Go to the menu" -msgstr "Aller au menu" +msgstr "Aller sur le site" msgid "Go to site" @@ -2174,4 +2162,7 @@ msgstr "Aide" +msgid "Help about this page" +msgstr "Aide pour cette page" + msgid "uncover" msgstr "dévoiler" @@ -2210,5 +2201,5 @@ msgid "Users with posts cannot be deleted." -msgstr "Les utilisateurs ayant écrit des billets ne peuvent être supprimés." +msgstr "Les utilisateurs ayant écrit des billets ne peuvent être effacées." #, php-format @@ -2256,5 +2247,5 @@ msgid "XHTML markup validator" -msgstr "Validation XHTML" +msgstr "Vérifier la validité XHTML" msgid "XHTML content is valid." @@ -2267,7 +2258,4 @@ msgstr "Vous avez des modifications non sauvegardées. Changer de format vous fera perdre ces modifications. Continuer ?" -msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?" -msgstr "Attention : le changement de syntaxe ne transformera pas les balises des contenus déjà saisis. Pensez à les réadapter après cette opération. Confirmez-vous ce changement de syntaxe ?" - msgid "Loading enhanced uploader, please wait." msgstr "Chargement de l'interface avancée." @@ -2518,5 +2506,5 @@ #, fuzzy msgid "You are not allowed to reset categories order" -msgstr "Vous n'êtes pas autorisé à réinitialiser l'ordre des catégories" +msgstr "Vous n'êtes pas autorisé à supprimer des catégories" msgid "Category URL must be unique." @@ -2941,22 +2929,107 @@ msgstr "Date de publication invalide" -msgid "(No cat)" -msgstr "(aucune)" - -msgid "Password strength: %s" -msgstr "Force du mot de passe : %s" - -msgid "very weak" -msgstr "très faible" - -msgid "weak" -msgstr "faible" - -msgid "mediocre" -msgstr "moyen" - -msgid "strong" -msgstr "fort" - -msgid "very strong" -msgstr "très fort" +msgid "System settings" +msgstr "Réglages système" + +msgid "Additional plugins" +msgstr "Modules complémentaires" + +msgid "Personal notes:" +msgstr "Notes personnelles :" + +msgid "New user" +msgstr "Nouvel utilisateur" + +msgid "Published" +msgstr "Publié" + +msgid "Unpublished" +msgstr "Non publié" + +msgid "Pending" +msgstr "En attente" + +msgid "Junk" +msgstr "Indésirable" + +msgid "Scheduled" +msgstr "Programmé" + +msgid "Protected" +msgstr "Protégé" + +msgid "Publish" +msgstr "Publier" + +msgid "Unpublish" +msgstr "Mettre hors ligne" + +msgid "Mark as pending" +msgstr "Mettre en attente" + +msgid "Mark as junk" +msgstr "Mettre en indésirable" + +msgid "Next entry" +msgstr "Billet suivant" + +msgid "Previous entry" +msgstr "Billet précédent" + +msgid "Add an introduction to the post." +msgstr "Ajoute une introduction au billet." + +msgid "Add unpublished notes." +msgstr "Ajoute des notes non publiées." + +msgid "Edit basename:" +msgstr "Modifier l'URL spécifique :" + +msgid "Protect with password" +msgstr "Protéger par un mot de passe" + +msgid "Information collected" +msgstr "Informations recueillies" + +msgid "Comment submitted" +msgstr "Commentaire déposé" + +msgid "Entry status" +msgstr "État du billet" + +msgid "Publication date and hour" +msgstr "Date et heure de publication" + +msgid "Text formating" +msgstr "Syntaxe de saisie" + +msgid "Entry lang" +msgstr "Langue du billet" + +msgid "Password" +msgstr "Mot de passe" + +msgid "Edit basename" +msgstr "URL spécifique" + +msgid "Ordering" +msgstr "Classement" + +msgid "Filter posts list" +msgstr "Filtrer la liste des billets" + +msgid "entries per page" +msgstr "billets par page" + +msgid "Show" +msgstr "Afficher" + +msgid "Filter blogs list" +msgstr "Filtrer la liste des blogs" + +msgid "blogs per page" +msgstr "blogs par page" + +msgid "Filter comments and trackbacks list" +msgstr "Filtrer la liste des commentaires et rétroliens" + Index: locales/fr/plugins.po =================================================================== --- locales/fr/plugins.po (revision 1286) +++ locales/fr/plugins.po (revision 1396) @@ -238,6 +238,6 @@ #, php-format -msgid "%s configuration" -msgstr "configuration %s" +msgid "%s filter configuration" +msgstr "Configuration du filtre %s" msgid "Information" @@ -1024,6 +1024,6 @@ msgid "" "On the other hand, in WordPress, a post can not be uncategorized, and a " -"default installation has a first category labelised \"Uncategorized\". If you did not change that category, you can just ignore it while " +"default installation has a first category labelised \"Uncategorized\"." +"If you did not change that category, you can just ignore it while " "importing your blog, as Dotclear allows you to actually keep your posts " "uncategorized." @@ -1031,5 +1031,5 @@ "D'autre part, dans WordPress, un billet ne peut pas être sans catégorie, et " "une installation par défaut possède systématiquement une première catégorie " -"nommée « sans catégorie ». Si vous n'avez pas changé cette " +"nommée « sans catégorie ». Si vous n'avez pas changé cette " "catégorie, vous pouvez simplement l'ignorer lors de l'importation sur votre " "blog, puisque Dotclear vous permet réellement de conserver votre message " @@ -1131,5 +1131,5 @@ msgid "Vacuum tables" -msgstr "Optimiser les tables" +msgstr "Vidage des tables" msgid "Counters" @@ -1137,5 +1137,5 @@ msgid "Reset comments and ping counters" -msgstr "Recalculer les compteurs de commentaires et de signalements" +msgstr "Remet à zéro les compteurs de commentaires et de signalements" msgid "Search engine index" @@ -1146,8 +1146,8 @@ msgid "Index all posts" -msgstr "Indexer tous les billets" +msgstr "Indexation de tous les billets" msgid "Index all comments" -msgstr "Indexer tous les commentaires" +msgstr "Indexation de tous les commentaires" msgid "Vacuum logs" @@ -1155,5 +1155,5 @@ msgid "Delete all logs" -msgstr "Supprimer tous les journaux" +msgstr "Suppression de tous les journaux" msgid "Empty templates cache directory" @@ -1161,5 +1161,5 @@ msgid "Empty directory" -msgstr "Vider le répertoire" +msgstr "Vidage du répertoire" msgid "Pages" @@ -1241,5 +1241,5 @@ msgid "Go to this page on the site" -msgstr "Aller sur cette page" +msgstr "Voir cette page sur le site" msgid "Page status:" @@ -1277,5 +1277,5 @@ msgid "Pings" -msgstr "Signalements" +msgstr "Signalements (pings)" msgid "Ping services" @@ -1777,8 +1777,8 @@ msgid "" "Once included in a sidebar, widgets have configuration options that you can " -"reach by clicking on the + sign next to their name." +"reach by clicking on the arrow next to their name." msgstr "" "Une fois inclus dans un bandeau, les widgets ont généralement des options " -"que vous pouvez configurer. Cliquez sur le signe + à côté de leur nom pour y " +"que vous pouvez configurer. Cliquez sur la flèche à côté de leur nom pour y " "accéder." @@ -1913,2 +1913,17 @@ #~ msgid "The backup file does not appear to be well formed." #~ msgstr "Le fichier de sauvegarde semble mal formaté." + +msgid "Settings for %s" +msgstr "Réglages pour %s" + +msgid "Settings for %s" +msgstr "Réglages pour %s" + +msgid "User preferences" +msgstr "Préférences utilisateur" + +msgid "Global preferences" +msgstr "Préférences globales" + +msgid "Edit theme files" +msgstr "Modifier les fichiers du thème" Index: locales/fr/resources.php =================================================================== --- locales/fr/resources.php (revision 1179) +++ locales/fr/resources.php (revision 1343) @@ -15,9 +15,9 @@ $__resources['doc'] = array( - "Accueil de l'aide Dotclear 2" => 'http://doc.dotclear.net/2.0', - 'Présentation de Dotclear 2' => 'http://doc.dotclear.net/2.0/overview/tour', + "Accueil de l'aide Dotclear" => 'http://fr.dotclear.org/documentation/2.0', + 'Présentation de Dotclear' => 'http://doc.dotclear.net/2.0/overview/tour', "Manuel de l'utilisateur" => 'http://doc.dotclear.net/2.0/usage', "Guide d'installation et d'administration" => 'http://doc.dotclear.net/2.0/admin', - "Forum de support de Dotclear 2" => 'http://forum.dotclear.net/' + "Forum de support de Dotclear" => 'http://forum.dotclear.net/' ); ?> Index: locales/hu/help/blowupConfig.html =================================================================== --- locales/hu/help/blowupConfig.html (revision 1264) +++ locales/hu/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/hu/plugins.po =================================================================== --- locales/hu/plugins.po (revision 1126) +++ locales/hu/plugins.po (revision 1354) @@ -1582,5 +1582,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/it/help/blowupConfig.html =================================================================== --- locales/it/help/blowupConfig.html (revision 1264) +++ locales/it/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/it/plugins.po =================================================================== --- locales/it/plugins.po (revision 1126) +++ locales/it/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/ja/help/blowupConfig.html =================================================================== --- locales/ja/help/blowupConfig.html (revision 1264) +++ locales/ja/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    デフォルトで指定されているものの代わりに、リストからヘッダ画像を選ぶことができます。

    -

    画像リストで「カスタム...」を選んだ場合、独自の画像をアップロードすることができます。 画像ファイルは JPG または PNG フォーマットで、横幅が正確に800ピクセルである必要があります。

    +

    画像リストで「カスタム...」を選んだ場合、独自の画像をアップロードすることができます。 画像ファイルは JPG または PNG フォーマットで、横幅が正確に800ピクセルである必要があります。

    JPG画像がアップロードされた場合、画像に境界線が付加されます。 PNG画像の場合には付加されず、透過性も維持されます。

    Index: locales/ja/plugins.po =================================================================== --- locales/ja/plugins.po (revision 1126) +++ locales/ja/plugins.po (revision 1354) @@ -1576,5 +1576,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/ko/help/blowupConfig.html =================================================================== --- locales/ko/help/blowupConfig.html (revision 1264) +++ locales/ko/help/blowupConfig.html (revision 1280) @@ -34,5 +34,5 @@

    기본이미지 대신, 목록에 있는 머리글 이미지를 쓰실 수 있습니다.

    -

    이미지 목록에서 "개성에 맞게..."를 선택하시면, 당신 자신이 보유한 이미지를 올릴 수 있습니다. 이미지 파일은 JPG나 PNG 포맷이어야하고 폭은 정확히 800px 이어야 합니다.

    +

    이미지 목록에서 "개성에 맞게..."를 선택하시면, 당신 자신이 보유한 이미지를 올릴 수 있습니다. 이미지 파일은 JPG나 PNG 포맷이어야하고 폭은 정확히 800px 이어야 합니다.

    JPG 이미지를 올리실 때는, 윤곽선이 추가됩니다. PNG 이미지의 경우는 해당되지 않습니다. (PNG 이미지의 투명도도 또한 유지됩니다.)

    Index: locales/ko/plugins.po =================================================================== --- locales/ko/plugins.po (revision 1126) +++ locales/ko/plugins.po (revision 1354) @@ -1583,5 +1583,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/lt/help/blowupConfig.html =================================================================== --- locales/lt/help/blowupConfig.html (revision 1264) +++ locales/lt/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    Du kannst ein Bild Deiner Wahl statt des Standardbildes einsetzen.

    -

    Wenn Du "Benutzerdefiniert..." in der Bilderliste auswählst, dann hast Du die Möglichkeit, Dein eigenes Bild upzuloaden. Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.

    +

    Wenn Du "Benutzerdefiniert..." in der Bilderliste auswählst, dann hast Du die Möglichkeit, Dein eigenes Bild upzuloaden. Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.

    Wenn Du ein JPG-Bild uploadest, dann wird automatisch ein Rahmen um das Bild gesetzt. Dies geschieht nicht bei der Verwendung eines PNG-Bildes und die Transparenz wird ebenfalls beibehalten.

    Index: locales/nl/help/blowupConfig.html =================================================================== --- locales/nl/help/blowupConfig.html (revision 1264) +++ locales/nl/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/nl/plugins.po =================================================================== --- locales/nl/plugins.po (revision 1126) +++ locales/nl/plugins.po (revision 1354) @@ -1536,5 +1536,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/oc/help/blowupConfig.html =================================================================== --- locales/oc/help/blowupConfig.html (revision 1264) +++ locales/oc/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/oc/plugins.po =================================================================== --- locales/oc/plugins.po (revision 1126) +++ locales/oc/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/pl/help/blowupConfig.html =================================================================== --- locales/pl/help/blowupConfig.html (revision 1264) +++ locales/pl/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/pl/plugins.po =================================================================== --- locales/pl/plugins.po (revision 1126) +++ locales/pl/plugins.po (revision 1354) @@ -1559,5 +1559,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/pt-br/help/blowupConfig.html =================================================================== --- locales/pt-br/help/blowupConfig.html (revision 1264) +++ locales/pt-br/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/pt-br/plugins.po =================================================================== --- locales/pt-br/plugins.po (revision 1126) +++ locales/pt-br/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/pt/help/blowupConfig.html =================================================================== --- locales/pt/help/blowupConfig.html (revision 1264) +++ locales/pt/help/blowupConfig.html (revision 1280) @@ -51,5 +51,5 @@
    -NOTA: Uma bordura aparecera a volta da imagem o formato JPG, isto não acontece com as imagem em PNG -é a transparência dos PNGs fica efectiva-

    +NOTA: Uma bordura aparecera a volta da imagem o formato JPG, isto não acontece com as imagem em PNG -é a transparência dos PNGs fica efectiva-

    Estilos pré-definidos

    Index: locales/pt/plugins.po =================================================================== --- locales/pt/plugins.po (revision 1126) +++ locales/pt/plugins.po (revision 1354) @@ -1576,5 +1576,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/ro/help/blowupConfig.html =================================================================== --- locales/ro/help/blowupConfig.html (revision 1264) +++ locales/ro/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/ro/plugins.po =================================================================== --- locales/ro/plugins.po (revision 1126) +++ locales/ro/plugins.po (revision 1354) @@ -1554,5 +1554,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/ru/plugins.po =================================================================== --- locales/ru/plugins.po (revision 1126) +++ locales/ru/plugins.po (revision 1354) @@ -1565,5 +1565,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/sr/help/blowupConfig.html =================================================================== --- locales/sr/help/blowupConfig.html (revision 1264) +++ locales/sr/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/sr/plugins.po =================================================================== --- locales/sr/plugins.po (revision 1126) +++ locales/sr/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/sv/help/blowupConfig.html =================================================================== --- locales/sv/help/blowupConfig.html (revision 1264) +++ locales/sv/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/sv/plugins.po =================================================================== --- locales/sv/plugins.po (revision 1126) +++ locales/sv/plugins.po (revision 1354) @@ -1529,5 +1529,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/te/help/blowupConfig.html =================================================================== --- locales/te/help/blowupConfig.html (revision 1264) +++ locales/te/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/te/plugins.po =================================================================== --- locales/te/plugins.po (revision 1126) +++ locales/te/plugins.po (revision 1354) @@ -1558,5 +1558,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/tr/help/blowupConfig.html =================================================================== --- locales/tr/help/blowupConfig.html (revision 1264) +++ locales/tr/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    You can choose a header image among the list to use in place of the default one.

    -

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    +

    When you choose "Custom..." in the image list, you will be able to upload your own image. The image file must be in JPG or PNG format and must be precisely 800px wide.

    If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).

    Index: locales/tr/plugins.po =================================================================== --- locales/tr/plugins.po (revision 1126) +++ locales/tr/plugins.po (revision 1354) @@ -1546,5 +1546,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: locales/zh-cn/help/blowupConfig.html =================================================================== --- locales/zh-cn/help/blowupConfig.html (revision 1264) +++ locales/zh-cn/help/blowupConfig.html (revision 1280) @@ -35,5 +35,5 @@

    您可以从列表中选择一个头部图片来取代默认的。

    -

    当您在图片列表中选择“定制...”,您将可以上传自己的图片。图片必须是 JPG 或者 PNG 格式并且必须精确等于 800 像素宽。

    +

    当您在图片列表中选择“定制...”,您将可以上传自己的图片。图片必须是 JPG 或者 PNG 格式并且必须精确等于 800 像素宽。

    如果您上传一个 JPG 图片,一个边框将会被添加。而 PNG 图片不会如此(透明特性也会被保留)。

    Index: locales/zh-cn/plugins.po =================================================================== --- locales/zh-cn/plugins.po (revision 1126) +++ locales/zh-cn/plugins.po (revision 1354) @@ -1573,5 +1573,5 @@ msgstr "" -msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name." +msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the arrow next to their name." msgstr "" Index: plugins/aboutConfig/_admin.php =================================================================== --- plugins/aboutConfig/_admin.php (revision 1179) +++ plugins/aboutConfig/_admin.php (revision 1294) @@ -12,5 +12,5 @@ if (!defined('DC_CONTEXT_ADMIN')) { return; } -$_menu['Plugins']->addItem('about:config','plugin.php?p=aboutConfig','index.php?pf=aboutConfig/icon.png', +$_menu['System']->addItem('about:config','plugin.php?p=aboutConfig','index.php?pf=aboutConfig/icon.png', preg_match('/plugin.php\?p=aboutConfig(&.*)?$/',$_SERVER['REQUEST_URI']), $core->auth->isSuperAdmin()); Index: plugins/aboutConfig/index.php =================================================================== --- plugins/aboutConfig/index.php (revision 1274) +++ plugins/aboutConfig/index.php (revision 1358) @@ -85,6 +85,6 @@ return - ''. - ''. + ''. + ''. ''.$field.''. ''.$s['type'].''. @@ -97,10 +97,5 @@ about:config - - '; + } + public static function adminPostFormItems($main,$sidebar,$post) { if ($post !== null) @@ -23,6 +29,5 @@ $core =& $GLOBALS['core']; $post_media = $core->media->getPostMedia($post->post_id); - echo - '

    '.__('Attachments').'

    '; + $item = '
    '.__('Attachments').'
    '; foreach ($post_media as $f) { @@ -31,6 +36,6 @@ $ftitle = substr($ftitle,0,16).'...'; } - echo - '
    '. + $item .= + '
    '. ''. ''. @@ -53,8 +58,8 @@ if (empty($post_media)) { - echo '

    '.__('No attachment.').'

    '; - } else { - } - echo '

    '.__('Add files to this entry').'

    '; + $item .= '

    '.__('No attachment.').'

    '; + } + $item .= '

    '.__('Add files to this entry').'

    '; + $sidebar['metas-box']['items']['attachments']= $item; } } Index: plugins/attachments/_public.php =================================================================== --- plugins/attachments/_public.php (revision 1266) +++ plugins/attachments/_public.php (revision 1280) @@ -40,16 +40,12 @@ "posts !== null && $core->media) {'."\n". - '$_ctx->attachments = $core->media->getPostMedia($_ctx->posts->post_id, null, true);'."\n". + '$_ctx->attachments = new ArrayObject($core->media->getPostMedia($_ctx->posts->post_id));'."\n". "?>\n". - ''. // LEGACY - 'attachments->fetch()) : ?>'. - - 'attachments; $GLOBALS[\'attach_f\'] = $attach_f;'. // LEGACY - '$_ctx->file_url = $attach_f->file_url; ?>'. // LEGACY + 'attachments as $attach_i => $attach_f) : '. + '$GLOBALS[\'attach_i\'] = $attach_i; $GLOBALS[\'attach_f\'] = $attach_f;'. + '$_ctx->file_url = $attach_f->file_url; ?>'. $content. - ''. // LEGACY - 'attachments = null; ?>'. + 'attachments = null; unset($attach_i,$attach_f,$_ctx->file_url); ?>'. "\n"; @@ -64,5 +60,5 @@ { return - "attachments->isStart()) : ?>". + "". $content. ""; @@ -75,5 +71,5 @@ { return - "attachments->isEnd()) : ?>". + "attachments)) : ?>". $content. ""; @@ -97,15 +93,15 @@ if (isset($attr['is_image'])) { $sign = (boolean) $attr['is_image'] ? '' : '!'; - $if[] = $sign.'$_ctx->attachments->media_image'; + $if[] = $sign.'$attach_f->media_image'; } if (isset($attr['has_thumb'])) { $sign = (boolean) $attr['has_thumb'] ? '' : '!'; - $if[] = $sign.'isset($_ctx->attachments->media_thumb[\'sq\'])'; + $if[] = $sign.'isset($attach_f->media_thumb[\'sq\'])'; } if (isset($attr['is_mp3'])) { $sign = (boolean) $attr['is_mp3'] ? '==' : '!='; - $if[] = '$_ctx->attachments->type '.$sign.' "audio/mpeg3"'; + $if[] = '$attach_f->type '.$sign.' "audio/mpeg3"'; } @@ -113,7 +109,7 @@ $sign = (boolean) $attr['is_flv'] ? '' : '!'; $if[] = $sign. - '($_ctx->attachments->type == "video/x-flv" || '. - '$_ctx->attachments->type == "video/mp4" || '. - '$_ctx->attachments->type == "video/x-m4v")'; + '($attach_f->type == "video/x-flv" || '. + '$attach_f->type == "video/mp4" || '. + '$attach_f->type == "video/x-m4v")'; } @@ -131,5 +127,5 @@ { $f = $GLOBALS['core']->tpl->getFilters($attr); - return 'attachments->type').'; ?>'; + return 'type').'; ?>'; } @@ -140,5 +136,5 @@ { $f = $GLOBALS['core']->tpl->getFilters($attr); - return 'attachments->media_type').'; ?>'; + return 'media_type').'; ?>'; } @@ -149,5 +145,5 @@ { $f = $GLOBALS['core']->tpl->getFilters($attr); - return 'attachments->basename').'; ?>'; + return 'basename').'; ?>'; } @@ -162,7 +158,7 @@ $f = $GLOBALS['core']->tpl->getFilters($attr); if (!empty($attr['full'])) { - return 'attachments->size').'; ?>'; - } - return 'attachments->size)').'; ?>'; + return 'size').'; ?>'; + } + return 'size)').'; ?>'; } @@ -173,5 +169,5 @@ { $f = $GLOBALS['core']->tpl->getFilters($attr); - return 'attachments->media_title').'; ?>'; + return 'media_title').'; ?>'; } @@ -184,6 +180,6 @@ return 'attachments->media_thumb[\'sq\'])) {'. - 'echo '.sprintf($f,'$_ctx->attachments->media_thumb[\'sq\']').';'. + 'if (isset($attach_f->media_thumb[\'sq\'])) {'. + 'echo '.sprintf($f,'$attach_f->media_thumb[\'sq\']').';'. '}'. '?>'; @@ -196,5 +192,5 @@ { $f = $GLOBALS['core']->tpl->getFilters($attr); - return 'attachments->file_url').'; ?>'; + return 'file_url').'; ?>'; } Index: plugins/attachments/js/post.js =================================================================== --- plugins/attachments/js/post.js (revision 1393) +++ plugins/attachments/js/post.js (revision 1393) @@ -0,0 +1,5 @@ +$(function() { + $('h5.s-attachments').toggleWithLegend($('.s-attachments').not('h5'),{ + cookie: 'dcx_attachments' + }); +}); Index: plugins/blogroll/_admin.php =================================================================== --- plugins/blogroll/_admin.php (revision 1179) +++ plugins/blogroll/_admin.php (revision 1296) @@ -25,5 +25,5 @@ } -$_menu['Plugins']->addItem(__('Blogroll'),'plugin.php?p=blogroll','index.php?pf=blogroll/icon-small.png', +$_menu['Blog']->addItem(__('Blogroll'),'plugin.php?p=blogroll','index.php?pf=blogroll/icon-small.png', preg_match('/plugin.php\?p=blogroll(&.*)?$/',$_SERVER['REQUEST_URI']), $core->auth->check('usage,contentadmin',$core->blog->id)); Index: plugins/blogroll/edit.php =================================================================== --- plugins/blogroll/edit.php (revision 1179) +++ plugins/blogroll/edit.php (revision 1358) @@ -95,4 +95,12 @@ +blog->name) => '', + ''.__('Blogroll').'' => $p_url + )); +?> + '.__('Return to blogroll').'

    '; ?> Index: plugins/blogroll/index.php =================================================================== --- plugins/blogroll/index.php (revision 1179) +++ plugins/blogroll/index.php (revision 1358) @@ -177,5 +177,11 @@ -

    blog->name); ?> ›

    +blog->name) => '', + ''.__('Blogroll').'' => '' + )); +?> '.html::escapeHTML($core->blog->name). -' › '.__('Blog appearance').''.__('Blowup configuration').''. +echo dcPage::breadcrumb( + array( + html::escapeHTML($core->blog->name) => '', + __('Blog appearance') => 'blog_theme.php', + ''.__('Blowup configuration').'' => '' + )); + +echo '

    '.__('back').'

    '; Index: plugins/daInstaller/inc/lib.da.installer.ui.php =================================================================== --- plugins/daInstaller/inc/lib.da.installer.ui.php (revision 1046) +++ plugins/daInstaller/inc/lib.da.installer.ui.php (revision 1416) @@ -64,5 +64,5 @@ ''; - echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; + echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; $blocks = explode('%s',$html_block); echo $blocks[0]; @@ -81,5 +81,5 @@ } echo $blocks[1]; - echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; + echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; } } Index: plugins/daInstaller/index.php =================================================================== --- plugins/daInstaller/index.php (revision 1237) +++ plugins/daInstaller/index.php (revision 1358) @@ -255,6 +255,14 @@ ''. ''. -infoMessages(). -'

    '.__('DotAddict.org Installer').'

    '. + +dcPage::breadcrumb( + array( + __('System') => '', + ''.__('DotAddict.org Installer').'' => '' + )). + +infoMessages(); + +echo '

    '.__('Install and update your extensions live from DotAddict.org').'

    '; Index: plugins/importExport/inc/class.dc.import.flat.php =================================================================== --- plugins/importExport/inc/class.dc.import.flat.php (revision 939) +++ plugins/importExport/inc/class.dc.import.flat.php (revision 1298) @@ -184,12 +184,12 @@ '

    '.sprintf(__('This will import a single blog backup as new content in the current blog: %s.'),html::escapeHTML($this->core->blog->name)).'

    '. - '

    '. - ''. + '

    '. + ' '. '

    '; if ($has_files) { echo - '

    '; @@ -211,8 +211,8 @@ '
    '. '
    '.__('Multiple blogs').''. - '

    '.__('This will reset all the content of your database, except users.').'

    '. - - '

    '. + '

    '.__('This will reset all the content of your database, except users.').'

    '. + + '

    '. ''. '

    '; @@ -220,5 +220,5 @@ if ($has_files) { echo - '

    '. + '

    '. form::combo('public_full_file',$public_files). '

    '; Index: plugins/importExport/index.php =================================================================== --- plugins/importExport/index.php (revision 840) +++ plugins/importExport/index.php (revision 1358) @@ -74,7 +74,12 @@ if ($type && $module !== null) { + echo dcPage::breadcrumb( + array( + __('Plugins') => '', + $title => $p_url, + ''.html::escapeHTML($module->name).'' => '' + )); + echo - '

    '.$title.''. - ' › '.html::escapeHTML($module->name).'

    '. '
    '; @@ -84,6 +89,11 @@ } else { + echo dcPage::breadcrumb( + array( + __('Plugins') => '', + ''.$title.'' => '' + )); + echo - '

    '.$title.'

    '. '

    '.__('Import').'

    '.listImportExportModules($core,$modules['import']). '

    '.__('Export').'

    '.listImportExportModules($core,$modules['export']); Index: plugins/maintenance/index.php =================================================================== --- plugins/maintenance/index.php (revision 1179) +++ plugins/maintenance/index.php (revision 1358) @@ -69,5 +69,11 @@ -

    + '', + ''.__('Maintenance').'' => '' + )); +?>
    Optimiser l'espace de la base de données
    -
    Au fur et à mesure des suppressions ou modifications dans vos billets, les tables de la +
    Au fur at à mesure des suppressions ou modifications dans vos billets, les tables de la base de données se fragmentent. L'opération d'optimisation permet de compacter celles-ci.
    Cette opération n'a aucun impact sur l'intégrité de vos données.
    - Il est fortement conseillé d'optimiser la base de données avant tout export de blog.
    + Il est fortement conseillé d'optimiser la base de données avant tout export de blog
    Compteurs
    Index: plugins/pages/list.php =================================================================== --- plugins/pages/list.php (revision 1179) +++ plugins/pages/list.php (revision 1416) @@ -44,5 +44,5 @@ } - echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; + echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; $blocks = explode('%s',$html_block); @@ -57,5 +57,5 @@ echo $blocks[1]; - echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; + echo '

    '.__('Page(s)').' : '.$pager->getLinks().'

    '; } } @@ -177,5 +177,11 @@ '.html::escapeHTML($core->blog->name).' › '.__('Pages').''. +echo dcPage::breadcrumb( + array( + html::escapeHTML($core->blog->name) => '', + ''.__('Pages').'' => '' + )); + +echo '

    '.__('New page').'

    '; Index: plugins/pages/page.php =================================================================== --- plugins/pages/page.php (revision 1239) +++ plugins/pages/page.php (revision 1358) @@ -302,5 +302,4 @@ dcPage::jsToolBar(). dcPage::jsModal(). - dcPage::jsMetaEditor(). dcPage::jsLoad('js/_post.js'). dcPage::jsConfirmClose('entry-form','comment-form'). @@ -316,4 +315,32 @@ blog->name) => '', + __('Pages') => $p_url, + ''.$edit_entry_title.'' => '' + )); + if (!empty($_GET['upd'])) { dcPage::message(__('Page has been successfully updated.')); @@ -339,29 +366,6 @@ } -echo '

    '.html::escapeHTML($core->blog->name). -' › '.__('Pages').''.$page_title; - if ($post_id) { - switch ($post_status) { - case 1: - $img_status = sprintf($img_status_pattern,__('published'),'check-on.png'); - break; - case 0: - $img_status = sprintf($img_status_pattern,__('unpublished'),'check-off.png'); - break; - case -1: - $img_status = sprintf($img_status_pattern,__('scheduled'),'scheduled.png'); - break; - case -2: - $img_status = sprintf($img_status_pattern,__('pending'),'check-wrn.png'); - break; - default: - $img_status = ''; - } - echo ' “'.$post_title.'”'.' '.$img_status; - } -echo '

    '; - if ($post_id && $post->post_status == 1) { - echo '

    '.__('Go to this page on the site').'

    '; + echo '

    '.__('Go to this page on the site').'

    '; } @@ -370,7 +374,7 @@ if ($post_id) { - echo '

    '; + echo '

    '.__('Pings:').'

    '; + $item = '
    '.__('Pings').'
    '; $i = 0; foreach ($pings_uris as $k => $v) { - echo + $item .= '

    '.html::escapeHTML($core->blog->name).' › '.$page_title.''.__('Add item').'

    '; - switch ($step) { case 1: // Selection du type d'item - echo ''; + echo ''; echo '
    '.__('Select type').''; echo '

    '.form::combo('item_type',$items_combo,'').'

    '; @@ -399,5 +412,5 @@ if ($items[$item_type][1]) { // Choix à faire - echo ''; + echo ''; echo '
    '.$item_type_label.''; switch ($item_type) { @@ -436,5 +449,5 @@ case 3: // Libellé et description - echo ''; + echo ''; echo '
    '.$item_type_label.($item_select_label != '' ? ' ('.$item_select_label.')' : '').''; echo '

    '.html::escapeHTML($core->blog->name).' › '.$page_title.'

    '; -} - -if (!$step) { - echo ''; - echo '

    '.$core->formNonce().'

    '; + echo ''; + echo '

    '.$core->formNonce().'

    '; echo ''; } Index: plugins/tags/_admin.php =================================================================== --- plugins/tags/_admin.php (revision 1239) +++ plugins/tags/_admin.php (revision 1398) @@ -18,10 +18,8 @@ require dirname(__FILE__).'/_widgets.php'; -$core->addBehavior('adminPostFormSidebar',array('tagsBehaviors','tagsField')); +$core->addBehavior('adminPostFormItems',array('tagsBehaviors','tagsField')); $core->addBehavior('adminAfterPostCreate',array('tagsBehaviors','setTags')); $core->addBehavior('adminAfterPostUpdate',array('tagsBehaviors','setTags')); - -$core->addBehavior('adminPageHeaders',array('tagsBehaviors','pageHeaders')); $core->addBehavior('adminPostHeaders',array('tagsBehaviors','postHeaders')); @@ -73,5 +71,5 @@ } - public static function tagsField($post) + public static function tagsField($main,$sidebar,$post) { $meta =& $GLOBALS['core']->meta; @@ -82,8 +80,7 @@ $value = ($post) ? $meta->getMetaStr($post->post_meta,'tag') : ''; } - - echo - '

    '. - '
    '.form::textarea('post_tags',20,3,$value,'maximal').'
    '; + $sidebar['metas-box']['items']['post_tags']= + '
    '. + '
    '.form::textarea('post_tags',20,3,$value,'maximal').'
    '; } @@ -101,33 +98,4 @@ } } - } - - public static function pageHeaders() - { - $tag_url = $GLOBALS['core']->blog->url.$GLOBALS['core']->url->getURLFor('tag'); - - $opts = $GLOBALS['core']->auth->getOptions(); - $type = isset($opts['tag_list_format']) ? $opts['tag_list_format'] : 'more'; - - return - ''. - ''. - '\n". - ''; } Index: plugins/tags/_define.php =================================================================== --- plugins/tags/_define.php (revision 1179) +++ plugins/tags/_define.php (revision 1392) @@ -18,5 +18,6 @@ /* Version */ '1.2', array( - 'permissions' => 'usage,contentadmin' + 'permissions' => 'usage,contentadmin', + 'priority' => 998 ) ); Index: lugins/tags/js/page.js =================================================================== --- plugins/tags/js/page.js (revision 1240) +++ (revision ) @@ -1,70 +1,0 @@ -$(function () { - $('#edit-entry').onetabload(function () { - var tags_edit = $('#tags-edit'); - var post_id = $('#id'); - var meta_field = null; - if (tags_edit.length > 0) { - post_id = (post_id.length > 0) ? post_id.get(0).value : false; - if (post_id == false) { - meta_field = $(''); - meta_field.val($('#post_tags').val()); - } - var mEdit = new metaEditor(tags_edit, meta_field, 'tag'); - mEdit.meta_url = 'plugin.php?p=tags&m=tag_posts&tag='; - mEdit.displayMeta('tag', post_id); - window.dc_tag_editor = mEdit; - } - }); -}); -jsToolBar.prototype.elements.tagSpace = { - type: 'space' -}; -jsToolBar.prototype.elements.tag = { - type: 'button', - title: 'Keyword', - fn: {} -}; -jsToolBar.prototype.elements.tag.context = 'post'; -jsToolBar.prototype.elements.tag.icon = 'index.php?pf=tags/img/tag-add.png'; -jsToolBar.prototype.elements.tag.fn.wiki = function () { - this.encloseSelection('', '', function (str) { - if (str == '') { - window.alert(dotclear.msg.no_selection); - return ''; - } - if (str.indexOf(',') != -1) { - return str; - } else { - return '[' + str + '|tag:' + str + ']'; - } - }); -}; -jsToolBar.prototype.elements.tag.fn.xhtml = function () { - var url = this.elements.tag.url; - this.encloseSelection('', '', function (str) { - if (str == '') { - window.alert(dotclear.msg.no_selection); - return ''; - } - if (str.indexOf(',') != -1) { - return str; - } else { - return '' + str + ''; - } - }); -}; -jsToolBar.prototype.elements.tag.fn.wysiwyg = function () { - var t = this.getSelectedText(); - if (t == '') { - window.alert(dotclear.msg.no_selection); - return; - } - if (t.indexOf(',') != -1) { - return; - } - var n = this.getSelectedNode(); - var a = document.createElement('a'); - a.href = this.stripBaseURL(this.elements.tag.url + '/' + t); - a.appendChild(n); - this.insertNode(a); -}; Index: plugins/tags/js/post.js =================================================================== --- plugins/tags/js/post.js (revision 1112) +++ plugins/tags/js/post.js (revision 1392) @@ -58,4 +58,9 @@ }); }); + + $('h5 .s-tags').toggleWithLegend($('.s-tags').not('label'),{ + cookie: 'post_tags' + }); + }); Index: plugins/tags/tag_posts.php =================================================================== --- plugins/tags/tag_posts.php (revision 1288) +++ plugins/tags/tag_posts.php (revision 1358) @@ -109,6 +109,12 @@ -

    blog->name); ?> › -

    +blog->name) => '', + __('Tags') => $p_url.'&m=tags', + ''.__('Tag').' “'.html::escapeHTML($tag).'”'.'' => '' + )); +?> -

    blog->name); ?> › -

    +blog->name) => '', + ''.__('Tags').'' => '' + )); +?> auth->isSuperAdmin()) { - return '

    '.__('Theme Editor').'

    '; + return '

    '.__('Edit theme files').'

    '; } } Index: plugins/themeEditor/index.php =================================================================== --- plugins/themeEditor/index.php (revision 1179) +++ plugins/themeEditor/index.php (revision 1382) @@ -61,5 +61,5 @@ - <?php echo __('Theme Editor'); ?> + <?php echo __('Edit theme files'); ?>