diff --git a/ext/blotter/main.php b/ext/blotter/main.php
index 21c87d8c..f02e1461 100644
--- a/ext/blotter/main.php
+++ b/ext/blotter/main.php
@@ -43,6 +43,7 @@ class Blotter extends Extension {
$config->set_default_string("blotter_position", "subheading");
}
+
public function onSetupBuilding(SetupBuildingEvent $event) {
global $config;
$sb = new SetupBlock("Blotter");
@@ -51,12 +52,14 @@ class Blotter extends Extension {
$sb->add_choice_option("blotter_position", array("Top of page" => "subheading", "In navigation bar" => "left"), "
Position: ");
$event->panel->add_block($sb);
}
+
public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user;
if($user->is_admin()) {
$event->add_link("Blotter Editor", make_link("blotter/editor"));
}
}
+
public function onPageRequest(PageRequestEvent $event) {
global $page, $database, $user;
if($event->page_matches("blotter")) {
@@ -105,7 +108,7 @@ class Blotter extends Extension {
$page->set_redirect(make_link("blotter/editor"));
}
break;
- case "":
+ case "list":
/**
* Displays all blotter entries
*/
diff --git a/ext/blotter/theme.php b/ext/blotter/theme.php
index 3099eed4..9fe9dd79 100644
--- a/ext/blotter/theme.php
+++ b/ext/blotter/theme.php
@@ -12,8 +12,9 @@ class BlotterTheme extends Themelet {
public function display_blotter_page($entries) {
global $page;
$html = $this->get_html_for_blotter_page($entries);
- $page->set_mode("data");
- $page->set_data($html);
+ $page->set_title("Blotter");
+ $page->set_heading("Blotter");
+ $page->add_block(new Block("Blotter Entries", $html, "main", 10));
}
public function display_blotter($entries) {
@@ -95,10 +96,8 @@ class BlotterTheme extends Themelet {
* This one displays a list of all blotter entries.
*/
global $config;
- $i_color = $config->get_string("blotter_color","#FF0000");
- $html = "";
- $html .= "Blotter
- ";
+ $i_color = $config->get_string("blotter_color", "#FF0000");
+ $html = "";
$num_entries = count($entries);
for ($i = 0 ; $i < $num_entries ; $i++) {
@@ -110,13 +109,15 @@ class BlotterTheme extends Themelet {
$i_close = "";
$id = $entries[$i]['id'];
$messy_date = $entries[$i]['entry_date'];
- $clean_date = date("m/d/y",strtotime($messy_date));
+ $clean_date = date("y/m/d", strtotime($messy_date));
$entry_text = $entries[$i]['entry_text'];
- if($entries[$i]['important'] == 'Y') { $i_open = ""; $i_close=""; }
+ if($entries[$i]['important'] == 'Y') {
+ $i_open = "";
+ $i_close="";
+ }
$html .= "{$i_open}{$clean_date} - {$entry_text}{$i_close}
";
}
-
- $html .= "";
+ $html .= "";
return $html;
}
@@ -143,14 +144,17 @@ class BlotterTheme extends Themelet {
}
$entries_list .= "{$i_open}{$clean_date} - {$entry_text}{$i_close}";
}
+
$out_text = "";
$in_text = "";
$pos_break = "";
$pos_align = "text-align: right; position: absolute; right: 0px;";
+
if($position === "left") {
$pos_break = "
";
$pos_align = "";
}
+
if(count($entries) === 0) {
$out_text = "No blotter entries yet.";
$in_text = "Empty.";
@@ -160,9 +164,18 @@ class BlotterTheme extends Themelet {
$out_text = "Blotter updated: {$clean_date}";
$in_text = "";
}
- $html = "";
- $html .= "";
- $html .= "$in_text
";
+
+ $html = "
+
+ $in_text
+ ";
return $html;
}
}