Merge branch 'master' of github.com:bitweaver/tags

11 files changed, 37 insertions, 37 deletions

diff --git a/modules/mod_tags_cloud.php b/modules/mod_tags_cloud.php
index d45c4e7..f91dffd 100644
--- a/modules/mod_tags_cloud.php
+++ b/modules/mod_tags_cloud.php
@@ -26,5 +26,5 @@ $listHash = array(
 $tag = new LibertyTag();
 
 $listData = $tag->getList( $listHash );
-$gBitSmarty->assign( 'modTagData', $listData["data"] );
+$_template->tpl_vars['modTagData'] = new Smarty_variable( $listData["data"] );
 ?>
diff --git a/templates/admin_tags.tpl b/templates/admin_tags.tpl
index 99b20fd..a6d62c0 100644
--- a/templates/admin_tags.tpl
+++ b/templates/admin_tags.tpl
@@ -7,8 +7,8 @@
 			{legend legend="Display Location"}
 				<input type="hidden" name="page" value="{$page}" />
 				{foreach from=$formTagsDisplayOptions key=item item=output}
-					<div class="row">
-						{formlabel label=`$output.label` for=$item}
+					<div class="control-group">
+						{formlabel label=$output.label for=$item}
 						{forminput}
 							{if $output.type == 'numeric'}
 								{html_options name="$item" values=$numbers output=$numbers selected=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -17,14 +17,14 @@
 							{else}
 								{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
 							{/if}
-							{formhelp note=`$output.note` page=`$output.page`}
+							{formhelp note=$output.note page=$output.page}
 						{/forminput}
 					</div>
 				{/foreach}
 			{/legend}
 			
 			{legend legend="Availability"}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Taggable Content"}
 					{forminput}
 						{formhelp note="Enabled content types can be tagged by users with appropriate permissions."}
@@ -38,8 +38,8 @@
 		{legend legend="Santitation Settings"}
 			<input type="hidden" name="page" value="{$page}" />
 			{foreach from=$formTagsStripOptions key=item item=output}
-				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+				<div class="control-group">
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{if $output.type == 'numeric'}
 							{html_options name="$item" values=$numbers output=$numbers selected=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -48,7 +48,7 @@
 						{else}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -59,8 +59,8 @@
 		{legend legend="Other Settings"}
 			<input type="hidden" name="page" value="{$page}" />
 			{foreach from=$formTagsOtherOptions key=item item=output}
-				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+				<div class="control-group">
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{if $output.type == 'numeric'}
 							{html_options name="$item" values=$numbers output=$numbers selected=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -69,7 +69,7 @@
 						{else}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -81,11 +81,11 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formTagLists key=item item=output}
-				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+				<div class="control-group">
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -95,8 +95,8 @@
 
 
 	{/jstabs}
-	<div class="row submit">
-		<input type="submit" name="tags_preferences" value="{tr}Change preferences{/tr}" />
+	<div class="control-group submit">
+		<input type="submit" class="btn" name="tags_preferences" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/edit_tag.tpl b/templates/edit_tag.tpl
index 911cd10..5d6e944 100644
--- a/templates/edit_tag.tpl
+++ b/templates/edit_tag.tpl
@@ -15,15 +15,15 @@
 			<input type="hidden" name="tag_id" value="{if $tagData}{$tagData.tag_id}{/if}" />
 
 			{legend legend="Edit Tag"}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Tag" for="tag"}
 					{forminput}
 						<input type="text" name="tag" id="tag" value="{if $tagData}{$tagData.tag}{/if}" />
 					{/forminput}
 				</div>
 
-				<div class="row submit">
-					<input type="submit" name="save" value="{tr}Save{/tr}" />
+				<div class="control-group submit">
+					<input type="submit" class="btn" name="save" value="{tr}Save{/tr}" />
 				</div>
 			{/legend}
 		{/form}
diff --git a/templates/edit_tags.tpl b/templates/edit_tags.tpl
index 91cc4ed..b3db6d3 100644
--- a/templates/edit_tags.tpl
+++ b/templates/edit_tags.tpl
@@ -2,7 +2,7 @@
 
 {if $gContent->mContentTypeGuid != 'bitcomment' || $gBitSystem->isFeatureActive('tags_on_comments')}
 
-	<div class="row">
+	<div class="control-group">
 		{formlabel label="Tags" for="tags"}
 		{forminput}
 			<input type="text" name="tags" id="tags" value="{if $preview}{$smarty.post.tags}{elseif $tagList}{$tagList}{/if}" />
diff --git a/templates/list_content.tpl b/templates/list_content.tpl
index fe68488..19b29ae 100644
--- a/templates/list_content.tpl
+++ b/templates/list_content.tpl
@@ -7,9 +7,9 @@
 	<div class="body">
 		{strip}
 		{form class="minifind" legend='find in entries' method="get" action="`$smarty.server.SCRIPT_NAME`?`$hidden|@http_build_query`"}
-			{biticon ipackage="icons" iname="edit-find" iexplain="Search"}
+			{booticon iname="icon-search"  ipackage="icons"  iexplain="Search"}
 			<input type="text" name="tags" value="{$smarty.request.tags|default:"Search Content by Tags"|escape}" {if $prompt}onclick="if (this.value == '{$prompt}') this.value = '';"{/if}/>&nbsp;
-			<input type="submit" name="search" value="{tr}Find{/tr}" />&nbsp;
+			<input type="submit" class="btn" name="search" value="{tr}Find{/tr}" />&nbsp;
 			{if $smarty.request.find}
 			<input type="button" onclick="location.href='{$smarty.server.SCRIPT_NAME}{if $hidden}?{/if}{foreach from=$hidden item=value key=name}{$name}={$value}&amp;{/foreach}'" value="{tr}Reset{/tr}" />
 			{/if}
@@ -25,7 +25,7 @@
 			{assign var=isort_editor value=modifier_real_name}
 		{/if}
 
-		<table class="data">
+		<table class="table data">
 		{if $contentList}
 			<caption>{tr}Available Content{/tr} <span class="total">[ {$listInfo.listInfo.total_records} ]</span></caption>
 			<thead>
@@ -64,7 +64,7 @@
 							<td>{$item.display_link}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'tags_list_type' )}
-							<td>{assign var=content_type_guid value=`$item.content_type_guid`}{$contentTypes.$content_type_guid}</td>
+							<td>{assign var=content_type_guid value=$item.content_type_guid}{$contentTypes.$content_type_guid}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'tags_list_author' )}
 							<td>{displayname real_name=$item.creator_real_name user=$item.creator_user}</td>
diff --git a/templates/list_tags.tpl b/templates/list_tags.tpl
index a26b559..5d8051f 100644
--- a/templates/list_tags.tpl
+++ b/templates/list_tags.tpl
@@ -10,7 +10,7 @@
 		{if $cloud}
 			<div class="navbar">
 				<ul>
-					<li>{biticon ipackage="icons" iname="emblem-symbolic-link" iexplain="Sort by"}</li>
+					<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="Sort by"}</li>
 					<li><a href="{$smarty.const.TAGS_PKG_URL}index.php?sort=mostpopular">Popularity</a></li>
 					<li><a href="{$smarty.const.TAGS_PKG_URL}index.php">Alphabeticaly</a></li>
 				</ul>
diff --git a/templates/menu_tags.tpl b/templates/menu_tags.tpl
index 3ef0f1e..74f2531 100644
--- a/templates/menu_tags.tpl
+++ b/templates/menu_tags.tpl
@@ -1,10 +1,10 @@
 {strip}
-<ul>
+<ul class="dropdown-menu">
 	{if $gBitUser->hasPermission('p_tags_view')}
-		<li><a class="item" href="{$smarty.const.TAGS_PKG_URL}index.php">{biticon ipackage="tags" iname="tags" iexplain="Tag Cloud" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.TAGS_PKG_URL}index.php">{booticon iname="icon-tags" iexplain="Tag Cloud" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission( 'p_tags_admin' )}
-		<li><a class="item" href="{$smarty.const.TAGS_PKG_URL}list.php">{biticon ipackage="icons" iname="document-new" iexplain="Edit Tags" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.TAGS_PKG_URL}list.php">{booticon iname="icon-file" ipackage="icons" iexplain="Edit Tags" ilocation=menu}</a></li>
 	{/if}
 </ul>
 {/strip}
diff --git a/templates/menu_tags_admin.tpl b/templates/menu_tags_admin.tpl
index cd6eb7c..b630000 100644
--- a/templates/menu_tags_admin.tpl
+++ b/templates/menu_tags_admin.tpl
@@ -1,6 +1,6 @@
 {strip}
-<ul>
-	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=tags">{tr}Tags Settings{/tr}</a></li>
+<ul class="{$packageMenuClass}">
+	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=tags">{tr}Tags{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.TAGS_PKG_URL}index.php">{tr}Tagged Content{/tr}</a></li>
 </ul>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/templates/search_inc.tpl b/templates/search_inc.tpl
index 8a4d27d..49a3366 100644
--- a/templates/search_inc.tpl
+++ b/templates/search_inc.tpl
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="control-group">
 	{formlabel label="Tags:" for="tags"}
 	{forminput}
 		<input type="text" name="tags" id="search_tags" value="{$listInfo.tags}" />
diff --git a/templates/tags_list.tpl b/templates/tags_list.tpl
index fba2721..8d019df 100644
--- a/templates/tags_list.tpl
+++ b/templates/tags_list.tpl
@@ -1,5 +1,5 @@
 {strip}
-<table class="data">
+<table class="table data">
 	<tr>
 		<th style="width:80%;">{tr}Tag{/tr}</th>
 		<th style="width:10%;">{tr}Use Count{/tr}</th>
@@ -17,10 +17,10 @@
 				</td>
 				<td class="actionicon">
 					{if $gBitUser->hasPermission( 'p_tags_create' ) }
-						{smartlink ititle="Edit" ifile="edit.php" ibiticon="icons/accessories-text-editor" tag_id=$tag.tag_id}
+						{smartlink ititle="Edit" ifile="edit.php" booticon="icon-edit" tag_id=$tag.tag_id}
 					{/if}
 					{if $gBitUser->hasPermission( 'p_tags_moderate' )}
-						{smartlink ititle="Remove" ibiticon="icons/edit-delete" action=remove tag_id=$tag.tag_id status_id=$smarty.request.status_id}
+						{smartlink ititle="Remove" booticon="icon-trash" action=remove tag_id=$tag.tag_id status_id=$smarty.request.status_id}
 					{/if}
 				</td>
 			</tr>
diff --git a/templates/view_tags_mini_inc.tpl b/templates/view_tags_mini_inc.tpl
index 2e6f547..bfc87ed 100644
--- a/templates/view_tags_mini_inc.tpl
+++ b/templates/view_tags_mini_inc.tpl
@@ -1,7 +1,7 @@
 {strip}
 {if count($tagData) > 0 && $gBitUser->hasPermission('p_tags_view')}
 	<div class="display tags">
-		{form ipackage=tags ifile=drop_tags.php}
+		{form ipackage=tags ifile="drop_tags.php"}
 			<input type="hidden" name="content_id" value="{$gContent->mContentId}" />
 
 			<strong>{tr}Tags:{/tr}</strong>
@@ -26,7 +26,7 @@
 
 			{if $gContent->isOwner() || $gBitUser->hasPermission('p_tags_admin')}
 				&nbsp;
-				<input type="submit" name="drop_tags" value="{tr}Drop selected{/tr}" />
+				<input type="submit" class="btn" name="drop_tags" value="{tr}Drop selected{/tr}" />
 			{/if}
 
 		{/form}