Updated device template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19847 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl b/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl
index a722aa08ef944a1913d710c1b5b6731a2cfe654b..03864b064150c26d494cbe936e35efed2ae63914 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl
@@ -35,7 +35,44 @@
                     </td>
                 </tr>
             </table>
+
             <hr>
+            <h3>{t}Registration{/t}</h3>
+            <table>
+                <tr>
+                    <td><LABEL for='deviceType'>{t}Type{/t}</LABEL>
+                    </td>
+                    <td>
+                        {render acl=$deviceTypeACL}
+                            <input type="text" name="deviceType" value="{$deviceType}" id="deviceType" value="{$deviceType}">
+                        {/render}
+                    </td>
+                </tr>
+                <tr>
+                    <td><LABEL for='deviceUUID'>{t}Device UUID{/t}</LABEL></td>
+                    <td> 
+                        {render acl=$deviceUUIDACL}
+                            <input type="text" name="deviceUUID" value="{$deviceUUID}" id="deviceUUID" value="{$deviceUUID}">
+                        {/render}
+                        {render acl=$deviceUUIDACL}
+                            {image path="images/lists/reload.png" action="reloadUUID"}
+                        {/render}
+                    </td>
+                </tr>
+                <tr>
+                    <td><LABEL for='deviceStatus'>{t}Status{/t}</LABEL>
+                    </td>
+                    <td>
+                        {render acl=$deviceStatusACL}
+                            <input type="text" name="deviceStatus" value="{$deviceStatus}" id="deviceStatus" value="{$deviceStatus}">
+                        {/render}
+                    </td>
+                </tr>
+            </table>
+        </td>
+        <td class='left-border' style='padding-left:5px;' rowspan=2>
+
+            <h3>{t}Orgaizational data{/t}</h3>
             <table>
                 <tr>
                     <td><LABEL for='ou'>{t}Organizational unit{/t}</LABEL></td>
@@ -69,6 +106,7 @@
                         {/render}
                     </td>
                 </tr>
+<!--
                 <tr>
                     <td><LABEL for='seeAlso'>{t}See also{/t}</LABEL></td>
                     <td>
@@ -77,8 +115,8 @@
                         {/render}
                     </td>
                 </tr>
-                <tr>
-                </tr>
+-->
+<!--
                 <tr>
                     <td><LABEL for='owner'>{t}Owner{/t}</LABEL></td>
                     <td>
@@ -94,11 +132,7 @@
                         {/if}
                  </td>
                 </tr>
-            </table>
-        </td>
-        <td class='left-border' style='padding-left:5px;'>
-            <h3>{t}Registered device{/t}</h3>
-            <table>
+-->
                 <tr>
                     <td><LABEL for='manager'>{t}Manager{/t}</LABEL>
                     </td>
@@ -115,37 +149,10 @@
                         {/if}
                  </td>
                 </tr>
-                <tr>
-                    <td><LABEL for='deviceUUID'>{t}Device UUID{/t}</LABEL></td>
-                    <td> 
-                        {render acl=$deviceUUIDACL}
-                            <input type="text" name="deviceUUID" value="{$deviceUUID}" id="deviceUUID" value="{$deviceUUID}">
-                        {/render}
-                        {render acl=$deviceUUIDACL}
-                            {image path="images/lists/reload.png" action="reloadUUID"}
-                        {/render}
-                    </td>
-                </tr>
-                <tr>
-                    <td><LABEL for='deviceStatus'>{t}Status{/t}</LABEL>
-                    </td>
-                    <td>
-                        {render acl=$deviceStatusACL}
-                            <input type="text" name="deviceStatus" value="{$deviceStatus}" id="deviceStatus" value="{$deviceStatus}">
-                        {/render}
-                    </td>
-                </tr>
-                <tr>
-                    <td><LABEL for='deviceType'>{t}Type{/t}</LABEL>
-                    </td>
-                    <td>
-                        {render acl=$deviceTypeACL}
-                            <input type="text" name="deviceType" value="{$deviceType}" id="deviceType" value="{$deviceType}">
-                        {/render}
-                    </td>
-                </tr>
             </table>
-
+        </td>
+    </tr>
+</table>
             <hr>
             <h3>{t}Network settings{/t}</h3>
             <table>
@@ -168,6 +175,3 @@
                     </td>
                 </tr>
             </table>
-        </td>
-    </tr>
-</table>