Changes in [2174:6ed25e45a14e:2175:44a940977175]
- Files:
-
- 2 added
- 47 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/blog.php
r1615 r2166 72 72 __('System') => '', 73 73 __('Blogs') => 'blogs.php', 74 '<span class="page-title">'.__('New blog').'</span>'=> ''74 __('New blog') => '' 75 75 )) 76 76 ); -
admin/blog_del.php
r1733 r2166 54 54 __('System') => '', 55 55 __('Blogs') => 'blogs.php', 56 '<span class="page-title">'.__('Delete a blog').'</span>'=> ''56 __('Delete a blog') => '' 57 57 )) 58 58 ); -
admin/blog_pref.php
r2028 r2166 270 270 array( 271 271 html::escapeHTML($blog_name) => '', 272 '<span class="page-title">'.__('Blog settings').'</span>' => '' 273 )); 272 __('Blog settings') => '' 273 ) 274 ); 274 275 } else { 275 276 $breadcrumb = dcPage::breadcrumb( … … 277 278 __('System') => '', 278 279 __('Blogs') => 'blogs.php', 279 '<span class="page-title">'.__('Blog settings').' : '.html::escapeHTML($blog_name).'</span>'=> ''280 __('Blog settings').' : '.html::escapeHTML($blog_name) => '' 280 281 )); 281 282 } -
admin/blogs.php
r2145 r2166 88 88 array( 89 89 __('System') => '', 90 '<span class="page-title">'.__('List of blogs').'</span>' => ''90 __('List of blogs') 91 91 )) 92 92 ); -
admin/categories.php
r2125 r2166 107 107 array( 108 108 html::escapeHTML($core->blog->name) => '', 109 '<span class="page-title">'.__('Categories').'</span>'=> ''109 __('Categories') => '' 110 110 )) 111 111 ); -
admin/category.php
r2117 r2166 166 166 } 167 167 } 168 $elements[ '<span class="page-title">'.$title.'</span>'] = '';168 $elements[$title] = ''; 169 169 170 170 dcPage::open($title, -
admin/comment.php
r1972 r2166 164 164 html::escapeHTML($core->blog->name) => '', 165 165 html::escapeHTML($post_title) => $core->getPostAdminURL($post_type,$post_id).'&co=1#c'.$comment_id, 166 '<span class="page-title">'.__('Edit comment').'</span>'=> ''166 __('Edit comment') => '' 167 167 )); 168 168 } else { … … 171 171 html::escapeHTML($core->blog->name) => '', 172 172 html::escapeHTML($post_title) => $core->getPostAdminURL($post_type,$post_id), 173 '<span class="page-title">'.__('Edit comment').'</span>'=> ''173 __('Edit comment') => '' 174 174 )); 175 175 } -
admin/comments.php
r2145 r2166 169 169 array( 170 170 html::escapeHTML($core->blog->name) => '', 171 '<span class="page-title">'.__('Comments and trackbacks').'</span>'=> ''171 __('Comments and trackbacks') => '' 172 172 )) 173 173 ); -
admin/help.php
r2074 r2166 77 77 array( 78 78 __('Global help') => 'help.php', 79 '<span class="page-title">'.$content_array['title'].'</span>'=> ''79 $content_array['title'] => '' 80 80 )); 81 81 } else { 82 82 $breadcrumb = dcPage::breadcrumb( 83 83 array( 84 '<span class="page-title">'.__('Global help').'</span>'=> ''84 __('Global help') => '' 85 85 )); 86 86 } -
admin/index.php
r2174 r2175 226 226 dcPage::breadcrumb( 227 227 array( 228 '<span class="page-title">'.__('Dashboard').' : '.html::escapeHTML($core->blog->name).'</span>'=> ''228 __('Dashboard').' : '.html::escapeHTML($core->blog->name) => '' 229 229 ), 230 false) 230 array('home_link' =>false) 231 ) 231 232 ); 232 233 -
admin/langs.php
r2007 r2166 133 133 array( 134 134 __('System') => '', 135 '<span class="page-title">'.__('Languages management').'</span>'=> ''135 __('Languages management') => '' 136 136 )) 137 137 ); -
admin/media.php
r2152 r2167 212 212 html::escapeHTML($core->blog->name) => '', 213 213 __('Media manager') => '', 214 '<span class="page-title">'.__('confirm removal').'</span>' => '' 215 ),!$popup) 214 __('confirm removal') => '' 215 ), 216 array('home_link' => !$popup) 217 ) 216 218 ); 217 219 … … 240 242 array( 241 243 html::escapeHTML($core->blog->name) => '', 242 '<span class="page-title">'.__('Media manager').'</span>' => '' 243 ),!$popup); 244 __('Media manager') => '' 245 ), 246 array('home_link' => !$popup) 247 ); 244 248 } else { 245 249 $breadcrumb_media = $core->media->breadCrumb(html::escapeURL($page_url).'&d=%s','<span class="page-title">%s</span>'); … … 248 252 array( 249 253 html::escapeHTML($core->blog->name) => '', 250 '<span class="page-title">'.__('Media manager').'</span>' => '' 251 ),!$popup); 254 __('Media manager') => '' 255 ), 256 array('home_link' => !$popup) 257 ); 252 258 } else { 253 259 $breadcrumb = dcPage::breadcrumb( … … 256 262 __('Media manager') => html::escapeURL($page_url.'&d='), 257 263 $breadcrumb_media => '' 258 ),!$popup); 264 ), 265 array( 266 'home_link' => !$popup, 267 'hl' => false 268 ) 269 ); 259 270 } 260 271 } -
admin/media_item.php
r2106 r2167 206 206 __('Media manager') => html::escapeURL($media_page_url), 207 207 $core->media->breadCrumb(html::escapeURL($media_page_url).'&d=%s').'<span class="page-title">'.$file->basename.'</span>' => '' 208 ),!$popup) 208 ), 209 array( 210 'home_link' => !$popup, 211 'hl' => false 212 ) 213 ) 209 214 ); 210 215 -
admin/plugin.php
r1358 r2166 85 85 array( 86 86 __('System') => '', 87 '<span class="page-title">'.__('Plugin not found').'</span>'=> ''87 __('Plugin not found') => '' 88 88 )) 89 89 ); -
admin/plugins.php
r2174 r2175 157 157 array( 158 158 __('System') => '', 159 '<span class="page-title">'.__('Plugins management').'</span>'=> ''159 __('Plugins management') => '' 160 160 )) 161 161 ); -
admin/post.php
r2142 r2166 385 385 html::escapeHTML($core->blog->name) => '', 386 386 __('Entries') => 'posts.php', 387 '<span class="page-title">'.($post_id ? $page_title_edit : $page_title).'</span>'=> ''387 ($post_id ? $page_title_edit : $page_title) => '' 388 388 )) 389 389 ); -
admin/posts.php
r2145 r2166 229 229 array( 230 230 html::escapeHTML($core->blog->name) => '', 231 '<span class="page-title">'.__('Entries').'</span>'=> ''231 __('Entries') => '' 232 232 )) 233 233 ); -
admin/preferences.php
r2152 r2166 382 382 array( 383 383 html::escapeHTML($core->auth->userID()) => '', 384 '<span class="page-title">'.$page_title.'</span>'=> ''384 $page_title => '' 385 385 )) 386 386 ); -
admin/search.php
r1912 r2166 74 74 array( 75 75 html::escapeHTML($core->blog->name) => '', 76 '<span class="page-title">'.__('Search').'</span>'=> ''76 __('Search') => '' 77 77 )) 78 78 ); -
admin/update.php
r1792 r2166 178 178 array( 179 179 __('System') => '', 180 '<span class="page-title">'.__('Dotclear update').'</span>'=> ''180 __('Dotclear update') => '' 181 181 )) 182 182 ); -
admin/user.php
r1719 r2166 186 186 __('System') => '', 187 187 __('Users') => 'users.php', 188 '<span class="page-title">'.$page_title.'</span>'=> ''188 $page_title => '' 189 189 )) 190 190 ); -
admin/users.php
r2145 r2166 109 109 array( 110 110 __('System') => '', 111 '<span class="page-title">'.__('Users').'</span>'=> ''111 __('Users') => '' 112 112 )) 113 113 ); -
admin/users_actions.php
r2108 r2166 136 136 __('System') => '', 137 137 __('Users') => 'users.php', 138 '<span class="page-title">'.__('Permissions').'</span>'=> ''138 __('Permissions') => '' 139 139 )); 140 140 } else { … … 143 143 __('System') => '', 144 144 __('Users') => 'users.php', 145 '<span class="page-title">'.__('Actions').'</span>'=> ''145 __('Actions') => '' 146 146 )); 147 147 } -
inc/admin/actions/class.dcaction.php
r2072 r2169 225 225 * @return string the redirection url 226 226 */ 227 public function getRedirection($ params=array(),$with_selected_entries=false) {227 public function getRedirection($with_selected_entries=false,$params=array()) { 228 228 $redir_args = array_merge($params,$this->redir_args); 229 229 if ($with_selected_entries) { … … 240 240 * @access public 241 241 */ 242 public function redirect($ params=array(),$with_selected_entries=false) {243 http::redirect($this->getRedirection($ params,$with_selected_entries));242 public function redirect($with_selected_entries=false,$params=array()) { 243 http::redirect($this->getRedirection($with_selected_entries,$params)); 244 244 exit; 245 245 } -
inc/admin/actions/class.dcactioncomments.php
r2075 r2169 46 46 47 47 } 48 echo '<p><a class="back" href="'.$this->getRedirection( array(),true).'">'.__('Back to comments list').'</a></p>';48 echo '<p><a class="back" href="'.$this->getRedirection(true).'">'.__('Back to comments list').'</a></p>'; 49 49 } 50 50 … … 59 59 html::escapeHTML($this->core->blog->name) => '', 60 60 __('Comments') => 'comments.php', 61 '<span class="page-title">'.__('Comments actions').'</span>'=> ''61 __('Comments actions') => '' 62 62 )) 63 63 ); … … 149 149 150 150 $core->blog->updCommentsStatus($co_ids,$status); 151 $ap->redirect( array('upd'=>1),true);151 $ap->redirect(true,array('upd'=>1)); 152 152 } 153 153 … … 168 168 169 169 $core->blog->delComments($co_ids); 170 $ap->redirect( array('del'=>1), false);170 $ap->redirect(false,array('del'=>1)); 171 171 } 172 172 } -
inc/admin/actions/class.dcactionposts.php
r2072 r2169 44 44 ); 45 45 } 46 echo '<p><a class="back" href="'.$this->getRedirection( array(),true).'">'.__('Back to entries list').'</a></p>';46 echo '<p><a class="back" href="'.$this->getRedirection(true).'">'.__('Back to entries list').'</a></p>'; 47 47 } 48 48 … … 60 60 array( 61 61 html::escapeHTML($this->core->blog->name) => '', 62 $this->getCallerTitle() => $this->getRedirection( array(),true),63 '<span class="page-title">'.__('Entries actions').'</span>'=> ''62 $this->getCallerTitle() => $this->getRedirection(true), 63 __('Entries actions') => '' 64 64 )) 65 65 ); … … 160 160 $core->blog->updPostsStatus($posts_ids,$status); 161 161 162 $ap->redirect( array('upd' => 1),true);162 $ap->redirect(true,array('upd' => 1)); 163 163 } 164 164 … … 171 171 $core->blog->updPostsSelected($posts_ids,$action == 'selected'); 172 172 173 $ap->redirect( array('upd' => 1),true);173 $ap->redirect(true,array('upd' => 1)); 174 174 } 175 175 … … 192 192 $core->blog->delPosts($posts_ids); 193 193 194 $ap->redirect( array('del',1),false);194 $ap->redirect(false,array('del',1)); 195 195 } 196 196 … … 221 221 $core->blog->updPostsCategory($posts_ids, $new_cat_id); 222 222 223 $ap->redirect( array('upd'=>1),true);223 $ap->redirect(true,array('upd'=>1)); 224 224 } else { 225 225 … … 228 228 array( 229 229 html::escapeHTML($core->blog->name) => '', 230 $ap->getCallerTitle() => $ap->getRedirection( array(),true),231 '<span class="page-title">'.__('Change category for this selection').'</span>'=> ''230 $ap->getCallerTitle() => $ap->getRedirection(true), 231 __('Change category for this selection') => '' 232 232 ))); 233 233 # categories list … … 280 280 $cur->update('WHERE post_id '.$core->con->in($posts_ids)); 281 281 282 $ap->redirect( array('upd' => 1),true);282 $ap->redirect(true,array('upd' => 1)); 283 283 } else { 284 284 $usersList = ''; … … 298 298 array( 299 299 html::escapeHTML($core->blog->name) => '', 300 $ap->getCallerTitle() => $ap->getRedirection( array(),true),301 '<span class="page-title">'.__('Change author for this selection').'</span>'=> '')),300 $ap->getCallerTitle() => $ap->getRedirection(true), 301 __('Change author for this selection') => '')), 302 302 dcPage::jsLoad('js/jquery/jquery.autocomplete.js'). 303 303 '<script type="text/javascript">'."\n". … … 333 333 $cur->update('WHERE post_id '.$core->con->in($posts_ids)); 334 334 335 $ap->redirect( array('upd' => 1),true);335 $ap->redirect(true,array('upd' => 1)); 336 336 } else { 337 337 $ap->beginPage( … … 339 339 array( 340 340 html::escapeHTML($core->blog->name) => '', 341 $ap->getCallerTitle() => $ap->getRedirection( array(),true),342 '<span class="page-title">'.__('Change language for this selection').'</span>'=> ''341 $ap->getCallerTitle() => $ap->getRedirection(true), 342 _('Change language for this selection') => '' 343 343 ))); 344 344 # lang list -
inc/admin/lib.dc.page.php
r2164 r2175 304 304 } 305 305 306 public static function breadcrumb($elements=null,$with_home_link=true,$echo=false) 307 { 306 public static function breadcrumb($elements=null,$options=array()) 307 { 308 $with_home_link = isset($options['home_link'])?$options['home_link']:true; 309 $hl = isset($options['hl'])?$options['hl']:true; 310 $hl_pos = isset($options['hl_pos'])?$options['hl_pos']:-1; 308 311 // First item of array elements should be blog's name, System or Plugins 309 312 $res = '<h2>'.($with_home_link ? … … 311 314 '<img src="style/dashboard-alt.png" alt="" />'); 312 315 $index = 0; 316 if ($hl_pos < 0) { 317 $hl_pos = count($elements)+$hl_pos; 318 } 313 319 foreach ($elements as $element => $url) { 320 if ($hl && $index == $hl_pos) { 321 $element = sprintf('<span class="page-title">%s</span>',$element); 322 } 314 323 $res .= ($with_home_link ? ($index == 1 ? ' : ' : ' › ') : ($index == 0 ? ' ' : ' › ')). 315 324 ($url ? '<a href="'.$url.'">' : '').$element.($url ? '</a>' : ''); … … 317 326 } 318 327 $res .= '</h2>'; 319 if ($echo) {320 echo $res;321 }322 328 return $res; 323 329 } -
plugins/aboutConfig/index.php
r2003 r2166 119 119 __('System') => '', 120 120 html::escapeHTML($core->blog->name) => '', 121 '<span class="page-title">'.__('about:config').'</span>'=> ''121 __('about:config') => '' 122 122 )); 123 123 if (!empty($_GET['upd'])) { -
plugins/antispam/index.php
r2122 r2166 127 127 __('Plugins') => '', 128 128 $page_name => $p_url, 129 '<span class="page-title">'.sprintf(__('%s filter configuration'),$filter->name).'</span>'=> ''129 sprintf(__('%s filter configuration'),$filter->name) => '' 130 130 )); 131 131 … … 139 139 array( 140 140 __('Plugins') => '', 141 '<span class="page-title">'.$page_name.'</span>'=> ''141 $page_name => '' 142 142 )); 143 143 -
plugins/blogroll/edit.php
r2002 r2166 99 99 array( 100 100 html::escapeHTML($core->blog->name) => '', 101 '<span class="page-title">'.__('Blogroll').'</span>'=> $p_url101 __('Blogroll') => $p_url 102 102 )); 103 103 ?> -
plugins/blogroll/index.php
r2115 r2166 181 181 array( 182 182 html::escapeHTML($core->blog->name) => '', 183 '<span class="page-title">'.__('Blogroll').'</span>'=> ''183 __('Blogroll') => '' 184 184 )); 185 185 ?> -
plugins/blowupConfig/index.php
r1588 r2166 231 231 html::escapeHTML($core->blog->name) => '', 232 232 __('Blog appearance') => 'blog_theme.php', 233 '<span class="page-title">'.__('Blowup configuration').'</span>'=> ''233 __('Blowup configuration') => '' 234 234 )); 235 235 -
plugins/daInstaller/index.php
r1912 r2166 259 259 array( 260 260 __('System') => '', 261 '<span class="page-title">'.__('DotAddict.org Installer').'</span>'=> ''261 __('DotAddict.org Installer') => '' 262 262 )). 263 263 -
plugins/importExport/index.php
r2095 r2166 78 78 __('Plugins') => '', 79 79 $title => $p_url, 80 '<span class="page-title">'.html::escapeHTML($module->name).'</span>'=> ''80 html::escapeHTML($module->name) => '' 81 81 )); 82 82 … … 92 92 array( 93 93 __('Plugins') => '', 94 '<span class="page-title">'.$title.'</span>'=> ''94 $title => '' 95 95 )); 96 96 -
plugins/maintenance/index.php
r2163 r2175 95 95 array( 96 96 __('Plugins') => '', 97 '<span class="page-title">'.__('Maintenance').'</span>'=> ''97 __('Maintenance') => '' 98 98 ) 99 99 ). … … 121 121 __('Plugins') => '', 122 122 '<a href="'.$p_url.'">'.__('Maintenance').'</a>' => '', 123 '<span class="page-title">'.html::escapeHTML($task->name()).'</span>'=> ''123 html::escapeHTML($task->name())=> '' 124 124 ) 125 125 ); … … 155 155 array( 156 156 __('Plugins') => '', 157 '<span class="page-title">'.__('Maintenance').'</span>'=> ''157 __('Maintenance') => '' 158 158 ) 159 159 ); -
plugins/pages/class.actionpage.php
r2061 r2169 25 25 array( 26 26 html::escapeHTML($this->core->blog->name) => '', 27 __('Pages') => $this->getRedirection( array(),true),28 '<span class="page-title">'.__('Pages actions').'</span>'=> ''27 __('Pages') => $this->getRedirection(true), 28 __('Pages actions') => '' 29 29 )) 30 30 ); … … 37 37 '</script></head><body>'. 38 38 $breadcrumb; 39 echo '<p><a class="back" href="'.$this->getRedirection( array(),true).'">'.__('Back to pages list').'</a></p>';39 echo '<p><a class="back" href="'.$this->getRedirection(true).'">'.__('Back to pages list').'</a></p>'; 40 40 41 41 } … … 80 80 81 81 } 82 $ap->redirect( array('reo'=>1),false);82 $ap->redirect(false,array('reo'=>1)); 83 83 } 84 84 } -
plugins/pages/list.php
r2056 r2166 75 75 array( 76 76 html::escapeHTML($core->blog->name) => '', 77 '<span class="page-title">'.__('Pages').'</span>'=> ''77 __('Pages') => '' 78 78 )); 79 79 -
plugins/pages/page.php
r1981 r2166 329 329 html::escapeHTML($core->blog->name) => '', 330 330 __('Pages') => $p_url, 331 '<span class="page-title">'.$edit_entry_title.'</span>'=> ''331 $edit_entry_title => '' 332 332 )); 333 333 -
plugins/pings/index.php
r1930 r2166 55 55 array( 56 56 __('Plugins') => '', 57 '<span class="page-title">'.__('Pings configuration').'</span>'=> ''57 __('Pings configuration') => '' 58 58 )); 59 59 -
plugins/simpleMenu/index.php
r2154 r2167 374 374 html::escapeHTML($core->blog->name) => '', 375 375 $page_title => $p_url, 376 '<span class="page-title">'.__('Add item').'</span>'=> '',376 __('Add item') => '', 377 377 $step_label => '' 378 )); 378 ), 379 array( 380 'hl_pos' => -2) 381 ); 379 382 } else { 380 383 echo dcPage::breadcrumb( 381 384 array( 382 385 html::escapeHTML($core->blog->name) => '', 383 '<span class="page-title">'.$page_title.'</span>'=> ''386 $page_title => '' 384 387 )); 385 388 } -
plugins/tags/_admin.php
r2065 r2169 136 136 } 137 137 } 138 $ap->redirect( array('upd' => 1),true);138 $ap->redirect(true,array('upd' => 1)); 139 139 } 140 140 else … … 150 150 array( 151 151 html::escapeHTML($core->blog->name) => '', 152 __('Entries') => $ap->getRedirection( array(),true),153 '<span class="page-title">'.__('Add tags to this selection').'</span>'=> ''152 __('Entries') => $ap->getRedirection(true), 153 __('Add tags to this selection') => '' 154 154 )), 155 155 dcPage::jsLoad('js/jquery/jquery.autocomplete.js'). … … 201 201 } 202 202 } 203 $ap->redirect( array('upd' => 1),true);203 $ap->redirect(true,array('upd' => 1)); 204 204 } 205 205 else … … 228 228 html::escapeHTML($core->blog->name) => '', 229 229 __('Entries') => 'posts.php', 230 '<span class="page-title">'.__('Remove selected tags from this selection').'</span>'=> ''230 __('Remove selected tags from this selection') => '' 231 231 ))); 232 232 $posts_count = count($_POST['entries']); -
plugins/tags/tag_posts.php
r2079 r2166 91 91 html::escapeHTML($core->blog->name) => '', 92 92 __('Tags') => $p_url.'&m=tags', 93 '<span class="page-title">'.__('Tag').' “'.html::escapeHTML($tag).'”'.'</span>' => ''93 __('Tag').' “'.html::escapeHTML($tag).'”' => '' 94 94 )); 95 95 ?> -
plugins/tags/tags.php
r2003 r2166 24 24 array( 25 25 html::escapeHTML($core->blog->name) => '', 26 '<span class="page-title">'.__('Tags').'</span>'=> ''26 __('Tags') => '' 27 27 )); 28 28 ?> -
plugins/themeEditor/index.php
r1382 r2166 91 91 html::escapeHTML($core->blog->name) => '', 92 92 __('Blog appearance') => 'blog_theme.php', 93 '<span class="page-title">'.__('Edit theme files').'</span>'=> ''93 __('Edit theme files') => '' 94 94 )); 95 95 ?> -
plugins/userPref/index.php
r2003 r2168 115 115 __('System') => '', 116 116 html::escapeHTML($core->auth->userID()) => '', 117 '<span class="page-title">'.__('user:preferences').'</span>'=> ''117 __('user:preferences') => '' 118 118 )); 119 119 … … 160 160 '<label for="lp_nav" class="classic">'.__('Goto:').'</label> '.form::combo('lp_nav',$ws_combo). 161 161 ' <input type="submit" value="'.__('Ok').'" id="lp_submit" />'. 162 '<input type="hidden" name="p" value=" aboutConfig" />'.162 '<input type="hidden" name="p" value="userPref" />'. 163 163 $core->formNonce().'</p></form>'; 164 164 } … … 210 210 '<label for="gp_nav" class="classic">'.__('Goto:').'</label> '.form::combo('gp_nav',$ws_combo). 211 211 ' <input type="submit" value="'.__('Ok').'" id="gp_submit" />'. 212 '<input type="hidden" name="p" value=" aboutConfig" />'.212 '<input type="hidden" name="p" value="userPref" />'. 213 213 $core->formNonce().'</p></form>'; 214 214 } -
plugins/widgets/index.php
r1993 r2166 190 190 array( 191 191 html::escapeHTML($core->blog->name) => '', 192 '<span class="page-title">'.__('Widgets').'</span>'=> ''192 __('Widgets') => '' 193 193 )); 194 194
Note: See TracChangeset
for help on using the changeset viewer.