From 3cc4e5c6c6d889acda38dcf317eaf36015fe1bc8 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 31 Mar 2010 12:01:23 +0000
Subject: [PATCH] Updated mimtypes

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17434 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/mimetypes/class_mimetypeGeneric.inc | 21 ++---
 gosa-plugins/goto/admin/mimetypes/generic.tpl | 81 ++++++++++---------
 .../goto/admin/mimetypes/paste_generic.tpl    | 13 ++-
 .../goto/admin/mimetypes/release_select.tpl   | 19 -----
 4 files changed, 63 insertions(+), 71 deletions(-)
 delete mode 100644 gosa-plugins/goto/admin/mimetypes/release_select.tpl

diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
index 966186251..de20d9a65 100644
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
@@ -279,25 +279,28 @@ class mimetype extends plugin
 
 
     if($this->acl_is_writeable("gotoMimeFilePattern") && !preg_match("/freeze/i",$this->FAIstate)){
-      $Pattern_Actions= " <input type='image' src='images/lists/sort-up.png' 	class='center'	name='Pattern_SortUp_%s' >&nbsp;
-      <input type='image' src='images/lists/sort-down.png' 	class='center'  name='Pattern_SortDown_%s'>&nbsp;
-      <input type='image' src='images/lists/trash.png'	class='center'  name='Pattern_Remove_%s'>";
+      $Pattern_Actions= 
+        image('images/lists/sort-up.png','Pattern_SortUp_%s','','top').
+        image('images/lists/sort-down.png','Pattern_SortDown_%s','','bottom').
+        image('images/lists/trash.png','Pattern_Remove_%s');
     }else{
       $Pattern_Actions= "";	
     }
 
     if($this->acl_is_writeable("gotoMimeApplication") && !preg_match("/freeze/i",$this->FAIstate)){
-      $Apps_Actions 	= " <input type='image' src='images/lists/sort-up.png' 	class='center'	name='Apps_SortUp_%s' >&nbsp;
-      <input type='image' src='images/lists/sort-down.png' 	class='center'  name='Apps_SortDown_%s'>&nbsp;
-      <input type='image' src='images/lists/trash.png'	class='center'  name='Apps_Remove_%s'>";
+      $Apps_Actions 	=  
+        image('images/lists/sort-up.png','Apps_SortUp_%s','','top').
+        image('images/lists/sort-down.png','Apps_SortDown_%s','','bottom').
+        image('images/lists/trash.png','Apps_Remove_%s');
     }else{
       $Apps_Actions= "";	
     }
 
     if($this->acl_is_writeable("gotoMimeEmbeddedApplication") && !preg_match("/freeze/i",$this->FAIstate)){
-      $EApps_Actions 	= " <input type='image' src='images/lists/sort-up.png' 	class='center'	name='EApps_SortUp_%s' >&nbsp;
-      <input type='image' src='images/lists/sort-down.png' 	class='center'  name='EApps_SortDown_%s'>&nbsp;
-      <input type='image' src='images/lists/trash.png'	class='center'  name='EApps_Remove_%s'>";
+      $EApps_Actions 	= 
+        image('images/lists/sort-up.png','EApps_SortUp_%s','','top').
+        image('images/lists/sort-down.png','EApps_SortDown_%s','','bottom').
+        image('images/lists/trash.png','EApps_Remove_%s');
     }else{
       $EApps_Actions= "";	
     }
diff --git a/gosa-plugins/goto/admin/mimetypes/generic.tpl b/gosa-plugins/goto/admin/mimetypes/generic.tpl
index 488e4d7a4..758d366d4 100644
--- a/gosa-plugins/goto/admin/mimetypes/generic.tpl
+++ b/gosa-plugins/goto/admin/mimetypes/generic.tpl
@@ -51,21 +51,22 @@
 
    <table summary="{t}Picture settings{/t}">
     <tr>
-     <td><LABEL for="picture_file">{t}Icon{/t}</LABEL>
+     <td>
+      <LABEL for="picture_file">{t}Icon{/t}</LABEL>
       <br>
-      
       {if $IconReadable}
-       <img src="{$gotoMimeIcon}" border=1 alt='{t}Mime icon{/t}' style="width:48px; height:48; background-color:white; vertical-align:bottom;">
+       <img src="{$gotoMimeIcon}" border=1 alt='{t}Mime icon{/t}' 
+         style="width:48px; height:48; background-color:white; vertical-align:bottom;">
        {else}
        {image path="images/empty.png"}
-       
       {/if}
      </td>
      <td>&nbsp;
       <br>
       <input type="hidden" name="MAX_FILE_SIZE" value="100000">
       {render acl=$gotoMimeIconACL}
-       <input name="picture_file" type="file" size="20" maxlength="255" 							accept="image/*.png" id="picture_file">
+       <input name="picture_file" type="file" size="20" maxlength="255" 							
+        accept="image/*.png" id="picture_file">
       {/render}
       {render acl=$gotoMimeIconACL}
        <button type='submit' name='update_icon'title="{t}Update mime type icon{/t}">{t}Update{/t}</button>
@@ -73,22 +74,26 @@
      </td>
     </tr>
    </table>
+
   </td>
  </tr>
  <tr>
   <td colspan="2">
+
    <hr>
+
   </td>
  </tr>
  <tr>
   <td colspan="2">
-   <h3>{t}Left click{/t}
-   </h3>
+   <h3>{t}Left click{/t}</h3>
   </td>
  </tr>
  <tr>
-  <td style='width:50%; '>{t}File patterns{/t}
-   {$must}
+  <td style='width:50%; '>
+    
+   {t}File patterns{/t}{$must}
+
    {render acl=$gotoMimeFilePatternACL}
     {$gotoMimeFilePatterns}
    {/render}
@@ -99,8 +104,12 @@
     <button type='submit' name='AddNewFilePattern' title="{t}Add a new file pattern{/t}">
     {msgPool type=addButton}</button>
    {/render}
+
   </td>
-  <td class='left-border'>{t}Applications{/t}
+  <td class='left-border'>
+
+   {t}Applications{/t}
+
    {render acl=$gotoMimeApplicationACL}
     {$gotoMimeApplications}
    {/render}
@@ -116,46 +125,45 @@
     <button type='submit' name='AddNewApplication' title="{t}Add application{/t}">
     {msgPool type=addButton}</button>
    {/render}
+
   </td>
  </tr>
  <tr>
   <td colspan="2">
+
    <hr>
+
   </td>
  </tr>
  <tr>
   <td colspan="2">
-   <h3>{t}Embedding{/t}
-   </h3>
+
+   <h3>{t}Embedding{/t}</h3>
+
   </td>
  </tr>
  <tr>
   <td style='width:50%; '>
-   <table summary="{t}Left click actions{/t}">
-    <tr>
-     <td>
-      {render acl=$gotoMimeLeftClickActionACL}
-       
-       
-       <input type='radio' name='gotoMimeLeftClickAction_IE' value='I' 							{if $gotoMimeLeftClickAction_I} checked {/if}>
-      {/render}{t}Show file in embedded viewer{/t}
-      <br>
-      {render acl=$gotoMimeLeftClickActionACL}
-       
-       
-       <input type='radio' name='gotoMimeLeftClickAction_IE' value='E' 							{if $gotoMimeLeftClickAction_E} checked {/if}>
-      {/render}{t}Show file in external viewer{/t}
-      <br>
-      {render acl=$gotoMimeLeftClickActionACL}
-       
-       
-       <input type='checkbox' name='gotoMimeLeftClickAction_Q' value='1' 							{if $gotoMimeLeftClickAction_Q} checked {/if}>
-      {/render}{t}Ask whether to save to local disk{/t}
-     </td>
-    </tr>
-   </table>
+
+   {render acl=$gotoMimeLeftClickActionACL}
+    <input type='radio' name='gotoMimeLeftClickAction_IE' value='I' 							
+       {if $gotoMimeLeftClickAction_I} checked {/if}>
+   {/render}{t}Show file in embedded viewer{/t}
+   <br>
+   {render acl=$gotoMimeLeftClickActionACL}
+    <input type='radio' name='gotoMimeLeftClickAction_IE' value='E' 							
+       {if $gotoMimeLeftClickAction_E} checked {/if}>
+   {/render}{t}Show file in external viewer{/t}
+   <br>
+   {render acl=$gotoMimeLeftClickActionACL}
+    <input type='checkbox' name='gotoMimeLeftClickAction_Q' value='1' 							
+       {if $gotoMimeLeftClickAction_Q} checked {/if}>
+   {/render}{t}Ask whether to save to local disk{/t}
+
   </td>
-  <td class='left-border'>{t}Applications{/t}
+  <td class='left-border'>
+
+   {t}Applications{/t}
    {render acl=$gotoMimeEmbeddedApplicationACL}
     {$gotoMimeEmbeddedApplications}
    {/render}
@@ -171,6 +179,7 @@
     <button type='submit' name='AddNewEmbeddedApplication' 
       title='{t}Add application{/t}'>{msgPool type=addButton}</button>
    {/render}
+
   </td>
  </tr>
 </table>
diff --git a/gosa-plugins/goto/admin/mimetypes/paste_generic.tpl b/gosa-plugins/goto/admin/mimetypes/paste_generic.tpl
index 00371a98e..72f2eb2e8 100644
--- a/gosa-plugins/goto/admin/mimetypes/paste_generic.tpl
+++ b/gosa-plugins/goto/admin/mimetypes/paste_generic.tpl
@@ -2,28 +2,27 @@
 <table style="width:100%" summary="{t}Mimetype settings{/t}">
  <tr>
   <td colspan="2">
-   <h3>{t}Generic{/t}
-   </h3>
+   <h3>{t}Generic{/t}</h3>
   </td>
  </tr>
  <tr>
   <td style='width:50%; '>
+
    <table summary="{t}Mimetype generic{/t}">
     <tr>
-     <td>{t}Mime type{/t}
-     </td>
+     <td>{t}Mime type{/t}</td>
      <td>
       <input type="text" name='cn' value="{$cn}" title='{t}Please enter a name for the mime type here{/t}'>
      </td>
     </tr>
     <tr>
-     <td>{t}Description{/t}
-     </td>
+     <td>{t}Description{/t}</td>
      <td>
       <input type="text" name='description' value="{$description}" title='{t}Please specify a description for this mime type here{/t}'>
      </td>
     </tr>
    </table>
+
   </td>
  </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/gosa-plugins/goto/admin/mimetypes/release_select.tpl b/gosa-plugins/goto/admin/mimetypes/release_select.tpl
deleted file mode 100644
index 43ff5367b..000000000
--- a/gosa-plugins/goto/admin/mimetypes/release_select.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-<div class="contentboxh" style="border-bottom:1px solid #B0B0B0;">
- <p class="contentboxh">
-  {image path="
-  {$branchimage}" align="right"}{t}Branches{/t}
- </p>
-</div>
-<div class="contentboxb">
- <table summary="" style="width:100%;">
-  <tr>
-   <td>{t}Current release{/t}&nbsp;
-    <select name="mime_release" onChange="document.mainform.submit();" size=1>
-     {html_options output=$mime_releases values=$mime_releases selected=$mime_release}
-    </select>
-   </td>
-  </tr>
- </table>
-</div>
-<br>
\ No newline at end of file
-- 
2.30.2