You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(16) |
Oct
(61) |
Nov
(74) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(13) |
Feb
(9) |
Mar
(82) |
Apr
(37) |
May
(27) |
Jun
(5) |
Jul
(58) |
Aug
(12) |
Sep
(33) |
Oct
(52) |
Nov
(24) |
Dec
(5) |
| 2009 |
Jan
(22) |
Feb
(28) |
Mar
(84) |
Apr
(22) |
May
(35) |
Jun
(6) |
Jul
(46) |
Aug
(58) |
Sep
(27) |
Oct
(23) |
Nov
(8) |
Dec
(18) |
| 2010 |
Jan
(16) |
Feb
(48) |
Mar
(38) |
Apr
(54) |
May
(17) |
Jun
(24) |
Jul
(16) |
Aug
(21) |
Sep
(3) |
Oct
(5) |
Nov
(31) |
Dec
(10) |
| 2011 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jonathan O. <os...@us...> - 2011-01-22 00:15:36
|
Update of /cvsroot/dlsciences/dcs-project/web/lib In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25364 Modified Files: autoform-styles.css metadata-editor-support.js Added Files: vocab-type-ahead.js Log Message: support for type-ahead vocab fields --- NEW FILE: vocab-type-ahead.js --- // ---------- TYPE AHEAD SUPPORT ---------- var VocabTypeAhead = Class.create ({ initialize: function () { this.busy = false; this.nextUrl = null; this.valueContainer = $('type-ahead-value-container'); if (!this.valueContainer) { this.valueContainer = new Element ('div', {'id':'type-ahead-value-container'}).setStyle({display:'none'}); $(document.body).insert(this.valueContainer); } this.initializeVocabTypeAheadFields(); this.spinner = this._init_simple_spinner(); }, _init_simple_spinner: function () { var img = $(new Image()); img.src = "../images/fedora-spinner.gif"; img.setStyle ({height:"25px",width:"25px"}); return img; }, showSpinner: function () { this.valueContainer.update (this.spinner); this.valueContainer.show(); }, initializeVocabTypeAheadFields: function () { log ("initializeVocabTypeAheadFields"); $$('.vocab-type-ahead').each ( function (el) { log (el.identify()); var name = el.readAttribute ("name"); var match = name.match(/valueOf\((.*?)\)/); var path = match[1] var initialValue = el.value; log (" path: " + path + ", initialValue: " + initialValue); el.observe ("keyup", function (event) { var fragment = event.element().value; if (!(fragment && fragment.trim().length > 1)) { this.emptyAndHide(); return; } var id = event.element().identify() log ("keyup: " + event.keyCode); if (event.keyCode == '13' || event.keyCode == '9' || event.keyCode == '27') { this.emptyAndHide(); return; } // log (" name: " + name + ", value: " + value); var params = $H(document.forms[0].serialize(true)); params.update({value:fragment, path:path, command:"vocabTypeAhead"}); var url = "edit.do?" + $H(params).toQueryString(); // log ("sending url: " + url); this.getTypeAheadValues (url, id, fragment); }.bindAsEventListener(this)); }.bind(this)); log (" VocabTypeAheadFields initialized"); }, emptyAndHide: function () { this.valueContainer.update(); this.valueContainer.hide(); }, getTypeAheadValues: function (url, id, fragment) { log ("getTypeAheadValues (" + this.busy + ")"); if (this.busy) { log (" busy ..."); this.nextUrl = url; return; } else { // this.busy = true; log (" set busy to TRUE "); } // this.showSpinner(); new Ajax.Request (url, { onSuccess: function (transport) { // log ("matches: " + transport.responseText); var json; try { json = transport.responseText.trim().evalJSON(true); } catch (error) { log ("could not parse json: " + error); this.emptyAndHide(); return; } try { this.showTypeAheadValues (id, json.vocabTypeAhead.value, fragment); } catch (error) { log ("showTypeAheadValues error: " + error); } }.bind(this) }); }, setBusyFalse: function () { this.busy = false; log (" .. set busy to FALSE"); if (this.nextUrl) { log (" processing nextUrl"); var url = this.nextUrl; this.nextUrl = null; this.getTypeAheadValues(url); } }, showTypeAheadValues: function (id, values, fragment) { // this.valueContainer.update(); // this.emptyAndHide(); log ("showTypeAheadValues: " + id); if (!values) { log (" no values to show"); this.setBusyFalse() return; } var input = $(id); var offset = input.cumulativeOffset(); var dims = input.getDimensions(); // log ("top: " + offset.top+dims.height); this.valueContainer.setStyle ({top:offset.top+dims.height, left:offset.left, width:dims.width}) if (typeof values == "string") values = [values] values = $A(values) this.valueContainer.update(); if (values.size() > 500) { this.valueContainer.insert (new Element ('div').update (values.size() + " matching terms ")); } else { $A(values).each ( function (value) { var valueElement = new Element ('div') /* var pattern = "\/"+fragment+"\/i" log ('pattern: ' + pattern); */ // valueElement.update(value.gsub(pattern, '<b>'+fragment+'</b>')); var regex = new RegExp(fragment, 'i'); valueElement.update(value.gsub(regex, '<b>'+fragment+'</b>')); valueElement.addClassName ("vocab-type-ahead-term"); valueElement.observe ('mouseover', function (event) { valueElement.addClassName ("vocab-type-ahead-term-over") }); valueElement.observe ('mouseout', function (event) { valueElement.removeClassName ("vocab-type-ahead-term-over") }); valueElement.observe ('click', function (event) { // log ("selected: " + value); input.value = value; this.emptyAndHide(); }.bind(this)); this.valueContainer.insert (valueElement); }.bind(this)); } this.valueContainer.show(); this.setBusyFalse(); } }); Index: autoform-styles.css =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/lib/autoform-styles.css,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** autoform-styles.css 28 Apr 2010 23:11:34 -0000 1.13 --- autoform-styles.css 22 Jan 2011 00:15:28 -0000 1.14 *************** *** 381,383 **** --- 381,402 ---- } + #type-ahead-value-container { + position:absolute; + top:100px; + left:100px; + height:auto; + padding:5px; + overflow:auto; + z-index:10; + border:black 1px outset; + background-color:white; + } + + .vocab-type-ahead-term { + } + + .vocab-type-ahead-term.vocab-type-ahead-term-over { + cursor:pointer; + background-color:#E8ECF4; + } Index: metadata-editor-support.js =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/lib/metadata-editor-support.js,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** metadata-editor-support.js 26 Mar 2010 23:53:55 -0000 1.23 --- metadata-editor-support.js 22 Jan 2011 00:15:28 -0000 1.24 *************** *** 704,707 **** --- 704,712 ---- // debug_init(); + + new VocabTypeAhead (); + } + + |
|
From: Jonathan O. <os...@us...> - 2010-12-22 21:22:30
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/vocabLayout In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19922 Modified Files: header.tag leaf.tag vocabLayoutSingleSelect.tag Log Message: fixed bug in single select for headers, optimized check for selected values Index: vocabLayoutSingleSelect.tag =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/vocabLayout/vocabLayoutSingleSelect.tag,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** vocabLayoutSingleSelect.tag 30 Sep 2010 17:06:00 -0000 1.5 --- vocabLayoutSingleSelect.tag 22 Dec 2010 21:22:22 -0000 1.6 *************** *** 28,31 **** --- 28,33 ---- <jsp:setProperty name="sef" property="vocabField" value="${elementPath}" /> + <bean:define id="selectedValue" name="sef" property="${elementPath}"/> + <%-- Debugging utility to show vocabLayout file URI --%> <c:if test="${false}"> *************** *** 38,51 **** <div>elementPath: ${elementPath}</div> <div>id: ${sid}</div> - <%-- <div>selected values:</div> - <bean:define id="selectedValues" name="sef" property="${elementPath}"/> - <c:forEach var="sv" items="${selectedValues}"> - <div> - ${sv}</div> - </c:forEach> --%> - <bean:define id="selectedValue" name="sef" property="${elementPath}"/> <div>selected value: ${selectedValue}</div> <bean:define id="legalValues" name="sef" property="legalEnumerationValuesOf(${sef.vocabLayout.path})" /> <div>there are ${fn:length(legalValues)} legal values</div> ! <c:if test="${not empty selectedValue and not sf:listContains (legalValues, selectedValue)}">FOOBERRY!!</c:if> </div> </div> --- 40,47 ---- <div>elementPath: ${elementPath}</div> <div>id: ${sid}</div> <div>selected value: ${selectedValue}</div> <bean:define id="legalValues" name="sef" property="legalEnumerationValuesOf(${sef.vocabLayout.path})" /> <div>there are ${fn:length(legalValues)} legal values</div> ! <c:if test="${not empty selectedValue and not sf:listContains (legalValues, selectedValue)}">Selected Value is not legal!</c:if> </div> </div> *************** *** 53,57 **** <%-- Check for an illegal value (not in controlled vocab) --%> - <bean:define id="selectedValue" name="sef" property="${elementPath}"/> <bean:define id="legalValues" name="sef" property="legalEnumerationValuesOf(${sef.vocabLayout.path})" /> <c:if test="${not empty selectedValue and not sf:listContains (legalValues, selectedValue)}"> --- 49,52 ---- Index: leaf.tag =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/vocabLayout/leaf.tag,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leaf.tag 2 Jul 2010 21:54:46 -0000 1.3 --- leaf.tag 22 Dec 2010 21:22:22 -0000 1.4 *************** *** 18,29 **** <c:choose> <c:when test="${inputMode == 'single'}"> ! <%-- RADIO --%> <c:set var="radioId" value="${sf:pathToId(elementPath)}_${vocabTerm.name}_id" /> <input type="radio" id="${radioId}" name="${elementPath}" value="<c:out value="${vocabTerm.name}"/>" ! <c:forEach var="elem" items="${selectedValues}"> ! <c:if test="${ elem == vocabTerm.name }">checked</c:if> ! </c:forEach> /><label class="${typeclass}" <c:if test="${not empty vocabTerm.definition}">title="${vocabTerm.definition}"</c:if> --- 18,27 ---- <c:choose> <c:when test="${inputMode == 'single'}"> ! <%-- RADIO - selectedValues contains the selectedValue (not a list) --%> <c:set var="radioId" value="${sf:pathToId(elementPath)}_${vocabTerm.name}_id" /> <input type="radio" id="${radioId}" name="${elementPath}" value="<c:out value="${vocabTerm.name}"/>" ! <c:if test="${ selectedValues == vocabTerm.name }">checked</c:if> /><label class="${typeclass}" <c:if test="${not empty vocabTerm.definition}">title="${vocabTerm.definition}"</c:if> *************** *** 39,45 **** name="${elementPath}" value="<c:out value="${vocabTerm.name}"/>" ! <c:forEach var="elem" items="${selectedValues}"> ! <c:if test="${ elem == vocabTerm.name }">checked</c:if> ! </c:forEach> /><label class="${typeclass}" <c:if test="${not empty vocabTerm.definition}">title="${vocabTerm.definition}"</c:if> --- 37,41 ---- name="${elementPath}" value="<c:out value="${vocabTerm.name}"/>" ! <c:if test="${sf:arrayContains (selectedValues, vocabTerm.name)}">checked</c:if> /><label class="${typeclass}" <c:if test="${not empty vocabTerm.definition}">title="${vocabTerm.definition}"</c:if> Index: header.tag =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/vocabLayout/header.tag,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** header.tag 2 Jul 2010 21:54:45 -0000 1.4 --- header.tag 22 Dec 2010 21:22:22 -0000 1.5 *************** *** 25,31 **** name="${elementPath}" value="<c:out value="${vocabTerm.name}"/>" ! <c:forEach var="elem" items="${selectedValues}"> ! <c:if test="${ elem == vocabTerm.name }">checked</c:if> ! </c:forEach> /><label class="typegroup" <c:if test="${not empty vocabTerm.definition}">title="${vocabTerm.definition}"</c:if> --- 25,29 ---- name="${elementPath}" value="<c:out value="${vocabTerm.name}"/>" ! <c:if test="${sf:arrayContains (selectedValues, vocabTerm.name)}">checked</c:if> /><label class="typegroup" <c:if test="${not empty vocabTerm.definition}">title="${vocabTerm.definition}"</c:if> *************** *** 33,36 **** --- 31,47 ---- </div> </c:when> + <c:when test="${not empty vocabTerm.name and inputMode == 'single'}"> + <%-- for single mode, selectedValues contains the selectedValue (not a list) --%> + <c:set var="radioId" value="${sf:pathToId(elementPath)}_${selectedValues}_id" /> + <div class="selectable-header-label ${vocabTerm.collapsible ? 'collapsible' : ''}"> + <input type="radio" id="${radioId}" + name="${elementPath}" + value="<c:out value="${vocabTerm.name}"/>" + <c:if test="${ selectedValues == vocabTerm.name }">checked</c:if> + /><label class="typegroup" + <c:if test="${not empty vocabTerm.definition}">title="${vocabTerm.definition}"</c:if> + for="${radioId}">${vocabTerm.label}</label> + </div> + </c:when> <c:otherwise> <span class="typegroup" |
|
From: John W. <jwe...@us...> - 2010-12-17 00:20:36
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23772/web/WEB-INF Modified Files: web.xml Log Message: -New seeting in RepositoyManager oaiBaseUrlOverride that allows a DDS, DCS, or jOAI installation to configure a hard-coded baseUrl for the OAI data provider -Removed serverUrl setting: no longer needed Index: web.xml =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/web.xml,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** web.xml 20 Nov 2010 00:23:31 -0000 1.48 --- web.xml 17 Dec 2010 00:20:28 -0000 1.49 *************** *** 573,587 **** </context-param> <context-param> ! <param-name>serverUrl</param-name> <param-value>[determine-from-client]</param-value> <description> ! This parameter defines the scheme, hostname and port for the server, which is displayed ! in the base URL for the data provider and elsewhere, for example http://www.example.org ! or http://www.example.org:8080. If the value '[determine-from-client]' is supplied (default), ! then the scheme, hostname and port number will be determined by examining the URL that was ! requested by the client. Note that when using mod_proxy with Apache, Tomcat must be ! configured properly in order for this mechanism to work. Refer to the Tomcat proxy how ! to documentation at http://tomcat.apache.org/tomcat-5.5-doc/proxy-howto.html ! for information about configuring Tomcat for use with mod_proxy. </description> </context-param> --- 573,585 ---- </context-param> <context-param> ! <param-name>oaiBaseUrlOverride</param-name> <param-value>[determine-from-client]</param-value> <description> ! This parameter defines the OAI Base URL that is returned in OAI-PMH responses. ! Use '[determine-from-client]' to have the baseURL determined ! automatically using the URL supplied by the client (default). ! If set, this value overrides the entire baseURL, including the value set for ! dataProviderBaseUrlPathEnding. Use this setting for proxy configurations ! to ensure the proper baseUrl is returned. </description> </context-param> |
|
From: Jonathan O. <os...@us...> - 2010-12-13 22:24:52
|
Update of /cvsroot/dlsciences/dcs-project/web/browse/searching In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6754 Modified Files: dcsSearchItemHeader.jspf Log Message: commented out an experimental feature (username popup) Index: dcsSearchItemHeader.jspf =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/dcsSearchItemHeader.jspf,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dcsSearchItemHeader.jspf 13 Dec 2010 21:55:44 -0000 1.6 --- dcsSearchItemHeader.jspf 13 Dec 2010 22:24:44 -0000 1.7 *************** *** 41,46 **** <c:choose> <c:when test="${not empty result.docMap['dcslastEditor']}"> ! <%-- ${sf:getFullName (result.docMap['dcslastEditor'], userManager)} --%> ! <st:popup_user_link username="${result.docMap['dcslastEditor']}"/> </c:when> <c:otherwise> </c:otherwise> --- 41,47 ---- <c:choose> <c:when test="${not empty result.docMap['dcslastEditor']}"> ! ${sf:getFullName (result.docMap['dcslastEditor'], userManager)} ! <%-- popup is experimental --%> ! <%-- <st:popup_user_link username="${result.docMap['dcslastEditor']}"/> --%> </c:when> <c:otherwise> </c:otherwise> |
|
From: Jonathan O. <os...@us...> - 2010-12-13 21:59:55
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF/dcs-config/frameworks/disabled In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2034 Modified Files: ccs_org_config.xml concepts.xml Added Files: comm_anno.xml eng_path.xml Log Message: added/updated framework configs (from ccs and nsdl ncs's) Index: ccs_org_config.xml =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/dcs-config/frameworks/disabled/ccs_org_config.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ccs_org_config.xml 18 Aug 2010 14:28:17 -0000 1.1 --- ccs_org_config.xml 13 Dec 2010 21:59:47 -0000 1.2 *************** *** 17,20 **** <rebuildOnStart>true</rebuildOnStart> </editorInfo> ! <name>OrgConfig</name> </frameworkConfigRecord> --- 17,20 ---- <rebuildOnStart>true</rebuildOnStart> </editorInfo> ! <name>CCS Organization Configuration</name> </frameworkConfigRecord> Index: concepts.xml =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/dcs-config/frameworks/disabled/concepts.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** concepts.xml 22 Dec 2009 00:21:57 -0000 1.2 --- concepts.xml 13 Dec 2010 21:59:47 -0000 1.3 *************** *** 1,46 **** ! <?xml version="1.0" encoding="UTF-8"?> ! ! <frameworkConfigRecord ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:noNamespaceSchemaLocation="http://ns.nsdl.org/ncs/framework_config/1.00/schemas/dcsFrameworkConfig.xsd"> ! ! <xmlFormat>concepts</xmlFormat> ! ! <schemaInfo> ! ! <rootElementName>concept</rootElementName> ! ! <schemaURI>http://www.dlsciences.org/frameworks/concepts/1.0/schemas/concepts.xsd</schemaURI> ! ! <paths> ! ! <path pathName="id" requiredByCopyRecord="true" requiredByMinimalRecord="true" ! readOnly="true">/concept/recordID</path> ! ! <path pathName="shortTitle" requiredByCopyRecord="true" readOnly="false" ! requiredByMinimalRecord="false">/concept/shortTitle</path> ! ! <path pathName="url" requiredByCopyRecord="true">/concept/contents/content/url</path> ! ! <path requiredByCopyRecord="true" pathName="contents">/concept/contents</path></paths> ! ! </schemaInfo> ! ! <editorInfo> ! ! <renderer>DleseEditorRenderer</renderer> ! ! <baseRenderLevel>2</baseRenderLevel> ! ! <firstPage>concept</firstPage> ! ! <rebuildOnStart>true</rebuildOnStart> ! ! <fieldInfoURI></fieldInfoURI> ! ! </editorInfo> ! ! <name>Concepts</name> </frameworkConfigRecord> - --- 1,21 ---- ! <?xml version="1.0" encoding="UTF-8" ?> + <frameworkConfigRecord xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.dlese.org/Metadata/dcs/framework-config/dcsFrameworkConfig.xsd"> + <xmlFormat>concepts</xmlFormat> + <schemaInfo> + <rootElementName>concept</rootElementName> + <schemaURI>http://www.dlsciences.org/frameworks/concepts/1.0/schemas/concepts.xsd</schemaURI> + <paths> + <path pathName="id" requiredByCopyRecord="true" requiredByMinimalRecord="true" readOnly="true">/concept/recordID</path> + <path pathName="shortTitle" requiredByCopyRecord="false" readOnly="false" requiredByMinimalRecord="false">/concept/shortTitle</path> + <path pathName="url" requiredByCopyRecord="false">/concept/contents/content/url</path> + </paths> + </schemaInfo> + <editorInfo> + <renderer>DleseEditorRenderer</renderer> + <baseRenderLevel>2</baseRenderLevel> + <firstPage>concept</firstPage> + <rebuildOnStart>true</rebuildOnStart> + </editorInfo> + <name>Concepts</name> </frameworkConfigRecord> --- NEW FILE: comm_anno.xml --- <?xml version="1.0" encoding="UTF-8" ?> <frameworkConfigRecord xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.dlese.org/Metadata/dcs/framework-config/dcsFrameworkConfig.xsd"> <xmlFormat>comm_anno</xmlFormat> <schemaInfo> <rootElementName>comm_anno</rootElementName> <schemaURI>http://ns.nsdl.org/ncs/comm_anno/1.00/schemas/comm_anno.xsd</schemaURI> <paths> <path pathName="id" requiredByCopyRecord="true" requiredByMinimalRecord="true" readOnly="true">/comm_anno/recordID</path> <path pathName="dateCreated" requiredByCopyRecord="true" requiredByMinimalRecord="true" valueType="date" readOnly="true">/comm_anno/date/@created</path> </paths> </schemaInfo> <editorInfo> <renderer>DleseEditorRenderer</renderer> <baseRenderLevel>2</baseRenderLevel> <firstPage></firstPage> <rebuildOnStart>true</rebuildOnStart> </editorInfo> <name>Community Annotations</name> </frameworkConfigRecord> --- NEW FILE: eng_path.xml --- <?xml version="1.0" encoding="UTF-8" ?> <frameworkConfigRecord xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.dlese.org/Metadata/dcs/framework-config/dcsFrameworkConfig.xsd"> <xmlFormat>eng_path</xmlFormat> <schemaInfo> <rootElementName>record</rootElementName> <schemaURI>http://ns.nsdl.org/ncs/eng_path/1.00/schemas/record.xsd</schemaURI> <paths> <path pathName="url" valueType="uniqueUrl" requiredByCopyRecord="true">/record/general/url</path> <path pathName="title" readOnly="false" requiredByMinimalRecord="true" requiredByCopyRecord="true">/record/general/title</path> <path pathName="description" readOnly="false" requiredByMinimalRecord="true" requiredByCopyRecord="true">/record/general/description</path> <path pathName="id" readOnly="true" requiredByCopyRecord="true" requiredByMinimalRecord="true">/record/general/recordID</path> <path pathName="recordDate" readOnly="true" requiredByCopyRecord="true" requiredByMinimalRecord="true" valueType="date">/record/general/recordDate</path> <path pathName="evaluation" readOnly="true">/record/educational/evaluation</path> </paths> </schemaInfo> <name>eng_path</name> <editorInfo> <renderer>DleseEditorRenderer</renderer> <firstPage>general</firstPage> <rebuildOnStart>true</rebuildOnStart> <vocabLayoutURI>http://ns.nsdl.org/ncs/eng_path/1.00/build/groups-list.xml</vocabLayoutURI> <fieldInfoURI>http://ns.nsdl.org/ncs/eng_path/1.00/build/fields-list.xml</fieldInfoURI> <baseRenderLevel>3</baseRenderLevel> <editorPages> <editorPage pageLabel="General">general</editorPage> <editorPage pageLabel="Educational">educational</editorPage> <editorPage pageLabel="Contributors">lifecycle</editorPage> <editorPage pageLabel="Coverage">coverage</editorPage> </editorPages> </editorInfo> <userInfo autoPopulate="Record Creation"> <property> <property>lastName</property> <path>/record/lifecycle/contributors/person/@role</path> </property> <property> <property>lastName</property> <path>/record/lifecycle/contributors/person/lastName</path> </property> <property> <property>firstName</property> <path>/record/lifecycle/contributors/person/firstName</path> </property> <property> <property>email</property> <path>/record/lifecycle/contributors/person/contactEmailAddress</path> </property> </userInfo> </frameworkConfigRecord> |
|
From: Jonathan O. <os...@us...> - 2010-12-13 21:56:41
|
Update of /cvsroot/dlsciences/dcs-project/web/editor/input_helpers/bounding_box In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1573 Added Files: eng_path_location_widget.jsp Log Message: added bounding box input helper for eng_path --- NEW FILE: eng_path_location_widget.jsp --- <c:set var="contextPath"><%@ include file="/ContextPath.jsp" %></c:set> <input id="${id}_bounding_box_button" style="display:none" type="button" value="Bounding box tool" onclick="boundingBoxHelper.openBoundingBoxTool('${id}')" title="Activate a tool to fill in the four coordinates"/> <script type="text/javascript" src="${contextPath}/editor/input_helpers/bounding_box/boundingBoxHelper.js"></script> <script type="text/javascript"> // test for presence of the coordinates fields before displaying widget Event.observe (window,'load', function () { // console.log ("id: ${id}"); var southCoord = "${sf:pathToId(id)}" + "${sf:pathToId('/')}" + "southCoord"; if ($(southCoord)) { $('${id}_bounding_box_button').show(); boundingBoxHelper.init('northCoord','southCoord','eastCoord','westCoord',"${sf:pathToId('/')}" ); } }); </script> |
|
From: Jonathan O. <os...@us...> - 2010-12-13 21:55:53
|
Update of /cvsroot/dlsciences/dcs-project/web/browse/viewing/synopses In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1431/viewing/synopses Modified Files: adn_view_info.jspf dlese_anno_view_info.jspf Log Message: annotations now displayed in uniform way accross all frameworks (modelled on dds advanced search display) Index: dlese_anno_view_info.jspf =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/viewing/synopses/dlese_anno_view_info.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dlese_anno_view_info.jspf 14 Oct 2008 18:23:00 -0000 1.2 --- dlese_anno_view_info.jspf 13 Dec 2010 21:55:45 -0000 1.3 *************** *** 25,45 **** </div> </c:if> ! ! <%-- ! <!-- Context not indexed! -> ! <c:if test="${not empty viewForm.docReader.context}"> ! <div class="searchResultValues"><em>Context:</em> ! ${viewForm.docReader.context} ! </div> ! </c:if> ! --%> ! ! <c:if test="${not empty viewForm.docReader.annotatedItemResultDoc}"> ! <div class="searchResultValues"><em>Annotated resource:</em> ! <a href="${contextPath}/browse/static.do?id=${viewForm.docReader.itemId}" ! title="see annotated record">${viewForm.docReader.itemId}</a> ! </div> ! </c:if> ! <c:if test="${not empty viewForm.docReader.status}"> <div class="searchResultValues"><em>Annotation status:</em> --- 25,29 ---- </div> </c:if> ! <c:if test="${not empty viewForm.docReader.status}"> <div class="searchResultValues"><em>Annotation status:</em> Index: adn_view_info.jspf =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/viewing/synopses/adn_view_info.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** adn_view_info.jspf 14 Oct 2008 15:58:19 -0000 1.1 --- adn_view_info.jspf 13 Dec 2010 21:55:45 -0000 1.2 *************** *** 7,33 **** </div> ! <%-- Annotations for this item-level record - ! SAME as searching/framework/annotations.jspf ! --%> ! <c:if test="${not empty viewForm.docReader.annotationResultDocs}"> ! <div class="searchResultValues"><em>Annotations for this resource:</em></div> ! <logic:iterate id="annotationResult" name="viewForm" property="docReader.annotationResultDocs"> ! <c:choose> ! <c:when test="${not empty annotationResult.docReader.title}"> ! <div class="searchResultValues2"><font color="#333333"> ! <b>${annotationResult.docReader.title}</b> ! </font></div> ! </c:when> ! <c:otherwise> ! <div class="searchResultValues2"><font color="#333333"> ! <b>Annotation</b> ! </font></div> ! </c:otherwise> ! </c:choose> ! ! <div class="searchResultValues2"><em>Annotation ID:</em> ! <a href='view.do?id=${annotationResult.docReader.id}' ! title='view annotation record'>${annotationResult.docReader.id}</a></div> ! </logic:iterate> ! </c:if> ! --- 7,9 ---- </div> ! |
|
From: Jonathan O. <os...@us...> - 2010-12-13 21:55:53
|
Update of /cvsroot/dlsciences/dcs-project/web/browse/searching In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1431/searching Modified Files: dcsSearchItemHeader.jspf item_search_template.jspf Added Files: annotationsDisplay.jspf Log Message: annotations now displayed in uniform way accross all frameworks (modelled on dds advanced search display) Index: dcsSearchItemHeader.jspf =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/dcsSearchItemHeader.jspf,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dcsSearchItemHeader.jspf 24 Mar 2010 19:45:55 -0000 1.5 --- dcsSearchItemHeader.jspf 13 Dec 2010 21:55:44 -0000 1.6 *************** *** 41,46 **** <c:choose> <c:when test="${not empty result.docMap['dcslastEditor']}"> ! <%-- ${result.docMap['dcslastEditor']} --%> ! ${sf:getFullName (result.docMap['dcslastEditor'], userManager)} </c:when> <c:otherwise> </c:otherwise> --- 41,46 ---- <c:choose> <c:when test="${not empty result.docMap['dcslastEditor']}"> ! <%-- ${sf:getFullName (result.docMap['dcslastEditor'], userManager)} --%> ! <st:popup_user_link username="${result.docMap['dcslastEditor']}"/> </c:when> <c:otherwise> </c:otherwise> --- NEW FILE: annotationsDisplay.jspf --- <%-- Display annotations and relations for this record code pulled form dds-project//admin/search_result_display.jsp - 12/12/2010 --%> <c:set var="MAX_ANNOS" value="10"/> <c:if test='${not empty result.docReader.relatedRecordsMap}'> <div class="searchResultValues"><em>Relationships:</em> <c:forEach items="${result.docReader.relatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> ${relatedRecordsEntry.key}${i.last ? '' : ','} </c:forEach> <div style="padding-left:25px;"> <c:forEach items="${result.docReader.relatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> <div> <em>${relatedRecordsEntry.key}:</em> <c:set var="numRelations" value="${fn:length(relatedRecordsEntry.value)}"/> <c:forEach items="${relatedRecordsEntry.value}" var="relatedRecordsResultDoc" varStatus="j" end="${MAX_ANNOS-1}"> <a href='${contextPath}/browse/view.do?id=${relatedRecordsResultDoc.docReader.id}' title='View this record'>${relatedRecordsResultDoc.docReader.id}</a>${j.last ? '' : ','}</c:forEach><c:if test="${numRelations > MAX_ANNOS}">, plus ${numRelations - MAX_ANNOS} more...</c:if> ${empty relatedRecordsEntry.value ? 'No records found for this relation' : ''} </div> </c:forEach> </div> </div> </c:if> <c:if test='${not empty result.docReader.assignedByIdRelatedRecordsMap}'> <div class="searchResultValues"><em>Assigns relationships by ID:</em> <c:forEach items="${result.docReader.assignedByIdRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> ${relatedRecordsEntry.key}${i.last ? '' : ','} </c:forEach> <div style="padding-left:25px;"> <c:forEach items="${result.docReader.assignedByIdRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> <div> Assigns <em>${relatedRecordsEntry.key}</em> relationship by ID (to this) for: <c:set var="numRelations" value="${fn:length(relatedRecordsEntry.value)}"/> <c:forEach items="${relatedRecordsEntry.value}" var="relatedRecordsResultDoc" varStatus="j" end="${MAX_ANNOS-1}"> <a href='${contextPath}/browse/view.do?id=${relatedRecordsResultDoc.docReader.id}' title='View this record'>${relatedRecordsResultDoc.docReader.id}</a>${j.last ? '' : ','}</c:forEach><c:if test="${numRelations > MAX_ANNOS}">, plus ${numRelations - MAX_ANNOS} more...</c:if> ${empty relatedRecordsEntry.value ? 'No records found for this relation' : ''} </div> </c:forEach> </div> </div> </c:if> <c:if test='${not empty result.docReader.assignedByUrlRelatedRecordsMap}'> <div class="searchResultValues"><em>Assigns relationships by URL:</em> <c:forEach items="${result.docReader.assignedByUrlRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> ${relatedRecordsEntry.key}${i.last ? '' : ','} </c:forEach> <div style="padding-left:25px;"> <c:forEach items="${result.docReader.assignedByUrlRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> <div> Assigns <em>${relatedRecordsEntry.key}</em> relationship by URL (to this) for: <c:set var="numRelations" value="${fn:length(relatedRecordsEntry.value)}"/> <c:forEach items="${relatedRecordsEntry.value}" var="relatedRecordsResultDoc" varStatus="j" end="${MAX_ANNOS-1}"> <a href='${contextPath}/browse/view.do?id=${relatedRecordsResultDoc.docReader.id}' title='View this record'>${relatedRecordsResultDoc.docReader.id}</a>${j.last ? '' : ','}</c:forEach><c:if test="${numRelations > MAX_ANNOS}">, plus ${numRelations - MAX_ANNOS} more...</c:if> ${empty relatedRecordsEntry.value ? 'No records found for this relation' : ''} </div> </c:forEach> </div> </div> </c:if> Index: item_search_template.jspf =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/item_search_template.jspf,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** item_search_template.jspf 13 Apr 2010 20:12:45 -0000 1.5 --- item_search_template.jspf 13 Dec 2010 21:55:44 -0000 1.6 *************** *** 13,16 **** --- 13,18 ---- ${item_info} + <%@ include file="annotationsDisplay.jspf" %> + <c:if test="${show_default_info}"> <c:if test="${not empty result.docReader.myCollectionDoc}"> *************** *** 41,47 **** <%-- Show lucene indexing to admin users (or if authentication is disabled)--%> <c:if test="${(not applicationScope['authenticationEnabled']) || sessionBean.user.isAdminUser}" > ! <div> <%@ include file="luceneEntryDisplay.jspf" %> </div> </c:if> --- 43,57 ---- <%-- Show lucene indexing to admin users (or if authentication is disabled)--%> <c:if test="${(not applicationScope['authenticationEnabled']) || sessionBean.user.isAdminUser}" > ! <div style="margin:0px 0px 3px 0px"> <%@ include file="luceneEntryDisplay.jspf" %> </div> + + <%-- Set up relations params for DDSWS requests --%> + <c:set var="relationRequestParms"><c:forEach items="${result.docReader.relatedRecordsMap}" var="relatedRecordsEntry" + varStatus="i">&relation=${relatedRecordsEntry.key}</c:forEach></c:set> + <div class="searchResultValues"><em>Web service requests:</em> + [ <a href='<c:url value="/services/ddsws1-1?verb=GetRecord&id=${result.docReader.id}${relationRequestParms}"/>' title='GetRecord service request'>GetRecord</a> + | <a href='<c:url value="/services/ddsws1-1?verb=Search&q=idvalue:"${result.docReader.id}"${relationRequestParms}&s=0&n=10"/>' title='Search service request'>Search</a> ] + </div> </c:if> |
|
From: Jonathan O. <os...@us...> - 2010-12-13 21:55:53
|
Update of /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1431/searching/synopses Modified Files: adn_search_info.jspf assessments_search_info.jsp comm_anno_search_info.jsp dlese_anno_search_info.jspf nsdl_anno_search_info.jsp teach_search_info.jsp Removed Files: annotations.jspf Log Message: annotations now displayed in uniform way accross all frameworks (modelled on dds advanced search display) Index: dlese_anno_search_info.jspf =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses/dlese_anno_search_info.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dlese_anno_search_info.jspf 14 Oct 2008 18:17:07 -0000 1.1 --- dlese_anno_search_info.jspf 13 Dec 2010 21:55:45 -0000 1.2 *************** *** 38,58 **** </div> </c:if> ! ! <%-- ! <!-- Context not indexed! -> ! <c:if test="${not empty result.docReader.context}"> ! <div class="searchResultValues"><em>Context:</em> ! ${result.docReader.context} ! </div> ! </c:if> ! --%> ! ! <c:if test="${not empty result.docReader.annotatedItemResultDoc}"> ! <div class="searchResultValues"><em>Annotated resource:</em> ! <a href="${contextPath}/browse/static.do?id=${result.docReader.itemId}" ! title="see annotated record">${result.docReader.itemId}</a> ! </div> ! </c:if> ! <c:if test="${not empty result.docReader.status}"> <div class="searchResultValues"><em>Annotation status:</em> --- 38,42 ---- </div> </c:if> ! <c:if test="${not empty result.docReader.status}"> <div class="searchResultValues"><em>Annotation status:</em> Index: adn_search_info.jspf =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses/adn_search_info.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** adn_search_info.jspf 14 Oct 2008 18:17:07 -0000 1.1 --- adn_search_info.jspf 13 Dec 2010 21:55:45 -0000 1.2 *************** *** 55,59 **** </c:if> - <%-- Annotations for this item-level record --%> - <%@ include file="annotations.jspf" %> --- 55,57 ---- --- annotations.jspf DELETED --- Index: assessments_search_info.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses/assessments_search_info.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** assessments_search_info.jsp 4 Jun 2010 22:10:08 -0000 1.1 --- assessments_search_info.jsp 13 Dec 2010 21:55:45 -0000 1.2 *************** *** 29,40 **** </c:if> - <c:if test="${not empty annotated_CCS_ID}"> - <div class="searchResultValues"><em>AnnotatedID:</em> - <a href="${contextPath}/browse/static.do?id=${annotated_CCS_ID}" - title="see annotated CCS record">${annotated_CCS_ID}</a> - </div> - </c:if> - - <%-- questions 2 - levels deep --%> <x:if select="$rootElement/question"> --- 29,32 ---- Index: comm_anno_search_info.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses/comm_anno_search_info.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** comm_anno_search_info.jsp 4 Jun 2010 22:10:08 -0000 1.1 --- comm_anno_search_info.jsp 13 Dec 2010 21:55:45 -0000 1.2 *************** *** 27,46 **** <%-- Display Values --%> - <%-- <c:if test="${not empty annotated_CCS_ID}"> - <div class="searchResultValues"><em>AnnotatedID:</em> - <a href="${contextPath}/browse/static.do?id=${annotated_CCS_ID}" - title="see annotated CCS record">${annotated_CCS_ID}</a> - </div> - </c:if> --%> - <c:if test="${not empty title}"> <div class="browse-item-title">${title}</div> </c:if> - <c:if test="${not empty annotatedID}"> - <div class="searchResultValues"><em>Annotated ID:</em> - ${annotatedID}</div> - </c:if> - <c:if test="${not empty rating}"> <div class="searchResultValues"><em>Rating:</em> --- 27,34 ---- *************** *** 52,56 **** </c:if> - <%-- assessment identifiers (type='CSS') --%> <x:if select="$rootElement/text"> <div class="searchResultValues"><em>Text:</em></div> --- 40,43 ---- Index: nsdl_anno_search_info.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses/nsdl_anno_search_info.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nsdl_anno_search_info.jsp 10 May 2010 23:31:51 -0000 1.1 --- nsdl_anno_search_info.jsp 13 Dec 2010 21:55:45 -0000 1.2 *************** *** 31,40 **** </c:if> - <c:if test="${not empty annotates}"> - <div class="searchResultValues"><em>Annotates:</em> - <dds:keywordsHighlight>${annotates}</dds:keywordsHighlight> - </div> - </c:if> - <c:if test="${not empty description}"> <div class="searchResultValues"><em>Description:</em> --- 31,34 ---- Index: teach_search_info.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses/teach_search_info.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** teach_search_info.jsp 23 Jun 2010 17:03:53 -0000 1.2 --- teach_search_info.jsp 13 Dec 2010 21:55:45 -0000 1.3 *************** *** 1,66 **** ! <%@ include file="/JSTLTagLibIncludes.jsp" %> ! <%@ taglib uri='/WEB-INF/tlds/dds.tld' prefix='dds' %> ! <c:set var="contextPath"><%@ include file="/ContextPath.jsp" %></c:set> ! <%@ page contentType="text/html; charset=UTF-8" %> ! ! <c:catch var="xmlParseError"> ! <x:transform xslt="${f:removeNamespacesXsl()}" xml="${param.xml}" var="myRec"/> ! <x:set var="rootElement" select="$myRec/teach"/> ! </c:catch> ! <c:choose> ! <c:when test="${not empty xmlParseError}"> ! <div style="color:red;">Error parsing record: ${xmlParseError}</div> ! </c:when> ! <c:otherwise> ! ! <%-- Compute Values --%> ! ! <c:set var="title"> ! <x:out select="$rootElement/title"/> ! </c:set> ! ! ! <c:set var="annotated_CCS_ID"> ! <x:out select="$rootElement/annotatedID[@type='CCS']"/> ! </c:set> ! <c:set var="classPeriods"> ! <x:out select="$rootElement/classPeriods"/> ! </c:set> ! ! <%-- Display Values --%> ! ! <c:if test="${not empty title}"> ! <div class="browse-item-title">${title}</div> ! </c:if> ! ! ! <c:if test="${not empty annotated_CCS_ID}"> ! <div class="searchResultValues"><em>AnnotatedID:</em> ! <a href="${contextPath}/browse/static.do?id=${annotated_CCS_ID}" ! title="see annotated CCS record">${annotated_CCS_ID}</a> ! </div> ! </c:if> ! ! <c:if test="${not empty classPeriods}"> ! <div class="searchResultValues"><em>Class periods:</em> ! ${classPeriods}</div> ! </c:if> ! ! <%-- assessment identifiers (type='CSS') --%> ! <x:if select="$rootElement/assessments/identifier[@type='CCS']"> ! <div class="searchResultValues"><em>Assessment Identifiers:</em></div> ! <ul style="margin:3px 0px 5px 0px;list-style-type:disc"> ! <x:forEach select="$rootElement/assessments/identifier[@type='CCS']"> ! <c:set var="ccs_id"><x:out select="."/></c:set> ! <li><a href="${contextPath}/browse/static.do?id=${ccs_id}" ! title="see CCS assessment record">${ccs_id}</a> ! </li> ! </x:forEach> ! </ul> ! </x:if> ! ! </c:otherwise> ! </c:choose> ! ! ! --- 1,58 ---- ! <%@ include file="/JSTLTagLibIncludes.jsp" %> ! <%@ taglib uri='/WEB-INF/tlds/dds.tld' prefix='dds' %> ! <c:set var="contextPath"><%@ include file="/ContextPath.jsp" %></c:set> ! <%@ page contentType="text/html; charset=UTF-8" %> ! ! <c:catch var="xmlParseError"> ! <x:transform xslt="${f:removeNamespacesXsl()}" xml="${param.xml}" var="myRec"/> ! <x:set var="rootElement" select="$myRec/teach"/> ! </c:catch> ! <c:choose> ! <c:when test="${not empty xmlParseError}"> ! <div style="color:red;">Error parsing record: ${xmlParseError}</div> ! </c:when> ! <c:otherwise> ! ! <%-- Compute Values --%> ! ! <c:set var="title"> ! <x:out select="$rootElement/title"/> ! </c:set> ! ! ! <c:set var="annotated_CCS_ID"> ! <x:out select="$rootElement/annotatedID[@type='CCS']"/> ! </c:set> ! <c:set var="classPeriods"> ! <x:out select="$rootElement/classPeriods"/> ! </c:set> ! ! <%-- Display Values --%> ! ! <c:if test="${not empty title}"> ! <div class="browse-item-title">${title}</div> ! </c:if> ! ! <c:if test="${not empty classPeriods}"> ! <div class="searchResultValues"><em>Class periods:</em> ! ${classPeriods}</div> ! </c:if> ! ! <%-- assessment identifiers (type='CSS') --%> ! <x:if select="$rootElement/assessments/identifier[@type='CCS']"> ! <div class="searchResultValues"><em>Assessment Identifiers:</em></div> ! <ul style="margin:3px 0px 5px 0px;list-style-type:disc"> ! <x:forEach select="$rootElement/assessments/identifier[@type='CCS']"> ! <c:set var="ccs_id"><x:out select="."/></c:set> ! <li><a href="${contextPath}/browse/view.do?id=${ccs_id}" ! title="see CCS assessment record">${ccs_id}</a> ! </li> ! </x:forEach> ! </ul> ! </x:if> ! ! </c:otherwise> ! </c:choose> ! ! ! |
|
From: Jonathan O. <os...@us...> - 2010-12-13 21:55:53
|
Update of /cvsroot/dlsciences/dcs-project/web/browse/viewing In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1431/viewing Modified Files: full_view.jsp Added Files: annotationsDisplay.jspf Log Message: annotations now displayed in uniform way accross all frameworks (modelled on dds advanced search display) --- NEW FILE: annotationsDisplay.jspf --- <%-- display annotations and relations for this record code pulled/adopted form dds-project//admin/search_result_display.jsp - 12/12/2010 --%> <c:set var="MAX_ANNOS" value="10"/> <c:if test='${not empty viewForm.docReader.relatedRecordsMap}'> <div class="searchResultValues"><em>Relationships:</em> <c:forEach items="${viewForm.docReader.relatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> ${relatedRecordsEntry.key}${i.last ? '' : ','} </c:forEach> <div style="padding-left:25px;"> <c:forEach items="${viewForm.docReader.relatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> <div> <em>${relatedRecordsEntry.key}:</em> <c:set var="numRelations" value="${fn:length(relatedRecordsEntry.value)}"/> <c:forEach items="${relatedRecordsEntry.value}" var="relatedRecordsResultDoc" varStatus="j" end="${MAX_ANNOS-1}"> <a href='${contextPath}/browse/view.do?id=${relatedRecordsResultDoc.docReader.id}' title='View this record'>${relatedRecordsResultDoc.docReader.id}</a>${j.last ? '' : ','}</c:forEach><c:if test="${numRelations > MAX_ANNOS}">, plus ${numRelations - MAX_ANNOS} more...</c:if> ${empty relatedRecordsEntry.value ? 'No records found for this relation' : ''} </div> </c:forEach> </div> </div> </c:if> <c:if test='${not empty viewForm.docReader.assignedByIdRelatedRecordsMap}'> <div class="searchResultValues"><em>Assigns relationships by ID:</em> <c:forEach items="${viewForm.docReader.assignedByIdRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> ${relatedRecordsEntry.key}${i.last ? '' : ','} </c:forEach> <div style="padding-left:25px;"> <c:forEach items="${viewForm.docReader.assignedByIdRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> <div> Assigns <em>${relatedRecordsEntry.key}</em> relationship by ID (to this) for: <c:set var="numRelations" value="${fn:length(relatedRecordsEntry.value)}"/> <c:forEach items="${relatedRecordsEntry.value}" var="relatedRecordsResultDoc" varStatus="j" end="${MAX_ANNOS-1}"> <a href='${contextPath}/browse/view.do?id=${relatedRecordsResultDoc.docReader.id}' title='View this record'>${relatedRecordsResultDoc.docReader.id}</a>${j.last ? '' : ','}</c:forEach><c:if test="${numRelations > MAX_ANNOS}">, plus ${numRelations - MAX_ANNOS} more...</c:if> ${empty relatedRecordsEntry.value ? 'No records found for this relation' : ''} </div> </c:forEach> </div> </div> </c:if> <c:if test='${not empty viewForm.docReader.assignedByUrlRelatedRecordsMap}'> <div class="searchResultValues"><em>Assigns relationships by URL:</em> <c:forEach items="${viewForm.docReader.assignedByUrlRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> ${relatedRecordsEntry.key}${i.last ? '' : ','} </c:forEach> <div style="padding-left:25px;"> <c:forEach items="${viewForm.docReader.assignedByUrlRelatedRecordsMap}" var="relatedRecordsEntry" varStatus="i"> <div> Assigns <em>${relatedRecordsEntry.key}</em> relationship by URL (to this) for: <c:set var="numRelations" value="${fn:length(relatedRecordsEntry.value)}"/> <c:forEach items="${relatedRecordsEntry.value}" var="relatedRecordsResultDoc" varStatus="j" end="${MAX_ANNOS-1}"> <a href='${contextPath}/browse/view.do?id=${relatedRecordsResultDoc.docReader.id}' title='View this record'>${relatedRecordsResultDoc.docReader.id}</a>${j.last ? '' : ','}</c:forEach><c:if test="${numRelations > MAX_ANNOS}">, plus ${numRelations - MAX_ANNOS} more...</c:if> ${empty relatedRecordsEntry.value ? 'No records found for this relation' : ''} </div> </c:forEach> </div> </div> </c:if> Index: full_view.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/viewing/full_view.jsp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** full_view.jsp 13 Apr 2010 20:16:00 -0000 1.17 --- full_view.jsp 13 Dec 2010 21:55:45 -0000 1.18 *************** *** 227,230 **** --- 227,232 ---- <%-- framework-independent item-info --%> + <%@ include file="annotationsDisplay.jspf" %> + <logic:notEmpty name="viewForm" property="docReader.myCollectionDoc"> <div class="searchResultValues"><em>Collection:</em> |
|
From: Jonathan O. <os...@us...> - 2010-12-02 20:01:01
|
Update of /cvsroot/dlsciences/dcs-project/web/lib/stds In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5312 Modified Files: display-controller.js Log Message: trap condition in which there is no criteria table (when suggestion service is inactive) Index: display-controller.js =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/lib/stds/display-controller.js,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** display-controller.js 13 May 2010 19:34:19 -0000 1.8 --- display-controller.js 2 Dec 2010 20:00:53 -0000 1.9 *************** *** 298,305 **** setSuggestCriteriaVisibility: function (displayContent) { // log ("setSuggestCriteriaVisibility: displayContent: " + displayContent); ! if (displayContent == 'suggested') ! $('criteria-table').show() ! else ! $('criteria-table').hide() }, --- 298,310 ---- setSuggestCriteriaVisibility: function (displayContent) { // log ("setSuggestCriteriaVisibility: displayContent: " + displayContent); ! ! var suggestionCriteria = $('criteria-table') ! ! if (suggestionCriteria) { ! if (displayContent == 'suggested') ! suggestionCriteria.show() ! else ! suggestionCriteria.hide() ! } }, |
|
From: Jonathan O. <os...@us...> - 2010-11-29 20:21:52
|
Update of /cvsroot/dlsciences/dcs-project/web/lib In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20010 Modified Files: pageMenu.js Log Message: page doc Index: pageMenu.js =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/lib/pageMenu.js,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pageMenu.js 13 Apr 2010 19:58:39 -0000 1.12 --- pageMenu.js 29 Nov 2010 20:21:43 -0000 1.13 *************** *** 1,4 **** /* Javascript classes supporting the pageMenu that appears at the top ! of each page */ var pageMenu = null; --- 1,10 ---- /* Javascript classes supporting the pageMenu that appears at the top ! of each page ! ! - included in pages via baseHTMLIncludes.jsp ! - inserted in pages by pageHeader.tag ! - data supplied by pageMenuData.jsp ! ! */ var pageMenu = null; |
|
From: Jonathan O. <os...@us...> - 2010-11-29 20:20:26
|
Update of /cvsroot/dlsciences/dcs-project/web/ndr In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19898 Modified Files: manage_ndr_collections.jsp Log Message: check validation progress every 3 seconds (rather than every 1) Index: manage_ndr_collections.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/ndr/manage_ndr_collections.jsp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** manage_ndr_collections.jsp 24 Mar 2010 21:17:21 -0000 1.16 --- manage_ndr_collections.jsp 29 Nov 2010 20:20:18 -0000 1.17 *************** *** 210,214 **** new PeriodicalExecuter(function(pe) { updateProgress (pe, progressUrl, finalize); ! }, 1); } --- 210,214 ---- new PeriodicalExecuter(function(pe) { updateProgress (pe, progressUrl, finalize); ! }, 3); } |
|
From: Jonathan O. <os...@us...> - 2010-11-29 20:20:01
|
Update of /cvsroot/dlsciences/dcs-project/web/manage In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19426 Modified Files: validate_collection.jsp Log Message: check validation progress every 3 seconds (rather than every 1) Index: validate_collection.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/manage/validate_collection.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** validate_collection.jsp 18 Aug 2009 23:03:57 -0000 1.8 --- validate_collection.jsp 29 Nov 2010 20:19:53 -0000 1.9 *************** *** 45,49 **** new PeriodicalExecuter(function(pe) { updateProgress (pe, progressUrl, finalize); ! }, 1); } } --- 45,49 ---- new PeriodicalExecuter(function(pe) { updateProgress (pe, progressUrl, finalize); ! }, 3); } } |
|
From: Jonathan O. <os...@us...> - 2010-11-29 20:18:54
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/res_qual In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19345 Modified Files: standards_checkbox.tag Removed Files: phenomenon_benchmarks.tag representation_benchmarks.tag Log Message: cleanup --- representation_benchmarks.tag DELETED --- --- phenomenon_benchmarks.tag DELETED --- Index: standards_checkbox.tag =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/res_qual/standards_checkbox.tag,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** standards_checkbox.tag 13 Feb 2010 00:11:09 -0000 1.1 --- standards_checkbox.tag 29 Nov 2010 20:18:45 -0000 1.2 *************** *** 1,2 **** --- 1,4 ---- + <%-- renders the check boxes used for res_qual standards browse and suggestions --%> + <%@ tag isELIgnored ="false" %> <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> *************** *** 6,10 **** <%@ taglib tagdir="/WEB-INF/tags" prefix="st" %> <%@ taglib tagdir="/WEB-INF/tags/std" prefix="std" %> - <%-- <%@ tag import="org.dlese.dpc.schemedit.standards.SuggestionServiceHelper" %> --%> <%@ tag import="org.dlese.dpc.schemedit.standards.StandardsNode" %> --- 8,11 ---- |
|
From: Jonathan O. <os...@us...> - 2010-11-23 17:13:36
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF/xsl_files In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv396 Modified Files: osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl Log Message: new version from Katy Index: osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/xsl_files/osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl 21 Nov 2010 01:43:36 -0000 1.2 --- osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl 23 Nov 2010 17:13:28 -0000 1.3 *************** *** 88,93 **** <xsl:value-of select="osm:redistribute"/> </xsl:attribute> ! <!-- <xsl:attribute name="libraryFormat">osm_collect</xsl:attribute> --> ! <xsl:attribute name="libraryFormat"><xsl:value-of select="osm:itemFormat"/></xsl:attribute> <xsl:value-of select="osm:key"/> </xsl:element> <!--end key element--> --- 88,94 ---- <xsl:value-of select="osm:redistribute"/> </xsl:attribute> ! <xsl:attribute name="libraryFormat"> ! <xsl:value-of select="osm:itemFormat"/> ! </xsl:attribute> <xsl:value-of select="osm:key"/> </xsl:element> <!--end key element--> |
|
From: Jonathan O. <os...@us...> - 2010-11-22 21:27:19
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/vocabLayout In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3326 Added Files: asyncSingleSelect.tag Log Message: async vocabLayout support finalized --- NEW FILE: asyncSingleSelect.tag --- <%-- singleSelect - it requires a parameter named elementPath. e.g. here is a call for this tag: <st:vocabLayoutSingleSelect elementPath="enumerationValuesOf(/itemRecord/educational/resourceTypes/resourceType)"/> - this tag produces a static multi-level display. - The very top level is not displayed, only the lower levels. e.g., in the case of "resourceType" there is no header for "resourceType". The header is displayed by Renderer. - this tag will be produced by Renderer.getSelectInput when a vocabLayout is found for a given xpath --%> <%@ tag isELIgnored ="false" %> <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="/WEB-INF/tlds/schemedit-functions.tld" prefix="sf" %> <%@ tag import="org.dlese.dpc.schemedit.display.CollapseBean" %> <%@ taglib tagdir="/WEB-INF/tags/vocabLayout" prefix="vl" %> <%@ taglib tagdir="/WEB-INF/tags" prefix="st" %> <%@ attribute name="elementPath" required="true" %> <jsp:setProperty name="sef" property="vocabField" value="${elementPath}" /> <c:set var="myXpath" value="${sf:extractPredicateXPath(elementPath)}" /> <c:set var="myId" value="${sf:pathToId(myXpath)}" /> <bean:define id="selectedValue" name="sef" property="${elementPath}"/> <bean:define id="legalValues" name="sef" property="legalEnumerationValuesOf(${sef.vocabLayout.path})" /> <bean:define id="collapseBean" name="sef" property="collapseBean" type="CollapseBean" /> <%-- CURRENT SELECTION --%> <div id="${myId}_async_view_element"> <table class="control" cellspacing="0" cellpadding="3px"> <tr style="background-color:#E8ECF4;align:center"> <td> <div style="font-weight:bold">Current selection |</div> </td> <td> <div class="edit-button" style="background-color:#FFFFCC;padding:0px 3px 0px 3px;color:blue">Edit selection</div> </td> </tr> </table> <div id="${myId}_value_display"></div> </div> <div id="${myId}_async_edit_element" style="display:none"> <table class="control" cellspacing="0" cellpadding="3px"> <tr style="background-color:#E8ECF4;align:center"> <td> <div style="font-weight:bold">Edit Selection |</div> </td> <td> <div class="view-button" style="background-color:#FFFFCC;padding:0px 3px 0px 3px;color:blue">Current Selection</div> </td> </tr> </table> <div id="${myId}_vocab_layout"></div> </div> <%-- Use to cache selected values --%> <div id="${myId}_hidden" style="display:none"></div> <script type="text/javascript"> document.observe ("dom:loaded", function (event) { new AsyncSingleSelect ("${myId}", "${myXpath}", "${elementPath}", "${selectedValue}"); }); function getValue () { var form = document.forms[0]; // this is the only thing chrome will accept var key = "${elementPath}"; if (form == undefined) throw "form is undefined"; var params = form.serialize(true); var value = params[key]; log (value); return value; } </script> |
|
From: Jonathan O. <os...@us...> - 2010-11-22 20:59:41
|
Update of /cvsroot/dlsciences/dcs-project/web/lib/async-vocab-layout In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3131/lib/async-vocab-layout Added Files: async-multi-vocab-layout.jsp async-single-vocab-layout.jsp async-vocab-layout-support.js Log Message: async vocabLayout support finalized --- NEW FILE: async-multi-vocab-layout.jsp --- <%@ include file="/lib/includes.jspf" %> <%-- We need to pass "elementPath" attribute to vocabLayoutMultiBox - this should come from sef --%> <%-- <h4>Hello world from async-vocab-layout.jspf</h4> <div>pathArg: ${sef.pathArg}</div> <div>elementPath: enumerationValuesOf(${sef.pathArg})</div> --%> <vl:vocabLayoutMultiBox elementPath="enumerationValuesOf(${sef.pathArg})" /> --- NEW FILE: async-single-vocab-layout.jsp --- <%@ include file="/lib/includes.jspf" %> <%-- We need to pass "elementPath" attribute to asyncSingleSelect.tag - this comes from sef --%> <%-- <h4>Hello world from async-single-vocab-layout.jsp</h4> <div>pathArg: ${sef.pathArg}</div> <div>elementPath: enumerationValuesOf(${sef.pathArg})</div> --%> <vl:vocabLayoutSingleSelect elementPath="valueOf(${sef.pathArg})" /> --- NEW FILE: async-vocab-layout-support.js --- var AbstractAsyncVocabLayout = Class.create ({ initialize: function (id, xpath, elementPath, initialFieldValue) { this.id = id; this.xpath = xpath; this.elementPath = elementPath; this.initialFieldValue = initialFieldValue; this.viewElement = $(this.id + "_async_view_element"); this.editElement = $(this.id + "_async_edit_element"); this.selectionCache = $(this.id + "_hidden"); this.initialized = false; this.initControls(); this.doViewMode(); this.initialized = true; }, initializeSelectionCache: function () { alert ("initializeSelectionCache (" + this.elementPath + " is abstract and must be defined in concrete class"); }, renderFieldValue: function () { alert ("renderFieldValue is abstract and must be defined in concrete class"); }, initControls: function () { $A([this.viewElement, this.editElement]).each ( function (modeTag) { var mode = modeTag == this.viewElement ? 'view' : 'edit'; var buttonClass = mode == 'view' ? 'edit-button' : 'view-button'; // log ('initControls; mode is ' + mode + ' buttonClass is ' + buttonClass); var button = modeTag.down('div.'+buttonClass); if (!button) log ("selection button not found for " + mode + " (" + modeTag.identify() + ")"); button.observe ("mouseover", function () { button.setStyle ({'textDecoration':'underline', 'cursor':'pointer'}); }); button.observe ("mouseout", function () { button.setStyle ({'textDecoration':'none', 'cursor':'none'}); }); if (mode == 'view') button.observe ("click", this.doEditMode.bindAsEventListener(this)); if (mode == 'edit') button.observe ("click", this.doViewMode.bindAsEventListener(this)); }.bind(this)); }, /* display the current selection (display mode) */ doViewMode: function () { this.editElement.hide() // get the values for this field and insert as hidden vars in the DOM if (!this.initialized) { this.initializeSelectionCache (this.initialFieldValue); // this.getCachedValues(); } else { this.updateSelectionCache(); } this.renderFieldValue(); this.viewElement.show(); }, /* render the vocabLayout (select mode) */ doEditMode: function (event) { this.viewElement.hide(); var vocabLayout = $(this.id + "_vocab_layout"); var form = document.forms[0]; // this is the only thing chrome will accept if (form == undefined) throw "form is undefined"; form.pathArg.value = this.xpath; form.command.value = "vocabLayout"; var params = form.serialize(true); this.selectionCache.update() this.editElement.show(); // only get layout once if (vocabLayout.empty()) { // log ("vocabLayout is EMPTY"); vocabLayout.update ("loading ...."); new Ajax.Request ('edit.do', { method:'post', parameters: params, onComplete: function(transport) { try { var html = transport.responseText; vocabLayout.update (html); } catch (error) { alert ("displayVocabLayout ajax error: " + error); } }, onFailure: function() { alert('Unable to update vocab Layout display') } }); } }, /* returns a LIST of values */ getFormValueList: function () { var form = document.forms[0]; // this is the only thing chrome will accept if (form == undefined) throw "form is undefined"; var params = form.serialize(true); var valueObj = $H(params).get(this.elementPath); return Object.isString (valueObj) ? $A([valueObj]) : valueObj; }, getCachedValues: function () { log ("cached values for " + this.id); var values = this.selectionCache.select ('input').inject ([], function (acc, input) { log (" - " + input.value); acc.push (input.value); return acc; }); return values; } }); /* controls the single-select asyncronous vocabLayout field */ var AsyncSingleSelect = Class.create (AbstractAsyncVocabLayout, { initialize: function ($super, id, xpath, elementPath, selectedValue) { $super (id, xpath, elementPath, selectedValue); // log ("AsyncSingleSelect initialized for " + this.elementPath); }, /* Using info from the FormBean, initialize the hidden selection with the current values for this field */ initializeSelectionCache: function (selectedValue) { var hiddenVar = '<input type="hidden" name="'+this.elementPath+'" value="'+selectedValue+'" />'; this.selectionCache.update(hiddenVar); }, /* create a hidden variable for each selected item so the values will be preserved in display mode */ updateSelectionCache: function () { var value = this.getFormValueList()[0]; this.selectionCache.update ('<input type="hidden" name="' + this.elementPath + '" value="' + value + '" />'); }, // show the currently selected values by drawing from the hidden variables renderFieldValue: function () { var currentValuesDisplay = $(this.id + "_value_display"); var currentValue = this.getFormValueList()[0]; currentValuesDisplay.update (currentValue || "Unspecified"); } }); var AsyncMultiBox = Class.create (AbstractAsyncVocabLayout, { initialize: function ($super, id, xpath, elementPath, selectedValues) { $super (id, xpath, elementPath, selectedValues) // log ("AsyncMultiBox initialized for " + this.elementPath); }, /* Using info from the FormBean, initialize the hidden selections with the current values for this field */ initializeSelectionCache: function (selectedValues) { this.selectionCache.update(); $A(selectedValues).each (function (term) { this.selectionCache.insert ('<input type="hidden" name="'+this.elementPath+'" value="'+term+'" />'); }.bind(this)); }, // show the currently selected values by drawing from the hidden variables renderFieldValue: function () { var currentValuesDisplay = $(this.id + "_value_display"); var valueList = this.getFormValueList(); var valueTree = new ValueHierarchy ( valueList ); currentValuesDisplay.update (valueTree.render()); }, /* create a hidden variable for each selected item so the values will be preserved in display mode */ updateSelectionCache: function () { this.selectionCache.update(); this.getFormValueList().each (function (term) { this.selectionCache.insert ('<input type="hidden" name="' + this.elementPath + '" value="' + term + '" />'); }.bind(this)); } }); /* holds single segment of colon-delimited vocab terms in linked tree */ var ValueNode = Class.create ({ initialize: function (name, parent) { this.name = name; this.parent = parent; this.children = $A(); }, isEmpty: function () { return this.children.size() == 0; }, getChild: function (name) { return this.children.find ( function (child) { return child.name == name; }); }, addChild: function (name) { var child = this.getChild (name); if (!child) { child = new ValueNode (name, this); this.children.push (child); } return child; }, report: function (level) { level = level || 0; var indent = ''; for (var i=0;i<level;i++) indent += " "; log (indent + this.name); this.children.each (function (child) { child.report (level+1) }); }, render: function (level) { level = level || 0; var indent = level * 15; var s = "" if (this.name != "root") { var label = this.children.size() == 0 ? '<b>'+this.name+'</b>' : this.name; s = '<div style="margin-left:'+indent+'px">' + label + '</div>' } this.children.each (function (child) { s += child.render(level+1); }); return s; } }); /* structures ValueNodes for hierarchical display of colon-delmited vocab terms */ var ValueHierarchy = Class.create ({ initialize: function (data) { this.root = new ValueNode ("root", null); $A(data).each (function (term) { if (term) { this.insertTerm (term); } }.bind(this)); }, insertTerm: function (term) { // value is : delimited string var ptr = this.root; $A(term.split(":")).each ( function (seg) { var child = ptr.addChild (seg); ptr = child; }); }, isEmpty: function () { return this.root.isEmpty(); }, report: function () { log ("value hierachy"); this.root.report(); }, render: function () { if (this.isEmpty()) return "<div><i>There are no selections</i></div>" else return this.root.render(); } }); |
|
From: Jonathan O. <os...@us...> - 2010-11-22 20:59:41
|
Update of /cvsroot/dlsciences/dcs-project/web/lib In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3131/lib Removed Files: async-vocab-layout-support.js async-vocab-layout.jsp Log Message: async vocabLayout support finalized --- async-vocab-layout.jsp DELETED --- --- async-vocab-layout-support.js DELETED --- |
|
From: Jonathan O. <os...@us...> - 2010-11-22 20:59:41
|
Update of /cvsroot/dlsciences/dcs-project/web/editor In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3131/editor Modified Files: editorHTMLIncludes.jsp Log Message: async vocabLayout support finalized Index: editorHTMLIncludes.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/editor/editorHTMLIncludes.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** editorHTMLIncludes.jsp 17 Nov 2010 00:09:59 -0000 1.10 --- editorHTMLIncludes.jsp 22 Nov 2010 20:59:33 -0000 1.11 *************** *** 18,22 **** <script type="text/javascript" src="${contextPath}/lib/best-practices-link-support.js"></script> <script type="text/javascript" src="${contextPath}/lib/vocabTree.js"></script> ! <script type="text/javascript" src="${contextPath}/lib/async-vocab-layout-support.js"></script> <%-- <script type="text/javascript" src="${contextPath}/lib/metadata-editor-debugging.js"></script> --%> <script type="text/javascript" src="${contextPath}/lib/metadata-editor-support.js"></script> --- 18,22 ---- <script type="text/javascript" src="${contextPath}/lib/best-practices-link-support.js"></script> <script type="text/javascript" src="${contextPath}/lib/vocabTree.js"></script> ! <script type="text/javascript" src="${contextPath}/lib/async-vocab-layout/async-vocab-layout-support.js"></script> <%-- <script type="text/javascript" src="${contextPath}/lib/metadata-editor-debugging.js"></script> --%> <script type="text/javascript" src="${contextPath}/lib/metadata-editor-support.js"></script> |
|
From: Jonathan O. <os...@us...> - 2010-11-22 20:59:41
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3131/WEB-INF Modified Files: struts-config.xml Log Message: async vocabLayout support finalized Index: struts-config.xml =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/struts-config.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** struts-config.xml 16 Nov 2010 23:59:53 -0000 1.35 --- struts-config.xml 22 Nov 2010 20:59:33 -0000 1.36 *************** *** 332,336 **** <forward name="resqual.representation.benchmarks" path="/lib/stds/res_qual/representation_benchmarks.jsp"/> <forward name="resqual.phenomenon.benchmarks" path="/lib/stds/res_qual/phenomenon_benchmarks.jsp"/> ! <forward name="async.vocab.layout" path="/lib/async-vocab-layout.jsp"/> </action> --- 332,337 ---- <forward name="resqual.representation.benchmarks" path="/lib/stds/res_qual/representation_benchmarks.jsp"/> <forward name="resqual.phenomenon.benchmarks" path="/lib/stds/res_qual/phenomenon_benchmarks.jsp"/> ! <forward name="async.multi.layout" path="/lib/async-vocab-layout/async-multi-vocab-layout.jsp"/> ! <forward name="async.single.layout" path="/lib/async-vocab-layout/async-single-vocab-layout.jsp"/> </action> |
|
From: Jonathan O. <os...@us...> - 2010-11-22 20:59:41
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/vocabLayout In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3131/WEB-INF/tags/vocabLayout Modified Files: asyncMultiBox.tag Log Message: async vocabLayout support finalized Index: asyncMultiBox.tag =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/tags/vocabLayout/asyncMultiBox.tag,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** asyncMultiBox.tag 17 Nov 2010 00:02:47 -0000 1.1 --- asyncMultiBox.tag 22 Nov 2010 20:59:33 -0000 1.2 *************** *** 24,40 **** </div> --%> ! <div id="${myId}_current_selections"> ! <div style="margin:0px 0px 10px"> ! <span style="font-weight:bold;margin-right:40px">Current selections</span> ! <input type="button" value="Edit selections" id="${myId}_edit_button" /> ! </div> ! <div id="${myId}_current_values"></div> </div> ! <div id="${myId}_vocab_selections" style="display:none"> ! <div style="margin:0px 0px 10px"> ! <span style="font-weight:bold;margin-right:40px">Edit selections</span> ! <input type="button" value="Show only selections" id="${myId}_selections_button" /> ! </div> <div id="${myId}_vocab_layout"></div> </div> --- 24,54 ---- </div> --%> ! <div id="${myId}_async_view_element"> ! <table class="control" cellspacing="0" cellpadding="3px"> ! <tr style="background-color:#E8ECF4;align:center"> ! <td> ! <div style="font-weight:bold">Current selections |</div> ! </td> ! <td> ! <div class="edit-button" ! style="background-color:#FFFFCC;padding:0px 3px 0px 3px;color:blue">Edit selections</div> ! </td> ! </tr> ! </table> ! <div id="${myId}_value_display"></div> </div> ! <div id="${myId}_async_edit_element" style="display:none"> ! <table class="control" cellspacing="0" cellpadding="3px"> ! <tr style="background-color:#E8ECF4;align:center"> ! <td> ! <div style="font-weight:bold">Edit Selections |</div> ! </td> ! <td> ! <div class="view-button" ! style="background-color:#FFFFCC;padding:0px 3px 0px 3px;color:blue">Current Selections</div> ! </td> ! </tr> ! </table> <div id="${myId}_vocab_layout"></div> </div> *************** *** 46,55 **** document.observe ("dom:loaded", function (event) { - log ("hello"); var selectedValues = []; <c:forEach var="instDiv" items="${selectedValues}"> selectedValues.push ("${instDiv}"); </c:forEach> - log ("about to instantiate AsyncMultiBox"); new AsyncMultiBox ("${myId}", "${myXpath}", "${elementPath}", selectedValues); }); --- 60,67 ---- |
|
From: Jonathan O. <os...@us...> - 2010-11-22 20:58:00
|
Update of /cvsroot/dlsciences/dcs-project/web/lib/async-vocab-layout In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2833/async-vocab-layout Log Message: Directory /cvsroot/dlsciences/dcs-project/web/lib/async-vocab-layout added to the repository |
|
From: Jonathan O. <os...@us...> - 2010-11-21 01:43:45
|
Update of /cvsroot/dlsciences/dcs-project/web/WEB-INF/xsl_files In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32491 Modified Files: osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl Log Message: fixed library-format bug (redistribute bug remains - osm_collect schema has element misspelled!) Index: osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/WEB-INF/xsl_files/osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl 20 Nov 2010 00:22:38 -0000 1.1 --- osm_collect-v1.0-to-dlese_collect-v1.0.00.xsl 21 Nov 2010 01:43:36 -0000 1.2 *************** *** 88,92 **** <xsl:value-of select="osm:redistribute"/> </xsl:attribute> ! <xsl:attribute name="libraryFormat">osm_collect</xsl:attribute> <xsl:value-of select="osm:key"/> </xsl:element> <!--end key element--> --- 88,93 ---- <xsl:value-of select="osm:redistribute"/> </xsl:attribute> ! <!-- <xsl:attribute name="libraryFormat">osm_collect</xsl:attribute> --> ! <xsl:attribute name="libraryFormat"><xsl:value-of select="osm:itemFormat"/></xsl:attribute> <xsl:value-of select="osm:key"/> </xsl:element> <!--end key element--> |
|
From: Jonathan O. <os...@us...> - 2010-11-20 23:49:37
|
Update of /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11666 Modified Files: osm_collect_search_info.jsp Log Message: display key field for osm_collect records Index: osm_collect_search_info.jsp =================================================================== RCS file: /cvsroot/dlsciences/dcs-project/web/browse/searching/synopses/osm_collect_search_info.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osm_collect_search_info.jsp 20 Nov 2010 01:56:00 -0000 1.2 --- osm_collect_search_info.jsp 20 Nov 2010 23:49:29 -0000 1.3 *************** *** 35,38 **** --- 35,41 ---- <x:out select="$rootElement/itemFormat"/> </c:set> + <c:set var="key"> + <x:out select="$rootElement/key"/> + </c:set> <%-- Display Values --%> *************** *** 55,58 **** --- 58,67 ---- </c:if> + <c:if test="${not empty key}"> + <div class="searchResultValues"><em>Key:</em> + <span style="font-weight:bold">${key}</span> + </div> + </c:if> + <c:choose> <c:when test="${not empty description}"> |