From b14b9ea23181053c6c617a1ec5c384c032651cfd Mon Sep 17 00:00:00 2001
From: spiderr <spider@viovio.com>
Date: Wed, 24 Apr 2013 13:25:47 -0400
Subject: fix <label class=checkbox> wrapping to be bootstrap compliant; add
 .table to all table.data tags

---
 templates/mailbox.tpl         |  2 +-
 templates/preferences_inc.tpl | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/templates/mailbox.tpl b/templates/mailbox.tpl
index 3f591d1..c9c536d 100644
--- a/templates/mailbox.tpl
+++ b/templates/mailbox.tpl
@@ -19,7 +19,7 @@
 			<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{booticon iname="icon-envelope"  ipackage="icons"  iexplain="Compose Message" iforce=icon_text}</a>
 
 			{assign var=displayName value=$gBitSystem->getConfig("users_display_name","real_name") }
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}Messages{/tr}</caption>
 				<tr>
 					<th style="width:1%">&nbsp;</th>
diff --git a/templates/preferences_inc.tpl b/templates/preferences_inc.tpl
index 00fdd25..6bafef6 100644
--- a/templates/preferences_inc.tpl
+++ b/templates/preferences_inc.tpl
@@ -27,19 +27,17 @@
 	</div>
 
 	<div class="control-group">
-		{formlabel label="Allow messages from other users" for="messages_allow_messages"}
-		{forminput}
-			<input type="checkbox" name="messages_allow_messages" id="messages_allow_messages" {if $userPrefs.messages_allow_messages eq 'y'}checked="checked"{/if} />
+		<label class="checkbox">
+			<input type="checkbox" name="messages_allow_messages" id="messages_allow_messages" {if $userPrefs.messages_allow_messages eq 'y'}checked="checked"{/if} />Allow messages from other users
 			{formhelp note=""}
-		{/forminput}
+		</label>
 	</div>
 
 	<div class="control-group">
-		{formlabel label="Message Alert" for="messages_alert"}
-		{forminput}
-			<input type="checkbox" name="messages_alert" id="messages_alert" {if $userPrefs.messages_alert eq 'y'}checked="checked"{/if} />
+		<label class="checkbox">
+			<input type="checkbox" name="messages_alert" id="messages_alert" {if $userPrefs.messages_alert eq 'y'}checked="checked"{/if} />Message Alert
 			{formhelp note="Whenever you have new messages, a popup will apear and take you directly to your message box."}
-		{/forminput}
+		</label>
 	</div>
 
 	<div class="control-group">
-- 
cgit v1.3