Changeset 823
- Timestamp:
- 10/28/10 20:07:53 (14 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r799 r823 58 58 </div> 59 59 <div id="left-menu" > 60 <div >61 < h2>Public Space</h2>62 <div id="serverqs" class=" block" data="">60 <div id="public-space" class="cmds-ui-block"> 61 <div class="header">Public Space</div> 62 <div id="serverqs" class="content" data=""> 63 63 <div id="serverquerysets" > 64 64 <label>Querysets</label><select id="serverqts_select" ></select> … … 68 68 </div> 69 69 70 <div >71 < h2>Personal Workspace</h2>72 <div id="userqs" class=" block">70 <div class="cmds-ui-block"> 71 <div class="header" >Personal Workspace</div> 72 <div id="userqs" class="content"> 73 73 <div id="userquerysets" > 74 74 <label>Querysets</label><select id="qts_select" ></select> … … 86 86 </div> 87 87 88 <div >89 < h2>Collections</h2>90 <div id="collections" class=" block">88 <div class="cmds-ui-block"> 89 <div class="header">Collections</div> 90 <div id="collections" class="content"> 91 91 </div> 92 92 </div> 93 <div >94 < h2>Terms</h2>95 <div id="terms" class=" block">93 <div class="cmds-ui-block"> 94 <div class="header">Terms</div> 95 <div id="terms" class="content"> 96 96 <div id="model_profiles"> 97 97 </div> … … 110 110 --> 111 111 112 <div >113 < h2>Profiles/Components</h2>114 <div id="compreg" class=" block">112 <div class="cmds-ui-block"> 113 <div class="header">Profiles/Components</div> 114 <div id="compreg" class="content"> 115 115 <div id="profiles" > 116 116 </div> … … 120 120 121 121 </div> 122 < div>123 < h2>isocatDCR</h2>124 <div id="dcr" class=" block">122 <!-- <div> 123 <div class="header">isocatDCR</div> 124 <div id="dcr" class="content"> 125 125 <p>isocatDCR</p> 126 126 </div> 127 127 </div> 128 --> 128 129 </div> 129 130 130 131 <div id="main" class="ui-widget"> 131 <div id="search" class="block">132 <div id="search"> 132 133 133 134 <!-- <label id="toggle_inputmode_cmd" >TEXT</label> --> 134 135 135 136 <!-- class="ui-widget ui-helper-reset ui-state-default ui-corner-all ui-widget-content" --> 136 <div id="query-input" class="ui-helper-reset ui-corner-all" > 137 <div class="ui-widget-header ui-state-default ui-corner-top" >Query</div> 138 <div class="ui-widget-content ui-corner-bottom"> 137 <div id="query-input" class="cmds-ui-block" > 138 <!-- <div class="ui-widget-header ui-state-default ui-corner-top" >Query</div> 139 <div class="ui-widget-content ui-corner-bottom"> --> 140 <div class="header" >Query</div> 141 <div class="content"> 139 142 <s:form action="searchretrieve"> 140 143 <!-- <label id="toggle_inputmode_cmd" value="TEXT" />--> -
MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js
r799 r823 1050 1050 ////////////VISUALS 1051 1051 1052 $('#left-menu').addClass('ui-accordion ui-widget ui-helper-reset ui-accordion-icons'); 1053 $('#left-menu h2').addClass('ui-accordion-header ui-helper-reset ui-state-default ui-corner-all'); 1054 $('#left-menu>div').addClass('block ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom'); 1055 $('#left-menu h2').click(function() { 1052 // $('#left-menu').addClass('ui-accordion ui-widget ui-helper-reset ui-accordion-icons'); 1053 $('.cmds-ui-block').addClass('ui-helper-reset ui-corner-all'); 1054 $('.cmds-ui-block .header').addClass('ui-widget-header ui-state-default ui-corner-top'); 1055 $('.cmds-ui-block .content').addClass('ui-widget-content ui-corner-bottom'); 1056 $('.cmds-ui-block .header').click(function() { 1056 1057 $(this).next().toggle('fast'); 1057 1058 return false; 1058 1059 }).next().hide(); 1059 1060 1061 /* 1060 1062 // Accordion 1061 // $("#left-menu").accordion({ header: "h2",event: 'click' }); 1062 // $("#left-menu").accordion('option', 'autoHeight', false); 1063 1063 $("#left-menu").accordion({ header: "h2",event: 'click' }); 1064 $("#left-menu").accordion('option', 'autoHeight', false); 1064 1065 // hack to open the accordion without scroll-bars on init 1065 //$("#left-menu").accordion('option', 'active', 1);1066 1066 $("#left-menu").accordion('option', 'active', 1); 1067 */ 1067 1068 1068 1069 //$("#main-menu").treeview(); -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r799 r823 272 272 notifyUser("resubmitting query:" + uri); 273 273 274 var get = $(this).parent().find('.cmd_up , .cmd_down');274 var get = $(this).parent().find('.cmd_up'); 275 275 get.addClass('cmd_get'); 276 276 get.removeClass('cmd_up'); -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_searchclause.js
r797 r823 273 273 return "ISOCAT( " + this.category + ") " + this.relation + " " + this.value; 274 274 } 275 return this.index + " " + this.relation + " " + this.value;275 return this.index.replace(" ","_") + " " + this.relation + " " + this.value; 276 276 }; 277 277 /* … … 548 548 var i = $('.focused','#searchclauselist').closest('.sc-i').attr("id"); 549 549 var j = $('.focused','#searchclauselist').closest('.sc-j').attr("id"); 550 searchclauseset.searchclauses[i][j].index = term ;550 searchclauseset.searchclauses[i][j].index = term.replace(" ","_"); 551 551 552 552 $('.focused','#searchclauselist').find('.value_input').focus(); -
MDService2/trunk/MDService2/WebContent/style/cmds-ui.css
r799 r823 58 58 .ui-widget-content { padding: 6px; } 59 59 60 .cmds-ui-block { }60 .cmds-ui-block { margin: 2px; } 61 61 62 62 .cmds-elem-plus .detail { display: none; border: 1px solid #A6C9E2;} -
MDService2/trunk/MDService2/src/terms_setup.xml
r789 r823 1 1 <Termsets> 2 <Termset type="model" id="olac" name="olac" url="" format="terms|cmdrepo" /> 3 <Termset type="model" id="coll" name="collection" url="" format="terms|cmdrepo" /> 2 4 <Termset type="model" id="tcp" name="TextCorpusProfile" url="" format="terms|cmdrepo" /> 3 5 <Termset type="model" id="tei" name="teiHeader" url="" format="terms" /> -
MDService2/trunk/MDService2/src/xsl/XCQL2Xpath.xsl
r689 r823 39 39 </sample> 40 40 --> 41 42 <xsl:include href="params.xsl"/> 43 <xsl:variable name="terms_setup" select="document($terms_setup_uri)" /> 44 <xsl:variable name="terms_flat" select="document($terms_flat_uri)" /> 41 45 42 46 <xsl:output method="text" /> … … 107 111 108 112 <xsl:template match="index"> 113 <xsl:variable name="ix_string" select="replace(text(),'_',' ')" /> 114 <xsl:variable name="ix_resolved" > 115 <xsl:choose> 116 <xsl:when test="contains(.,':')"> 117 <xsl:variable name="prefix" select="substring-before(.,':')" /> 118 <xsl:variable name="termset" select="$terms_setup/Termsets/Termset[@id=$prefix]" /> 119 120 <xsl:message>XCQL2XPath.index:<xsl:copy-of select="$termset"/> 121 ix_string:<xsl:value-of select="$ix_string"/> 122 </xsl:message> 123 <xsl:choose> 124 <xsl:when test="$termset[@type='dcr' or @type='rr']"> 125 <xsl:variable name="expanded_context" select="$terms_flat//context[@path=$ix_string]"></xsl:variable> 126 <xsl:variable name="expanded_query" > 127 <xsl:text>(</xsl:text> 128 <xsl:for-each select="distinct-values($expanded_context//context[@elem]/@path)"> 129 <xsl:variable name="prefix" select="substring-before(.,':')" /> 130 <xsl:variable name="termset" select="$terms_setup/Termsets/Termset[@id=$prefix]" /> 131 <xsl:value-of select="concat($termset/@name,'//',substring-after(.,':'))" /> 132 <xsl:if test="position()!=last()"><xsl:text>|</xsl:text></xsl:if> 133 </xsl:for-each> 134 <xsl:text>)</xsl:text> 135 </xsl:variable> 136 <xsl:message>expanded-context:<xsl:value-of select="$expanded_query" /></xsl:message> 137 <xsl:value-of select="$expanded_query" /> 138 </xsl:when> 139 <xsl:otherwise> 140 <xsl:value-of select="concat($termset/@name,'//',substring-after(.,':'))" /> 141 </xsl:otherwise> 142 </xsl:choose> 143 144 </xsl:when> 145 <xsl:otherwise><xsl:value-of select="." /> 146 </xsl:otherwise> 147 </xsl:choose> 148 149 </xsl:variable> 150 <xsl:variable name="ix_xpathed" select="translate($ix_resolved, '.', '/')" ></xsl:variable> 109 151 <xsl:choose> 110 152 <xsl:when test=".='cql.serverChoice'" >//*</xsl:when> 111 153 <xsl:when test="ancestor::triple" > 112 <xsl:value-of select="concat('.//',translate(.,'.','/'))" />154 <xsl:value-of select="concat('.//',$ix_xpathed)" /> 113 155 </xsl:when> 114 156 <xsl:otherwise> 115 <xsl:value-of select="concat('//', translate(.,'.','/'))" />157 <xsl:value-of select="concat('//',$ix_xpathed)" /> 116 158 </xsl:otherwise> 117 159 </xsl:choose> -
MDService2/trunk/MDService2/src/xsl/cmd_commons.xsl
r794 r823 29 29 30 30 <xsl:variable name="terms_setup" select="document($terms_setup_uri)" /> 31 <xsl:variable name="terms_flat" select="document($terms_flat_uri)" /> 31 32 32 33 <xsl:template match="/"> -
MDService2/trunk/MDService2/src/xsl/mdinst2view.xsl
r793 r823 55 55 --> 56 56 57 <xsl:apply-templates select=".//IsPartOfList" /> 57 58 <xsl:apply-templates select=".//ResourceProxyList" /> 58 59 <xsl:apply-templates select=".//Components/*" /> … … 60 61 </xsl:template> 61 62 62 <xsl:template match="ResourceProxyList" > 63 <ul> 64 <xsl:apply-templates /> 65 </ul> 66 </xsl:template> 63 <xsl:template match="IsPartOfList" > 64 <div class="ispartof-list"> 65 <xsl:apply-templates select=".//IsPartOf" /> 66 </div> 67 </xsl:template> 68 69 <xsl:template match="IsPartOf" > 70 <a href="{concat($recordset_prefix, .)}"><xsl:value-of select="." /></a>, 71 </xsl:template> 72 73 74 <xsl:template match="ResourceProxyList" > 75 <xsl:choose> 76 <xsl:when test="count(ResourceProxy) > 1"> 77 <div class="resource-links"> 78 <span class="detail-caller"> 79 references <xsl:value-of select="count(ResourceProxy[ResourceType='Metadata'])" /> MDRecords 80 <xsl:value-of select="count(ResourceProxy[ResourceType='Resource'])" /> Resources 81 </span> 82 <ul class="detail"> 83 <xsl:if test="count(ResourceProxy) > $resourceref_limit" > 84 showing first <xsl:value-of select="$resourceref_limit" /> references. 85 <a href="{concat($recordset_prefix, ./ancestor::CMD/Header/MdSelfLink)}">see more</a> 86 </xsl:if> 87 <xsl:apply-templates select="ResourceProxy[position() < $resourceref_limit]" /> 88 </ul> 89 </div> 90 </xsl:when> 91 <xsl:otherwise> 92 <ul> 93 <xsl:apply-templates /> 94 </ul> 95 </xsl:otherwise> 96 </xsl:choose> 97 98 </xsl:template> 67 99 68 100 <xsl:template match="ResourceProxy" > -
MDService2/trunk/MDService2/src/xsl/params.xsl
r799 r823 20 20 <xsl:param name="datcats_terms_uri" select="'http://localhost:8080/MDService2/datcats/terms/?q='" /> 21 21 <xsl:param name="terms_setup_uri" select="'http://localhost:8080/MDService2/datcats/xml/?q='" /> 22 <xsl:param name="terms_flat_uri" select="'http://localhost:8080/MDService2/terms/flat/?q=all'" /> 23 22 24 23 25 <!-- for resolving components by suffixing with @ComponentId --> … … 29 31 <xsl:param name="components_uri" select="'http://localhost:8080/MDService2/comp/xml/'" /> 30 32 <xsl:param name="components_id_prefix" select="'clarin.eu:cr1:'" /> 33 34 31 35 32 36 <xsl:param name="autocolumns_limit" select="6" /> 37 <xsl:param name="resourceref_limit" select="20" /> 38 39 <xsl:param name="recordset_prefix" select="concat($base_dir, '/record/htmlpage/')" /> 33 40 34 41 <xsl:param name="detail_comp_prefix" select="'comp/htmldetail/'"/> -
MDService2/trunk/MDService2/src/xsl/terms2view.xsl
r799 r823 136 136 </div> --> 137 137 </div> 138 <ul><xsl:apply-templates select=" *" mode="list" /></ul>138 <ul><xsl:apply-templates select="Term" mode="list" /></ul> 139 139 </li> 140 140 </xsl:template> … … 213 213 <xsl:copy-of select="@*" /> 214 214 <div class="term-contexts"> 215 <xsl:apply-templates mode="autocomplete" /> 215 <ul> 216 <xsl:apply-templates mode="autocomplete" /> 217 </ul> 216 218 </div> 217 219 </xsl:copy> … … 219 221 220 222 <xsl:template match="context" mode="autocomplete"> 221 < divclass="context cmds-elem-plus">223 <li class="context cmds-elem-plus"> 222 224 <span class="detail-caller"><a href="{concat($detail_model_prefix,@path)}" > 223 225 <xsl:value-of select="@path"/></a></span> 224 226 225 227 <xsl:call-template name="attr-detail-div" /> 226 <xsl:apply-templates mode="autocomplete" /> 227 </div> 228 <ul> 229 <xsl:apply-templates select="context" mode="autocomplete" /> 230 </ul> 231 </li> 228 232 </xsl:template> 229 233
Note: See TracChangeset
for help on using the changeset viewer.