Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1090

Timestamp:

11/15/06 16:19:05

Author:

johnsa

Message:

updates to category support in admin client when creating and editing events.

search result updates in admin client.

Files:

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (5 diffs)
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/common.css (modified) (1 diff)
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (1 diff)

Legend:

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

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

r1089	r1090
448	448	<div id="searchFields">
449	449	Limit to:
450		<input type="radio" name="~~searchLimit" value="future"/>future~~
451		<input type="radio" name="~~searchLimit" value="future"/>past~~
452		<input type="radio" name="~~searchLimit" value="all~~" checked="checked"/>all dates
	450	<input type="radio" name="limits" value="fromToday"/>today forward
	451	<input type="radio" name="limits" value="beforeToday"/>past dates
	452	<input type="radio" name="limits" value="none" checked="checked"/>all dates
453	453	</div>
454	454	</form>
…	…
1010	1010	</td>
1011	1011	<td>
1012		<input type="radio" name="categoryCheckboxes" value="preferred" checked="checked" onclick="changeClass('preferredCategoryCheckboxes','shown');changeClass('allCategoryCheckboxes','invisible');"/>show preferred
1013		<input type="radio" name="categoryCheckboxes" value="all" onclick="changeClass('preferredCategoryCheckboxes','invisible');changeClass('allCategoryCheckboxes','shown')"/>show all<br/>
1014		<xsl:choose>
1015		<xsl:when test="/bedeworkadmin/formElements/form/categories/preferred/category">
1016		<table cellpadding="0" id="preferredCategoryCheckboxes">
1017		<tr>
1018		<xsl:variable name="catCount" select="count(/bedeworkadmin/formElements/form/categories/preferred/category)"/>
1019		<td>
1020		<xsl:for-each select="/bedeworkadmin/formElements/form/categories/preferred/category[position() <= ceiling($catCount div 2)]">
1021		<input type="checkbox" name="categoryKey">
1022		<xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
1023		<xsl:attribute name="id">pref-<xsl:value-of select="keyword"/></xsl:attribute>
1024		<xsl:attribute name="onchange">setCatChBx('pref-<xsl:value-of select="keyword"/>','all-<xsl:value-of select="keyword"/>')</xsl:attribute>
1025		<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
1026		<xsl:value-of select="keyword"/>
1027		</input><br/>
1028		</xsl:for-each>
1029		</td>
1030		<td>
1031		<xsl:for-each select="/bedeworkadmin/formElements/form/categories/preferred/category[position() > ceiling($catCount div 2)]">
1032		<input type="checkbox" name="categoryKey">
1033		<xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
1034		<xsl:attribute name="id">pref-<xsl:value-of select="keyword"/></xsl:attribute>
1035		<xsl:attribute name="onchange">setCatChBx('pref-<xsl:value-of select="keyword"/>','all-<xsl:value-of select="keyword"/>')</xsl:attribute>
1036		<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
1037		<xsl:value-of select="keyword"/>
1038		</input><br/>
1039		</xsl:for-each>
1040		</td>
1041		</tr>
1042		</table>
1043		</xsl:when>
1044		<xsl:otherwise>
1045		<table cellpadding="0" id="preferredCategoryCheckboxes">
1046		<tr>
1047		<td>
1048		No preferred categories (yet).
1049		</td>
1050		</tr>
1051		</table>
1052		</xsl:otherwise>
1053		</xsl:choose>
1054		<table cellpadding="0" id="allCategoryCheckboxes" class="invisible">
	1012	<xsl:if test="/bedeworkadmin/formElements/form/categories/preferred/category and /bedeworkadmin/creating='true'">
	1013	<input type="radio" name="categoryCheckboxes" value="preferred" checked="checked" onclick="changeClass('preferredCategoryCheckboxes','shown');changeClass('allCategoryCheckboxes','invisible');"/>show preferred
	1014	<input type="radio" name="categoryCheckboxes" value="all" onclick="changeClass('preferredCategoryCheckboxes','invisible');changeClass('allCategoryCheckboxes','shown')"/>show all<br/>
	1015	<table cellpadding="0" id="preferredCategoryCheckboxes">
	1016	<tr>
	1017	<xsl:variable name="catCount" select="count(/bedeworkadmin/formElements/form/categories/preferred/category)"/>
	1018	<td>
	1019	<xsl:for-each select="/bedeworkadmin/formElements/form/categories/preferred/category[position() <= ceiling($catCount div 2)]">
	1020	<input type="checkbox" name="categoryKey">
	1021	<xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
	1022	<xsl:attribute name="id">pref-<xsl:value-of select="keyword"/></xsl:attribute>
	1023	<xsl:attribute name="onchange">setCatChBx('pref-<xsl:value-of select="keyword"/>','all-<xsl:value-of select="keyword"/>')</xsl:attribute>
	1024	<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
	1025	<xsl:value-of select="keyword"/>
	1026	</input><br/>
	1027	</xsl:for-each>
	1028	</td>
	1029	<td>
	1030	<xsl:for-each select="/bedeworkadmin/formElements/form/categories/preferred/category[position() > ceiling($catCount div 2)]">
	1031	<input type="checkbox" name="categoryKey">
	1032	<xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
	1033	<xsl:attribute name="id">pref-<xsl:value-of select="keyword"/></xsl:attribute>
	1034	<xsl:attribute name="onchange">setCatChBx('pref-<xsl:value-of select="keyword"/>','all-<xsl:value-of select="keyword"/>')</xsl:attribute>
	1035	<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
	1036	<xsl:value-of select="keyword"/>
	1037	</input><br/>
	1038	</xsl:for-each>
	1039	</td>
	1040	</tr>
	1041	</table>
	1042	</xsl:if>
	1043	<table cellpadding="0" id="allCategoryCheckboxes">
	1044	<xsl:if test="/bedeworkadmin/creating='true'">
	1045	<xsl:attribute name="class">invisible</xsl:attribute>
	1046	</xsl:if>
1055	1047	<tr>
1056	1048	<xsl:variable name="catCount" select="count(/bedeworkadmin/formElements/form/categories/all/category)"/>
…	…
1059	1051	<input type="checkbox" name="categoryKey">
1060	1052	<xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
1061		<xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute>
1062		<xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute>
1063		<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
	1053	<xsl:if test="/bedeworkadmin/creating='true'">
	1054	<xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute>
	1055	<xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute>
	1056	</xsl:if>
	1057	<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword">
	1058	<xsl:attribute name="checked">checked</xsl:attribute>
	1059	</xsl:if>
1064	1060	<xsl:value-of select="keyword"/>
1065	1061	</input><br/>
…	…
1070	1066	<input type="checkbox" name="categoryKey">
1071	1067	<xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
1072		<xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute>
1073		<xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute>
1074		<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
	1068	<xsl:if test="/bedeworkadmin/creating='true'">
	1069	<xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute>
	1070	<xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute>
	1071	</xsl:if>
	1072	<xsl:if test="keyword = /bedeworkadmin/formElements/form/categories/current//category/keyword">
	1073	<xsl:attribute name="checked">checked</xsl:attribute>
	1074	</xsl:if>
1075	1075	<xsl:value-of select="keyword"/>
1076	1076	</input><br/>
…	…
3875	3875	<h2 class="bwStatusConfirmed">
3876	3876	<div id="searchFilter">
3877		Limit search to:
3878		<input type="radio" name="searchLimit" value="future"/>today forward
3879		<input type="radio" name="searchLimit" value="future"/>past dates
3880		<input type="radio" name="searchLimit" value="all" checked="checked"/>all dates
	3877	<form name="searchForm" method="post" action="{$search}">
	3878	<input type="text" name="query" size="15">
	3879	<xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/searchResults/query"/></xsl:attribute>
	3880	</input>
	3881	<input type="submit" name="submit" value="go"/>
	3882	Limit to:
	3883	<input type="radio" name="limits" value="fromToday"/>today forward
	3884	<input type="radio" name="limits" value="beforeToday"/>past dates
	3885	<input type="radio" name="limits" value="none"/>all dates
	3886	</form>
	3887	<!--Limit search to:
	3888	<xsl:variable name="query" select="/bedework/searchResults/query"/>
	3889	<input type="radio" name="searchLimit" value="future" onchange="window.location.replace('{$search}&query={$query}&limits=fromToday')"/>today forward
	3890	<input type="radio" name="searchLimit" value="past" onchange="window.location.replace('{$search}&query={$query}&limits=beforeToday')"/>past dates
	3891	<input type="radio" name="searchLimit" value="all" onchange="window.location.replace('{$search}&query={$query}&limits=none')"/>all dates-->
3881	3892	</div>
3882	3893	Search Result

trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/common.css

r1065 r1090

69 69 margin-top: 5px;
70 70 }
71 #searchFilter form {
72 display: inline;
73 }
71 74 #stats {
72 75 font-size: 0.9em;

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

r1088	r1090
2862	2862
2863	2863	<form action="{$category-delete}" method="post">
2864		<input type="submit" name="~~upda~~teCategory" value="Yes: Delete Category"/>
	2864	<input type="submit" name="deleteCategory" value="Yes: Delete Category"/>
2865	2865	<input type="submit" name="cancelled" value="No: Cancel"/>
2866	2866	</form>

r1065	r1090
69	69	margin-top: 5px;
70	70	}
	71	#searchFilter form {
	72	display: inline;
	73	}
71	74	#stats {
72	75	font-size: 0.9em;

Changeset Navigation

Changeset 1090

Legend:

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

trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/common.css

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

Download in other formats: