From 7f1b50d946949dcbb50550ff762dabaf4e4b2437 Mon Sep 17 00:00:00 2001
From: spiderr <spider@viovio.com>
Date: Fri, 6 Jun 2014 15:24:41 -0400
Subject: boostrap3-control-group-2-from-group

---
 templates/admin_newsletter_subscriptions.tpl |  6 +++---
 templates/admin_newsletters.tpl              |  4 ++--
 templates/center_list_newsletters.tpl        |  8 ++++----
 templates/edit_edition.tpl                   | 12 ++++++------
 templates/edit_newsletter.tpl                | 16 ++++++++--------
 templates/send_newsletters.tpl               | 14 +++++++-------
 templates/user_register_inc.tpl              |  2 +-
 templates/user_subscriptions.tpl             | 10 +++++-----
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl
index 170832d..b0de9ef 100644
--- a/templates/admin_newsletter_subscriptions.tpl
+++ b/templates/admin_newsletter_subscriptions.tpl
@@ -9,7 +9,7 @@
 		{form}
 			<input type="hidden" name="nl_id" value="{$nl_id|escape}" />
 
-			<div class="control-group">
+			<div class="form-group">
 				{if $gContent->getField('validate_addr') eq 'y'}
 					{formfeedback warning="Validate Email is enabled, a confirmation email will be sent to every subsciber inviting them to the newsletter. <strong>Any duplicate or previously unsubscribed emails will *NOT* be re-subscribed using this method.</strong>"}
 				{else}
@@ -17,7 +17,7 @@
 				{/if}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="New Subscribers" for=""}
 				{forminput}
 					<textarea cols="50" rows="5" name="new_subscribers" id="new_subscribers"></textarea>
@@ -25,7 +25,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				{forminput}
 					<input type="submit" class="btn btn-default" name="save" value="{tr}Subscribe{/tr}" />
 				{/forminput}
diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index 54d82d7..c7824a1 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -3,7 +3,7 @@
 	{legend legend="Newsletter Mail Server Settings"}
 		<input type="hidden" name="page" value="{$page}" />
 		{foreach from=$formNewsletterFeatures key=item item=output}
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label=$output.label for=$item}
 				{forminput}
 					<input type="text" name="{$item|escape}" value="{$gBitSystem->getConfig($item,$output.default)|escape}"/>
@@ -12,7 +12,7 @@
 			</div>
 		{/foreach}
 
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" name="apply" value="{tr}Change preferences{/tr}" />
 		</div>
 	{/legend}
diff --git a/templates/center_list_newsletters.tpl b/templates/center_list_newsletters.tpl
index d5d04e7..29d9ba5 100644
--- a/templates/center_list_newsletters.tpl
+++ b/templates/center_list_newsletters.tpl
@@ -11,14 +11,14 @@
 		{formfeedback hash=$feedback}
 		{if $subscribe eq 'y'}
 			<h2>{tr}Subscribe to Newsletter{/tr}</h2>
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Name" for=""}
 				{forminput}
 					{$gContent->getTitle()}
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="form-group">
 				{formlabel label="Description" for=""}
 				{forminput}
 					{$gContent->parseData()}
@@ -27,7 +27,7 @@
 			{if ($gContent->getField('allow_user_sub') eq 'y') or $gBitUser->hasPermission( 'p_newsletters_subscribe' )}
 				{form}
 					<input type="hidden" name="nl_id" value="{$gContent->mNewsletterId}" />
-					<div class="control-group">
+					<div class="form-group">
 						{formlabel label="Email" for=""}
 						{forminput}
 						{if $gBitUser->hasPermission( 'p_newsletters_subscribe_email' )}
@@ -37,7 +37,7 @@
 						{/if}
 						{/forminput}
 					</div>
-					<div class="control-group submit">
+					<div class="form-group submit">
 						{forminput}
 							<input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />
 							{if $gContent->getField( 'subscribed_date' )}
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index a020563..c9a4c44 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -22,7 +22,7 @@
 			{jstabs}
 				{jstab title="Edition Body"}
 					{legend legend="Edition Body"}
-						<div class="control-group">
+						<div class="form-group">
 							{formlabel label="Newsletter" for="nl_content_id"}
 							{forminput}
 								<select name="nl_content_id" id="nl_content_id">
@@ -35,7 +35,7 @@
 						</div>
 
 						{if $gBitUser->hasPermission('p_use_content_templates') && $templates}
-							<div class="control-group">
+							<div class="form-group">
 								{formlabel label="Template" for=""}
 								{forminput}
 									<select name="template_id" onchange="javascript:document.getElementById('editpageform').submit();">
@@ -51,14 +51,14 @@
 
 						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
 
-						<div class="control-group">
+						<div class="form-group">
 							<label class="checkbox">
 								<input type="checkbox" name="is_draft" id="draft" value="y" {if $pageInfo.is_draft eq 'y'}checked="checked"{/if} />Draft
 								{formhelp note=""}
 							</label>
 						</div>
 
-						<div class="control-group">
+						<div class="form-group">
 							{formlabel label="Subject" for="subject"}
 							{forminput}
 								<input type="text" maxlength="250" size="40" name="title" id="subject" value="{$pageInfo.title|escape:html}" />
@@ -66,7 +66,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group">
+						<div class="form-group">
 							{formlabel label="Reply-To" for="replyto"}
 							{forminput}
 								<input type="text" maxlength="250" size="40" name="reply_to" id="replyto" value="{$pageInfo.reply_to|default:$gBitSystem->getConfig('site_sender_email',$smarty.server.SERVER_ADMIN)|escape:html}" />
@@ -89,7 +89,7 @@
 
 			{/jstabs}
 
-			<div class="control-group submit">
+			<div class="form-group submit">
 				<input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />
 				<input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" />
 				<input type="submit" class="btn btn-default" name="save" value="{tr}Save Edition{/tr}" />
diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl
index ba18770..a55e2c6 100644
--- a/templates/edit_newsletter.tpl
+++ b/templates/edit_newsletter.tpl
@@ -14,7 +14,7 @@
 				{/if}
 				<input type="hidden" name="nl_id" value="{$gContent->mNewsletterId}" />
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Title" for="title"}
 					{forminput}
 						<input type="text" name="title" id="title" value="{$gContent->mInfo.title|escape}" />
@@ -22,7 +22,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					{formlabel label="Description" for="description"}
 					{forminput}
 						<textarea name="edit" rows="4" cols="40" id="description">{$gContent->mInfo.data|escape}</textarea>
@@ -30,42 +30,42 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="allow_user_sub" id="allow_user_sub" {if !$gContent->isValid() || $gContent->mInfo.allow_user_sub eq 'y'}checked="checked"{/if} />Users can Subscribe
 						{formhelp note="Users can subscribe to this list. Disabling this options means that you have to manually add users to the list."}
 					</label>
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="allow_any_sub" id="allow_any_sub" {if !$gContent->isValid() || $gContent->mInfo.allow_any_sub eq 'y'}checked="checked"{/if} />Any e-mail Address
 						{formhelp note="Users may subscribe using any email address."}
 					</label>
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="unsub_msg" id="unsub_msg" {if !$gContent->isValid() || $gContent->mInfo.unsub_msg eq 'y'}checked="checked"{/if} />Append Un/Subscribe Instructions
 						{formhelp note="Append instructions on how to subscribe / unsubscribe to ever outgoing newsletter. This is only useful when users can un / subscribe to the list themselves."}
 					</label>
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="validate_addr" id="validate_addr" {if $gContent->mInfo.validate_addr eq 'y'}checked="checked"{/if} />Validate e-mail Addresses
 						{formhelp note="Validate all email addresses before they are added to the list. This might result in members not being added despite working email addresses."}
 					</label>
 				</div>
 
-				<div class="control-group">
+				<div class="form-group">
 					<label class="checkbox">
 						<input type="checkbox" name="registration_optin" id="registration_optin" {if $gContent->getPreference('registration_optin') eq 'y'}checked="checked"{/if} value="y"/>Registration Opt-In
 						{formhelp note="List this newsletter on the registration page and allow user to join newsletter."}
 					</label>
 				</div>
 
-				<div class="control-group submit">
+				<div class="form-group submit">
 					<input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />
 					<input type="submit" class="btn btn-default" name="save" value="{tr}Save{/tr}" />
 				</div>
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 945e2e9..8be1f17 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -8,7 +8,7 @@
 
 	<div class="body">
 		{if $feedback}
-			<div class="control-group">
+			<div class="form-group">
 				{formfeedback hash=$feedback}
 			</div>
 		{/if}
@@ -31,7 +31,7 @@
 
 						{jstab title="Preview Recipient List"}
 							{legend legend="Preview Recipient List"}
-								<div class="control-group">
+								<div class="form-group">
 									{foreach from=$smarty.request.send_group item=groupId key=i}
 										<input type="hidden" name="send_group[]" value="{$groupId}" />
 									{/foreach}
@@ -49,13 +49,13 @@
 						{/jstab}
 					{/jstabs}
 
-					<div class="control-group submit">
+					<div class="form-group submit">
 						<input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />
 						<input type="submit" class="btn btn-default" name="send" value="{tr}Send{/tr}" />
 					</div>
 				{else}
 					{legend legend="Recipient Groups"}
-						<div class="control-group">
+						<div class="form-group">
 							{formlabel label="Groups"}
 							{forminput}
 								{foreach from=$groupList item=group key=groupId }
@@ -65,21 +65,21 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group">
+						<div class="form-group">
 							<label class="checkbox">
 								<input type="checkbox" name="test_mode" />Send Test
 								{formhelp note="This will enable you to send the newsletter to the same recipients again."}
 							</label>
 						</div>
 {*
-						<div class="control-group">
+						<div class="form-group">
 							{formlabel label="Only send to validated emails"}
 							{forminput}
 								<input type="checkbox" name="validated" checked="checked" />
 							{/forminput}
 						</div>
 *}
-						<div class="control-group submit">
+						<div class="form-group submit">
 							<input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" />
 						</div>
 					{/legend}
diff --git a/templates/user_register_inc.tpl b/templates/user_register_inc.tpl
index fa55312..373b4f1 100644
--- a/templates/user_register_inc.tpl
+++ b/templates/user_register_inc.tpl
@@ -15,7 +15,7 @@ for (var i = 0; i < checkboxes.length; i++){
 {/literal}
 </script>
 
-<div class="control-group">
+<div class="form-group">
 	{formlabel label="Subscriptions"}
 	{forminput}
 	{foreach from=$newsletters item='newsletter'}
diff --git a/templates/user_subscriptions.tpl b/templates/user_subscriptions.tpl
index 42ae5d0..7581b63 100644
--- a/templates/user_subscriptions.tpl
+++ b/templates/user_subscriptions.tpl
@@ -11,7 +11,7 @@
 		<input type="hidden" name="response_content_id" value="{$subInfo.content_id}" />
 {if $smarty.request.c}
 		<input type="hidden" name="c" value="{$smarty.request.c}" />
-		<div class="control-group">
+		<div class="form-group">
 <em>
 			{formlabel label="In Response To"}
 			{forminput}
@@ -20,14 +20,14 @@
 </em>
 		</div>
 {/if}
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="User Information"}
 			{forminput}
 				{displayname hash=$subInfo}<br/>
 				{$subInfo.email}
 			{/forminput}
 		</div>
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Subscriptions"}
 			{forminput}
 				{foreach from=$newsletters key=nlId item=nl}
@@ -37,13 +37,13 @@
 				{/foreach}
 			{/forminput}
 		</div>
-		<div class="control-group">
+		<div class="form-group">
 			{formlabel label="Permanent Unsubscribe"}
 			{forminput}
 				<input type="checkbox" name="unsubscribe_all" value="y" {if $subInfo.unsubscribe_all}checked="checked"{/if} /> {tr}Remove myself from all lists, and receive no further mailings from{/tr} {$gBitSystem->getConfig('siteTitle','this site')}.</br>
 			{/forminput}
 		</div>
-		<div class="control-group submit">
+		<div class="form-group submit">
 			<input type="submit" class="btn btn-default" name="update" value="{tr}Update Subscriptions{/tr}" />
 		</div>
 	{/form}
-- 
cgit v1.3