Changeset 799
- Timestamp:
- 10/17/10 10:07:35 (14 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 8 added
- 10 edited
-
WebContent/index.jsp (modified) (1 diff)
-
WebContent/scripts/mdservice2_ui.js (modified) (17 diffs)
-
WebContent/scripts/mdservice_model.js (modified) (3 diffs)
-
WebContent/static/welcome.xml (modified) (1 diff)
-
WebContent/style/cmds-ui.css (modified) (5 diffs)
-
WebContent/style/imgs/cdb-icon-columns.png (added)
-
WebContent/style/imgs/cdb-icon-detail.png (added)
-
WebContent/style/imgs/cdb-icon-down.png (added)
-
WebContent/style/imgs/cdb-icon-filter.png (added)
-
WebContent/style/imgs/cdb-icon-next.png (added)
-
WebContent/style/imgs/cdb-icon-prev.png (added)
-
WebContent/style/imgs/cdb-icon-save.png (added)
-
WebContent/style/imgs/cdb-icon-up.png (added)
-
src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.java (modified) (1 diff)
-
src/xsl/mdset2view.xsl (modified) (3 diffs)
-
src/xsl/model2matrix.xsl (modified) (2 diffs)
-
src/xsl/params.xsl (modified) (1 diff)
-
src/xsl/terms2view.xsl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r782 r799 80 80 <label>name</label> 81 81 <input type="text" id="qts_input" ></input> 82 < button id="qts_save" >Save</button>82 <span id="qts_save" class="cmd cmd_save" ></span> 83 83 <div id="userqueries" ></div> 84 84 </div> -
MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js
r797 r799 56 56 loadCollections(); 57 57 loadComponentsRegistry(); 58 load Elements();58 loadTerms(); 59 59 loadDCR(); 60 60 … … 78 78 function submit_query (columns, query, squery) { 79 79 notifyUser("processing query"); 80 80 81 if (jQuery.trim(query).length == 0){ 81 82 query = null; … … 285 286 del = '<span class="cmd cmd_del" ><xsl:text> </xsl:text></span>'; 286 287 } 287 var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class=" query-detail-caller" ><a href="'+id + '_'+ i+'" >' +288 var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class="detail-caller" ><a href="'+id + '_'+ i+'" >' + 288 289 Query.fullformatstring(json) + '</a></span>' + 289 290 del + … … 386 387 //////////////////////////////////////////////// 387 388 function loadWelcomeMessage(){ 388 $('#detail').load("/MDService2/static/welcome.xml"); //profile.collections.base_uri, 389 $('#detail').load("/MDService2/static/welcome.xml", function() { //profile.collections.base_uri, 390 $('#welcome').addClass("ui-helper-reset ui-corner-all ui-widget-content"); 391 }); 392 } 393 394 function hideWelcomeMessage(){ 395 // kick the welcome message on first submit 396 notifyUser("hiding welcome"); 397 if( $('#welcome').is(':visible') ) { 398 $('#welcome').hide(); 399 } 389 400 } 390 401 … … 501 512 });// end of collection callback 502 513 } 503 function load Elements(){514 function loadTerms(){ 504 515 $('#model_profiles').load(link('terms','htmlselect',actions.terms.current)); 505 516 … … 544 555 }); 545 556 557 /* 558 * deactivated -> obsolete? 546 559 $('#terms .cmd_detail').live('click', function(event) { 547 560 //showTermDetail($(this).parent().text()); … … 557 570 558 571 }); 559 572 */ 573 560 574 } 561 575 function loadComponentsRegistry(){ … … 692 706 693 707 } 708 694 709 function handleBubble(){ 695 710 // this is dangerous workaround … … 714 729 //$('#srquery').val(term); 715 730 }); 716 $(".term_detail_caller a, .query-detail-caller a").live('click', 731 732 /* obsolete: ? */ 733 /* $(".term_detail_caller a, .query-detail-caller a").live('click', 717 734 // function(event) { 718 735 // //notifyUser("term_detail_caller_live_click",'debug'); … … 738 755 } 739 756 notifyUser('last_bubble_uri:' + last_bubble_uri,'debug'); 740 }); 741 742 757 }); 758 */ 743 759 744 760 } … … 746 762 function addFunctionality(){ 747 763 748 $('.cmds-elem-plus').live('click', function(event) {764 /* $('.cmds-elem-plus').live('click', function(event) { 749 765 $(this).children('.detail').toggle(); 750 766 }); 751 752 $('.detail-caller ').live('click', function(event) {767 */ 768 $('.detail-caller, .cmd_detail').live('click', function(event) { 753 769 $(this).parent().children('.detail').toggle(); 770 }); 771 772 $('.detail-caller a').live('click', function(event) { 773 event.preventDefault(); 754 774 }); 755 775 … … 761 781 762 782 $('.result a').live('click', function(event) { 763 //showTermDetail($(this).parent().text()); 764 event.preventDefault(); 765 766 var uri = $(this).attr('href'); // + " body"; 767 // $.ajax({ 768 // url: uri, 769 // success: showDetail2 770 // }); 771 783 event.preventDefault(); 784 var uri = $(this).attr('href'); // + " body"; 772 785 $.get(uri, showDetail,'html'); 773 774 }); 786 }); 787 788 $('.result .cmd_detail').live('click', function(event) { 789 var uri = $(this).parent().find("a").attr('href'); // + " body"; 790 $.get(uri, showDetail,'html'); 791 }); 792 775 793 776 794 // RECORDSET searchRetrieve 777 795 $('#searchretrieve').submit( function(event) { 778 796 event.preventDefault(); 797 hideWelcomeMessage(); 779 798 searchclauseset.buildsctext(); 780 799 notifyUser(searchclauseset.sctext,'debug'); … … 926 945 927 946 $('#collections .cmd_load').live('click',function(event){ 928 947 hideWelcomeMessage(); 929 948 var collection_text = ""; 930 949 var coll = $(this).next().next().next(); … … 940 959 }); 941 960 $('#serverqueries .cmd_load').live('click',function(event){ 942 961 hideWelcomeMessage(); 943 962 var id = parseInt( $("#serverqts_select option:selected").val()); 944 963 var str = $(this).parent().find('a').attr("href"); … … 959 978 }); 960 979 $('#userqueries .cmd_load').live('click',function(event){ 961 980 hideWelcomeMessage(); 962 981 var id = parseInt( $("#qts_select option:selected").val()); 963 982 var str = $(this).parent().find('a').attr("href"); … … 1031 1050 ////////////VISUALS 1032 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() { 1056 $(this).next().toggle('fast'); 1057 return false; 1058 }).next().hide(); 1059 1033 1060 // Accordion 1034 $("#left-menu").accordion({ header: "h2",event: 'click' });1035 $("#left-menu").accordion('option', 'autoHeight', false);1061 // $("#left-menu").accordion({ header: "h2",event: 'click' }); 1062 // $("#left-menu").accordion('option', 'autoHeight', false); 1036 1063 1037 1064 // hack to open the accordion without scroll-bars on init 1038 $("#left-menu").accordion('option', 'active', 1);1065 // $("#left-menu").accordion('option', 'active', 1); 1039 1066 1040 1067 … … 1055 1082 1056 1083 } 1084 1057 1085 String.prototype.beginsWith = function(t, i) { if (i==false) { return 1058 1086 (t == this.substring(0, t.length)); } else { return (t.toLowerCase() -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r774 r799 221 221 Query.prototype.render = function () { 222 222 var x = "<div id='" + this.listid + "' class='query_wrapper ui-widget' ><div class='query_header ui-widget-header ui-state-default ui-corner-top'>" + 223 "<span class='cmd cmd_ del'> </span><span class='cmd cmd_get'></span><span class='query_id'>" +224 this.listid + "</span> <span class='query'>" +225 this.getcollectiontext("name") + ": " + Query.queryliststring(this.squery, this.query) + "</span><span class='cmd cmd_save'></span><span class='cmd cmd_resubmit'></span></div>" +223 "<span class='cmd cmd_get'></span><span class='cmd cmd_save'></span><span class='query_id'>" + 224 this.listid + "</span>: <span class='query'>" + 225 this.getcollectiontext("name") + Query.queryliststring(this.squery, this.query) + "</span><span class='cmd cmd_del'> </span></div>" + 226 226 "<div class='result ui-widget-content ui-corner-bottom'></div></div>"; 227 227 addToQuerylist(x); … … 243 243 // get.show(); 244 244 245 var result_header = $(this).children('.result _header');245 var result_header = $(this).children('.result-header'); 246 246 247 247 var q_header; 248 248 q_header = $(this).parent().find('.query_header'); 249 249 q_header.append(result_header); 250 q_header.find('. reload').click(function() {250 q_header.find('.cmd_reload').click(function() { 251 251 var qid = $(this).closest('.query_wrapper').attr("id"); 252 252 queryset.resubmit(qid); … … 272 272 notifyUser("resubmitting query:" + uri); 273 273 274 var get = $(this).parent().find('.cmd_up, .cmd_down'); 275 get.addClass('cmd_get'); 276 get.removeClass('cmd_up'); 277 get.removeClass('cmd_down'); 278 // get.show(); 279 274 280 $('#' + qid ).children('.result').children().remove(); 275 281 $('#' + qid ).children('.result').load( uri, function() { -
MDService2/trunk/MDService2/WebContent/static/welcome.xml
r796 r799 2 2 <div id="welcome"> 3 3 4 <h2>Welcome to CLARIN Metadata Service - the gate to CLARIN Metadata Repository</h2> 5 <p>Metadata Service is the user-interface for exploring the CMDRepository. 6 where you can: 4 <h3>Welcome to CLARIN Metadata Service the gate to CLARIN Metadata Repository</h3> 5 <p>Metadata Service is the user-interface for exploring the CMDRepository. Yes, you can: 7 6 <ul> 8 7 <li>simply search</li> -
MDService2/trunk/MDService2/WebContent/style/cmds-ui.css
r782 r799 9 9 #notify {max-width: 400px; position: relative; overflow: auto; height: 40px;} 10 10 #user {text-align: right;} 11 #welcome {max-width: 600px; padding: 10px;} 11 12 12 13 /* ******************** */ … … 14 15 body { font-size: 12px;} 15 16 #site-name { font-family: Helvetica, Tahoma, Verdana, sans-serif; font-size: 24px; color: #014172; /* #040288 #666699; */ display:inline; padding-left: 20px; position:absolute; top:24px} 17 #welcome h3 { color: #014172;} 16 18 17 19 .note { font-size: 0.9em; color: #9999aa; } … … 43 45 44 46 table.show { border: 1px solid #A6C9E2; } 45 table.show, table.show table, table.show td { border: 1px solid #A6C9E2; border-collapse: collapse; }47 table.show, table.show table, table.show td { border: 1px solid #A6C9E2; border-collapse: collapse; vertical-align: top; } 46 48 47 49 … … 98 100 .value_input { width:32%; } 99 101 .sc_cmds { } 102 .paging-input { width: 3em; text-align: right; height: 1em;} 103 104 .result-header { float: right; } 105 100 106 101 107 .sc-wrapper .index-context { display: none; border: 1px solid #A6C9E2;} … … 121 127 .cmd_add_and { background-image: url("imgs/icon_add_and.png");} 122 128 .cmd_add_or { background-image: url("imgs/icon_add_or.png");} 123 .cmd_columns { background-image: url("imgs/ icon_cols.png");}129 .cmd_columns { background-image: url("imgs/cdb-icon-columns.png");} 124 130 .cmd_del { background-image: url("imgs/cdb-icon-del.png");} 125 .cmd_detail { background-image: url("imgs/ icon_detail_10.png");}126 .cmd_down { background-image: url("imgs/ icon_down.png"); }127 .cmd_filter { background-image: url("imgs/ icon_filter_10.png"); }131 .cmd_detail { background-image: url("imgs/cdb-icon-detail.png");} 132 .cmd_down { background-image: url("imgs/cdb-icon-down.png"); } 133 .cmd_filter { background-image: url("imgs/cdb-icon-filter.png"); } 128 134 .cmd_get { background-image: url("imgs/icon_get.gif");} 129 135 .cmd_load { background-image: url("imgs/cdb-icon-load.png");} 136 .cmd_reload { background-image: url("imgs/cdb-icon-load.png");} 130 137 .cmd_resubmit { background-image: url("imgs/cdb-icon-.png");} 131 .cmd_save { background-image: url("imgs/icon_filter_10.png");} 132 .cmd_sc_delete { background-image: url("imgs/icon_delete.png");} 133 .cmd_up { background-image: url("imgs/icon_up.png");} 138 .cmd_save { background-image: url("imgs/cdb-icon-save.png");} 139 .cmd_sc_delete { background-image: url("imgs/cdb-icon-del.png");} 140 .cmd_up { background-image: url("imgs/cdb-icon-up.png");} 141 .cmd_prev { background-image: url("imgs/cdb-icon-prev.png");} 142 .cmd_next { background-image: url("imgs/cdb-icon-next.png");} -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.java
r795 r799 135 135 136 136 InputStream resultStream = null; 137 // if no arguments - get the local-config file 138 if ((getQ()==null || getQ().equals("")) && (getActionkey().equals(DATCATS))) { 139 resultStream = this.getClass().getClassLoader().getResourceAsStream(Admin.getConfig().getProperty("datcats.file")); 137 // if no arguments - get the local-config file 138 // FIXME: although this should be competence of TermsProxyAction 139 if ((getQ().equals(ALL) || getQ()==null || getQ().equals("")) && (getActionkey().equals(DATCATS))) { 140 Admin.notifyUser("serving terms.file:" + Admin.getConfig().getProperty("terms.file")); 141 resultStream = this.getClass().getClassLoader().getResourceAsStream(Admin.getConfig().getProperty("terms.file")); 140 142 } else { 141 143 -
MDService2/trunk/MDService2/src/xsl/mdset2view.xsl
r789 r799 118 118 --> 119 119 <xsl:template name="header"> 120 <div class="result _header" >120 <div class="result-header" > 121 121 <xsl:attribute name="max_value"><xsl:value-of select="numberOfRecords" /></xsl:attribute> 122 <span class="label" >query:</span><span class="value"><xsl:value-of select="echoedSearchRetrieveRequest" /></span>; 123 <span class="label" >hitcount:</span><span class="value hilight"><xsl:value-of select="numberOfRecords" /></span>; 124 <span class="label" >showing:</span><span class="value"><xsl:value-of select="diagnostics" /></span>; 122 <xsl:variable name="cnt_hits" select="number(diagnostics)" /> 123 <span class="label" >hits: </span><span class="value hilight"><xsl:value-of select="numberOfRecords" /></span>; 124 <span class="label" >from:</span><span><input type="text" class="value start_record paging-input"><xsl:attribute name="value"> 125 <xsl:value-of select="$startRecord"/> 126 </xsl:attribute> 127 </input></span> 128 <span class="label" >max:</span><span><input type="text" class="value maximum_records paging-input" ><xsl:attribute name="value"> 129 <xsl:value-of select="if(number($cnt_hits) < number($maximumRecords)) then $cnt_hits else $maximumRecords"/> 130 </xsl:attribute></input></span> 131 <span class="cmd cmd_reload" /> 132 <!-- <button class="reload">reload</button>--> 125 133 <span class="cmd cmd_prev"> 126 134 <xsl:choose> … … 137 145 </xsl:choose> 138 146 </span> 139 <span class="label" >startRecord:</span><span><input type="text" size="5" class="value start_record"><xsl:attribute name="value">140 <xsl:value-of select="$startRecord"/>141 </xsl:attribute>142 </input></span>143 <span class="label" >maximumRecords:</span><span><input type="text" size="5" class="value maximum_records" ><xsl:attribute name="value">144 <xsl:value-of select="$maximumRecords"/>145 </xsl:attribute></input></span>146 <button class="reload">reload</button>147 147 </div> 148 <div class="note" ><span class="label" >echo: </span><span class="value"><xsl:value-of select="echoedSearchRetrieveRequest" /></span>;</div> 148 149 </xsl:template> 149 150 150 151 <xsl:template match="records" mode="table"> 152 151 153 <table class="show"> 152 154 <thead><tr><th>pos</th> … … 176 178 <a href="{concat('record/htmldetail/', encode-for-uri(replace(.//MdSelfLink,'/','_')))}" > 177 179 <xsl:value-of select="position()" /> 178 </a> 180 </a> 181 <span class="cmd cmd_detail" ></span> 182 179 183 </xsl:when> 180 184 <xsl:otherwise><xsl:value-of select="position()" /></xsl:otherwise> -
MDService2/trunk/MDService2/src/xsl/model2matrix.xsl
r794 r799 289 289 </xsl:function> 290 290 291 <!-- obsoleted?! --> 291 292 <xsl:function name="my:pick" > 292 293 <xsl:param name="partial_result" /> … … 296 297 <xsl:when test="count($set/*) > 1" > 297 298 <xsl:message>count-rest:<xsl:value-of select="count($set/*[position()> 1])" /></xsl:message> 298 <xsl:variable name="pickone" select="$set/*[1]/tokenize(.,' ')[last()]" />299 <!--<xsl:variable name="rest" select="my:pick($pickone $set/*[position()> 1]))" />299 <!-- <xsl:variable name="pickone" select="$set/*[1]/tokenize(.,' ')[last()]" /> 300 <xsl:variable name="rest" select="my:pick($pickone $set/*[position()> 1]))" /> 300 301 301 302 <xsl:message>rest:<xsl:value-of select="count($rest)" /></xsl:message> -
MDService2/trunk/MDService2/src/xsl/params.xsl
r789 r799 17 17 18 18 19 <xsl:param name="model_matrix_uri" select="'http://localhost:8080/MDService2/model/matrix? q='" />19 <xsl:param name="model_matrix_uri" select="'http://localhost:8080/MDService2/model/matrix?maxdepth=8&q='" /> 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='" /> -
MDService2/trunk/MDService2/src/xsl/terms2view.xsl
r795 r799 121 121 <xsl:template match="Term" mode="list" > 122 122 <!-- <xsl:variable name="translated_path" select="translate(replace(@path,'//',''),'/','.')" /> --> 123 <li><div class="cmds-elem-plus"><span class="detail-caller">< a href="{concat($detail_model_prefix,@context)}">124 <xsl:value-of select="@name"/></ a></span>123 <li><div class="cmds-elem-plus"><span class="detail-caller"><!-- <a href="{concat($detail_model_prefix,@context)}" > --> 124 <xsl:value-of select="@name"/></span> 125 125 <span class="note">|<xsl:value-of select="@count"/>/<xsl:value-of select="@count_text"/>/<xsl:value-of select="@count_distinct_text"/>|</span> 126 126 <span class="data comppath"><xsl:value-of select="@path" /></span> … … 204 204 <xsl:template match="Termset" mode="select"> 205 205 206 <xsl:variable name="count" select="Term/@count" /> 207 <option value="{@id}" ><xsl:value-of select="@name" /> |<xsl:value-of select="$count" />|</option> 206 <xsl:variable name="count" select="if (Term/@count) then concat(' |',Term/@count,'|') else '' " /> 207 <xsl:variable name="call-value" select="if (@type='model') then @name else @id" /> 208 <option value="{$call-value}" ><xsl:value-of select="@name" /><xsl:value-of select="$count" /></option> 208 209 </xsl:template> 209 210
Note: See TracChangeset
for help on using the changeset viewer.
