r4932 - trunk/lib/style/skins/first

[leinfelder at ecoinformatics.org]

Author: leinfelder
Date: 2009-04-22 09:05:08 -0700 (Wed, 22 Apr 2009)
New Revision: 4932

Modified:
   trunk/lib/style/skins/first/index.jsp
Log:
include the "mock up" search fields

Modified: trunk/lib/style/skins/first/index.jsp
===================================================================
--- trunk/lib/style/skins/first/index.jsp	2009-04-21 18:32:01 UTC (rev 4931)
+++ trunk/lib/style/skins/first/index.jsp	2009-04-22 16:05:08 UTC (rev 4932)
@@ -61,6 +61,11 @@
 			var year = document.getElementById("year").value;
 			var otherField = document.getElementById("otherField").value;
 			var otherValue = document.getElementById("otherValue").value;
+			//keywords
+			var keywordThesaurus1 = document.getElementById("keywordThesaurus1").value;
+			var keyword1 = document.getElementById("keyword1").value;
+
+			
 			var searchTerms = new Object();
 			searchTerms["anyValue"] = searchString;
 			searchTerms["institution/organizationName"] = institution;
@@ -68,6 +73,8 @@
 			searchTerms["course/lom/general/title/string"] = course;
 			searchTerms["course/year"] = year;
 			searchTerms[otherField] = otherValue;
+			//TODO: implement thesaurus matching (compound INTERSECTION)
+			searchTerms["keyword"] = keyword1;
 			
 			var operator = "UNION";
 			if (document.getElementById("all").checked) {
@@ -118,15 +125,18 @@
 
 				</tr>
 				<tr>
-					<td align="left" class="borderbottom">
+					<td valign="top" align="left" class="borderbottom">
 							
 						<input name="query" type="hidden"> 
 						<input name="qformat" value="first" type="hidden"> 
 						<input type="hidden" name="action" value="squery"> 								
 						
 						<table>
-							
 							<tr>
+								<td nowrap="nowrap">Question contains: </td>
+								<td><input disabled="disabled" readonly="readonly" name="question" id="question" type="text" size="14"/></td>
+							</tr>
+							<tr>
 								<td>Institution: </td>
 								<td><input name="institution" id="institution" type="text" size="14"/></td>
 							</tr>
@@ -142,21 +152,63 @@
 								<td>Year: </td>
 								<td><input name="year" id="year" type="text" size="4"/></td>
 							</tr>
+							
+						</table>
+					</td>
+					<td valign="top" class="borderbottom">
+						<table>
 							<tr>
 								<td>
 									<select id="otherField" name="otherValue">
 										<option value="assessment/title">Assessment Title</option>
 										<option value="assessment/type">Assessment Type</option>
 										<option value="assessment/duration">Assessment Duration</option>
+										<option value="assessment/grading/@group">Group Grading</option>
+										<option value="assessment/grading/@size">Group Size</option>
+										<option value="assessment/grading">Group Grading Approach</option>
+
+										<option value="course/lom/general/identifier/entry">Course Id</option>
+										<option value="course/lom/general/title/string">Course Title</option>
+										<option value="course/lom/general/description/string">Course Description</option>
 										<option value="course/term">Course Term</option>
+										<option value="course/year">Course Year</option>
+										<option value="course/coverage/rangeOfDates/beginDate/calendarDate">Course Start Date</option>
+										<option value="course/coverage/rangeOfDates/endDate/calendarDate">Course End Date</option>
+
+										<option value="institution/organizationName">Institution Name</option>
+										<option value="instructor/individualName/surName">Instructor Surname</option>
+										<option value="instructor/organizationName">Instructor Organization</option>
+
 									</select>
 								</td>
 								<td><input name="otherValue" id="otherValue" type="text" size="14"/></td>
 							</tr>
+							<tr>
+								<td colspan="2"><input type="button" value="+"/></td>
+							</tr>
+							<tr>
+								<td colspan="2">Keywords</td>
+							</tr>
+							<tr>
+								<td>
+									<select id="keywordThesaurus1" name="keywordThesaurus1">
+										<option value=""></option>
+										<option value="keywordThesaurus">NBII</option>
+										<option value="keywordThesaurus">Bloom</option>
+									</select>
+								</td>
+								<td><input name="keyword1" id="keyword1" type="text" size="14"/></td>
+							</tr>
+							<tr>
+								<td colspan="2"><input type="button" value="+"/></td>
+							</tr>
+							
 						</table>
 					</td>
-					<td valign="bottom" class="borderbottom">
-						<table>	
+				</tr>
+				<tr>
+					<td valign="top" class="borderbottom">
+						<table>
 							<tr>
 								<td nowrap="nowrap">
 									<input name="anyAll" id="any" value="UNION" type="radio" checked="checked"/>
@@ -169,6 +221,10 @@
 								</td>	
 								<td nowrap="nowrap">Match all</td>
 							</tr>
+						</table>
+					</td>
+					<td valign="bottom" class="borderbottom">
+						<table>
 							<tr>
 								<td colspan="2">
 									<input type="button" onclick="javascript:searchAssessments()" value="Search"/>
@@ -177,7 +233,6 @@
 						</table>
 					</td>
 				</tr>
-				
 			</table>
 			</form>