Dotclear


Ignore:
Timestamp:
12/06/11 11:43:14 (14 years ago)
Author:
Dsls <dsls@…>
Branch:
formfilters
Parents:
781:b509ac00bf4a (diff), 779:58c45f1b96e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged last default changes with formfilter branch

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • admin/popup_posts.php

    r557 r782  
    1717$q = !empty($_GET['q']) ? $_GET['q'] : null; 
    1818 
    19 $page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1; 
    20 $nb_per_page =  10; 
     19$post_list = new adminPostMiniList($core); 
    2120 
    2221$params = array(); 
    23 $params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page); 
    2422$params['no_content'] = true; 
    25 $params['order'] = 'post_dt DESC'; 
     23 
     24# - Limit, sortby and order filter 
     25$params = $post_list->applyFilters($params); 
    2626 
    2727if ($q) { 
     
    4343     $posts = $core->blog->getPosts($params); 
    4444     $counter = $core->blog->getPosts($params,true); 
    45      $post_list = new adminPostMiniList($core,$posts,$counter->f(0)); 
     45     $post_list->setItems($posts,$counter->f(0)); 
    4646} catch (Exception $e) { 
    4747     $core->error->add($e->getMessage()); 
     
    4949 
    5050echo '<div id="form-entries">'; # I know it's not a form but we just need the ID 
    51 $post_list->display($page,$nb_per_page); 
     51$post_list->display(); 
    5252echo '</div>'; 
    5353 
  • admin/popup_posts.php

    r520 r782  
    44# This file is part of Dotclear 2. 
    55# 
    6 # Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear 
     6# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear 
    77# Licensed under the GPL version 2.0 license. 
    88# See LICENSE file or 
     
    3333     dcPage::jsLoad('js/jsToolBar/popup_posts.js')); 
    3434 
    35 echo '<h2>'.__('Add a link to an entry').'</h2>'; 
     35echo '<h2 class="page-title">'.__('Add a link to an entry').'</h2>'; 
    3636 
    3737echo '<form action="popup_posts.php" method="get">'. 
    3838'<p><label for="q" class="classic">'.__('Search entry:').' '.form::field('q',30,255,html::escapeHTML($q)).'</label> '. 
    39 ' <input type="submit" value="'.__('ok').'" /></p>'. 
     39' <input type="submit" value="'.__('Search').'" /></p>'. 
    4040'</form>'; 
    4141 
Note: See TracChangeset for help on using the changeset viewer.

Sites map