From a91bfa60c825c48486baec41529a1b8d90571cbb Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 19 Mar 2010 16:41:58 +0000
Subject: [PATCH] Updated share service

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16969 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../systems/services/shares/class_servNfs.inc |  4 +-
 .../systems/services/shares/goShareServer.tpl | 61 ++++++++-----------
 .../admin/systems/services/shares/servnfs.tpl | 19 ++----
 3 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc b/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc
index 14bd2677e..8e50b5fc2 100644
--- a/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc
+++ b/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc
@@ -108,7 +108,7 @@ class servnfs extends plugin
     $smarty->assign("allow_mounts", $this->parent->allow_mounts);
     $smarty->assign("mount_checked", "");
 
-    $smarty->assign("appleMountsACL",    $this->getacl("appleMounts"));
+    $smarty->assign("appleMountsACL",    $this->parent->getacl("appleMounts"));
 
     if (($this->type == "netatalk") || ($this->type == "NFS")) {
       if ($this->create_mount_init) {
@@ -264,8 +264,6 @@ class servnfs extends plugin
   function should_create_mount() {
     return $this->create_mount;
   }
-
-
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/gosa-plugins/goto/admin/systems/services/shares/goShareServer.tpl b/gosa-plugins/goto/admin/systems/services/shares/goShareServer.tpl
index 10f0c7f3c..647d21a26 100644
--- a/gosa-plugins/goto/admin/systems/services/shares/goShareServer.tpl
+++ b/gosa-plugins/goto/admin/systems/services/shares/goShareServer.tpl
@@ -1,40 +1,33 @@
 <h3>{t}Shares{/t}</h3>
-   <table summary="" style="width:100%">
-    <tr>
-     <td>
-{render acl=$nameACL  mode=read_active}
-        <select style="width:100%" id="goExportEntry" name="goExportEntryList[]" size=12 multiple >
-            {html_options values=$goExportEntry output=$goExportEntryKeys}
-            <option disabled>&nbsp;</option>
-        </select>
-{/render}
-    <br>
-	
-{render acl=$nameACL}
-        <button type='submit' name='NewNfsAdd' id="NewNfsAddId" {if !$createable} disabled {/if}
->{msgPool type=addButton}</button>
-
-{/render}
-{render acl=$nameACL mode=read_active}
-        <button type='submit' name='NewNfsEdit' id="NewNfsEditId">{t}Edit{/t}</button>
-
-{/render}
-{render acl=$nameACL}
-        <button type='submit' name='DelNfsEnt' id="DelNfsEntId" {if !$removeable} disabled {/if}
->{msgPool type=delButton}</button>
-
-{/render}
-    </td>
-    </tr>
-   </table>
 
+<table summary="{t}Shares{/t}" style="width:100%">
+ <tr>
+  <td>
+   {render acl=$nameACL  mode=read_active}
+    <select style="width:100%" id="goExportEntry" name="goExportEntryList[]" size=12 multiple >
+      {html_options values=$goExportEntry output=$goExportEntryKeys}
+      <option disabled>&nbsp;</option>
+    </select>
+   {/render}
+   <br>
+   {render acl=$nameACL}
+    <button type='submit' name='NewNfsAdd' id="NewNfsAddId" 
+      {if !$createable} disabled {/if}>{msgPool type=addButton}</button>
+   {/render}
+   {render acl=$nameACL mode=read_active}
+    <button type='submit' name='NewNfsEdit' id="NewNfsEditId">{t}Edit{/t}</button>
+   {/render}
+   {render acl=$nameACL}
+    <button type='submit' name='DelNfsEnt' id="DelNfsEntId" 
+      {if !$removeable} disabled {/if}>{msgPool type=delButton}</button>
+   {/render}
+  </td>
+ </tr>
+</table>
 
 <hr>
-<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
-    <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
-
-    &nbsp;
-    <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
-
+<div class="plugin-actions">
+ <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
+ <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
 </div>
 <input type="hidden" name="goShareServerPosted" value="1">
diff --git a/gosa-plugins/goto/admin/systems/services/shares/servnfs.tpl b/gosa-plugins/goto/admin/systems/services/shares/servnfs.tpl
index 9e91a55d3..dbaf9e794 100644
--- a/gosa-plugins/goto/admin/systems/services/shares/servnfs.tpl
+++ b/gosa-plugins/goto/admin/systems/services/shares/servnfs.tpl
@@ -75,7 +75,7 @@
 						{/if}
 
 								{literal}
-									<script language="JavaScript">
+									<script type="text/javascript" language="JavaScript">
 										document.getElementById('sharetype').onchange=function() {
 											var foobar=this[this.selectedIndex].value;
 											var box=document.getElementById('netatalk_mount');
@@ -132,18 +132,11 @@
 			</table>
 		</td>
 	</tr>
-	<tr>
-		<td colspan=2>
-			<hr>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2 style="text-align:right">
-			<button type='submit' name='NFSsave'>{msgPool type=saveButton}</button>
+</table>
 
+<hr>
+<div class="plugin-actions">
+			<button type='submit' name='NFSsave'>{msgPool type=saveButton}</button>
 			<button type='submit' name='NFScancel'>{msgPool type=cancelButton}</button>
-
-		</td>
-	</tr>
-</table>
+</div>
 <input type='hidden' name='servnfs_posted' value='1'>
-- 
2.30.2