diff --git a/.gitignore b/.gitignore index d583e74d..6dd0495a 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ ext/text_score ext/tips ext/twitter_soc ext/upload_cmd +ext/update ext/wiki ext/word_filter ext/zoom diff --git a/contrib/downtime/theme.php b/contrib/downtime/theme.php index 0003c2af..e529209e 100644 --- a/contrib/downtime/theme.php +++ b/contrib/downtime/theme.php @@ -6,7 +6,7 @@ class DowntimeTheme extends Themelet { */ public function display_notification(Page $page) { $page->add_block(new Block("Downtime", - "DOWNTIME MODE IS ON!", "left", 0)); + "
DOWNTIME MODE IS ON!
", "left", 0)); } /** @@ -28,7 +28,7 @@ class DowntimeTheme extends Themelet {
-

Down for Maintenance

+

Down for Maintenance

$message
diff --git a/contrib/featured/theme.php b/contrib/featured/theme.php index e4a3ab78..74a4134e 100644 --- a/contrib/featured/theme.php +++ b/contrib/featured/theme.php @@ -5,7 +5,7 @@ class FeaturedTheme extends Themelet { * Show $text on the $page */ public function display_featured(Page $page, Image $image) { - $page->add_block(new Block("Featured Image", $this->build_thumb_html($image), "left", 3)); + $page->add_block(new Block("Featured Image", $this->build_featured_html($image), "left", 3)); } public function get_buttons_html($image_id) { @@ -18,5 +18,25 @@ class FeaturedTheme extends Themelet { "; } + + public function build_featured_html(Image $image, $query=null) { + global $config; + $i_id = int_escape($image->id); + $h_view_link = make_link("post/view/$i_id", $query); + $h_thumb_link = $image->get_thumb_link(); + $h_tip = html_escape($image->get_tooltip()); + $tsize = get_thumbnail_size($image->width, $image->height); + + + return " +
+ + + $h_tip + + +
+ "; + } } ?> diff --git a/contrib/handle_mp3/theme.php b/contrib/handle_mp3/theme.php index 7844f595..953f9a19 100644 --- a/contrib/handle_mp3/theme.php +++ b/contrib/handle_mp3/theme.php @@ -4,13 +4,14 @@ class MP3FileHandlerTheme extends Themelet { public function display_image(Page $page, Image $image) { $data_href = get_base_href(); $ilink = $image->get_image_link(); + $fname = url_escape($image->filename); //Most of the time this will be the title/artist of the song. $html = " - diff --git a/contrib/home/main.php b/contrib/home/main.php index c1be967f..f9485309 100644 --- a/contrib/home/main.php +++ b/contrib/home/main.php @@ -21,8 +21,7 @@ class Home extends SimpleExtension { $config->set_default_string("home_links", '[$base/post/list|Posts] [$base/comment/list|Comments] [$base/tags|Tags] -[$base/wiki|Wiki] -[$base/wiki/more|»]'); +[$base/ext_doc|»]'); } public function onPageRequest(PageRequestEvent $event) { @@ -46,7 +45,8 @@ class Home extends SimpleExtension { } $sb = new SetupBlock("Home Page"); - $sb->add_longtext_option("home_links", 'Page Links - Example: [/post/list|Posts]
'); + $sb->add_bool_option("home_choice", "Use custom page links: "); + $sb->add_longtext_option("home_links", '
Page Links - Example: [/post/list|Posts]
'); $sb->add_longtext_option("home_text", "
Page Text:
"); $sb->add_choice_option("home_counter", $counters, "
Counter: "); $event->panel->add_block($sb); @@ -74,7 +74,14 @@ class Home extends SimpleExtension { } // get the homelinks and process them - $main_links = $config->get_string('home_links'); + if($config->get_bool('home_choice')){ + $main_links = $config->get_string('home_links'); + }else{ + $main_links = '[$base/post/list|Posts] [$base/comment/list|Comments] [$base/tags|Tags]'; + if(file_exists("ext/pools")){$main_links .= ' [$base/pools|Pools]';} + if(file_exists("ext/wiki")){$main_links .= ' [$base/wiki|Wiki]';} + $main_links .= ' [$base/ext_doc|»]'; + } $main_links = str_replace('$base', $base_href, $main_links); $main_links = preg_replace('#\[(.*?)\|(.*?)\]#', "\\2", $main_links); $main_links = str_replace('//', "/", $main_links); diff --git a/contrib/home/theme.php b/contrib/home/theme.php index eda5e815..da3c80a8 100644 --- a/contrib/home/theme.php +++ b/contrib/home/theme.php @@ -29,6 +29,7 @@ EOD $main_links_html = empty($main_links) ? "" : ""; $message_html = empty($main_text) ? "" : "
$main_text
"; $counter_html = empty($counter_text) ? "" : "
$counter_text
"; + $contact_link = empty($contact_link) ? "" : "
Contact –"; $search_html = "