Modify templates for ink frameworkINK_Port

4 files changed, 27 insertions, 20 deletions

diff --git a/templates/admin_calendar.tpl b/templates/admin_calendar.tpl
index d42a32d..dd5c0db 100644
--- a/templates/admin_calendar.tpl
+++ b/templates/admin_calendar.tpl
@@ -8,7 +8,7 @@
 {form legend="Calendar Settings"}
 	<input type="hidden" name="view_user" value="{$view_user}" />
 	<input type="hidden" name="page" value="{$page}" />
-	<div class="control-group">
+	<div class="control-group column-group gutters">
 		{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}
@@ -16,7 +16,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="control-group column-group gutters">
 		{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}
@@ -24,7 +24,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group">
+	<div class="control-group column-group gutters">
 		{formlabel label="Day View" for="calendar_day_start"}
 		{forminput}
 			{tr}from{/tr} &nbsp;
@@ -36,7 +36,7 @@
 	</div>
 
 	{if $gBitUser->isAdmin() and $page eq "calendar"}
-		<div class="control-group">
+		<div class="control-group column-group gutters">
 			{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}
@@ -44,7 +44,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group">
+		<div class="control-group column-group gutters">
 			{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}
@@ -52,7 +52,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group">
+		<div class="control-group column-group gutters">
 			{formlabel label="Default Content Types"}
 			{forminput}
 				{html_checkboxes name="defaultTypes" options=$calendarTypeDefaults selected=$calendarTypesSelected separator="<br />"}
@@ -62,7 +62,7 @@
 	{/if}
 	
 	<div class="control-group submit">
-		<input type="submit" class="btn" name="calendar_submit" value="{tr}Change preferences{/tr}" />
+		<input type="submit" class="ink-button" name="calendar_submit" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index e30a99a..34f3041 100644
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -24,10 +24,10 @@
 									{foreach from=$time.items item=item}
 										{assign var=over value=$item.over}
 										<div class="cal{$item.content_type_guid}">
-	<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
-		{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
-		<img style="padding:0px 4px;" src="{booticon iname="icon-plus-sign"  ipackage="icons"  iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 sticky=1 closeclick=1 target=$itemurl}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
-	</a>
+											<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
+												{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
+												<img style="padding:0px 4px;" src="/config/images/plus-sign.png" title="{tr}Detailed Information{/tr}" alt="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 sticky=1 closeclick=1 target=$itemurl}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
+											</a>
 										</div>
 									{/foreach}
 								</td>
@@ -50,11 +50,11 @@
 										{if $day.day|cal_date_format:"%m" eq $navigation.focus_month or $smarty.session.calendar.view_mode eq "week"}
 											{foreach from=$day.items item=item}
 												{assign var=over value=$item.over}
-		{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
+												{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
 												<div class="cal{$item.content_type_guid}" style="float:left;width:50%;">
 													<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
-				<img style="padding:0px 4px;" src="{booticon iname="icon-plus-sign"  ipackage="icons"  iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 sticky=1 closeclick=1 target=$itemurl}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
-			</a>
+														<img style="padding:0px 4px;" src="/config/images/plus-sign.png" title="{tr}Detailed Information{/tr}" alt="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 sticky=1 closeclick=1 target=$itemurl}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
+													</a>
 												</div>
 											{/foreach}
 										{else}
@@ -95,11 +95,16 @@
 											{* - Cell Content - *}
 											{foreach from=$day.items item=item}
 												{assign var=over value=$item.over}
-		{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
+												{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
 												<div class="cal{$item.content_type_guid}">
 													<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
-				<img style="padding:0px 4px;" src="{booticon iname="icon-plus-sign"  ipackage="icons"  iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 target=$itemurl sticky=1 closeclick=1}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|truncate:$trunc:"..."|default:"?"}
-			</a>
+														<img style="padding:0px 4px;" src="/config/images/plus-sign.png" title="{tr}Detailed Information{/tr}" alt="{tr}Detailed Information{/tr}"
+														{if $gBitSystem->isFeatureActive('calendar_ajax_popups')}
+														{popup fullhtml=1 target=$itemurl sticky=1 closeclick=1}{else}
+														{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if}
+														/> 
+														{$item.title|escape|truncate:$trunc:"..."|default:"?"}
+													</a>
 												</div>
 											{/foreach}
 										{else}
diff --git a/templates/calendar_options_inc.tpl b/templates/calendar_options_inc.tpl
index f3d412b..b5ec658 100644
--- a/templates/calendar_options_inc.tpl
+++ b/templates/calendar_options_inc.tpl
@@ -22,7 +22,7 @@
 	</div>
 
 	<div class="control-group submit">
-		<input type="submit" class="btn" name="refresh" value="{tr}Update Calendar{/tr}" />
+		<input type="submit" class="ink-button" name="refresh" value="{tr}Update Calendar{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/menu_calendar_admin.tpl b/templates/menu_calendar_admin.tpl
index 8ccb255..116b1d1 100644
--- a/templates/menu_calendar_admin.tpl
+++ b/templates/menu_calendar_admin.tpl
@@ -1,3 +1,5 @@
 {strip}
-{if $packageMenuTitle}<a class="nosubmenu"href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=calendar">{tr}Calendar{/tr}</a>{/if}
-{/strip}
+<ul class="{$packageMenuClass}">
+	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=calendar">{tr}Calendar Settings{/tr}</a></li>
+</ul>
+{/strip}
\ No newline at end of file