Sync with master on github

4 files changed, 34 insertions, 38 deletions

diff --git a/styles/plain.css b/styles/plain.css
index 3600f34..cc04949 100644
--- a/styles/plain.css
+++ b/styles/plain.css
@@ -11,31 +11,29 @@
 .calendar					{border:2px solid #999; background-color:#eee; padding:5px;}
 
 /* now for the individual content type settings */
-.caloptions .calbitarticle	,.calitems .calbitarticle	a	{border-bottom-color:#f80;}
-.caloptions .calbitblog		,.calitems .calbitblog		a	{border-bottom-color:#fb6;}
-.caloptions .calbitblogpost	,.calitems .calbitblogpost	a	{border-bottom-color:#fd6;}
-.caloptions .calbitcomment	,.calitems .calbitcomment	a	{border-bottom-color:#f6f;}
-.caloptions .calbituser		,.calitems .calbituser		a	{border-bottom-color:#9f6;}
+.caloptions .calbitarticle		,.calitems .calbitarticle		a	{border-bottom-color:#f80;}
+.caloptions .calbitblog			,.calitems .calbitblog			a	{border-bottom-color:#fb6;}
+.caloptions .calbitblogpost		,.calitems .calbitblogpost		a	{border-bottom-color:#fd6;}
+.caloptions .calbitcomment		,.calitems .calbitcomment		a	{border-bottom-color:#f6f;}
+.caloptions .calbituser			,.calitems .calbituser			a	{border-bottom-color:#9f6;}
 .caloptions .calfisheyegallery	,.calitems .calfisheyegallery	a	{border-bottom-color:#9cf;}
-.caloptions .calfisheyeimage	,.calitems .calfisheyeimage	a	{border-bottom-color:#39f;}
-.caloptions .calpigeonholes	,.calitems .calpigeonholes	a	{border-bottom-color:#f66;}
-.caloptions .caltikisticky	,.calitems .caltikisticky	a	{border-bottom-color:#ff6;}
-.caloptions .calbitbook		,.calitems .calbitbook		a	{border-bottom-color:#777;}
-.caloptions .calbitpage		,.calitems .calbitpage		a	{border-bottom-color:#bbb;}
-.caloptions .calbitevents	,.calitems .calbitevents	a	{border-bottom-color:#f0f;}
+.caloptions .calfisheyeimage	,.calitems .calfisheyeimage		a	{border-bottom-color:#39f;}
+.caloptions .calpigeonholes		,.calitems .calpigeonholes		a	{border-bottom-color:#f66;}
+.caloptions .caltikisticky		,.calitems .caltikisticky		a	{border-bottom-color:#ff6;}
+.caloptions .calbitbook			,.calitems .calbitbook			a	{border-bottom-color:#777;}
+.caloptions .calbitpage			,.calitems .calbitpage			a	{border-bottom-color:#bbb;}
 
-
-.caloptions .calbitarticle	,.calitems .calbitarticle	a	{background:#fa6;}
-.caloptions .calbitblog		,.calitems .calbitblog		a	{background:#fa9;}
-.caloptions .calbitblogpost	,.calitems .calbitblogpost	a	{background:#fc9;}
-.caloptions .calbitcomment	,.calitems .calbitcomment	a	{background:#f9f;}
-.caloptions .calbituser		,.calitems .calbituser		a	{background:#af8;}
+/*
+.caloptions .calbitarticle		,.calitems .calbitarticle		a	{background:#fa6;}
+.caloptions .calbitblog			,.calitems .calbitblog			a	{background:#fa9;}
+.caloptions .calbitblogpost		,.calitems .calbitblogpost		a	{background:#fc9;}
+.caloptions .calbitcomment		,.calitems .calbitcomment		a	{background:#f9f;}
+.caloptions .calbituser			,.calitems .calbituser			a	{background:#af8;}
 .caloptions .calfisheyegallery	,.calitems .calfisheyegallery	a	{background:#acf;}
-.caloptions .calfisheyeimage	,.calitems .calfisheyeimage	a	{background:#7af;}
-.caloptions .calpigeonholes	,.calitems .calpigeonholes	a	{background:#f99;}
-.caloptions .caltikisticky	,.calitems .caltikisticky	a	{background:#ff9;}
-.caloptions .calbitbook		,.calitems .calbitbook		a	{background:#777;}
-.caloptions .calbitpage		,.calitems .calbitpage		a	{background:#bbb;}
-.caloptions .calbitevents	,.calitems .calbitevents	a	{background:#fdf;}
-
+.caloptions .calfisheyeimage	,.calitems .calfisheyeimage		a	{background:#7af;}
+.caloptions .calpigeonholes		,.calitems .calpigeonholes		a	{background:#f99;}
+.caloptions .caltikisticky		,.calitems .caltikisticky		a	{background:#ff9;}
+.caloptions .calbitbook			,.calitems .calbitbook			a	{background:#777;}
+.caloptions .calbitpage			,.calitems .calbitpage			a	{background:#bbb;}
+*/
 
diff --git a/templates/admin_calendar.tpl b/templates/admin_calendar.tpl
index dd5c0db..d0909d9 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 column-group gutters">
+	<div class="form-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}
@@ -16,7 +16,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group column-group gutters">
+	<div class="form-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}
@@ -24,7 +24,7 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{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 column-group gutters">
+		<div class="form-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}
@@ -44,7 +44,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group column-group gutters">
+		<div class="form-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}
@@ -52,7 +52,7 @@
 			{/forminput}
 		</div>
 
-		<div class="control-group column-group gutters">
+		<div class="form-group">
 			{formlabel label="Default Content Types"}
 			{forminput}
 				{html_checkboxes name="defaultTypes" options=$calendarTypeDefaults selected=$calendarTypesSelected separator="<br />"}
@@ -61,8 +61,8 @@
 		</div>
 	{/if}
 	
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="calendar_submit" value="{tr}Change preferences{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" name="calendar_submit" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/calendar_options_inc.tpl b/templates/calendar_options_inc.tpl
index b5ec658..e2a2120 100644
--- a/templates/calendar_options_inc.tpl
+++ b/templates/calendar_options_inc.tpl
@@ -3,7 +3,7 @@
 	<div class="caloptions">
 		{forminput}
 			{foreach from=$calContentTypes key=value item=type}
-				<div class="control-group cal{$value}">
+				<div class="form-group cal{$value}">
 					<label>
 						<input type="checkbox" value="{$value}" name="content_type_guid[]"
 							{foreach from=$smarty.session.calendar.content_type_guid item=selected}
@@ -21,8 +21,8 @@
 		{/forminput}
 	</div>
 
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="refresh" value="{tr}Update Calendar{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" 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 116b1d1..36e22f6 100644
--- a/templates/menu_calendar_admin.tpl
+++ b/templates/menu_calendar_admin.tpl
@@ -1,5 +1,3 @@
 {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>
+{if $packageMenuTitle}<a class="nosubmenu"href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=calendar">{tr}Calendar{/tr}</a>{/if}
 {/strip}
\ No newline at end of file