Code

Updated mailqueue style
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 19 Apr 2010 11:23:03 +0000 (11:23 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 19 Apr 2010 11:23:03 +0000 (11:23 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17686 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-plugins/mail/addons/mailqueue/contents.tpl
gosa-plugins/mail/addons/mailqueue/header.tpl
gosa-plugins/mail/addons/mailqueue/main.inc

index 4d5e0b88bd1e2958ce775af0c55e57fe0a21fa49..8fbbfdb4dff96b5400e3a03c55bc69c0124b2a3a 100644 (file)
-<div style="height: 5px;">&nbsp;</div>
-<div class="contentboxh">
- <p class="contentboxh">{image path="images/launch.png" align="right"}Filter
-</p>
-</div>
-<div class="contentboxb">
-  <div >
-       <table width="100%" summary="{t}Filter{/t}">
-               <tr>
-                       <td>
-       {image path="images/lists/search.png"}
-
-        &nbsp;{t}Search for{/t}
-    <input type='text' name="search_for" size="12" maxlength="60" value="{$search_for}" title="{t}Please enter a search string here.{/t}" onchange="mainform.submit()">
-        &nbsp;in 
-       <select size="1" name="p_server" title="{t}Select a server{/t}" onchange="mainform.submit()">
-        {html_options values=$p_serverKeys output=$p_servers selected=$p_server}
-       </select>
-<!--
-       {t}with status{/t} : 
-       <select size="1" name="Stat" onchange="mainform.submit()">
-        {html_options values=$stats output=$r_stats selected=$stat}
-       </select>
--->
-        &nbsp;{t}within the last{/t}&nbsp;
-       <select size="1" name="p_time" onchange="mainform.submit()">
-        {html_options values=$p_timeKeys output=$p_times selected=$p_time}
-       </select>
-        &nbsp;
-       <button type='submit' name='search'>{t}Search{/t}</button>
-
-                       </td>
-                       <td style='text-align:right;' class='left-border'>&nbsp;
 
-                               {if $delAll_W}
-                               <input name="all_del"  src="images/lists/trash.png"             
-                                       value="{t}Remove all messages{/t}" type="image" 
-                                       title="{t}Remove all messages from selected servers queue{/t}">
-                               {/if}
-                               {if $holdAll_W}
-                               <input name="all_hold" src="plugins/mail/images/mailq_hold.png"
-                                       value="{t}Hold all messages{/t}" type="image"
-                                       title="{t}Hold all messages in selected servers queue{/t}">
-                               {/if}
-                               {if $unholdAll_W}
-                               <input name="all_unhold" src="plugins/mail/images/mailq_unhold.png"             
-                                       value="{t}Release all messages{/t}"     type="image"
-                                       title="{t}Release all messages in selected servers queue{/t}">
-                               {/if}
-                               {if $requeueAll_W}
-                               <input name="all_requeue" src="images/lists/reload.png"         
-                                       value="{t}Requeue all messages{/t}" type="image"
-                                       title="{t}Requeue all messages in selected servers queue{/t}">
-                               {/if}
-                       </td>
-               </tr>
-       </table>
-       </div>
+<div id="mainlist">
+ <div class="mainlist-header">
+  <p>{t}Mail queue{/t}
+  </p>
+  <div class="mainlist-nav">
+   <table summary="{t}Filter{/t}" style="width: 100%;"      id="t_scrolltable" cellpadding="0" cellspacing="0">
+    <tr>
+     <td>{t}Search on{/t}
+      <select size="1" name="p_server" title="{t}Select a server{/t}" onchange="mainform.submit()">
+       {html_options values=$p_serverKeys output=$p_servers selected=$p_server}
+      </select>
+     </td>
+     <td>{t}Search for{/t}
+      <input type='text' name="search_for" size=25 maxlength=60        
+        value="{$search_for}" title="{t}Enter user name to search for{/t}"        
+        onChange="mainform.submit()">
+     </td>
+     <td>{t}within the last{/t}&nbsp;
+      <select size="1" name="p_time" onchange="mainform.submit()">
+       {html_options values=$p_timeKeys output=$p_times selected=$p_time}
+      </select>
+     </td>
+     <td>
+      <button type='submit' name='search'>{t}Search{/t}</button>
+     </td>
+     <td>
+      {if $delAll_W}
+       <input name="all_del"  src="images/lists/trash.png"                                                     
+        value="{t}Remove all messages{/t}" type="image"                                        
+        title="{t}Remove all messages from selected servers queue{/t}">
+      {/if}
+      {if $holdAll_W}
+       <input name="all_hold" src="plugins/mail/images/mailq_hold.png"                                 
+        value="{t}Hold all messages{/t}" type="image"                                  
+        title="{t}Hold all messages in selected servers queue{/t}">
+      {/if}
+      {if $unholdAll_W}
+       <input name="all_unhold" src="plugins/mail/images/mailq_unhold.png"                                                     
+        value="{t}Release all messages{/t}"    type="image"                                    
+        title="{t}Release all messages in selected servers queue{/t}">
+      {/if}
+      {if $requeueAll_W}
+       <input name="all_requeue" src="images/lists/reload.png"                                                 
+        value="{t}Requeue all messages{/t}" type="image"                                       
+        title="{t}Requeue all messages in selected servers queue{/t}">
+      {/if}
+     </td>
+    </tr>
+   </table>
+  </div>
+ </div>
 </div>
+
 <br>
 
 {if !$query_allowed}
-       <b>{msgPool type=permView}</b>
-{else}
+<b>{msgPool type=permView}</b>
 
-{if $all_ok != true}
-<b>{t}Search returned no results{/t}...</b>
 {else}
 
-<table style='width: 100%; ' summary="{t}Entries{/t}">
- border="0" cellpadding="2" cellspacing="1" rules="cols">
-       <tr style="background-color: rgb(232, 232, 232); height: 26px; font-weight: bold;">
-               <td style='width:20px'>
-               <input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."'
-               onClick="toggle_all_('^selected_.*$','select_all');"></td>
-               <td><a href="{$plug}&amp;sort=MailID"           >{t}ID{/t}                      {if $OrderBy == "MailID"}       {$SortType}{/if}</a></td>
-               <td><a href="{$plug}&amp;sort=Server"           >{t}Server{/t}          {if $OrderBy == "Server"}       {$SortType}{/if}</a></td>
-               <td><a href="{$plug}&amp;sort=Size"                     >{t}Size{/t}            {if $OrderBy == "Size"}         {$SortType}{/if}</a></td>
-               <td><a href="{$plug}&amp;sort=Arrival"          >{t}Arrival{/t}         {if $OrderBy == "Arrival"}      {$SortType}{/if}</a></td>
-               <td><a href="{$plug}&amp;sort=Sender"           >{t}Sender{/t}          {if $OrderBy == "Sender"}       {$SortType}{/if}</a></td>
-               <td><a href="{$plug}&amp;sort=Recipient"        >{t}Recipient{/t}       {if $OrderBy == "Recipient"}{$SortType}{/if}</a></td>
-               <td><a href="{$plug}&amp;sort=Status"           >{t}Status{/t}          {if $OrderBy == "Status"}       {$SortType}{/if}</a></td>
-               <td>&nbsp;</td>
-       </tr>
-
-{counter start=0 assign=i start=1}
-{foreach from=$entries item=val key=key}
-                       
-       {if ($i%2)==0}
-               <tr style="height: 22px; background-color: rgb(236, 236, 236);">
-       {else}
-               <tr style="height: 22px; background-color: rgb(245, 245, 245);">
-       {/if}
-               <td><input id="selected_{$entries[$key].MailID}" type='checkbox' name='selected_{$entries[$key].MailID}_{$entries[$key].Server}' class='center'></td>
-               <td >
-                       {if $entries[$key].Active == true}
-                               {image path="plugins/mail/images/mailq_active.png"}
-
-                       {/if}
-                       {$entries[$key].MailID}</td>
-               <td>{$entries[$key].ServerName}</td>
-               <td>{$entries[$key].Size}</td>
-               <td>{$entries[$key].Arrival|date_format:"%d.%m.%Y %H:%M:%S"}</td>
-               <td>{$entries[$key].Sender}</td>
-               <td>{$entries[$key].Recipient}</td>
-               <td >{$entries[$key].Status}</td>
-               <td style="text-align:right">
-                       {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}
-               </td>
-       </tr>
-       {counter}
-{/foreach}
-</table>
-
- <table style='width:100%; text-align:center;' summary="{t}Page selection{/t}">
-
-  <tr>
-   <td>{$range_selector}</td>
-  </tr>
- </table>
-
-{/if}
+ {if $all_ok != true}
+
+  <b>{t}Search returned no results{/t}...</b>
+
+ {else}
+
+  <div class="listContainer" id="d_scrollbody" style="min-height: 475px; height: 444px;">
+   <table summary="{t}Phone reports{/t}" style="width:100%;" cellpadding="0" cellspacing="0">
+    <thead class="fixedListHeader listHeaderFormat">
+     <tr>
+      <td class='listheader'>
+       <input type='checkbox' id='select_all' name='select_all' 
+          title='"._("Select all")."' onClick="toggle_all_('^selected_.*$','select_all');">
+      </td> 
+      <td class='listheader'><a href="{$plug}&amp;sort=MailID">{t}ID{/t}{if $OrderBy == "MailID"} {$SortType}{/if}</a></td>
+      <td class='listheader'><a href="{$plug}&amp;sort=Server">{t}Server{/t}{if $OrderBy == "Server"}{$SortType}{/if}</a></td>
+      <td class='listheader'><a href="{$plug}&amp;sort=Size">{t}Size{/t}{if $OrderBy == "Size"} {$SortType}{/if}</a></td>
+      <td class='listheader'><a href="{$plug}&amp;sort=Arrival">{t}Arrival{/t}{if $OrderBy == "Arrival"}{$SortType}{/if}</a></td>
+      <td class='listheader'><a href="{$plug}&amp;sort=Sender">{t}Sender{/t}{if $OrderBy == "Sender"}{$SortType}{/if}</a></td>
+      <td class='listheader'><a href="{$plug}&amp;sort=Recipient">{t}Recipient{/t}{if $OrderBy == "Recipient"}{$SortType}{/if}</a></td>
+      <td class='listheader'><a href="{$plug}&amp;sort=Status">{t}Status{/t}{if $OrderBy == "Status"}{$SortType}{/if}</a></td>
+      <td class='listheader'>&nbsp;</td>
+     </tr>
+    </thead>
+    <tbody class="listScrollContent listBodyFormat" id="t_nscrollbody">
+
+
+     {foreach from=$entries item=val key=key}
+      <tr>
+       <td class="list0">
+        <input id="selected_{$entries[$key].MailID}" type='checkbox' 
+         name='selected_{$entries[$key].MailID}_{$entries[$key].Server}' class='center'>
+       </td>
+       <td class="list0">
+        {if $entries[$key].Active == true}
+         {image path="plugins/mail/images/mailq_active.png"}
+        {/if}
+        {$entries[$key].MailID}
+       </td>
+       <td class="list0">{$entries[$key].ServerName}</td>
+       <td class="list0">{$entries[$key].Size}</td>
+       <td class="list0">$entries[$key].Arrival|date_format:"%d.%m.%Y %H:%M:%S"}</td>
+       <td class="list0">{$entries[$key].Sender}</td>
+       <td class="list0">{$entries[$key].Recipient}</td>
+       <td class="list0">{$entries[$key].Status}</td>
+       <td class="list0" style='border-right: 0pt none;'>
+        {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}
+       </td>
+      </tr>
+     {/foreach}
+     <tr>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0" style='border-right: 0pt none;'>
+</td>
+     </tr>
+    </tbody>
+   </table>
+   <table style='width:100%; text-align:center;' summary="{t}Page selector{/t}">
+    <tr>
+     <td>{$range_selector}</td>
+    </tr>
+   </table>
+  </div>
+  <hr>
+ {/if}
 {/if}
-
-<hr>
-
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('search_for');
-  -->
-</script>
index 8125a223a8767e0e96ca09808a0f5bf7a344f0d3..24f9611a4b624969037136bfe9daa0d27f7bd218 100644 (file)
@@ -1,8 +1,9 @@
-<pre>{$header}
-</pre>
 
+<pre>
+ {$header}
+</pre>
 <hr>
 <div style='text-align:right; padding:5px;'>
-       <button type='submit' name='back'>{msgPool type=backButton}</button> 
-
-</div>
+ <button type='submit' name='back'>
+ {msgPool type=backButton}</button>
+</div>
\ No newline at end of file
index 3d937387538728ad9427127eae9837d947fd4123..557123ce21b4d50587d2ff63b969ecc91fe4ee76 100644 (file)
@@ -52,9 +52,6 @@ if ( $cleanup ){
        $display= $mailqueue->execute ();
        $display.= "<input type=\"hidden\" name=\"ignore\">\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);
 }