Changeset 2079

Timestamp:

02/26/09 22:58:56

Author:

johnsa

Message:

access form refactored, moved to common resources

Files:

• trunk/deployment/resources/javascript/bedework/bedeworkAccess.js (modified) (19 diffs)
• trunk/deployment/resources/xsl/default/default/entityAccessForm.xsl (added)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (5 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkAccess.js (deleted)

trunk/deployment/resources/javascript/bedework/bedeworkAccess.js

@@ -1 +1 @@
-/* Bedework Access control form functions
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-/* **********************************************************************
@@ -52 +49 @@
-var otherStr = "other";
-var grantStr = "grant";
+var denyStr = "deny"
-var allStr = "all";
-
-
+
+
+
+
+
+
+
+
+
-
-// How granted accesses appear
@@ -106 +112 @@
-/* We shouldn't use the word local - it probably doesn't mean too much and it might actually be
-   inherited from something called /local for example */
-N
+n
-
-// **************************
@@ -176 +182 @@
-  hv.push(new howVals("W", "apcbStysuN", "<D:write/>", howWriteVal, howDenyWriteVal));
-  hv.push(new howVals("a", "", "<D:write-acl/>", howWriteAclVal, howDenyWriteAclVal));
- 
+
-  hv.push(new howVals("c", "", "<D:write-content/>", howWriteContentVal, howDenyWriteContentVal));
-
@@ -223 +229 @@
-        formObj.howItem[i].disabled = true;
-        // now iterate over corresponding radio buttons for each howItem
-value
-value
+id
+id
-        }
-      } else {
@@ -237 +243 @@
-function toggleAllowDenyFlag(chkBoxObj,formObj) {
-  if (chkBoxObj.checked == true) {
-value
+id
-  } else {
-value
+id
-  }
-}
@@ -246 +252 @@
-function activateAllowDenyFlag(val,formObj,disabledFlag) {
-  for (i = 0; i < formObj[val].length; i++) {
-
-
-
-
-
-
+
+
+
+
+
+
+
-// If in "basic" mode:
-//   Set the value of how to the value of the basicHowItem radio button.
@@ -259 +266 @@
-//   The allow/deny flag contains the final values to be returned with
-//   the "-" switch if we set the value to deny (e.g. "A" or "-A", "R" or "-R").
-
-
-
-
+
-  var howString = "";
-  if (formObj.setappvar[0].checked == true) { // "basic" mode is selected
@@ -273 +277 @@
-    for (i = 0; i < formObj.howItem.length; i++) {
-      if (formObj.howItem[i].checked == true) {
-Val = formObj.howItem[i].value; // get the howItem value
-Val
-formObj[howItemVal][j].checked == true
-Val
+Id = formObj.howItem[i].id; // get the howItem id
+Id
+(formObj[howItemId][j].checked == true) && (formObj[howItemId][j].type == "radio")
+Id
-          }
-        }
@@ -282 +286 @@
-    }
-  }
-
-
-
-
-
+
-}
-
@@ -325 +325 @@
-  this.format = function() {
-    if (whoType == "user") {
+      return userIcon + " " + who;
+    }
+
+    if (whoType == "group") {
+      return groupIcon + " " + who;
+    }
+
+    if (whoType == "resource") {
+      return who;
+    }
+
+    if (whoType == "auth") {
+      return groupIcon + " " + authenticatedStr;
+    }
+
+    if (whoType == "unauth") {
+      return groupIcon + " " + unauthenticatedStr;
+    }
+
+    if (whoType == "owner") {
+      return userIcon + " " + ownerStr;
+    }
+
+    if (whoType == "other") {
+      return groupIcon + " " + otherStr;
+    }
+
+    if (whoType == "all") {
+      return groupIcon + " " + allStr;
+    }
+
+    return "***************" + whoType;
+  }
+
+  // format the who string for xml representation
+  this.formatXml = function() {
+    if (whoType == "user") {
-      return who;
-    }
@@ -360 +397 @@
-
-  this.toXml = function() {
-
+Xml
-
-    if (whoType == "other") {
@@ -390 +427 @@
-
-  this.equals = function(pr) {
-    //alert("this=" + this.toString() + " pr=" + pr.toString());
-
-    if (this.whoType != pr.whoType) {
-      return false;
-    }
-
-    return this.who == pr.who;
-  }
-}
-
-
-
-
+
+
-function bwAce(who, whoType, how, inherited, invert) {
-  this.principal = new bwPrincipal(who, whoType);
@@ -425 +458 @@
-      var h = how[i];
-      var negated = false;
+      var grantDenyStr = grantStr;
-      if (h == "-") {
-        negated = true;
+        grantDenyStr = denyStr;
-        i++;
-        h = how[i];
-      }
-
-
+
+
+
+
-    }
-
@@ -505 +543 @@
-  // row: current row in table
-  // aceI: index of the ace
-
-
-
+
+
+
+
+
+
-    row.insertCell(2).appendChild(document.createTextNode(this.formatInherited()));
-    var td_3 = row.insertCell(3);
-    if (this.inherited == "") {
-)\">" + d
+,'" + id + "')\">" + trashIcon + " " + bwAclWidgetD
-    }
-  }
@@ -551 +592 @@
-
-  // Update the list - expects the browser form object
-
+,id
-    // get the type of ace being set
-    var type;
@@ -568 +609 @@
-
-    // get the how string from the form
-, 2
+
-
-    //alert("About to update who=" + formObj.who.value +
@@ -581 +622 @@
-
-    // redraw the display
-
-
-
-
+id
+
+
+,id
-    var ace = aces[index];
-    var replace = false;
@@ -607 +648 @@
-
-    // redraw the display
-
-
-
-update the ACL table displayed on screen
-
+id
+
+
+build the ACL widget displayed on screen in the given id
+id
-    try {
+
+      var aclWidget = document.getElementById(id);
+      aclWidget.innerHTML = "";
+
+      var bwCurrentAccess = document.createElement("table");
+      bwCurrentAccess.className = "common scheduling";
+      bwCurrentAccess.id = "bwCurrentAccess";
+      bwCurrentAccess.createTHead();
+      bwCurrAccessHead = bwCurrentAccess.tHead.insertRow(0);
+      bwCurrAccessHead.innerHTML = '<th>' + bwAclWidgetEntryStr + '</th>' +  '<th>' + bwAclWidgetAccessStr + '</th>' + '<th>' + bwAclWidgetInheritedStr + '</th><th></th>';
+      var bwCurrAccessTBody = document.createElement("tbody");
+      bwCurrentAccess.appendChild(bwCurrAccessTBody);
+
+      // finally, write the table back to the display
+      aclWidget.appendChild(bwCurrentAccess);
+
-      // get the table body
-      var aclTableBody = document.getElementById("bwCurrentAccess").tBodies[0];
-
-      // remove existing rows
-
-
-
-
-re
+//
+//
+//
+
+
-      for (var j = 0; j < aces.length; j++) {
-        var curAce = aces[j];
-        var tr = aclTableBody.insertRow(j);
-
-
-
+
+
+
-    } catch (e) {
-      alert(e);

trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css

@@ -1789 +1789 @@
-  padding: 0;
-}
-share
+access
-  border: 1px solid #666;
-  padding: 0 0 0.5em 0;
-}
-share
+access
-  background: #e5e5e5;
-  color: black;
@@ -1799 +1799 @@
-  padding: 4px;
-}
-share
+access
-  float: right;
-  font-weight: normal;
-  font-size: 0.8em;
-}
-share
+access
-  margin: 1em;
-}

trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

@@ -53 +53 @@
-  <xsl:include href="../../../bedework-common/default/default/messages.xsl"/>
-  <xsl:include href="../../../bedework-common/default/default/util.xsl"/>
+  <xsl:include href="../../../bedework-common/default/default/entityAccessForm.xsl"/>
-
-  <!-- DEFINE GLOBAL CONSTANTS -->
@@ -404 +405 @@
-    <xsl:if test="/bedework/page='modCalendar' or
-                  /bedework/page='modSchedulingPrefs'">
-{$resourcesRoot}/resources
+/bedework-common/javascript/bedework
-      <!-- initialize calendar acls, if present -->
-      <xsl:if test="/bedework/currentCalendar/acl/ace">
@@ -449 +450 @@
-      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script>
-      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script>
-{$resourcesRoot}/resources
+/bedework-common/javascript/bedework
-      <!-- initialize event acls, if present -->
-      <xsl:if test="/bedework/editableAccess/access/acl/ace">
@@ -4915 +4916 @@
-
-      <div id="sharingBox">
+        <h3>Current Access:</h3>
-        <div id="bwCurrentAccessWidget">&#160;</div>
-        <script type="text/javascript">
@@ -7719 +7721 @@
-  </xsl:template>
-
-  <xsl:template name="entityAccessForm">
-    <xsl:param name="type"/><!-- optional: currently used for inbox and outbox to conditionally display scheduling access -->
-    <xsl:param name="acl"/><!-- required: nodeset of entity acls used to initialize javascript object. -->
-    <xsl:param name="outputId"/><!-- required: id of the current access block display to update -->
-
-    <table cellpadding="0" id="shareFormTable" class="common">
-      <tr>
-        <th colspan="2" class="commonHeader">Add:</th>
-      </tr>
-      <tr>
-        <td>
-          <h5>Who:</h5>
-          <div class="whoTypes">
-            <input type="text" name="who" size="20"/><br/>
-            <input type="radio" value="user" name="whoType" checked="checked"/> user
-            <input type="radio" value="group" name="whoType"/> group
-            <p>OR</p>
-            <p>
-              <input type="radio" value="owner" name="whoType"/> owner<br/>
-              <input type="radio" value="auth" name="whoType"/> authenticated<br/>
-              <input type="radio" value="unauth" name="whoType"/> unauthenticated<br/>
-              <input type="radio" value="all" name="whoType"/> all users
-            </p>
-            <input type="button" name="updateACLs" value="add entry" onclick="bwAcl.update(this.form,'{$outputId}')"/>
-          </div>
-        </td>
-        <td>
-          <h5>
-            <span id="accessRightsToggle">
-              <xsl:choose>
-                <xsl:when test="/bedework/appvar[key='accessRightsToggle']/value='advanced'">
-                  <input type="radio" name="setappvar" value="accessRightsToggle(basic)" onclick="changeClass('howList','visible');changeClass('howTable','invisible');"/>basic
-                  <input type="radio" name="setappvar" value="accessRightsToggle(advanced)" checked="checked" onclick="changeClass('howList','invisible');changeClass('howTable','visible');"/>advanced
-                </xsl:when>
-                <xsl:otherwise>
-                  <input type="radio" name="setappvar" value="accessRightsToggle(basic)" checked="checked" onclick="changeClass('howList','visible');changeClass('howTable','invisible');"/>basic
-                  <input type="radio" name="setappvar" value="accessRightsToggle(advanced)" onclick="changeClass('howList','invisible');changeClass('howTable','visible');"/>advanced
-                </xsl:otherwise>
-              </xsl:choose>
-            </span>
-            Rights:
-          </h5>
-          <input type="hidden" name="how" value="" id="bwCurrentHow"/>
-          <!-- field 'acl' will receive xml for method 2 -->
-          <input type="hidden" name="acl" value="" id="bwCurrentAcl" />
-          <!-- Advanced Access Rights: -->
-          <!-- the "how" field is set by iterating over the howItems below -->
-          <table id="howTable" class="invisible" cellspacing="0">
-            <xsl:if test="/bedework/appvar[key='accessRightsToggle']/value='advanced'">
-              <xsl:attribute name="class">visible</xsl:attribute>
-            </xsl:if>
-            <tr>
-              <th>access type</th>
-              <th>allow</th>
-              <th>deny</th>
-            </tr>
-            <tr>
-              <td class="level1">
-                <input type="checkbox" value="A" id="accessAll" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)"/>All
-              </td>
-              <td>
-                <input type="radio" value="A" name="accessAll" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-A" name="accessAll" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level2">
-                <input type="checkbox" value="R" id="accessRead" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)" checked="checked"/> Read
-              </td>
-              <td>
-                <input type="radio" value="R" name="accessRead" checked="checked"/>
-              </td>
-              <td>
-                <input type="radio" value="-R" name="accessRead"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level3">
-                <input type="checkbox" value="r" id="r" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> read ACL
-              </td>
-              <td>
-                <input type="radio" value="r" name="r" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-r" name="r" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level3">
-                <input type="checkbox" value="P" id="accessPriv" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> read current user privilege set
-              </td>
-              <td>
-                <input type="radio" value="P" name="accessPriv" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-P" name="accessPriv" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level3">
-                <input type="checkbox" value="F" id="F" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> read freebusy
-              </td>
-              <td>
-                <input type="radio" value="F" name="F" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-F" name="F" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level2">
-                <input type="checkbox" value="W" id="W" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)"/> Write
-              </td>
-              <td>
-                <input type="radio" value="W" name="W" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-W" name="W" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level3">
-                <input type="checkbox" value="a" id="a" name="howItem" onclick="toggleAllowDenyFlag(this, this.form)"/> write ACL
-              </td>
-              <td>
-                <input type="radio" value="a" name="a" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-a" name="a" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level3">
-                <input type="checkbox" value="p" id="p" name="howItem" onclick="toggleAllowDenyFlag(this, this.form)"/> write properties
-              </td>
-              <td>
-                <input type="radio" value="p" name="p" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-p" name="p" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level3">
-                <input type="checkbox" value="c" id="c" name="howItem" onclick="toggleAllowDenyFlag(this, this.form)"/> write content
-              </td>
-              <td>
-                <input type="radio" value="c" name="c" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-c" name="c" disabled="disabled"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="level3">
-                <input type="checkbox" value="b" id="b" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)"/> create (bind)
-              </td>
-              <td>
-                <input type="radio" value="b" name="b" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-b" name="b" disabled="disabled"/>
-              </td>
-            </tr>
-            <xsl:if test="$type = 'inbox' or $type = 'outbox'">
-              <tr>
-                <td class="level4">
-                  <input type="checkbox" value="S" id="accessSchedule" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)"/> schedule
-                </td>
-              <td>
-                <input type="radio" value="S" name="accessSchedule" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-S" name="accessSchedule" disabled="disabled"/>
-              </td>
-              </tr>
-              <tr>
-                <td class="level5">
-                  <input type="checkbox" value="t" id="t" name="howItem" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule request
-                </td>
-              <td>
-                <input type="radio" value="t" name="t" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-t" name="t" disabled="disabled"/>
-              </td>
-              </tr>
-              <tr>
-                <td class="level5">
-                  <input type="checkbox" value="y" id="y" name="howItem" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule reply
-                </td>
-              <td>
-                <input type="radio" value="y" name="y" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-y" name="y" disabled="disabled"/>
-              </td>
-              </tr>
-              <tr>
-                <td class="level5">
-                  <input type="checkbox" value="s" id="s" name="howItem" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule free-busy
-                </td>
-              <td>
-                <input type="radio" value="s" name="s" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-s" name="s" disabled="disabled"/>
-              </td>
-              </tr>
-            </xsl:if>
-            <tr>
-              <td class="level3">
-                 <input type="checkbox" value="u" id="u" name="howItem" onclick="toggleAllowDenyFlag(this, this.form)"/> delete (unbind)
-              </td>
-              <td>
-                <input type="radio" value="u" name="u" checked="checked" disabled="disabled"/>
-              </td>
-              <td>
-                <input type="radio" value="-u" name="u" disabled="disabled"/>
-              </td>
-            </tr>
-            <!--<tr>
-              <td class="level1">
-                <input type="checkbox" value="N" name="howItem" onclick="setupAccessForm(this, this.form)"/> None
-              </td>
-              <td>
-              </td>
-              <td>
-              </td>
-            </tr>-->
-          </table>
-          <!-- Simple Access Rights: -->
-          <!-- the "how" field is set by getting the selected basicHowItem -->
-          <ul id="howList">
-            <xsl:if test="/bedework/appvar[key='accessRightsToggle']/value='advanced'">
-              <xsl:attribute name="class">invisible</xsl:attribute>
-            </xsl:if>
-            <li>
-              <input type="radio" value="A" name="basicHowItem"/>All
-            </li>
-            <li>
-              <input type="radio" value="R" name="basicHowItem" checked="checked"/>Read only
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="acl" mode="currentAccess">
-    <h3>Current Access:</h3>