diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php index c7e54351..7c160bca 100644 --- a/bl-kernel/admin/views/dashboard.php +++ b/bl-kernel/admin/views/dashboard.php @@ -139,7 +139,7 @@ $keys = array_keys($scheduledPages); foreach($keys as $key) { $page = buildPage($key); - echo '
  • '.$Language->g('Page').''.($page->title()?$page->title():'['.$Language->g('Empty title').'] ').'
  • '; + echo '
  • '.($page->title()?$page->title():'['.$Language->g('Empty title').'] ').'
  • '; } } ?> diff --git a/bl-kernel/admin/views/pages.php b/bl-kernel/admin/views/pages.php index 1bad7730..27f926a7 100644 --- a/bl-kernel/admin/views/pages.php +++ b/bl-kernel/admin/views/pages.php @@ -4,6 +4,7 @@ HTML::title(array('title'=>$L->g('Manage content'), 'icon'=>'folder')); echo ' '.$L->g('Add new content').''; +// Fixed page list echo ' @@ -20,21 +21,43 @@ echo ' '; -foreach($pages as $page) { - $status = false; - if($page->status()!='published') { - $status = $Language->g( $page->status() ); +function table($status, $icon='arrow-circle-o-down') { + global $pages; + global $Url; + $showLegend = true; + foreach ($pages as $key=>$page) { + if ($page->status()==$status) { + if ($showLegend) { + $showLegend = false; + echo ' + + + + '; + } + unset($pages[$key]); + echo ''; + echo ''; + + echo ''; + + $friendlyURL = Text::isEmpty($Url->filters('page')) ? '/'.$page->key() : '/'.$Url->filters('page').'/'.$page->key(); + echo ''; + echo ''; + } } - echo ''; - echo ''; - - echo ''; - - $friendlyURL = Text::isEmpty($Url->filters('page')) ? '/'.$page->key() : '/'.$Url->filters('page').'/'.$page->key(); - echo ''; - echo ''; } +table('draft', 'spinner'); +table('scheduled', 'clock-o'); +table('fixed', 'thumb-tack'); +table('sticky', 'sticky-note-o'); +table('published', 'check'); + echo '
    '.$status.'
    + ' + .($page->title()?$page->title():''.$Language->g('Empty title').' ') + .' + '.( (ORDER_BY=='date') ? $page->dateRaw() : $page->position() ).''.$friendlyURL.'
    '.($status?''.$status.'':'').($page->title()?$page->title():''.$Language->g('Empty title').' ').''.( (ORDER_BY=='date') ? $page->dateRaw() : $page->position() ).''.$friendlyURL.'
    @@ -47,7 +70,7 @@ echo ' '; + echo '
  • '; } for($i=1; $i<=Paginator::amountOfPages(); $i++) { @@ -56,7 +79,7 @@ echo ' // Show next page link if(Paginator::showNext()) { - echo ''; + echo ''; } ?> diff --git a/bl-kernel/helpers/text.class.php b/bl-kernel/helpers/text.class.php index ab3255bd..9955ca2c 100644 --- a/bl-kernel/helpers/text.class.php +++ b/bl-kernel/helpers/text.class.php @@ -215,7 +215,10 @@ class Text { public static function imgRel2Abs($string, $base) { - return preg_replace('/(src)="([^:"]*)(?:")/', "$1=\"$base$2\"", $string); + $pattern = "/]*) src=\"([^http|https|ftp|\/\/][^\"]*)\"/"; + $replace = "".htmlentities($input[2])."";'), $string); } - } \ No newline at end of file diff --git a/bl-themes/editorial/php/home.php b/bl-themes/editorial/php/home.php index 16663be9..282f75c9 100644 --- a/bl-themes/editorial/php/home.php +++ b/bl-themes/editorial/php/home.php @@ -18,14 +18,10 @@
    -
    -

    Pages

    -
    -
    - +

    title() ?>

    description() ?>