From 540e4ed9eb6df5955a58ea9946049a84efa67e33 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 1 Jan 2009 00:43:22 +0000
Subject: Turn the permission dialog into a real 3-state faux checkbox.  If we
 replace them with intuitive icons, we're most of the way there.

---
 core/views/permissions_form.html.php | 40 +++++++++++++++---------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

(limited to 'core')

diff --git a/core/views/permissions_form.html.php b/core/views/permissions_form.html.php
index d0b605e2..8c72bc94 100644
--- a/core/views/permissions_form.html.php
+++ b/core/views/permissions_form.html.php
@@ -20,30 +20,24 @@
         <? $lock = access::locked_by($group, $permission->name, $item) ?>
 
         <? if ($lock): ?>
-
-        <? if ($allowed): ?>
-        allowed
-        <? else: ?>
-        denied
-        <? endif ?>
-
-        <a href="javascript:show(<?= $lock->id ?>)">(parental lock)</a>
-        <? else: ?>
-
-        <? if ($allowed): ?>
-        <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">allowed</a>
+          denied and locked by <a href="javascript:show(<?= $lock->id ?>)">parent</a>
         <? else: ?>
-        <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">denied</a>
-        <? endif ?>
-
-        <? if ($intent === null): ?>
-        (from parent)
-        <? else: ?>
-        <? if ($item->id != 1): ?>
-        <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">(reset to parent)</a>
-        <? endif ?>
-        <? endif ?>
-
+          <? if ($intent === null): ?>
+            <? if ($allowed): ?>
+              <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">allowed by parent</a>
+            <? else: ?>
+              <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">denied by parent</a>
+            <? endif ?>
+          </a>
+          <? elseif ($intent === access::DENY): ?>
+            <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">denied</a>
+          <? elseif ($intent === access::ALLOW): ?>
+            <? if ($item->id == 1): ?>
+            <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">allowed</a>
+            <? else: ?>
+            <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">allowed</a>
+            <? endif ?>
+          <? endif ?>
         <? endif ?>
       </td>
       <? endforeach ?>
-- 
cgit v1.2.3