Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 998

Timestamp:

09/12/06 15:48:05

Author:

johnsa

Message:

beginnings of scheduling preferences in personal client UI; corrected subscription color classes to allow for full range of subscription colors; minor updates to the deployment manual.

Files:

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/default/default/subColors.css (modified) (3 diffs)
trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml (modified) (1 diff)
trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js (modified) (1 diff)
trunk/docs/BedeworkDeploymentManual.odt (modified) (previous)

Legend:

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

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

r952	r998
44	44	font-size: 1em;
45	45	}
	46	td {
	47	vertical-align: top;
	48	}
46	49	.center {
47	50	text-align: center;
…	…
392	395	background: #FF8B86 url(../../resources/glassFill-error.gif) repeat-x bottom;
393	396	}*/
	397	ul.submenu {
	398	margin: 0 0 1em 0;
	399	padding: 0;
	400	font-size: 0.9em;
	401	color: black;
	402	background: #eee;
	403	border-bottom: 1px solid #666;
	404	border-top: 1px solid #666;
	405	}
	406	ul.submenu li {
	407	display: inline;
	408	margin: 0;
	409	padding: 0 0.5em;
	410	border-right: 1px solid #999;
	411	}
	412	ul.submenu li.selected {
	413	color: black;
	414	background: white;
	415	font-weight: bold;
	416	border-bottom: 1px solid white;
	417	}
	418	ul.submenu li a:link,
	419	ul.submenu li a:active,
	420	ul.submenu li a:visited {
	421	}
	422	table#prefSchedulingForm {
	423	margin: 0 1em 1em 1em;
	424	padding: 0;
	425	border: 1px solid #999;
	426	}
	427	table#prefSchedulingForm td {
	428	padding: 1em;
	429	}
394	430	#standardForm {
395	431	margin: 0;

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

r952	r998
112	112	<xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/>
113	113	<xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/>
	114	<xsl:variable name="prefs-fetchSchedulingForUpdate" select="/bedework/urlPrefixes/prefs/fetchSchedulingForUpdate/a/@href"/>
	115	<xsl:variable name="prefs-setAccess" select="/bedework/urlPrefixes/prefs/setAccess/a/@href"/>
114	116
115	117	<!-- URL of the web application - includes web context
…	…
210	212	<xsl:when test="/bedework/page='modPrefs'">
211	213	<xsl:apply-templates select="/bedework/prefs"/>
	214	</xsl:when>
	215	<xsl:when test="/bedework/page='modSchedulingPrefs'">
	216	<xsl:apply-templates select="/bedework/schPrefs"/>
212	217	</xsl:when>
213	218	<xsl:when test="/bedework/page='other'">
…	…
3649	3654	<xsl:template match="prefs">
3650	3655	<h2>Manage Preferences</h2>
	3656	<ul class="submenu">
	3657	<li class="selected">General</li>
	3658	<li><a href="{$prefs-fetchSchedulingForUpdate}">Scheduling/Meetings</a></li>
	3659	</ul>
3651	3660	<!-- The name "eventForm" is referenced by several javascript functions. Do not
3652	3661	change it without modifying includes.js -->
…	…
3892	3901	</select>
3893	3902	</td>
3894		</tr>
3895		<!-- as you add skins, update this list and set the selected flag
	3903	</tr><!-- as you add skins, update this list and set the selected flag
3896	3904	as required; hide if not in use -->
3897	3905	<!--<tr>
…	…
3961	3969	<input type="reset" value="Reset"/>
3962	3970	<input type="submit" name="cancelled" value="Cancel"/>
	3971	</form>
	3972	</xsl:template>
	3973
	3974	<xsl:template match="schPrefs">
	3975	<h2>Manage Preferences</h2>
	3976	<ul class="submenu">
	3977	<li><a href="{$prefs-fetchForUpdate}">General</a></li>
	3978	<li class="selected"><a href="">Scheduling/Meetings</a></li>
	3979	</ul>
	3980	<form name="eventForm" method="post" action="{$prefs-setAccess}">
	3981	<table id="prefSchedulingForm">
	3982	<tr>
	3983	<td>
	3984	<input type="text" width="40"/>
	3985	<input type="radio" name="whoType" value="user" checked="checked"/>user
	3986	<input type="radio" name="whoType" value="group"/>group
	3987	<input type="radio" name="whoType" value="owner"/>owner<br/>
	3988	<input type="radio" name="how" value="inbox" checked="checked"/>can send me meeting requests<br/>
	3989	<input type="radio" name="how" value="outbox"/>can send meeting requests on my behalf<br/><br/>
	3990	<input type="submit" name="modPrefs" value="Update"/>
	3991	<input type="reset" value="Reset"/>
	3992	<input type="submit" name="cancelled" value="Cancel"/>
	3993	</td>
	3994	<td>
	3995	<input type="hidden" name="how" value="S"/>
	3996	Access control settings:<br/>
	3997	<dl>
	3998	<dt>
	3999	<input type="checkbox" name="howSetter" value="S" checked="checked" onchange="setScheduleHow(this)"/>schedule
	4000	</dt>
	4001	<dd>
	4002	<input type="checkbox" name="howSetter" value="t" checked="checked" disabled="disabled"/>schedule-request<br/>
	4003	<input type="checkbox" name="howSetter" value="y" checked="checked" disabled="disabled"/>schedule-reply<br/>
	4004	<input type="checkbox" name="howSetter" value="s" checked="checked" disabled="disabled"/>schedule-free-busy
	4005	</dd>
	4006	</dl>
	4007	</td>
	4008	</tr>
	4009	</table>
	4010
	4011	<table class="common">
	4012	<tr>
	4013	<th>Can send me meeting requests:</th>
	4014	<th>Can schedule meetings on my behalf:</th>
	4015	</tr>
	4016	<tr>
	4017	<td>
	4018	<em>list not implemented</em>
	4019	</td>
	4020	<td>
	4021	<em>list not implemented</em>
	4022	</td>
	4023	</tr>
	4024	</table>
3963	4025	</form>
3964	4026	</xsl:template>

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

r952	r998
3	3	to create the web forms. Background-color must be
4	4	"important" to override more specific selectors in
5		the default.css stylesheet. */
	5	the default.css stylesheet. Note - class names must not
	6	begin with a number, so all color classes are prepended with "c" */
6	7
7		.FFFFFF {
	8	.cFFFFFF {
8	9	background-color: #FFFFFF !important;
9	10	color: black;
10	11	}
11		.FDDEEE {
	12	.cFDDEEE {
12	13	background-color: #FDDEEE !important;
13	14	color: black;
14	15	}
15		.DDD4E8 {
	16	.cDDD4E8 {
16	17	background-color: #DDD4E8 !important;
17	18	color: black;
18	19	}
19		.BFD5E8 {
	20	.cBFD5E8 {
20	21	background-color: #BFD5E8 !important;
21	22	color: black;
22	23	}
23		.CCECEF {
	24	.cCCECEF {
24	25	background-color: #CCECEF !important;
25	26	color: black;
26	27	}
27		.B3E2DD {
	28	.cB3E2DD {
28	29	background-color: #B3E2DD !important;
29	30	color: black;
30	31	}
31		.CFECCF {
	32	.cCFECCF {
32	33	background-color: #CFECCF !important;
33	34	color: black;
34	35	}
35		.E0F3B0 {
	36	.cE0F3B0 {
36	37	background-color: #E0F3B0 !important;
37	38	color: black;
38	39	}
39		.FFFFB0 {
	40	.cFFFFB0 {
40	41	background-color: #FFFFB0 !important;
41	42	color: black;
42	43	}
43		.FEEBC9 {
	44	.cFEEBC9 {
44	45	background-color: #FEEBC9 !important;
45	46	color: black;
46	47	}
47	48	/* medium pastels */
48		.EEEEEE {
	49	.cEEEEEE {
49	50	background-color: #EEEEEE !important;
50	51	color: black;
51	52	}
52		.FBB6D1 {
	53	.cFBB6D1 {
53	54	background-color: #FBB6D1 !important;
54	55	color: black;
55	56	}
56		.C1B3D7 {
	57	.cC1B3D7 {
57	58	background-color: #C1B3D7 !important;
58	59	color: black;
…	…
61	62	border-bottom: 1px solid #999 !important;
62	63	}
63		.94A8D0 {
	64	.c94A8D0 {
64	65	background-color: #94A8D0 !important;
65	66	color: black;
66	67	}
67		.9ACEDF {
	68	.c9ACEDF {
68	69	background-color: #9ACEDF !important;
69	70	color: black;
70	71	}
71		.86CFBE {
	72	.c86CFBE {
72	73	background-color: #86CFBE !important;
73	74	color: black;
74	75	}
75		.B5E1AE {
	76	.cB5E1AE {
76	77	background-color: #B5E1AE !important;
77	78	color: black;
78	79	}
79		.BFE476 {
	80	.cBFE476 {
80	81	background-color: #BFE476 !important;
81	82	color: black;
…	…
84	85	border-bottom: 1px solid #999 !important;
85	86	}
86		.FFFA81 {
	87	.cFFFA81 {
87	88	background-color: #FFFA81 !important;
88	89	color: black;
89	90	}
90		.FDCAA2 {
	91	.cFDCAA2 {
91	92	background-color: #FDCAA2 !important;
92	93	color: black;
93	94	}
94	95	/* dark pastels */
95		.DDDDDD {
	96	.cDDDDDD {
96	97	background-color: #DDDDDD !important;
97	98	color: black;
98	99	}
99		.F98CB6 {
	100	.cF98CB6 {
100	101	background-color: #F98CB6 !important;
101	102	color: black;
102	103	}
103		.A589C1 {
	104	.cA589C1 {
104	105	background-color: #A589C1 !important;
105	106	color: black;
106	107	}
107		.7589BF {
	108	.c7589BF {
108	109	background-color: #7589BF !important;
109	110	color: black;
110	111	}
111		.6FB7D6 {
	112	.c6FB7D6 {
112	113	background-color: #6FB7D6 !important;
113	114	color: black;
114	115	}
115		.48B5A3 {
	116	.c48B5A3 {
116	117	background-color: #48B5A3 !important;
117	118	color: black;
118	119	}
119		.91D290 {
	120	.c91D290 {
120	121	background-color: #91D290 !important;
121	122	color: black;
122	123	}
123		.85CA5D {
	124	.c85CA5D {
124	125	background-color: #85CA5D !important;
125	126	color: black;
126	127	}
127		.FFED62 {
	128	.cFFED62 {
128	129	background-color: #FFED62 !important;
129	130	color: black;
130	131	}
131		.FCA985 {
	132	.cFCA985 {
132	133	background-color: #FCA985 !important;
133	134	color: black;

trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml

r952	r998
3	3	<subscriptionColors>
4	4	<!-- light pastels -->
5		<color name="white">FFFFFF</color>
6		<color name="lt pink">FDDEEE</color>
7		<color name="lt purple">DDD4E8</color>
8		<color name="lt steelblue">BFD5E8</color>
9		<color name="lt blue">CCECEF</color>
10		<color name="lt aquamarine">B3E2DD</color>
11		<color name="lt seagreen">CFECCF</color>
12		<color name="lt green">E0F3B0</color>
13		<color name="lt yellow">FFFFB0</color>
14		<color name="lt salmon">FEEBC9</color>
	5	<color name="white">cFFFFFF</color>
	6	<color name="lt pink">cFDDEEE</color>
	7	<color name="lt purple">cDDD4E8</color>
	8	<color name="lt steelblue">cBFD5E8</color>
	9	<color name="lt blue">cCCECEF</color>
	10	<color name="lt aquamarine">cB3E2DD</color>
	11	<color name="lt seagreen">cCFECCF</color>
	12	<color name="lt green">cE0F3B0</color>
	13	<color name="lt yellow">cFFFFB0</color>
	14	<color name="lt salmon">cFEEBC9</color>
15	15
16	16	<!-- medium pastels -->
17		<color name="gray">EEEEEE</color>
18		<color name="pink">FBB6D1</color>
19		<color name="purple">C1B3D7</color>
20		<!-- these colors are broken for some reason
21		<color name="steelblue">94A8D0</color>
22		<color name="blue">9ACEDF</color>
23		<color name="aquamarine">86CFBE</color>-->
24		<color name="seagreen">B5E1AE</color>
25		<color name="green">BFE476</color>
	17	<color name="gray">cEEEEEE</color>
	18	<color name="pink">cFBB6D1</color>
	19	<color name="purple">cC1B3D7</color>
	20	<color name="steelblue">c94A8D0</color>
	21	<color name="blue">c9ACEDF</color>
	22	<color name="aquamarine">c86CFBE</color>
	23	<color name="seagreen">cB5E1AE</color>
	24	<color name="green">cBFE476</color>
26	25	<!-- don't allow bright yellow - reserve for a hover color
27		<color name="yellow">FFFA81</color> -->
28		<color name="salmon">FDCAA2</color>
	26	<color name="yellow">cFFFA81</color> -->
	27	<color name="salmon">cFDCAA2</color>
29	28
30	29	<!-- dark pastels -->
31		<color name="md gray">DDDDDD</color>
32		<color name="md pink">F98CB6</color>
33		<color name="md purple">A589C1</color>
34		<!-- these colors are broken for some reason
35		<color name="md steelblue">7589BF</color>
36		<color name="md blue">6FB7D6</color>
37		<color name="md aquamarine">48B5A3</color>
38		<color name="md seagreen">91D290</color>
39		<color name="md green">85CA5D</color> -->
	30	<color name="md gray">cDDDDDD</color>
	31	<color name="md pink">cF98CB6</color>
	32	<color name="md purple">cA589C1</color>
	33	<color name="md steelblue">c7589BF</color>
	34	<color name="md blue">c6FB7D6</color>
	35	<color name="md aquamarine">c48B5A3</color>
	36	<color name="md seagreen">c91D290</color>
	37	<color name="md green">c85CA5D</color>
40	38	<!-- don't allow bright yellow - reserve for a hover color
41		<color name="md yellow">FFED62</color> -->
42		<color name="md salmon">FCA985</color>
	39	<color name="md yellow">cFFED62</color> -->
	40	<color name="md salmon">cFCA985</color>
43	41	</subscriptionColors>

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

r952	r998
136	136	}
137	137	}
	138
	139	function setScheduleHow(multibox) {
	140	var accessString = "";
	141	for (i=0; i<multibox.length; i++) {
	142	alert(mulitbox[i].value);
	143	}
	144	}