SF.net SVN: postfixadmin:[868] trunk

[<chr...@us...>]

Revision: 868
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=868&view=rev
Author:   christian_boltz
Date:     2010-09-26 23:14:42 +0000 (Sun, 26 Sep 2010)

Log Message:
-----------
list-virtual.php:
- hand over $search to smarty templates

templates/list-virtual_alias.tpl, templates/list-virtual_alias_domain.tpl:
- add search result highlighting

templates/list-virtual_mailbox.tpl:
- add search result highlighting
- move output of "Mailbox" / "Forward only" outside the foreach loop
  (was displayed once per mailbox alias target)

css/default.css:
- add style for ".searchresult"

Modified Paths:
--------------
    trunk/css/default.css
    trunk/list-virtual.php
    trunk/templates/list-virtual_alias.tpl
    trunk/templates/list-virtual_alias_domain.tpl
    trunk/templates/list-virtual_mailbox.tpl

Modified: trunk/css/default.css
===================================================================
--- trunk/css/default.css	2010-09-26 13:23:42 UTC (rev 867)
+++ trunk/css/default.css	2010-09-26 23:14:42 UTC (rev 868)
@@ -311,6 +311,10 @@
 	padding-bottom:1em;
 }
 
+.searchresult {
+	background:lightgreen;
+}
+
 div.nav_bar {
 	text-align: left;
 	width: 750px;

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2010-09-26 13:23:42 UTC (rev 867)
+++ trunk/list-virtual.php	2010-09-26 23:14:42 UTC (rev 868)
@@ -437,6 +437,8 @@
 
 $smarty->assign ('fDomain', $fDomain, false);
 
+$smarty->assign ('search', $search);
+
 $smarty->assign ('list_domains', $list_domains);
 $smarty->assign ('limit', $limit);
 $smarty->assign ('tDisplay_back_show', $tDisplay_back_show);

Modified: trunk/templates/list-virtual_alias.tpl
===================================================================
--- trunk/templates/list-virtual_alias.tpl	2010-09-26 13:23:42 UTC (rev 867)
+++ trunk/templates/list-virtual_alias.tpl	2010-09-26 23:14:42 UTC (rev 868)
@@ -13,11 +13,23 @@
 		{if $CONF.show_status===YES}
 			<td>{$gen_show_status[$i]}</td>
 		{/if}
-		<td>{$item.address}</td>
+		<td>
+			{if $search eq ""}
+				{$item.address}
+			{else}
+				{$item.address|replace:$search:"<span class='searchresult'>$search</span>"}
+			{/if}
+		</td>
 		{if $CONF.alias_goto_limit>0}
 			<td><i>sorry, alias_goto_limit > 0 not handled</i></td>
 		{else}
-			<td>{$item.goto|replace:",":"<br/>"}</td>
+			<td>
+				{if $search eq ""}
+					{$item.goto|replace:",":"<br/>"}
+				{else}
+					{$item.goto|replace:",":"<br/>"|replace:$search:"<span class='searchresult'>$search</span>"}
+				{/if}
+			</td>
 		{/if}
 		<td>{$item.modified}</td>
 		{if $authentication_has_role.global_admin==true}

Modified: trunk/templates/list-virtual_alias_domain.tpl
===================================================================
--- trunk/templates/list-virtual_alias_domain.tpl	2010-09-26 13:23:42 UTC (rev 867)
+++ trunk/templates/list-virtual_alias_domain.tpl	2010-09-26 23:14:42 UTC (rev 868)
@@ -13,7 +13,13 @@
 			</tr>
 			{foreach from=$tAliasDomains item=item}
 				{#tr_hilightoff#}
-				<td><a href="{$smarty.config.url_list_virtual}?domain={$item.alias_domain|escape:"url"}&amp;limit={$current_limit|escape:"url"}">{$item.alias_domain}</a></td>
+				<td><a href="{$smarty.config.url_list_virtual}?domain={$item.alias_domain|escape:"url"}&amp;limit={$current_limit|escape:"url"}">
+					{if $search eq ""}
+						{$item.alias_domain}
+					{else}
+						{$item.alias_domain|replace:$search:"<span class='searchresult'>$search</span>"}
+					{/if}
+				</a></td>
 				<td>{$item.modified}</td>
 				<td><a href="{#url_edit_active#}?alias_domain=true&amp;domain={$item.alias_domain|escape:"url"}&amp;return={$smarty.config.url_list_virtual|escape:"url"}?domain={$fDomain|escape:"url"}&amp;limit={$current_limit|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
 				<td><a href="{#url_delete#}?table=alias_domain&amp;delete={$item.alias_domain|escape:"url"}&amp;domain={$item.alias_domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain}');">{$PALANG.del}</a></td>

Modified: trunk/templates/list-virtual_mailbox.tpl
===================================================================
--- trunk/templates/list-virtual_mailbox.tpl	2010-09-26 13:23:42 UTC (rev 867)
+++ trunk/templates/list-virtual_mailbox.tpl	2010-09-26 23:14:42 UTC (rev 868)
@@ -16,16 +16,27 @@
 			{if $CONF.show_status===YES}
 				<td>{$gen_show_status_mailbox[$i]}</td>
 			{/if}
-			<td>{$item.username}</td>
+			<td>
+				{if $search eq ""}
+					{$item.username}
+				{else}
+					{$item.username|replace:$search:"<span class='searchresult'>$search</span>"}
+				{/if}
+			</td>
 			{if $display_mailbox_aliases==true}
 				<td>
+				{if $item.goto_mailbox == 1}
+					Mailbox<br/>
+				{else}
+					Forward only<br/>
+				{/if}
 				{foreach from=$item.goto_other item=item2 key=j}
-				   {if $item.goto_mailbox == 1}
-				   	  Mailbox<br/>
-				   {else}
-					  Forward only<br/>
-				   {/if}
-			   	   {$item2}<br/>
+					{if $search eq ""}
+						{$item2}
+					{else}
+						{$item2|replace:$search:"<span class='searchresult'>$search</span>"}
+					{/if}
+					<br/>
 				{/foreach}
 				</td>
 			{/if}


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