bootstrap-conversion

8 files changed, 49 insertions, 53 deletions

diff --git a/templates/admin_messages.tpl b/templates/admin_messages.tpl
index c3cda93..8a2ae6c 100644
--- a/templates/admin_messages.tpl
+++ b/templates/admin_messages.tpl
@@ -3,7 +3,7 @@
 {form legend="Anonymous Contact"}
 	<input type="hidden" name="page" value="{$page}" />
 
-	<div class="row">
+	<div class="control-group">
 		{formlabel label="Contact Us" for="messages_site_contact"}
 		{forminput}
 			{html_checkboxes name="messages_site_contact" values="y" checked=$gBitSystem->getConfig('messages_site_contact') labels=false id="messages_site_contact"}
@@ -11,7 +11,7 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
+	<div class="control-group">
 		{formlabel label="Contact user" for="messages_contact_user"}
 		{forminput}
 			{if $usersList}
@@ -23,7 +23,7 @@
 		{/forminput}
 	</div>
 
-	<div class="row submit">
+	<div class="control-group submit">
 		<input type="submit" name="anonymous_settings" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
diff --git a/templates/broadcast.tpl b/templates/broadcast.tpl
index df3478f..f31c501 100644
--- a/templates/broadcast.tpl
+++ b/templates/broadcast.tpl
@@ -11,7 +11,7 @@
 
 		{if !$feedback}
 			{form legend="Broadcast message"}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Group" for="broadcast-group"}
 					{forminput}
 						<select name="group_id" id="broadcast-group">
@@ -25,7 +25,7 @@
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Priority" for="broadcast-priority"}
 					{forminput}
 						<select name="priority" id="broadcast-priority">
@@ -39,7 +39,7 @@
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Subject" for="broadcast-subject"}
 					{forminput}
 						<input type="text" name="subject" id="broadcast-subject" value="{$subject|escape}" size="50" maxlength="255" />
diff --git a/templates/compose.tpl b/templates/compose.tpl
index b355796..90c658c 100644
--- a/templates/compose.tpl
+++ b/templates/compose.tpl
@@ -17,7 +17,7 @@
 
 		{if !$feedback or $feedback.error}
 			{form legend="Compose Private Message"}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="To" for="to"}
 					{forminput}
 						<input type="text" name="to" id="to" size="30" value="{$to}" />
@@ -25,21 +25,21 @@
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Carbon Copy" for="cc"}
 					{forminput}
 						<input type="text" name="cc" id="cc" size="30" value="{$cc}" />
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Blind Carbon Copy" for="bcc"}
 					{forminput}
 						<input type="text" name="bcc" id="bcc" size="30" value="{$bcc}" />
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Priority" for="priority"}
 					{forminput}
 						<select name="priority" id="mess-prio">
@@ -52,14 +52,14 @@
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Subject" for="subject"}
 					{forminput}
 						<input type="text" name="subject" id="subject" size="50" value="{$subject|escape}" />
 					{/forminput}
 				</div>
 				{textarea noformat=1 id="message_body" name="body}{$body}{/textarea}
-				<div class="row submit">
+				<div class="control-group submit">
 					<input type="submit" name="send" value="{tr}Send Message{/tr}" />
 				</div>
 			{/form}
diff --git a/templates/contact.tpl b/templates/contact.tpl
index af8e6c0..a3faa05 100644
--- a/templates/contact.tpl
+++ b/templates/contact.tpl
@@ -10,7 +10,7 @@
 		{form legend="Send us a message"}
 			<input type="hidden" name="to" value="{$gBitSystem->getConfig('messages_contact_user')|escape}" />
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Priority" for="priority"}
 				{forminput}
 					<select name="priority" id="priority">
@@ -24,7 +24,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Subject" for="subject"}
 				{forminput}
 					<input type="text" name="subject" id="subject" size="50" maxlength="255" />
@@ -33,7 +33,7 @@
 			</div>
 
 			{textarea noformat=1 id="message_body" name="body}{/textarea}
-			<div class="row submit">
+			<div class="control-group submit">
 				<input type="submit" name="send" value="{tr}Send Message{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/mailbox.tpl b/templates/mailbox.tpl
index 1286e13..1fff001 100644
--- a/templates/mailbox.tpl
+++ b/templates/mailbox.tpl
@@ -62,7 +62,7 @@
 		{/form}
 
 		{form legend="Search your Personal Messages"}
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Messages" for="messages"}
 				{forminput}
 					<select name="flags" id="messages">
@@ -76,7 +76,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Priority" for="priority"}
 				{forminput}
 					<select name="priority" id="priority">
@@ -91,7 +91,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Containing" for="find"}
 				{forminput}
 					<input type="text" name="find" size="40" id="find" value="{$smarty.request.find|escape}" />
@@ -99,7 +99,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row submit">
+			<div class="control-group submit">
 				<input type="submit" name="filter" value="{tr}Filter{/tr}" />
 			</div>
 		{/form}
diff --git a/templates/messages_nav.tpl b/templates/messages_nav.tpl
index e2b6f28..8366662 100644
--- a/templates/messages_nav.tpl
+++ b/templates/messages_nav.tpl
@@ -1,9 +1,7 @@
-<div class="navbar">
-	<ul>
-		<li><a href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">{tr}Mailbox{/tr}</a></li>
-		<li><a href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{tr}Compose{/tr}</a></li>
-		{if $gBitUser->hasPermission( 'p_messages_broadcast')}
-			<li><a href="{$smarty.const.MESSAGES_PKG_URL}broadcast.php">{tr}Broadcast{/tr}</a></li>
-		{/if}
-	</ul>
-</div>
+<ul class="inline navbar">
+	<li><a href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">{tr}Mailbox{/tr}</a></li>
+	<li><a href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{tr}Compose{/tr}</a></li>
+	{if $gBitUser->hasPermission( 'p_messages_broadcast')}
+		<li><a href="{$smarty.const.MESSAGES_PKG_URL}broadcast.php">{tr}Broadcast{/tr}</a></li>
+	{/if}
+</ul>
diff --git a/templates/preferences_inc.tpl b/templates/preferences_inc.tpl
index 98ddf04..4a142df 100644
--- a/templates/preferences_inc.tpl
+++ b/templates/preferences_inc.tpl
@@ -1,7 +1,7 @@
 {strip}
 {form legend="User Messages"}
 	<input type="hidden" name="view_user" value="{$view_user}" />
-	<div class="row">
+	<div class="control-group">
 		{formlabel label="Personal Messages" for=""}
 		{forminput}
 			<a href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">
@@ -10,7 +10,7 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
+	<div class="control-group">
 		{formlabel label="Messages per page" for="messages_max_records"}
 		{forminput}
 			<select name="messages_max_records" id="messages_max_records">
@@ -26,7 +26,7 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
+	<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} />
@@ -34,7 +34,7 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
+	<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} />
@@ -42,7 +42,7 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
+	<div class="control-group">
 		{formlabel label="Send an email" for="messages_min_priority"}
 		{forminput}
 			<select name="messages_min_priority" id="messages_min_priority">
@@ -57,7 +57,7 @@
 		{/forminput}
 	</div>
 
-	<div class="row submit">
+	<div class="control-group submit">
 		<input type="submit" name="messprefs" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
diff --git a/templates/read.tpl b/templates/read.tpl
index f0f3231..628b6bf 100644
--- a/templates/read.tpl
+++ b/templates/read.tpl
@@ -15,38 +15,36 @@
 		{assign var=read_id value=$msg_id}
 	{/if}
 	<div class="body">
-		<div class="navbar">
-			<ul>
-				{if $msg.is_flagged eq 'y'}
-					<li>{biticon ipackage="icons" iname="mail-mark-important" iexplain=Flagged} {smartlink ititle="Unflag Message" offset=$smarty.request.offset act=is_flagged actval=n msg_id=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
-				{else}
-					<li>{smartlink ititle="Flag Message" offset=$smarty.request.offset act=is_flagged actval=y msg_id=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
-				{/if}
-				<li>{smartlink ititle="Delete" msg_id=$read_id offset=$smarty.request.offset msgdel=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
-				{if $prev}<li>{smartlink ianchor=top ititle="Previous message" ibiticon="icons/go-previous" sort_mode=$smarty.request.sort_mode msg_id=$prev find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>{/if}
-				{if $next}<li>{smartlink ianchor=top ititle="Next message" ibiticon="icons/go-next" sort_mode=$smarty.request.sort_mode msg_id=$next find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>{/if}
-			</ul>
-		</div>
+		<ul class="inline navbar">
+			{if $msg.is_flagged eq 'y'}
+				<li>{biticon ipackage="icons" iname="mail-mark-important" iexplain=Flagged} {smartlink ititle="Unflag Message" offset=$smarty.request.offset act=is_flagged actval=n msg_id=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
+			{else}
+				<li>{smartlink ititle="Flag Message" offset=$smarty.request.offset act=is_flagged actval=y msg_id=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
+			{/if}
+			<li>{smartlink ititle="Delete" msg_id=$read_id offset=$smarty.request.offset msgdel=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
+			{if $prev}<li>{smartlink ianchor=top ititle="Previous message" ibiticon="icons/go-previous" sort_mode=$smarty.request.sort_mode msg_id=$prev find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>{/if}
+			{if $next}<li>{smartlink ianchor=top ititle="Next message" ibiticon="icons/go-next" sort_mode=$smarty.request.sort_mode msg_id=$next find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>{/if}
+		</ul>
 
 		{if $legend}
 			{$legend}
 		{else}
 			{form legend="Message" ipackage=messages ifile='compose.php'}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Date"}
 					{forminput}
 						{$msg.msg_date|bit_long_datetime}
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="From"}
 					{forminput}
 						{displayname user_id=$msg.from_user_id}
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="To"}
 					{forminput}
 						{$msg.msg_to|default:"&nbsp;"}
@@ -54,7 +52,7 @@
 				</div>
 
 				{if $msg.msg_cc}
-					<div class="row">
+					<div class="control-group">
 						{formlabel label="Carbon Copy"}
 						{forminput}
 							{$msg.msg_cc}
@@ -62,14 +60,14 @@
 					</div>
 				{/if}
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Subject"}
 					{forminput}
 						{$msg.subject}
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{forminput class="message"}
 						{$msg.parsed}
 					{/forminput}
@@ -94,7 +92,7 @@
 					<input type="hidden" name="msg_id" value="{$msg_id}" />
 				{/if}
 
-				<div class="row submit">
+				<div class="control-group submit">
 					<input type="submit" name="action[reply]" value="{tr}Reply{/tr}" />&nbsp;
 					<input type="submit" name="action[replyall]" value="{tr}Reply All{/tr}" />
 				</div>