Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1177

Timestamp:

12/21/06 00:25:51

Author:

johnsa

Message:

personal and admin clients:

- update access control forms
- note: resetting scheduling access in personal

client is not yet available

Files:

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (4 diffs)
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (1 diff)
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (4 diffs)
trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

r1175	r1177
2572	2572	<xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)">user</xsl:when>
2573	2573	<xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)">group</xsl:when>
	2574	<xsl:when test="$who='authenticated'">auth</xsl:when>
	2575	<xsl:when test="invert/principal/property/owner">other</xsl:when>
	2576	<xsl:when test="principal/property"><xsl:value-of select="name(principal/property/*)"/></xsl:when>
	2577	<xsl:when test="invert/principal/property"><xsl:value-of select="name(invert/principal/property/*)"/></xsl:when>
2574	2578	<xsl:otherwise></xsl:otherwise>
2575	2579	</xsl:choose>
…	…
2579	2583	<xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when>
2580	2584	<xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when>
2581		<xsl:otherwise><~~xsl:value-of select="$who"/></xsl:otherwise~~>
	2585	<xsl:otherwise></xsl:otherwise> <!-- if not user or group, send no who -->
2582	2586	</xsl:choose>
2583	2587	</xsl:variable>
…	…
3941	3945	<xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)">user</xsl:when>
3942	3946	<xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)">group</xsl:when>
	3947	<xsl:when test="$who='authenticated'">auth</xsl:when>
	3948	<xsl:when test="invert/principal/property/owner">other</xsl:when>
	3949	<xsl:when test="principal/property"><xsl:value-of select="name(principal/property/*)"/></xsl:when>
	3950	<xsl:when test="invert/principal/property"><xsl:value-of select="name(invert/principal/property/*)"/></xsl:when>
3943	3951	<xsl:otherwise></xsl:otherwise>
3944	3952	</xsl:choose>
…	…
3948	3956	<xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when>
3949	3957	<xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when>
3950		<xsl:otherwise><~~xsl:value-of select="$who"/></xsl:otherwise~~>
	3958	<xsl:otherwise></xsl:otherwise> <!-- if not user or group, send no who -->
3951	3959	</xsl:choose>
3952	3960	</xsl:variable>

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

r1163	r1177
1495	1495	padding-top: 1em;
1496	1496	}
	1497	.nowrap {
	1498	white-space: nowrap;
	1499	}
1497	1500	#featureHighlight {
1498	1501	color: #dd0;

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

r1176	r1177
5889	5889	<p>
5890	5890	<input type="text" name="who" width="40"/>
5891		<~~input type="radio" name="whoType" value="user" checked="checked"/>user~~
5892		<~~input type="radio" name="whoType" value="group"/>group~~
	5891	<span class="nowrap"><input type="radio" name="whoType" value="user" checked="checked"/>user</span>
	5892	<span class="nowrap"><input type="radio" name="whoType" value="group"/>group</span>
5893	5893	</p>
5894	5894	<p>
5895	5895	<strong>or</strong>
5896		<~~input type="radio" name="whoType" value="owner"/>owner~~
5897		<~~input type="radio" name="whoType" value="auth"/>authenticated users~~
5898		<~~input type="radio" name="whoType" value="other"/>anyone~~
	5896	<span class="nowrap"><input type="radio" name="whoType" value="owner"/>owner</span>
	5897	<span class="nowrap"><input type="radio" name="whoType" value="auth"/>authenticated users</span>
	5898	<span class="nowrap"><input type="radio" name="whoType" value="other"/>anyone</span>
5899	5899	</p>
5900	5900
…	…
5918	5918	</form>
5919	5919	<h3>Current Access:</h3>
5920		<xsl:for-each select="inbox/acl/ace[principal/href]">
5921		<xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/>
5922		</xsl:for-each>
	5920	<table class="common">
	5921	<tr>
	5922	<th>Entry</th>
	5923	<th>Access</th>
	5924	<td></td>
	5925	</tr>
	5926	<xsl:for-each select="inbox/acl/ace">
	5927	<tr>
	5928	<td>
	5929	<xsl:choose>
	5930	<xsl:when test="principal/href">
	5931	<xsl:value-of select="principal/href"/>
	5932	</xsl:when>
	5933	<xsl:when test="principal/property">
	5934	<xsl:value-of select="name(principal/property/*)"/>
	5935	</xsl:when>
	5936	<xsl:when test="invert/principal/property/owner">
	5937	anyone (other)
	5938	</xsl:when>
	5939	<xsl:otherwise>
	5940	<xsl:value-of select="name(principal/*)"/>
	5941	</xsl:otherwise>
	5942	</xsl:choose>
	5943	</td>
	5944	<td>
	5945	<xsl:value-of select="name(grant/*)"/>
	5946	</td>
	5947	<td>
	5948	<xsl:variable name="who">
	5949	<xsl:choose>
	5950	<xsl:when test="invert">
	5951	<xsl:choose>
	5952	<xsl:when test="invert/principal/href"><xsl:value-of select="normalize-space(invert/principal/href)"/></xsl:when>
	5953	<xsl:when test="invert/principal/property"><xsl:value-of select="name(invert/principal/property/*)"/></xsl:when>
	5954	<xsl:otherwise><xsl:value-of select="name(invert/principal/*)"/></xsl:otherwise>
	5955	</xsl:choose>
	5956	</xsl:when>
	5957	<xsl:otherwise>
	5958	<xsl:choose>
	5959	<xsl:when test="principal/href"><xsl:value-of select="normalize-space(principal/href)"/></xsl:when>
	5960	<xsl:when test="principal/property"><xsl:value-of select="name(principal/property/*)"/></xsl:when>
	5961	<xsl:otherwise><xsl:value-of select="name(principal/*)"/></xsl:otherwise>
	5962	</xsl:choose>
	5963	</xsl:otherwise>
	5964	</xsl:choose>
	5965	</xsl:variable>
	5966	<xsl:variable name="whoType">
	5967	<xsl:choose>
	5968	<xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)">user</xsl:when>
	5969	<xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)">group</xsl:when>
	5970	<xsl:when test="$who='authenticated'">auth</xsl:when>
	5971	<xsl:when test="invert/principal/property/owner">other</xsl:when>
	5972	<xsl:when test="principal/property"><xsl:value-of select="name(principal/property/*)"/></xsl:when>
	5973	<xsl:when test="invert/principal/property"><xsl:value-of select="name(invert/principal/property/*)"/></xsl:when>
	5974	<xsl:otherwise></xsl:otherwise>
	5975	</xsl:choose>
	5976	</xsl:variable>
	5977	<xsl:variable name="shortWho">
	5978	<xsl:choose>
	5979	<xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when>
	5980	<xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when>
	5981	<xsl:otherwise></xsl:otherwise> <!-- if not user or group, send no who -->
	5982	</xsl:choose>
	5983	</xsl:variable>
	5984	<xsl:choose>
	5985	<xsl:when test="invert">
	5986	<a href="{$prefs-setAccess}&how=default&who={$shortWho}&whoType={$whoType}&notWho=yes" title="reset to default">
	5987
	5988	<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="reset to default"/>
	5989	</a>
	5990	</xsl:when>
	5991	<xsl:otherwise>
	5992	<a href="{$prefs-setAccess}&how=default&who={$shortWho}&whoType={$whoType}" title="reset to default">
	5993
	5994	<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="reset to default"/>
	5995	</a>
	5996	</xsl:otherwise>
	5997	</xsl:choose>
	5998	</td>
	5999	</tr>
	6000	</xsl:for-each>
	6001	</table>
5923	6002	</td>
5924	6003	<td class="leftBorder padMe">
…	…
5927	6006	<p>
5928	6007	<input type="text" name="who" width="40"/>
5929		<~~input type="radio" name="whoType" value="user" checked="checked"/>user~~
5930		<~~input type="radio" name="whoType" value="group"/>group~~
	6008	<span class="nowrap"><input type="radio" name="whoType" value="user" checked="checked"/>user</span>
	6009	<span class="nowrap"><input type="radio" name="whoType" value="group"/>group</span>
5931	6010	</p>
5932	6011	<p>
5933	6012	<strong>or</strong>
5934		<~~input type="radio" name="whoType" value="owner"/>owner~~
5935		<~~input type="radio" name="whoType" value="auth"/>authenticated users~~
5936		<~~input type="radio" name="whoType" value="other"/>anyone~~
	6013	<span class="nowrap"><input type="radio" name="whoType" value="owner"/>owner</span>
	6014	<span class="nowrap"><input type="radio" name="whoType" value="auth"/>authenticated users</span>
	6015	<span class="nowrap"><input type="radio" name="whoType" value="other"/>anyone</span>
5937	6016	</p>
5938	6017
…	…
5956	6035	</form>
5957	6036	<h3>Current Access:</h3>
5958		<xsl:for-each select="outbox/acl/ace[principal/href]">
5959		<xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/>
5960		</xsl:for-each>
	6037	<table class="common">
	6038	<tr>
	6039	<th>Entry</th>
	6040	<th>Access</th>
	6041	<td></td>
	6042	</tr>
	6043	<xsl:for-each select="outbox/acl/ace">
	6044	<tr>
	6045	<td>
	6046	<xsl:choose>
	6047	<xsl:when test="principal/href">
	6048	<xsl:value-of select="principal/href"/>
	6049	</xsl:when>
	6050	<xsl:when test="principal/property">
	6051	<xsl:value-of select="name(principal/property/*)"/>
	6052	</xsl:when>
	6053	<xsl:when test="invert/principal/property/owner">
	6054	anyone (other)
	6055	</xsl:when>
	6056	<xsl:otherwise>
	6057	<xsl:value-of select="name(principal/*)"/>
	6058	</xsl:otherwise>
	6059	</xsl:choose>
	6060	</td>
	6061	<td>
	6062	<xsl:value-of select="name(grant/*)"/>
	6063	</td>
	6064	<td>
	6065	<xsl:variable name="who">
	6066	<xsl:choose>
	6067	<xsl:when test="invert">
	6068	<xsl:choose>
	6069	<xsl:when test="invert/principal/href"><xsl:value-of select="normalize-space(invert/principal/href)"/></xsl:when>
	6070	<xsl:when test="invert/principal/property"><xsl:value-of select="name(invert/principal/property/*)"/></xsl:when>
	6071	<xsl:otherwise><xsl:value-of select="name(invert/principal/*)"/></xsl:otherwise>
	6072	</xsl:choose>
	6073	</xsl:when>
	6074	<xsl:otherwise>
	6075	<xsl:choose>
	6076	<xsl:when test="principal/href"><xsl:value-of select="normalize-space(principal/href)"/></xsl:when>
	6077	<xsl:when test="principal/property"><xsl:value-of select="name(principal/property/*)"/></xsl:when>
	6078	<xsl:otherwise><xsl:value-of select="name(principal/*)"/></xsl:otherwise>
	6079	</xsl:choose>
	6080	</xsl:otherwise>
	6081	</xsl:choose>
	6082	</xsl:variable>
	6083	<xsl:variable name="whoType">
	6084	<xsl:choose>
	6085	<xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)">user</xsl:when>
	6086	<xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)">group</xsl:when>
	6087	<xsl:when test="$who='authenticated'">auth</xsl:when>
	6088	<xsl:when test="invert/principal/property/owner">other</xsl:when>
	6089	<xsl:when test="principal/property"><xsl:value-of select="name(principal/property/*)"/></xsl:when>
	6090	<xsl:when test="invert/principal/property"><xsl:value-of select="name(invert/principal/property/*)"/></xsl:when>
	6091	<xsl:otherwise></xsl:otherwise>
	6092	</xsl:choose>
	6093	</xsl:variable>
	6094	<xsl:variable name="shortWho">
	6095	<xsl:choose>
	6096	<xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when>
	6097	<xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when>
	6098	<xsl:otherwise></xsl:otherwise> <!-- if not user or group, send no who -->
	6099	</xsl:choose>
	6100	</xsl:variable>
	6101	<xsl:choose>
	6102	<xsl:when test="invert">
	6103	<a href="{$prefs-setAccess}&how=default&who={$shortWho}&whoType={$whoType}&notWho=yes" title="reset to default">
	6104	<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="reset to default"/>
	6105	</a>
	6106	</xsl:when>
	6107	<xsl:otherwise>
	6108	<a href="{$prefs-setAccess}&how=default&who={$shortWho}&whoType={$whoType}" title="reset to default">
	6109	<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="reset to default"/>
	6110	</a>
	6111	</xsl:otherwise>
	6112	</xsl:choose>
	6113	</td>
	6114	</tr>
	6115	</xsl:for-each>
	6116	</table>
5961	6117	</td>
5962	6118	</tr>

trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js

r1176	r1177
407	407
408	408	function setScheduleHow(formObj) {
409		var access = new Array();
410		// gather up the access characters
411		access = collectRecurChkBoxVals(access, formObj.howSetter);
412		formObj.how.value = access.join('');
	409	if (formObj.howSetter[0].checked == true) {
	410	formObj.how.value = formObj.howSetter[0].value;
	411	} else {
	412	var access = new Array();
	413	// gather up the access characters - begin on the second element
	414	for (i = 1; i < formObj.howSetter.length; i++) {
	415	if (formObj.howSetter[i].checked == true) {
	416	access.push(formObj.howSetter[i].value);
	417	}
	418	}
	419	formObj.how.value = access.join('');
	420	}
	421
413	422	if (debug) {
414	423	alert(formObj.how.value);

Changeset Navigation

Changeset 1177

Legend:

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

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

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

trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js

Download in other formats: