Merge with master

5 files changed, 27 insertions, 27 deletions

diff --git a/templates/admin_articles.tpl b/templates/admin_articles.tpl
index 64c35f5..17f2c7d 100644
--- a/templates/admin_articles.tpl
+++ b/templates/admin_articles.tpl
@@ -7,7 +7,7 @@
 
 			{legend legend="CMS Settings"}
 				{foreach from=$formCmsSettings key=feature item=output}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -16,7 +16,7 @@
 					</div>
 				{/foreach}
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Maximum Articles" for="articles-maxhome"}
 					{forminput}
 						<input size="5" type="text" name="articles_max_list" id="articles-maxhome" value="{$gBitSystem->getConfig('articles_max_list')|escape}" />
@@ -24,7 +24,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Article Description Length" for="articles-descrlength"}
 					{forminput}
 						<input size="5" type="text" name="articles_description_length" id="articles-descrlength" value="{$gBitSystem->getConfig('articles_description_length')|escape}" /> {tr}characters{/tr}
@@ -32,7 +32,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="form-group">
 					{formlabel label="Article Image Size" for="article_topic_thumbnail_size"}
 					{forminput}
 						{html_options values=$imageSizes options=$imageSizes name="articles_image_size" selected=$gBitSystem->getConfig('articles_image_size')|default:small}
@@ -45,7 +45,7 @@
 		{jstab title="Article Listings"}
 			{legend legend="CMS Settings"}
 				{foreach from=$formArticleListing key=feature item=output}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -57,8 +57,8 @@
 		{/jstab}
 	{/jstabs}
 
-	<div class="control-group submit">
-		<input type="submit" class="ink-button" name="store_settings" value="{tr}Change preferences{/tr}" />
+	<div class="form-group submit">
+		<input type="submit" class="btn btn-default" name="store_settings" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/admin_topics.tpl b/templates/admin_topics.tpl
index 823ca0c..7f83a76 100644
--- a/templates/admin_topics.tpl
+++ b/templates/admin_topics.tpl
@@ -14,7 +14,7 @@
 		{form legend="Create a new Topic" enctype="multipart/form-data"}
 			<input type="hidden" name="MAX_FILE_SIZE" value="1000000" />
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Topic Title" for="topic_name"}
 				{forminput}
 					<input type="text" id="topic_name" name="topic_name" />
@@ -22,7 +22,7 @@
 				{/forminput}
 			</div> 
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Upload Image" for="t-image"}
 				{forminput}
 					<input name="upload" id="t-image" type="file" />
@@ -30,8 +30,8 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" />
 			</div>
 		{/form}
 
diff --git a/templates/admin_types.tpl b/templates/admin_types.tpl
index 838b6d6..a7226c2 100644
--- a/templates/admin_types.tpl
+++ b/templates/admin_types.tpl
@@ -23,7 +23,7 @@
 							<th style="width:5%" title="{tr}Remove Type{/tr}">{counter name=th}</th>
 						</tr>
 						{section name=user loop=$types}
-							<tr class="{cycle values="odd,even"}">
+							<tr class="{cycle values="odd,even}">
 								<td>
 									<input type="hidden" name="type_array[{$types[user].article_type_id}]" />
 									<input type="text" name="type_name[{$types[user].article_type_id}]" value="{$types[user].type_name}" />
@@ -44,8 +44,8 @@
 					</table>
 					{formhelp note='hover over the number to see the column header'}
 
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" name="update_type" value="{tr}Apply changes{/tr}" /><br />
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" name="update_type" value="{tr}Apply changes{/tr}" /><br />
 					</div>
 				{/form}
 
@@ -90,15 +90,15 @@
 						</ul>
 					{/section}
 
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" name="update_type" value="{tr}Apply changes{/tr}" /><br />
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" name="update_type" value="{tr}Apply changes{/tr}" /><br />
 					</div>
 				{/form}
 			{/jstab}
 
 			{jstab title="Add Article Type"}
 				{form legend="Create New Article Type"}
-					<div class="control-group column-group gutters">
+					<div class="form-group">
 						{formlabel label="Create new Type" for="add_type"}
 						{forminput}
 							<input type="text" id="add_type" name="type_name" />
@@ -106,8 +106,8 @@
 						{/forminput}
 					</div>
 
-					<div class="control-group submit">
-						<input type="submit" class="ink-button" name="add_type" value="{tr}Create new article type{/tr}" />
+					<div class="form-group submit">
+						<input type="submit" class="btn btn-default" name="add_type" value="{tr}Create new article type{/tr}" />
 					</div>
 				{/form}
 			{/jstab}
diff --git a/templates/article_display.tpl b/templates/article_display.tpl
index 1dd4358..5a70335 100644
--- a/templates/article_display.tpl
+++ b/templates/article_display.tpl
@@ -25,7 +25,7 @@
 			<div class="date">
 				{if $article.show_author eq 'y'}
 					{* can't really use the link here since it only works when the user uses his login name *}
-					{$article.author_name}&nbsp;
+					{displayname hash=$article}&nbsp;
 				{/if}
 
 				{if $article.show_pubdate eq 'y'}
@@ -105,7 +105,7 @@
 		</div>
 
 		{if $article.status_id == $smarty.const.ARTICLE_STATUS_PENDING && !$preview}
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Approve or deny Submission"}
 				{forminput}
 					{if $gContent->hasUserPermission( 'p_articles_approve_submission' )}
diff --git a/templates/edit_topic.tpl b/templates/edit_topic.tpl
index 77ef448..b00847a 100644
--- a/templates/edit_topic.tpl
+++ b/templates/edit_topic.tpl
@@ -14,7 +14,7 @@
 
 			{formfeedback success=$gContent->mSuccess error=$gContent->mErrors}
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Topic Name" for="topic_name"}
 				{forminput}
 					<input type="text" id="topic_name" name="topic_name" value="{$gContent->mInfo.topic_name}" />
@@ -22,14 +22,14 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				<label class="checkbox">
 					<input type="checkbox" id="topic_enabled" name="active_topic" {if $gContent->mInfo.active_topic == 'y'}checked="checked"{/if} />Topic Enabled
 					{formhelp note=""}
 				</label>
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Upload Image" for="t-image"}
 				{forminput}
 					<input name="upload" id="t-image" type="file" />
@@ -37,7 +37,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="form-group">
 				{formlabel label="Current Image"}
 				{forminput}
 					{if $gContent->mInfo.has_topic_image eq 'y'}
@@ -50,8 +50,8 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="fSubmitSaveTopic" value="{tr}Update Topic{/tr}" />
+			<div class="form-group submit">
+				<input type="submit" class="btn btn-default" name="fSubmitSaveTopic" value="{tr}Update Topic{/tr}" />
 			</div>
 		{/form}
 	</div><!-- end .body -->