From: hickert Date: Mon, 19 Apr 2010 11:23:03 +0000 (+0000) Subject: Updated mailqueue style X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3a41d040098b879931174e2bbeaec802bcee9814;p=gosa.git Updated mailqueue style git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17686 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/mail/addons/mailqueue/contents.tpl b/gosa-plugins/mail/addons/mailqueue/contents.tpl index 4d5e0b88b..8fbbfdb4d 100644 --- a/gosa-plugins/mail/addons/mailqueue/contents.tpl +++ b/gosa-plugins/mail/addons/mailqueue/contents.tpl @@ -1,170 +1,167 @@ -
 
-
-

{image path="images/launch.png" align="right"}Filter -

-
-
-
- - - - - -
- {image path="images/lists/search.png"} - -  {t}Search for{/t} - -  in - - -  {t}within the last{/t}  - -   - - -   - {if $delAll_W} - - {/if} - {if $holdAll_W} - - {/if} - {if $unholdAll_W} - - {/if} - {if $requeueAll_W} - - {/if} -
-
+
+
+

{t}Mail queue{/t} +

+
+ + + + + + + + +
{t}Search on{/t} + + {t}Search for{/t} + + {t}within the last{/t}  + + + + + {if $delAll_W} + + {/if} + {if $holdAll_W} + + {/if} + {if $unholdAll_W} + + {/if} + {if $requeueAll_W} + + {/if} +
+
+
+
{if !$query_allowed} - {msgPool type=permView} -{else} +{msgPool type=permView} -{if $all_ok != true} -{t}Search returned no results{/t}... {else} - - border="0" cellpadding="2" cellspacing="1" rules="cols"> - - - - - - - - - - - - -{counter start=0 assign=i start=1} -{foreach from=$entries item=val key=key} - - {if ($i%2)==0} - - {else} - - {/if} - - - - - - - - - - - {counter} -{/foreach} -
- {t}ID{/t} {if $OrderBy == "MailID"} {$SortType}{/if}{t}Server{/t} {if $OrderBy == "Server"} {$SortType}{/if}{t}Size{/t} {if $OrderBy == "Size"} {$SortType}{/if}{t}Arrival{/t} {if $OrderBy == "Arrival"} {$SortType}{/if}{t}Sender{/t} {if $OrderBy == "Sender"} {$SortType}{/if}{t}Recipient{/t} {if $OrderBy == "Recipient"}{$SortType}{/if}{t}Status{/t} {if $OrderBy == "Status"} {$SortType}{/if} 
- {if $entries[$key].Active == true} - {image path="plugins/mail/images/mailq_active.png"} - - {/if} - {$entries[$key].MailID}{$entries[$key].ServerName}{$entries[$key].Size}{$entries[$key].Arrival|date_format:"%d.%m.%Y %H:%M:%S"}{$entries[$key].Sender}{$entries[$key].Recipient}{$entries[$key].Status} - {if $del_W} - {image action="del__{$entries[$key].MailID}__{$entries[$key].Server}"} - src="images/lists/trash.png" alt="{t}delete{/t}" title="{t}Delete this message{/t}"> - {else} - {image path="images/empty.png"} - - {/if} - {if $entries[$key].Hold == true} - - {if $unhold_W} - {image action="unhold__{$entries[$key].MailID}__{$entries[$key].Server}"} - src="plugins/mail/images/mailq_unhold.png" alt="{t}unhold{/t}" title="{t}Release message{/t}"> - {else} - {image path="images/empty.png"} - - {/if} - {else} - {if $hold_W} - {image action="hold__{$entries[$key].MailID}__{$entries[$key].Server}"} - src="plugins/mail/images/mailq_hold.png" alt="{t}hold{/t}" title="{t}Hold message{/t}"> - {else} - {image path="images/empty.png"} - - {/if} - {/if} - {if $requeue_W} - {image action="requeue__{$entries[$key].MailID}__{$entries[$key].Server}"} - src="images/lists/reload.png" alt="{t}requeue{/t}" title="{t}Requeue this message{/t}"> - {else} - {image path="images/empty.png"} - - {/if} - {if $header_W} - {image action="header__{$entries[$key].MailID}__{$entries[$key].Server}"} - src="plugins/mail/images/mailq_header.png" alt="{t}header{/t}" - title="{t}Display header of this message{/t}"> - {else} - {image path="images/empty.png"} - - {/if} -
- - - - - - -
{$range_selector}
- -{/if} + {if $all_ok != true} + + {t}Search returned no results{/t}... + + {else} + +
+ + + + + + + + + + + + + + + + + + {foreach from=$entries item=val key=key} + + + + + + + + + + + + {/foreach} + + + + + + + + + + +
+ + {t}ID{/t}{if $OrderBy == "MailID"} {$SortType}{/if}{t}Server{/t}{if $OrderBy == "Server"}{$SortType}{/if}{t}Size{/t}{if $OrderBy == "Size"} {$SortType}{/if}{t}Arrival{/t}{if $OrderBy == "Arrival"}{$SortType}{/if}{t}Sender{/t}{if $OrderBy == "Sender"}{$SortType}{/if}{t}Recipient{/t}{if $OrderBy == "Recipient"}{$SortType}{/if}{t}Status{/t}{if $OrderBy == "Status"}{$SortType}{/if} 
+ + + {if $entries[$key].Active == true} + {image path="plugins/mail/images/mailq_active.png"} + {/if} + {$entries[$key].MailID} + {$entries[$key].ServerName}{$entries[$key].Size}$entries[$key].Arrival|date_format:"%d.%m.%Y %H:%M:%S"}{$entries[$key].Sender}{$entries[$key].Recipient}{$entries[$key].Status} + {if $del_W} + {image action="del__{$entries[$key].MailID}__{$entries[$key].Server}" + path="images/lists/trash.png" title="{t}Delete this message{/t}"} + {else} + {image path="images/empty.png"} + {/if} + + {if $entries[$key].Hold == true} + {if $unhold_W} + {image action="unhold__{$entries[$key].MailID}__{$entries[$key].Server}" + path="plugins/mail/images/mailq_unhold.png" title="{t}Release message{/t}"} + {else} + {image path="images/empty.png"} + {/if} + {else} + {if $hold_W} + {image action="hold__{$entries[$key].MailID}__{$entries[$key].Server}" + path="plugins/mail/images/mailq_hold.png" title="{t}Hold message{/t}"} + {else} + {image path="images/empty.png"} + {/if} + {/if} + + {if $requeue_W} + {image action="requeue__{$entries[$key].MailID}__{$entries[$key].Server}" + path="images/lists/reload.png" title="{t}Requeue this message{/t}"} + {else} + {image path="images/empty.png"} + {/if} + + {if $header_W} + {image action="header__{$entries[$key].MailID}__{$entries[$key].Server}" + path="plugins/mail/images/mailq_header.png" title="{t}Display header of this message{/t}"} + {else} + {image path="images/empty.png"} + {/if} +
       +
+ + + + +
{$range_selector}
+
+
+ {/if} {/if} - -
- - diff --git a/gosa-plugins/mail/addons/mailqueue/header.tpl b/gosa-plugins/mail/addons/mailqueue/header.tpl index 8125a223a..24f9611a4 100644 --- a/gosa-plugins/mail/addons/mailqueue/header.tpl +++ b/gosa-plugins/mail/addons/mailqueue/header.tpl @@ -1,8 +1,9 @@ -
{$header}
-
+
+ {$header}
+
- - -
+ +
\ No newline at end of file diff --git a/gosa-plugins/mail/addons/mailqueue/main.inc b/gosa-plugins/mail/addons/mailqueue/main.inc index 3d9373875..557123ce2 100644 --- a/gosa-plugins/mail/addons/mailqueue/main.inc +++ b/gosa-plugins/mail/addons/mailqueue/main.inc @@ -52,9 +52,6 @@ if ( $cleanup ){ $display= $mailqueue->execute (); $display.= "\n"; - /* Page header*/ - $display= print_header(get_template_path('plugins/mail/images/mailqueue.png'), _("Mail queue")).$display; - /* Store changes in session */ session::set('mailqueue',$mailqueue); }