admin sets content types which can be tagged; add/delete tags via input field; removed 'drop tags' outside of edit view, removed listing of linked tags near input field

3 files changed, 57 insertions, 58 deletions

diff --git a/templates/admin_tags.tpl b/templates/admin_tags.tpl
index 4a62e64..99b20fd 100644
--- a/templates/admin_tags.tpl
+++ b/templates/admin_tags.tpl
@@ -3,28 +3,38 @@
 {form}
 	{jstabs}
 
-		{jstab title="Display Settings"}
-		{legend legend="Display Settings"}
-			<input type="hidden" name="page" value="{$page}" />
-			{foreach from=$formTagsDisplayOptions key=item item=output}
+		{jstab title="Settings"}
+			{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}
+						{forminput}
+							{if $output.type == 'numeric'}
+								{html_options name="$item" values=$numbers output=$numbers selected=$gBitSystem->getConfig($item) labels=false id=$item}
+							{elseif $output.type == 'input'}
+								<input type='text' name="{$item}" id="{$item}" value="{$gBitSystem->getConfig($item)}" />
+							{else}
+								{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
+							{/if}
+							{formhelp note=`$output.note` page=`$output.page`}
+						{/forminput}
+					</div>
+				{/foreach}
+			{/legend}
+			
+			{legend legend="Availability"}
 				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+					{formlabel label="Taggable Content"}
 					{forminput}
-						{if $output.type == 'numeric'}
-							{html_options name="$item" values=$numbers output=$numbers selected=$gBitSystem->getConfig($item) labels=false id=$item}
-						{elseif $output.type == 'input'}
-							<input type='text' name="{$item}" id="{$item}" value="{$gBitSystem->getConfig($item)}" />
-						{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="Enabled content types can be tagged by users with appropriate permissions."}
+						{html_checkboxes options=$formTaggable.guids value=y name=taggable_content separator="<br />" checked=$formTaggable.checked}
 					{/forminput}
 				</div>
-			{/foreach}
-		{/legend}
+			{/legend}
 		{/jstab}
-
-		{jstab title="Sanitation Settings"}
+            
+		{jstab title="Sanitation"}
 		{legend legend="Santitation Settings"}
 			<input type="hidden" name="page" value="{$page}" />
 			{foreach from=$formTagsStripOptions key=item item=output}
@@ -66,7 +76,7 @@
 		{/legend}
 		{/jstab}
 *}
-	{jstab title="List Settings"}
+	{jstab title="List"}
 		{form legend="List Settings"}
 			<input type="hidden" name="page" value="{$page}" />
 
diff --git a/templates/edit_tags.tpl b/templates/edit_tags.tpl
index dc76887..20a9d3c 100644
--- a/templates/edit_tags.tpl
+++ b/templates/edit_tags.tpl
@@ -1,28 +1,17 @@
 {strip}
-{if $gContent->mContentTypeGuid != 'bitcomment' || $gBitSystem->isFeatureActive('tags_on_comments')}
+
+{if $loadTags}
+
 	<div class="row">
-		{formlabel label="Add Tags" for="tags"}
+		{formlabel label="Tags" for="tags"}
 		{forminput}
-		<input type="text" name="tags" id="tags" value="{if $smarty.post.preview}{$smarty.post.tags}{elseif $tagList}{$tagList}{/if}" />
-		{formhelp note="Enter key words to describe your content. Separate each tag with a comma: tag one,tag two."}
+			<input type="text" name="tags" id="tags" value="{if $preview}{$smarty.post.tags}{elseif $tagList}{$tagList}{/if}" />
+			<br />
+			{jspopup class="popup_link" href=$smarty.const.TAGS_PKG_URL title="View all tags" width="null" height="null"}
+			{formhelp note="Key words to describe the content, separated by commas: tag one, tag two."}
 		{/forminput}
 	</div>
-	<div class="row">
-		{forminput}
-			{jspopup notra=1 href=$smarty.const.TAGS_PKG_URL title="View all tags" width="null" height="null"}
-		{/forminput}
-	</div>
-	{if count($tagData) > 0 }
-		<div class="row tags">
-			{forminput}
-				<strong>{tr}Existing Tags:{/tr}</strong>&nbsp;
-				{section name=tag loop=$tagData}
-					{if $smarty.section.tag.index > 0},&nbsp;{/if}
-					<a href="{$smarty.const.TAGS_PKG_URL}index.php?tags={$tagData[tag].tag}">{$tagData[tag].tag}</a>
-				{/section}
-				{formhelp note="NOTE: To remove tags use the \"Drop Tag\" options that are available when just viewing this content."}
-			{/forminput}
-		</div>
-	{/if}
+	
 {/if}
-{/strip}
+
+{/strip}
\ No newline at end of file
diff --git a/templates/view_tags_mini_inc.tpl b/templates/view_tags_mini_inc.tpl
index ff77f91..fb6bd8c 100644
--- a/templates/view_tags_mini_inc.tpl
+++ b/templates/view_tags_mini_inc.tpl
@@ -1,23 +1,23 @@
 {strip}
 {if count($tagData) > 0 && $gBitUser->hasPermission('p_tags_view')}
-<div class="display tags">
-	{form ipackage=tags ifile=drop_tags.php}
-		<input type="hidden" name="content_id" value="{$gContent->mContentId}" />
-		<strong>{tr}Tags:{/tr}</strong>
-		&nbsp;
-		{section name=tag loop=$tagData}
-			{if $gContent->isOwner() || $gBitUser->hasPermission('p_tags_admin')}
-				<input type="checkbox" name="tag_id[]" value="{$tagData[tag].tag_id}" />
-				<input type="hidden" name="tag_{$tagData[tag].tag_id}" value="{$tagData[tag].tag}" />
+	<div class="display tags">
+		{form ipackage=tags ifile=drop_tags.php}
+			<input type="hidden" name="content_id" value="{$gContent->mContentId}" />
+
+			<h2>{tr}Tags{/tr}</h2>
+	
+			{if $preview}
+				{$smarty.post.tags|escape}
+			{elseif $tagData}
+				
+				{section name=tag loop=$tagData}
+					<a href="{$tagData[tag].tag_url}" rel="tag">{$tagData[tag].tag}</a>
+					{if !$smarty.section.tag.last}, {/if}
+				{/section}
+			
 			{/if}
-			<a href="{$tagData[tag].tag_url}" rel="tag">{$tagData[tag].tag}</a>
-			{if !$smarty.section.tag.last}, {/if}
-		{/section}
-		{if $gContent->isOwner() || $gBitUser->hasPermission('p_tags_admin')}
-			&nbsp;
-			<input type="submit" name="drop_tags" value="{tr}Drop selected{/tr}" />
-		{/if}
-	{/form}
-</div>
+			
+		{/form}
+	</div>
 {/if}
 {/strip}
\ No newline at end of file