Removed old acls, added ability to greyout divlists with render tag

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

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 6b5771a25555080367a9cc19d9032f2d55e98fc0..3fa1880d84c03fcf867d77d0940f572bbf4c1024 100644 (file)
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -155,6 +155,13 @@ td.list1nohighlight {
        padding:3px;
        height:22px;
 }
+td.list1nohighlightdisabled {
+       background-color:#EBEBEB;;
+       border-right:1px solid #C0C0C0;
+       padding:3px;
+       height:22px;
+}
+
 
 td.list1#fill {
        height:100%;

diff --git a/include/smarty/plugins/block.render.php b/include/smarty/plugins/block.render.php
index fd25db6c1976adc0b4c914a627e526e69209646a..6fe13b4a76bae6413aa8f75e04d0e349896e383c 100755 (executable)
--- a/include/smarty/plugins/block.render.php
+++ b/include/smarty/plugins/block.render.php
@@ -26,9 +26,9 @@ function smarty_block_render($params, $text, &$smarty)
        /* Disable objects, but keep those active that have mode=read_active */
        if(!(isset($params['mode']) && $params['mode']=='readable')){
 
-               /* Disable options */
-               $from   = array("/name=/i");
-               $to     = array(" disabled name=");
+               /* Disable options && greyout divlists */
+               $from   = array("/name=/i" ,            "/list1nohighlight/");
+               $to     = array(" disabled name=",      "list1nohighlightdisabled");
                $text   = preg_replace($from,$to,$text);
 
                /* Replace picture if object is disabled */

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 695b40d2c5d0b1f1912350c68749e20a529cb7b3..1f7f926ba98e5d0e2784a10315d5c6bb4b992a74 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -149,7 +149,7 @@
 {render acl=$gotoShareACL}
       <input type="submit" name="gotoShareAdd" value="{t}Add{/t}"> 
 {/render}
-      <!--   <input type="submit" {$gotoShareACL} name="gotoShareDel" value="{t}Remove{/t}"> -->
+      <!--   <input type="submit" name="gotoShareDel" value="{t}Remove{/t}"> -->
      </td>
     </tr>
    </table>
@@ -163,7 +163,7 @@
     <tr>
      <td>
 {render acl=$gotoLogonScriptACL}
-      <select style="width:100%;" name="gotoLogonScript" multiple size=5 {$gotoLogonScriptACL} id="gotoLogonScript">
+      <select style="width:100%;" name="gotoLogonScript" multiple size=5 id="gotoLogonScript">
        {html_options values=$gotoLogonScriptKeys output=$gotoLogonScripts }
        <option disabled>&nbsp;</option>
       </select>
@@ -171,13 +171,13 @@
 
       <br>
 {render acl=$gotoLogonScriptACL}
-      <input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptNew" value="{t}Add{/t}">
+      <input type="submit" name="gotoLogonScriptNew" value="{t}Add{/t}">
 {/render}
 {render acl=$gotoLogonScriptACL}
-      <input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptEdit"  value="{t}Edit{/t}">
+      <input type="submit" name="gotoLogonScriptEdit"  value="{t}Edit{/t}">
 {/render}
 {render acl=$gotoLogonScriptACL}
-      <input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptDel"  value="{t}Delete{/t}" >
+      <input type="submit" name="gotoLogonScriptDel"  value="{t}Delete{/t}" >
 {/render}
      </td>
     </tr>
@@ -199,7 +199,7 @@
     <tr>
      <td>
 {render acl=$gotoHotplugDeviceACL}
-      <select name="gotoHotplugDevice[]" {$gotoHotplugDeviceACL} size=5  style="width:100%;" id="gotoHotplugDevice" multiple>
+      <select name="gotoHotplugDevice[]" size=5  style="width:100%;" id="gotoHotplugDevice" multiple>
        {html_options values=$gotoHotplugDeviceKeys output=$gotoHotplugDevices}
        <option disabled>&nbsp;</option>
       </select>
@@ -209,10 +209,10 @@
     <tr>
      <td>
 {render acl=$gotoHotplugDeviceACL}
-      <input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceNew" value="{t}New{/t}">
+      <input type="submit" name="gotoHotplugDeviceNew" value="{t}New{/t}">
 {/render}
 {render acl=$gotoHotplugDeviceACL}
-      <input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceUse" value="{t}Existing{/t}">
+      <input type="submit" name="gotoHotplugDeviceUse" value="{t}Existing{/t}">
 {/render}
 {render acl=$gotoHotplugDeviceACL}
       <input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceDel" value="{t}Delete{/t}"
@@ -231,23 +231,23 @@
     <tr>
      <td>
 {render acl=$gotoPrinterACL}
-      <select style="width:100%;" name="gotoPrinterSel[]" multiple size=5 {$gotoPrinterACL} id="gotoPrinter">
+      <select style="width:100%;" name="gotoPrinterSel[]" multiple size=5 id="gotoPrinter">
        {html_options values=$gotoPrinterKeys output=$gotoPrinter}
        <option disabled>&nbsp;</option>
       </select>
 {/render}
       <br>
 {render acl=$gotoPrinterACL}
-      <input type="submit" {$gotoPrinterACL} name="gotoPrinterAdd"     value="{t}Add{/t}">
+      <input type="submit"  name="gotoPrinterAdd"     value="{t}Add{/t}">
 {/render}
 {render acl=$gotoPrinterACL}
-      <input type="submit" {$gotoPrinterACL} name="gotoPrinterDel"     value="{t}Delete{/t}" {if !$gotoPrinter } disabled {/if}>
+      <input type="submit" name="gotoPrinterDel"     value="{t}Delete{/t}" {if !$gotoPrinter } disabled {/if}>
 {/render}
 {render acl=$gotoPrinterACL}
-      <input type="submit" {$gotoPrinterACL} name="gotoPrinterEdit"    value="{t}Toggle admin{/t}" {if !$gotoPrinter } disabled {/if}>
+      <input type="submit" name="gotoPrinterEdit"    value="{t}Toggle admin{/t}" {if !$gotoPrinter } disabled {/if}>
 {/render}
 {render acl=$gosaDefaultPrinterACL}
-      <input type="submit" {$gotoPrinterACL} name="gotoPrinterDefault"    value="{t}Toggle default{/t}" {if !$gotoPrinter } disabled {/if}>
+      <input type="submit" name="gotoPrinterDefault"    value="{t}Toggle default{/t}" {if !$gotoPrinter } disabled {/if}>
 {/render}
      </td>
     </tr>