diff --git a/e107_plugins/blogcalendar_menu/archive.php b/e107_plugins/blogcalendar_menu/archive.php
index cd5ae5b39..4d12fc90a 100644
--- a/e107_plugins/blogcalendar_menu/archive.php
+++ b/e107_plugins/blogcalendar_menu/archive.php
@@ -29,7 +29,7 @@ require_once(HEADERF);
// initialize some cruft
// ---------------------
$bcSql = new db;
-$prefix = e_PLUGIN."blogcalendar_menu";
+$prefix = e_PLUGIN_ABS."blogcalendar_menu";
$marray = array(BLOGCAL_M1, BLOGCAL_M2, BLOGCAL_M3, BLOGCAL_M4,
BLOGCAL_M5, BLOGCAL_M6, BLOGCAL_M7, BLOGCAL_M8,
BLOGCAL_M9, BLOGCAL_M10, BLOGCAL_M11, BLOGCAL_M12);
@@ -119,19 +119,25 @@ for($i = 1; $i <= 12; $i++)
$newline = 1;
}
$archive .= "
";
- $archive .= "";
-
- // href the current month regardless of newsposts or any month with news
- if (($req_year == $cur_year && $i == $cur_month) || $day_links[$i])
+
+ if(!deftrue('BOOTSTRAP'))
{
- $archive .= " ".$marray[$i-1]."";
- }
- else
- {
- $archive .= $marray[$i-1];
+
+ $archive .= " ";
+
+ // href the current month regardless of newsposts or any month with news
+ if (($req_year == $cur_year && $i == $cur_month) || $day_links[$i])
+ {
+ $archive .= " ".$marray[$i-1]."";
+ }
+ else
+ {
+ $archive .= $marray[$i-1];
+ }
+
+ $archive .= " ";
}
-
- $archive .= " ";
+
if (($req_year == $cur_year) && ($i == $cur_month))
{
$req_day = $cur_day;
@@ -143,6 +149,7 @@ for($i = 1; $i <= 12; $i++)
$archive .= "".calendar($req_day, $i, $req_year, $day_links[$i], $pref['blogcal_ws'])." | \n";
}
$archive .= "";
+
$ns->tablerender(BLOGCAL_L2 ." $req_year", $archive);
require_once(FOOTERF);
diff --git a/e107_plugins/blogcalendar_menu/blogcalendar_menu.php b/e107_plugins/blogcalendar_menu/blogcalendar_menu.php
index 40cf508eb..df61275c5 100644
--- a/e107_plugins/blogcalendar_menu/blogcalendar_menu.php
+++ b/e107_plugins/blogcalendar_menu/blogcalendar_menu.php
@@ -33,7 +33,7 @@ if(false === $cached)
// ------------------------------
// initialization + fetch options
// ------------------------------
- $prefix = e_PLUGIN."blogcalendar_menu";
+ $prefix = e_PLUGIN_ABS."blogcalendar_menu";
$marray = array(BLOGCAL_M1, BLOGCAL_M2, BLOGCAL_M3, BLOGCAL_M4, BLOGCAL_M5, BLOGCAL_M6, BLOGCAL_M7, BLOGCAL_M8, BLOGCAL_M9, BLOGCAL_M10, BLOGCAL_M11, BLOGCAL_M12);
$pref['blogcal_ws'] = "monday";
@@ -147,9 +147,7 @@ if(false === $cached)
$months[$cur_year][$cur_month] = 1;
}
-
-
-
+
// ------------------------
// create and show calendar
// ------------------------
diff --git a/e107_plugins/blogcalendar_menu/calendar.php b/e107_plugins/blogcalendar_menu/calendar.php
index 4543749f7..3e8ac840b 100644
--- a/e107_plugins/blogcalendar_menu/calendar.php
+++ b/e107_plugins/blogcalendar_menu/calendar.php
@@ -140,7 +140,7 @@ function calendar($req_day, $req_month, $req_year, $links = NULL, $ws = "sunday"
if(deftrue('BOOTSTRAP'))
{
- $active = date("n") == $req_month ? 'active' : '';
+ $active = date("n-Y") == ($req_month."-".$req_year) ? 'active' : '';
$text = "";
$text .= "
".$marray[$req_month]." ".$req_year."
";
$text .= $calendar;