major clean up for Smarty 3.0 and another pass at cleaning the top menus

2 files changed, 7 insertions, 12 deletions

diff --git a/templates/admin_calendar.tpl b/templates/admin_calendar.tpl
index 1eaecfd..d42a32d 100644
--- a/templates/admin_calendar.tpl
+++ b/templates/admin_calendar.tpl
@@ -11,7 +11,7 @@
 	<div class="control-group">
 		{formlabel label="First day of Week" for="calendar_week_offset"}
 		{forminput}
-			{html_options name=calendar_week_offset output=$firstDayOutput values=$firstDayValues selected=`$settings.calendar_week_offset` id=calendar_week_offset}
+			{html_options name=calendar_week_offset output=$firstDayOutput values=$firstDayValues selected=$settings.calendar_week_offset id=calendar_week_offset}
 			{formhelp note="Set the first day of the week."}
 		{/forminput}
 	</div>
@@ -19,7 +19,7 @@
 	<div class="control-group">
 		{formlabel label="Time Blocks" for="calendar_hour_fraction"}
 		{forminput}
-			{html_options name=calendar_hour_fraction output=$hourOutput values=$hourValues selected=`$settings.calendar_hour_fraction` id=calendar_hour_fraction} {tr}minutes{/tr}
+			{html_options name=calendar_hour_fraction output=$hourOutput values=$hourValues selected=$settings.calendar_hour_fraction id=calendar_hour_fraction} {tr}minutes{/tr}
 			{formhelp note="Set the timeblocks for the day view."}
 		{/forminput}
 	</div>
@@ -28,9 +28,9 @@
 		{formlabel label="Day View" for="calendar_day_start"}
 		{forminput}
 			{tr}from{/tr} &nbsp;
-			{html_options name=calendar_day_start output=$dayStart values=$dayStart selected=`$settings.calendar_day_start` id=calendar_day_start}
+			{html_options name=calendar_day_start output=$dayStart values=$dayStart selected=$settings.calendar_day_start id=calendar_day_start}
 			&nbsp; {tr}to{/tr} &nbsp;
-			{html_options name=calendar_day_end output=$dayEnd values=$dayEnd selected=`$settings.calendar_day_end` id=calendar_day_start}
+			{html_options name=calendar_day_end output=$dayEnd values=$dayEnd selected=$settings.calendar_day_end id=calendar_day_start}
 			{formhelp note="Pick the start and end time of your day view."}
 		{/forminput}
 	</div>
@@ -39,7 +39,7 @@
 		<div class="control-group">
 			{formlabel label="Individual Calendar Settings" for="calendar_user_prefs"}
 			{forminput}
-				{html_checkboxes name="calendar_user_prefs" values="y" checked=`$settings.calendar_user_prefs` labels=false id=calendar_user_prefs}
+				{html_checkboxes name="calendar_user_prefs" values="y" checked=$settings.calendar_user_prefs labels=false id=calendar_user_prefs}
 				{formhelp note="Allow users to set their own calendar preferences."}
 			{/forminput}
 		</div>
@@ -47,7 +47,7 @@
 		<div class="control-group">
 			{formlabel label="Ajax Popups" for="calendar_ajax_popups"}
 			{forminput}
-				{html_checkboxes name="calendar_ajax_popups" values="y" checked=`$settings.calendar_ajax_popups` labels=false id=calendar_ajax_popups}
+				{html_checkboxes name="calendar_ajax_popups" values="y" checked=$settings.calendar_ajax_popups labels=false id=calendar_ajax_popups}
 				{formhelp note="Use ajax for calendar popups. This saves page load time and bandwidth at the expense of requiring javascript."}
 			{/forminput}
 		</div>
diff --git a/templates/menu_calendar.tpl b/templates/menu_calendar.tpl
index d39d98b..61813b6 100644
--- a/templates/menu_calendar.tpl
+++ b/templates/menu_calendar.tpl
@@ -1,8 +1,3 @@
 {strip}
-<ul>
-	<li><a class="item" href="{$smarty.const.CALENDAR_PKG_URL}index.php">{booticon iname="icon-calendar" iexplain="Display Calendar" ilocation=menu}</a></li>
-	{if $gBitSystem->isPackageActive( 'minical' )}
-		<li><a class="item" href="{$smarty.const.MINICAL_PKG_URL}index.php">{booticon iname="icon-calendar"  iexplain="Mini Calendar" ilocation=menu}</a></li>
-	{/if}
-</ul>
+<a href="{$smarty.const.CALENDAR_PKG_URL}index.php">{tr}{$packageMenuTitle}{/tr}</a>
 {/strip}