Modify templates for ink frameworkINK_Port

10 files changed, 34 insertions, 36 deletions

diff --git a/templates/admin_articles.tpl b/templates/admin_articles.tpl
index 12cc97c..64c35f5 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">
+					<div class="control-group column-group gutters">
 						{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">
+				<div class="control-group column-group gutters">
 					{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">
+				<div class="control-group column-group gutters">
 					{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">
+				<div class="control-group column-group gutters">
 					{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">
+					<div class="control-group column-group gutters">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -58,7 +58,7 @@
 	{/jstabs}
 
 	<div class="control-group submit">
-		<input type="submit" class="btn btn-default" name="store_settings" value="{tr}Change preferences{/tr}" />
+		<input type="submit" class="ink-button" name="store_settings" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/admin_topics.tpl b/templates/admin_topics.tpl
index be3a6cd..823ca0c 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">
+			<div class="control-group column-group gutters">
 				{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">
+			<div class="control-group column-group gutters">
 				{formlabel label="Upload Image" for="t-image"}
 				{forminput}
 					<input name="upload" id="t-image" type="file" />
@@ -31,7 +31,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="btn btn-default" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" />
+				<input type="submit" class="ink-button" name="fSubmitAddTopic" value="{tr}Add Topic{/tr}" />
 			</div>
 		{/form}
 
diff --git a/templates/admin_types.tpl b/templates/admin_types.tpl
index 05a7ab1..838b6d6 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}" />
@@ -45,7 +45,7 @@
 					{formhelp note='hover over the number to see the column header'}
 
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="update_type" value="{tr}Apply changes{/tr}" /><br />
+						<input type="submit" class="ink-button" name="update_type" value="{tr}Apply changes{/tr}" /><br />
 					</div>
 				{/form}
 
@@ -91,14 +91,14 @@
 					{/section}
 
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="update_type" value="{tr}Apply changes{/tr}" /><br />
+						<input type="submit" class="ink-button" 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">
+					<div class="control-group column-group gutters">
 						{formlabel label="Create new Type" for="add_type"}
 						{forminput}
 							<input type="text" id="add_type" name="type_name" />
@@ -107,7 +107,7 @@
 					</div>
 
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="add_type" value="{tr}Create new article type{/tr}" />
+						<input type="submit" class="ink-button" 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 33610f9..1dd4358 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 *}
-					{displayname hash=$article}&nbsp;
+					{$article.author_name}&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">
+			<div class="control-group column-group gutters">
 				{formlabel label="Approve or deny Submission"}
 				{forminput}
 					{if $gContent->hasUserPermission( 'p_articles_approve_submission' )}
diff --git a/templates/article_filter_inc.tpl b/templates/article_filter_inc.tpl
index ce6b8ee..4755440 100644
--- a/templates/article_filter_inc.tpl
+++ b/templates/article_filter_inc.tpl
@@ -16,7 +16,7 @@
 					{html_options options=$filter.topic values=$filter.topic name=topic_id selected=$smarty.request.topic_id}
 				</td>
 				<td>
-					<input type="submit" class="btn btn-default" value="Apply filter">
+					<input type="submit" class="ink-button" value="Apply filter">
 				</td>
 			</tr>
 		</table>
diff --git a/templates/article_history.tpl b/templates/article_history.tpl
index d2c83ec..4b68169 100644
--- a/templates/article_history.tpl
+++ b/templates/article_history.tpl
@@ -103,7 +103,7 @@
 
 			{if $gContent->hasUserPermission( 'p_articles_remove' )}
 				<div style="text-align:right;">
-					<input type="submit" class="btn btn-default" name="delete" value="{tr}Delete selected versions{/tr}" />
+					<input type="submit" class="ink-button" name="delete" value="{tr}Delete selected versions{/tr}" />
 				</div>
 			{/if}
 		{/form}
diff --git a/templates/articles_mini_search.tpl b/templates/articles_mini_search.tpl
index e3246c6..9984484 100644
--- a/templates/articles_mini_search.tpl
+++ b/templates/articles_mini_search.tpl
@@ -1,6 +1,6 @@
 {form method="get" ipackage="articles" ifile="list.php"}
 	<input type="text" name="find" value="{$find|escape}" />
-	<input type="submit" class="btn btn-default" value="{tr}find{/tr}" name="search" />
+	<input type="submit" class="ink-button" value="{tr}find{/tr}" name="search" />
 	<input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
 	<select name="type">
 		<option value="" {if $find_type eq ''}selected="selected"{/if}>{tr}all{/tr}</option>
diff --git a/templates/center_list_articles.tpl b/templates/center_list_articles.tpl
index 897df09..1531e1b 100644
--- a/templates/center_list_articles.tpl
+++ b/templates/center_list_articles.tpl
@@ -28,9 +28,7 @@
 	{/if}
 
 	{foreach from=$articles item=article}
-		<div class="clear">
-			{include file="bitpackage:articles/article_display.tpl"}
-		</div>
+		{include file="bitpackage:articles/article_display.tpl"}
 	{foreachelse}
 		<p class="norecords">
 			{tr}No records found{/tr}<br />
diff --git a/templates/edit_article.tpl b/templates/edit_article.tpl
index f610e01..ee4d4f4 100644
--- a/templates/edit_article.tpl
+++ b/templates/edit_article.tpl
@@ -34,7 +34,7 @@
 			{jstabs}
 				{jstab title="Article Body"}
 					{legend legend="Article Body"}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							{formlabel label="Title" for="title"}
 							{forminput}
 								<input type="text" name="title" id="title" value="{$article.title|escape}" size="50" />
@@ -42,7 +42,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							{formlabel label="Author Name" for="author_name"}
 							{forminput}
 								<input type="text" name="author_name" id="author_name" value="{$article.author_name|escape}" />
@@ -51,7 +51,7 @@
 						</div>
 
 						{if $topics or $gContent->hasUserPermission( 'p_articles_admin' )}
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="Topic" for="topic_id"}
 								{forminput}
 									{if $topics}
@@ -75,7 +75,7 @@
 								{if $types[t].use_ratings eq 'y'}{assign var=ratings value=TRUE}{/if}
 							{/section}
 						{else}
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="Type" for="article_type_id"}
 								{forminput}
 									<select id="article_type_id" name="article_type_id">
@@ -89,7 +89,7 @@
 						{/if}
 
 						{if $ratings}
-							<div id="ratingedit" class="control-group">
+							<div id="ratingedit" class="control-group column-group gutters">
 								{formlabel label="Rating" for="rating"}
 								{forminput}
 									<select name="rating" id="rating">
@@ -122,8 +122,8 @@
 						{/if}
 
 						<div class="control-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" value="{tr}Save{/tr}" />
+							<input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" />&nbsp;
+							<input type="submit" class="ink-button" name="save" value="{tr}Save{/tr}" />
 						</div>
 
 						{if $gBitSystem->isFeatureActive( 'articles_attachments' ) }
@@ -136,7 +136,7 @@
 
 				{jstab title="Advanced"}
 					{legend legend="Publication and Expiration Dates"}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<input type="hidden" name="publishDateInput" value="1" />
 							{formlabel label="Publish Date" for=""}
 							{forminput}
@@ -146,7 +146,7 @@
 							{/forminput}
 						</div>
 
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<input type="hidden" name="expireDateInput" value="1" />
 							{formlabel label="Expiration Date" for=""}
 							{forminput}
diff --git a/templates/edit_topic.tpl b/templates/edit_topic.tpl
index daec797..77ef448 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">
+			<div class="control-group column-group gutters">
 				{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">
+			<div class="control-group column-group gutters">
 				<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">
+			<div class="control-group column-group gutters">
 				{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">
+			<div class="control-group column-group gutters">
 				{formlabel label="Current Image"}
 				{forminput}
 					{if $gContent->mInfo.has_topic_image eq 'y'}
@@ -51,7 +51,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="btn btn-default" name="fSubmitSaveTopic" value="{tr}Update Topic{/tr}" />
+				<input type="submit" class="ink-button" name="fSubmitSaveTopic" value="{tr}Update Topic{/tr}" />
 			</div>
 		{/form}
 	</div><!-- end .body -->