Sync with master on github

9 files changed, 47 insertions, 47 deletions

diff --git a/templates/admin_blogs.tpl b/templates/admin_blogs.tpl
index c6dcf54..44ed354 100644
--- a/templates/admin_blogs.tpl
+++ b/templates/admin_blogs.tpl
@@ -4,7 +4,7 @@
 		{jstab title="Blog Features"}
 			{legend legend="Home Blog"}
 				<input type="hidden" name="page" value="{$page}" />
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Home Blog (main blog)" for="blog_home"}
 					{forminput}
 						<select name="blog_home" id="blog_home">
@@ -20,8 +20,8 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="set_blog_home" value="{tr}Change preferences{/tr}" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" name="set_blog_home" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 
@@ -29,7 +29,7 @@
 				<input type="hidden" name="page" value="{$page}" />
 
 				{foreach from=$formBlogFeatures key=item item=output}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -38,7 +38,7 @@
 					</div>
 				{/foreach}
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Maximum Blog Posts" for="blogposts-maxhome"}
 					{forminput}
 						<input size="5" type="text" name="blog_posts_max_list" id="blogposts-maxhome" value="{$gBitSystem->getConfig('blog_posts_max_list')|escape}" />
@@ -47,7 +47,7 @@
 				</div>
 
 				{foreach from=$formBlogInputs key=item item=output}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							<input type="text" name="$item" value="{$gBitSystem->getConfig($item, 3)}" id="{$item}" />
@@ -56,7 +56,7 @@
 					</div>
 				{/foreach}
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Blog Posts Description Length" for="blog-posts-descrlength"}
 					{forminput}
 						<input size="5" type="text" name="blog_posts_description_length" id="blog-posts-descrlength" value="{$gBitSystem->getConfig('blog_posts_description_length')|escape}" /> {tr}characters{/tr}
@@ -64,7 +64,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Default ordering for blog listing" for="blog_list_order"}
 					{forminput}
 						<select name="blog_list_order" id="blog_list_order">
@@ -78,7 +78,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Display user as" for="blog_list_user_as"}
 					{forminput}
 						<select name="blog_list_user_as" id="blog_list_user_as">
@@ -90,8 +90,8 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="featuresTabSubmit" value="{tr}Change preferences{/tr}" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" name="featuresTabSubmit" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/jstab}
@@ -101,7 +101,7 @@
 				<input type="hidden" name="page" value="{$page}" />
 
 				{foreach from=$formBlogLists key=item item=output}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -110,8 +110,8 @@
 					</div>
 				{/foreach}
 
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="listTabSubmit" value="{tr}Change preferences{/tr}" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" name="listTabSubmit" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/jstab}
diff --git a/templates/blog_post.tpl b/templates/blog_post.tpl
index 697f44e..882894c 100644
--- a/templates/blog_post.tpl
+++ b/templates/blog_post.tpl
@@ -26,7 +26,7 @@
 				{jstab title="Blog Post"}
 					{legend legend="Post"}
 						{if !$blog_data.use_title OR $blog_data.use_title eq 'y'}
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label="Title" for="title"}
 								{forminput}
 									<input type="text" size="50" name="title" id="title" value="{$post_info.title|escape}" />
@@ -35,7 +35,7 @@
 							</div>
 						{/if}
 
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label="Summary" for="summary"}
 								{forminput}
 									<input type="text" size="50" name="summary" id="summary" value="{$post_info.summary|escape}" />
@@ -57,7 +57,7 @@
 						{/if}
 
 						{if $availableBlogs}
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label="Include in Blogs" for=""}
 								{forminput}
 									{if count($availableBlogs) > 10}
@@ -81,9 +81,9 @@
 
 						{include file="bitpackage:liberty/edit_storage_list.tpl"}
 
-						<div class="control-group submit">
-							<input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" />&nbsp;
-							<input type="submit" class="ink-button" name="save_post_exit" value="{tr}Save{/tr}" />
+						<div class="form-group submit">
+							<input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" />&nbsp;
+							<input type="submit" class="btn btn-default" name="save_post_exit" value="{tr}Save{/tr}" />
 						</div>
 					{/legend}
 				{/jstab}
@@ -100,7 +100,7 @@
 
 				{jstab title="Advanced Options"}
 					{legend legend="Publication and Expiration Dates"}
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<input type="hidden" name="publishDateInput" value="1" />
 							{formlabel label="Publish Date" for=""}
 							{forminput}
@@ -110,7 +110,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<input type="hidden" name="expireDateInput" value="1" />
 							{formlabel label="Expiration Date" for=""}
 							{forminput}
@@ -122,7 +122,7 @@
 					{/legend}
 
 					{legend legend="Trackbacks"}
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Send trackback pings" for="trackback"}
 							{forminput}
 								<textarea name="trackback" id="trackback" rows="3" cols="50">{section name=ix loop=$trackbacks_to}{if not $smarty.section.ix.first},{/if}{$trackbacks_to[ix]}{/section}</textarea>
diff --git a/templates/crosspost.tpl b/templates/crosspost.tpl
index 3f3c752..dc0d9ec 100644
--- a/templates/crosspost.tpl
+++ b/templates/crosspost.tpl
@@ -12,7 +12,7 @@
 					{legend legend="Crosspost"}
 						{* we loop over this twice because we want two separate lists from the same hash *}
 						{if $availableBlogs}
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label="Blogs this Post is Already Crossposted To" for="blog_id"}
 								{forminput}
 										{foreach from=$availableBlogs key=blogContentId item=availBlogTitle}
@@ -33,7 +33,7 @@
 						{/if}
 
 						{if $availableBlogs}
-							<div class="control-group column-group gutters">
+							<div class="form-group">
 								{formlabel label="Include in Blogs" for="blog_id"}
 								{forminput}
 										{foreach from=$availableBlogs key=blogContentId item=availBlogTitle}
@@ -62,9 +62,9 @@
 							{/forminput}
 							{textarea id="crosspost_note" label="Crosspost Note (Optional)" name="crosspost_note" noformat="y" rows=6 help="Add a note you would like to appear above the post when viewed on the crossposted blog. This does not appear on the post page." edit=$crosspost.crosspost_note}
 
-							<div class="control-group submit">
-								<input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" />&nbsp;
-								<input type="submit" class="ink-button" name="save_post_exit" value="{tr}Save{/tr}" />
+							<div class="form-group submit">
+								<input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" />&nbsp;
+								<input type="submit" class="btn btn-default" name="save_post_exit" value="{tr}Save{/tr}" />
 							</div>
 						{/if}
 					{/legend}
diff --git a/templates/edit_blog.tpl b/templates/edit_blog.tpl
index 5ba461b..d65d54a 100644
--- a/templates/edit_blog.tpl
+++ b/templates/edit_blog.tpl
@@ -27,7 +27,7 @@
 					{legend legend="Blog Settings"}
 						<input type="hidden" name="blog_id" value="{$gContent->getField('blog_id')}" />
 						<input type="hidden" name="content_id" value="{$gContent->getField('content_id')}" />
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formfeedback warning=$warning}
 							{formlabel label="Title" for="title"}
 							{forminput}
@@ -37,7 +37,7 @@
 
 						{textarea edit=$edit|default:$gContent->getField('data')}
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							{formlabel label="Number of posts to show" for="max_posts"}
 							{forminput}
 								<input type="text" name="max_posts" id="max_posts" value="{$gContent->getField('max_posts')|escape|default:10}" />
@@ -47,7 +47,7 @@
 
 {* DEPRECATED - Slated for removal  -wjames5
 						{if $gBitUser->hasPermission('p_blogs_create_is_public')}
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<label class="checkbox">
 								<input type="checkbox" name="is_public" id="is_public" {if $gContent->getField('is_public') eq 'y'}checked="checked"{/if} />Public
 								{formhelp note='Allow other user to post in this blog'}
@@ -56,21 +56,21 @@
 						{/if}
 *}
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<label class="checkbox">
 								<input type="checkbox" name="use_title" id="use_title" {if !$gContent->isValid() || $gContent->getField('use_title') eq 'y'}checked="checked"{/if} />Use titles in blog posts
 								{formhelp note='If this is not selected, the time and date of when the post was created will be displayed instead of the post title.'}
 							</label>
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<label class="checkbox">
 								<input type="checkbox" name="use_find" id="use_find" {if !$gContent->isValid() || $gContent->getField('use_find') eq 'y'}checked="checked"{/if} />Allow search
 								{formhelp note='Allow users to search this blog for occurances of words.'}
 							</label>
 						</div>
 
-						<div class="control-group column-group gutters">
+						<div class="form-group">
 							<label class="checkbox">
 								<input type="checkbox" name="allow_comments" id="allow_comments" {if !$gContent->isValid() || $gContent->getField('allow_comments') eq 'y'}checked="checked"{/if} />Allow comments
 								{formhelp note='Are other users allowed to add comments to posts made in this blog?'}
@@ -79,9 +79,9 @@
 
 						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
 
-						<div class="control-group submit">
-							<input type="submit" class="ink-button" name="preview" value="{tr}preview{/tr}" />&nbsp;
-							<input type="submit" class="ink-button" name="save_blog" value="{tr}save{/tr}" />
+						<div class="form-group submit">
+							<input type="submit" class="btn btn-default" name="preview" value="{tr}preview{/tr}" />&nbsp;
+							<input type="submit" class="btn btn-default" name="save_blog" value="{tr}save{/tr}" />
 						</div>
 					{/legend}
 				{/jstab}
diff --git a/templates/edit_blogpost_status_inc.tpl b/templates/edit_blogpost_status_inc.tpl
index c4acdb3..ca4fb03 100644
--- a/templates/edit_blogpost_status_inc.tpl
+++ b/templates/edit_blogpost_status_inc.tpl
@@ -1,5 +1,5 @@
 {if $gBitSystem->isFeatureActive( 'liberty_display_status' ) && $gBitSystem->isFeatureActive( 'liberty_display_status_menu' ) && ($gBitUser->hasPermission('p_liberty_edit_content_status') || $gBitUser->hasPermission('p_liberty_edit_all_status'))}
-	<div class="control-group column-group gutters">
+	<div class="form-group">
 		{formlabel label="Publish Status" for="content_status_id"}
 		{forminput}
 			{html_options name="content_status_id" options=$gContent->getAvailableContentStatuses() selected=$gContent->getField('content_status_id',$smarty.const.BIT_CONTENT_DEFAULT_STATUS)}
diff --git a/templates/ranking.tpl b/templates/ranking.tpl
index 71376d4..19cda98 100644
--- a/templates/ranking.tpl
+++ b/templates/ranking.tpl
@@ -7,7 +7,7 @@
 
 	<div class="body">
 		{form legend="Ranking Settings"}
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Select Attribute" for="which"}
 				{forminput}
 					<select name="which" id="which">
@@ -18,7 +18,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Number of items" for="limit"}
 				{forminput}
 					<select name="limit" id="limit">
@@ -30,8 +30,8 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="selrank" value="{tr}Apply settings{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="selrank" value="{tr}Apply settings{/tr}" />
 			</div>
 		{/form}
 		
diff --git a/templates/send_blog_post.tpl b/templates/send_blog_post.tpl
index 32d54ef..1d59bb4 100644
--- a/templates/send_blog_post.tpl
+++ b/templates/send_blog_post.tpl
@@ -20,7 +20,7 @@
 		{else}
 			{form legend="Send post to these addresses"}
 				<input type="hidden" name="post_id" value="{$post_info.post_id}" />
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Email Addresses" for="addresses"}
 					{forminput}
 						<textarea cols="50" rows="2" name="addresses" id="addresses">{$addresses|escape}</textarea>
@@ -28,8 +28,8 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="send" value="{tr}Send{/tr}" />
+				<div class="form-group submit">
+					<input type="submit" class="btn btn-default" name="send" value="{tr}Send{/tr}" />
 				</div>
 			{/form}
 		{/if}
diff --git a/templates/view_blog_post.tpl b/templates/view_blog_post.tpl
index 66f5d3f..e9a8645 100644
--- a/templates/view_blog_post.tpl
+++ b/templates/view_blog_post.tpl
@@ -96,7 +96,7 @@
 			{* deal with the blog post image if there is one *}
 			{if $gBitSystem->isFeatureActive( 'blog_show_image' ) && $post_info.thumbnail_url}
 				<div class="image primary">
-					{jspopup notra=1 href=$post_info.thumbnail_url.original alt=$post_info.title|escape title=$post_info.title|escape" img=$post_info.thumbnail_url.medium}
+					{jspopup notra=1 href=$post_info.thumbnail_url.original alt=$post_info.title|escape title=$post_info.title|escape img=$post_info.thumbnail_url.medium}
 				</div>
 			{/if}
 
diff --git a/templates/wp-migrate.tpl b/templates/wp-migrate.tpl
index 3c1c694..3da4de9 100644
--- a/templates/wp-migrate.tpl
+++ b/templates/wp-migrate.tpl
@@ -17,7 +17,7 @@
 			{formhelp note="The full path to your wordpress installation directory."}
 		{/forminput}
 	{/legend}
-	<input type="submit" class="ink-button" name="migrate" value="Migrate!" />
+	<input type="submit" class="btn btn-default" name="migrate" value="Migrate!" />
 {/form}
 {/if}
 {/strip}