[CS-Project-svn_notify] SF.net SVN: cs-project: [732] trunk

[<cra...@us...>]

Revision: 732
          http://cs-project.svn.sourceforge.net/cs-project/?rev=732&view=rev
Author:   crazedsanity
Date:     2007-12-27 17:53:34 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
Include tag images.  YAY!

Modified Paths:
--------------
    trunk/includes/content/helpdesk.inc
    trunk/includes/content/tags.inc
    trunk/templates/content/helpdesk/view.content.tmpl
    trunk/templates/content/tags/index.content.tmpl

Modified: trunk/includes/content/helpdesk.inc
===================================================================
--- trunk/includes/content/helpdesk.inc	2007-12-28 01:53:11 UTC (rev 731)
+++ trunk/includes/content/helpdesk.inc	2007-12-28 01:53:34 UTC (rev 732)
@@ -353,7 +353,7 @@
 		
 		
 		
-		$myTagList = $proj->tagObj->get_tags_for_record($helpdeskData['record_id']);
+		$myTagList = $proj->tagObj->get_tags_for_record($helpdeskData['record_id'], TRUE);
 		if(is_array($myTagList)) {
 			if($helpdeskData['status_id'] == 4) {
 				$tagListVar = 'text_tags';
@@ -365,7 +365,8 @@
 			}
 			$myTagRow = "";
 			$tCount = 0;
-			foreach($myTagList as $tagNameId=>$tagName) {
+			foreach($myTagList as $tagNameId=>$tagData) {
+				$tagName = $tagData['name'];
 				
 				//don't show a separator for the end piece.
 				$tCount++;
@@ -376,7 +377,8 @@
 				$repArr = array(
 					'tag_name_id'	=> $tagNameId,
 					'name'			=> $tagName,
-					'separator'		=> $separator
+					'separator'		=> $separator,
+					'imgHtml'		=> $tagData['imgHtml']
 				);
 				$myTagRow .= mini_parser($baseRow, $repArr, '%%', '%%');
 			}

Modified: trunk/includes/content/tags.inc
===================================================================
--- trunk/includes/content/tags.inc	2007-12-28 01:53:11 UTC (rev 731)
+++ trunk/includes/content/tags.inc	2007-12-28 01:53:34 UTC (rev 732)
@@ -280,6 +280,7 @@
 	
 	//display the list of available tags.
 	$tagListBaseRow = $page->templateRows['availableTagsList'];
+	$showIconRow = $page->templateRows['availableTagsList__tagIcon'];
 	$myRow = "";
 	foreach($myTagList as $tagNameId=>$data) {
 		$tagName = $data['name'];
@@ -292,7 +293,12 @@
 			'tagNameId'	=> $tagNameId,
 			'tagName'	=> $tagName
 		);
-		$myRow .= mini_parser($tagListBaseRow, $repArr, '%%', '%%');
+		$tmpRow = mini_parser($tagListBaseRow, $repArr, '%%', '%%');
+		if(strlen($data['icon_name'])) {
+			$parsedIconDisplay = mini_parser($showIconRow, array('icon_name' => $data['icon_name']), '%%', '%%');
+			$tmpRow = mini_parser($tmpRow, array('availableTagsList__tagIcon'=>$parsedIconDisplay), '{', '}');
+		}
+		$myRow .= $tmpRow;
 	}
 	$page->add_template_var("availableTagsList", $myRow);
 }

Modified: trunk/templates/content/helpdesk/view.content.tmpl
===================================================================
--- trunk/templates/content/helpdesk/view.content.tmpl	2007-12-28 01:53:11 UTC (rev 731)
+++ trunk/templates/content/helpdesk/view.content.tmpl	2007-12-28 01:53:34 UTC (rev 732)
@@ -150,7 +150,7 @@
 					
 					<td colspan="2">
 				<!-- BEGIN editable_tags -->
-				<!-- BEGIN removeable_tag --><a href="/content/tags/remove/%%tag_name_id%%/{record_id}">%%name%%</a>%%separator%%
+				<!-- BEGIN removeable_tag --><a href="/content/tags/remove/%%tag_name_id%%/{record_id}">%%name%%%%imgHtml%%</a>%%separator%%
 				<!-- END removeable_tag -->
 						
 						<BR>
@@ -164,7 +164,7 @@
 						<input type="text" name="newTag" value=""><input type="button" value="Add New Tag" 
 						onClick="this.value='Creating Tag...';document.main.newTag.readonly=true;document.hiddenAddTagForm.new_tag.value=document.main.newTag.value;document.hiddenAddTagForm.submit()">
 				<!-- END editable_tags -->
-				<!-- BEGIN text_tags --><b>%%name%%</b>%%separator%%
+				<!-- BEGIN text_tags --><b>%%name%%%%imgHtml%%</b>%%separator%%
 				<!-- END text_tags -->
 					</td>
 				

Modified: trunk/templates/content/tags/index.content.tmpl
===================================================================
--- trunk/templates/content/tags/index.content.tmpl	2007-12-28 01:53:11 UTC (rev 731)
+++ trunk/templates/content/tags/index.content.tmpl	2007-12-28 01:53:34 UTC (rev 732)
@@ -12,6 +12,8 @@
 								<td nowrap style="padding-left:5px;">
 									<img src="/images/bullet-round.png" border="0">
 									<a href="{PHP_SELF}?showTag=%%tagNameId%%"> %%tagName%%</a>
+									<!-- BEGIN availableTagsList__tagIcon --><img src="/images/tags/%%icon_name%%.gif" border="0">
+									<!-- END availableTagsList__tagIcon -->
 								</td>
 							</tr>
 					<!-- END availableTagsList -->
@@ -20,6 +22,7 @@
 								<td nowrap style="padding-left:5px;">
 									<img src="/images/bullet-round.png" border="0">
 									<font size="+1"><b>%%tagName%%</b></font>
+									{availableTagsList__tagIcon}
 								</td>
 							</tr>
 					<!-- END availableTagsList_noLink -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.