Changeset 1153 for MDService2/trunk/MDService2/WebContent
- Timestamp:
- 03/04/11 10:42:32 (13 years ago)
- Location:
- MDService2/trunk/MDService2/WebContent
- Files:
-
- 6 edited
-
index.jsp (modified) (3 diffs)
-
scripts/mdservice_helpers.js (modified) (2 diffs)
-
scripts/mdservice_model.js (modified) (1 diff)
-
scripts/mdservice_searchclause.js (modified) (1 diff)
-
scripts/mdservice_ui.js (modified) (9 diffs)
-
scripts/mdservice_ui_settings.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r1125 r1153 28 28 <script src="scripts/mdservice_helpers.js" type="text/javascript"></script> 29 29 <script src="scripts/mdservice_ui_helpers.js" type="text/javascript"></script> 30 <script src="scripts/mdservice_ui_detail.js" type="text/javascript"></script> 30 31 <script src="scripts/mdservice_searchclause.js" type="text/javascript"></script> 31 32 <script src="scripts/mdservice_widgets.js" type="text/javascript"></script> … … 36 37 37 38 <body> 38 39 <div class="cmds-ui-block" id="base_east_p"></div>40 <div class="cmds-ui-block" id="base_center_p"></div>41 39 42 40 <!-- - BLOCK --> … … 157 155 </div> 158 156 159 <!-- ---QUERYLISTELEMENT------------------------- 160 <div id='querylistelement' class='query_wrapper ui-widget' > 161 <div class='query_header ui-widget-header ui-state-default ui-corner-top'> 162 <span class='cmd cmd_get'></span> 163 <span class='query_id'>qid</span>: 164 <span class='query'>collection:query, repository:repository</span> 165 <span class='cmd cmd_detail'></span> 166 </div> 157 <div id="detail-float"> 167 158 </div> 159 168 160 169 <div id='detail_querylistelement' class='query_wrapper ui-widget' >170 <div class='query_header ui-widget-header ui-state-default ui-corner-top'>171 <span class='cmd cmd_get'></span>172 <span class='cmd cmd_save'></span>173 <span class='cmd cmd_del'> </span>174 <span class='query_id'>qid</span>:175 <span class='query'>collection:query, repository:repository</span>176 <a class='cmd cmd_xml' target='_blank' href=''>xml</a>177 <a class='cmd cmd_link' target='_blank' href='' >link</a>178 </div>179 <div class='result ui-widget-content ui-corner-bottom'></div>180 </div>181 -->182 161 </body> 183 162 </html> -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_helpers.js
r1125 r1153 28 28 */ 29 29 30 $(elems).children('.header').prepend('<span class="cmd cmd-collapse cmd_down" > </span>');31 $(elems).find('.cmd-collapse').click(function(event) {32 $(this).closest('.header').next().toggle('fast');33 34 return false;35 });30 //$(elems).children('.header').prepend('<span class="cmd cmd-collapse cmd_down" > </span>'); 31 //$(elems).find('.cmd-collapse').click(function(event) { 32 // $(this).closest('.header').next().toggle('fast'); 33 // //$(this).toggleClass('cmd_down cmd_up'); 34 // return false; 35 // }); 36 36 37 37 $(elems).each(function(i) { 38 38 // default is: hidden 39 /* 39 40 if ($(this).hasClass('init-show')) { 40 41 $(this).children('.content').show(); … … 43 44 $(this).children('.content').hide(); 44 45 } 45 46 */ 46 47 if ($(this).parent().hasClass('cmds-ui-closable')) { 47 48 $(this).children('.header').prepend('<span class="cmd cmd_close" > </span>'); -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r1125 r1153 357 357 $(x).children().children(".query").text(this.getcollectiontext("name") + ":" + Query.queryliststring(this.squery, this.query) + ", repository:" + this.repository.toString()); 358 358 */ 359 var x = "<div id='" + this.listid + "' class='query_wrapper ui-widget' ><div class='query_header ui-widget-header ui-state-default ui-corner-top'>" +359 var x = "<div id='" + this.listid + "' class='query_wrapper ui-widget' name='query' ><div class='query_header ui-widget-header ui-state-default ui-corner-top'>" + 360 360 "<span class='cmd cmd_get'></span><span class='cmd cmd_del'> </span>" + 361 361 "<span class='query_id'>" + this.listid + "</span>: <span class='query'>" + 362 362 this.getcollectiontext("name") + ":" + Query.queryliststring(this.squery, this.query) + ", repository:" + this.repository.toString() + "</span>" + 363 "< span class='cmd cmd_detail'></span></div>" +363 "</div>" + 364 364 "<div class='result ui-widget-content ui-corner-bottom'></div>"; 365 365 addToQuerylist(x); -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_searchclause.js
r1029 r1153 52 52 //TODO defaults 53 53 //this.relation = '='; 54 54 var index_detail = ""; 55 if ((this.i == 0) && (this.j == 0)) { 56 index_detail = "<span name='detail_index' class='cmd cmd_detail'></span>"; 57 } 55 58 var x = "<div id='" + this.j + "' class='sc-j or_level' ><div id='" + this.listid + "' class='sc-wrapper focused' > " + 56 59 "<div class='search'><span class='index_search'><select class='index_select'/><input type='text' class='index-input autocomplete-input' /></span>" + 60 index_detail + 57 61 //"<select type='text' class='rel_input' />" + 58 62 "<select class='rel_input'><option value='='>=</option><option value='>'>></option><option value='<'><</option><option value='any'>any</option><option value='contains'>contains</option><option value='all'>all</option></select>" + 59 63 "<select class='value_select'/><input type='text' class='value_input' />" + 60 "<span class='sc_cmds'><span class='cmd cmd_sc_delete'> </span><span class='sc_id'>" + this.listid + "</span>" +64 "<span class='sc_cmds'><span name='detail_value' class='cmd cmd_detail'></span><span class='cmd cmd_sc_delete'> </span><span class='sc_id'>" + this.listid + "</span>" + 61 65 "<span class='cmd cmd_add_and'> </span><span class='cmd cmd_add_or'></span>"+ 62 66 " </span></div><div class='index-context'><table></table></div></div></div>"; -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui.js
r1136 r1153 43 43 44 44 45 45 $("#detail-float").dialog({ autoOpen: false});//, 46 //position: ['right','70px'], 47 //height: 450, 48 //width: 300, 49 //minHeigh: 100}); 50 51 //$('#detail-float').dialog( "option", "minHeight", '0px' ); 52 53 $("#detail-float").dialog(); 54 $("#detail-float").tabs(); 46 55 47 56 }); … … 53 62 54 63 } 55 56 64 function addFunctionality(){ 57 58 // TEST from .query_header 59 $('.cmd_detail').live('click', function(){ 60 var qid = $(this).closest('.query_wrapper').attr("id"); 61 var q = queryset.getQuery(qid); 62 63 if ($('#detail-'+qid).length == 0){ 64 q.renderDetail(); 65 } 66 q.showDetail(); 67 68 //$('#detailblock').append(detail); 69 }); 65 // DEL COMMAND 70 66 $('.query_header .cmd_del').live('click', function(){ 71 67 $(this).closest('.query_wrapper').remove(); 72 68 }); 69 70 $('.cmd_del').live('click', function(){ 71 var did, detail; 72 73 if ($(this).parent().hasClass('detail-header')){ 74 var dw = $(this).closest('.detail-wrapper'); 75 did = dw.attr('id'); 76 dw.hide(); 77 } 78 else { 79 did = $(this).parent().siblings('.ui-dialog-content').find('.detail-wrapper').attr('id'); 80 } 81 if (did != undefined){ 82 detail = detailcaller.getdetail(did); 83 detail.close(); 84 } 85 }); 86 87 // DETAIL-CALLER 88 /* 89 $('.detail-caller, .cmd_detail').live('click', function(event) { 90 $(this).parent().children('.detail').toggle(); 91 $(this).children('.cmd_down, .cmd_up').toggleClass('cmd_down cmd_up'); 92 }); 93 */ 94 $('.detail-caller a').live('click', function(event) { 95 event.preventDefault(); 96 }); 97 // open detail (from result-set, but also already within detail-view (ResourceRef, IsPartOf) 98 $('.result a.internal, .mdrecord-detail a.internal').live('click', function(event) { 99 event.preventDefault(); 100 101 var uri = $(this).attr('href'); // + " body"; 102 notifyUser('internal-link: ' + uri,'debug' ); 103 $.get(uri, showDetail,'html'); 104 }); 105 106 $('.result a.external, .mdrecord-detail a.external').live('click', function(event) { 107 108 //event.preventDefault(); 109 var uri = $(this).attr('href'); // + " body"; 110 notifyUser('resource-link: ' + uri,'debug' ); 111 // $.get(uri, showDetail,'html'); */ 112 }); 113 /* 114 $('.result .cmd_detail').live('click', function(event) { 115 //var qid = $(this).closest('.query_wrapper').attr('id'); 116 //var query = queryset.getQuery(qid); 117 118 var uri = $(this).parent().find("a").attr('href'); // + " body"; 119 $.get(uri, showDetail,'html'); 120 }); 121 */ 122 $(".detail-caller, .cmd_detail").live('click',function(event) { 123 event.preventDefault(); 124 detailcaller.calldetail($(this)); 125 126 }); 127 128 // cmd_up cmd_down 129 $('.cmd_up').live('click', function(event) { 130 if ($(this).closest('.detail-wrapper').length > 0 ) { 131 $(this).closest('.detail-wrapper').find('.detail-content').hide(); 132 } else { 133 $(this).closest('.query_wrapper').find('.result').hide(); 134 } 135 $(this).toggleClass('cmd_down cmd_up'); 136 }); 137 $('.cmd_down').live('click', function(event) { 138 if ($(this).closest('.detail-wrapper').length > 0 ) { 139 $(this).closest('.detail-wrapper').find('.detail-content').show(); 140 } else { 141 $(this).closest('.query_wrapper').find('.result').show(); 142 } 143 $(this).toggleClass('cmd_down cmd_up'); 144 }); 145 146 ////////////////////////////////////////////// 73 147 $('#searchretrieve').submit( function(event) { 74 148 event.preventDefault(); … … 79 153 //submit_query (columns_widget.getColumnsListText(),searchclauseset.sctext, $('#input-simplequery').attr("value"), $('#input-withsummary').attr("checked")); 80 154 81 var query = null;155 var query = searchclauseset.sctext; 82 156 var squery = $('#input-simplequery').attr("value"); 83 157 var columns = columns_widget.getColumnsListText(); 84 var collections =searchclauseset.sctext;85 var ws = false; //$('#input-withsummary').attr("checked");158 //var collections = collections_widget.get //searchclauseset.sctext; 159 var ws = $('#input-withsummary').attr("checked"); 86 160 87 161 notifyUser("processing query"); … … 103 177 }); 104 178 105 $('.autocomplete-select-caller').live('click', function(event) {179 $('.autocomplete-select-caller').live('click', function(event) { 106 180 107 181 $(this).closest(".index-context").prev().parent().find(".autocomplete-input").val($(this).text()).change(); … … 111 185 event.preventDefault(); 112 186 }); 113 $('.detail-caller, .cmd_detail').live('click', function(event) { 114 $(this).parent().children('.detail').toggle(); 115 $(this).children('.cmd_down, .cmd_up').toggleClass('cmd_down cmd_up'); 116 }); 117 118 $('.detail-caller a').live('click', function(event) { 119 event.preventDefault(); 120 }); 187 121 188 122 189 $('.comp_detail input').live('keyup', function(event) { … … 126 193 }); 127 194 128 // open detail (from result-set, but also already within detail-view (ResourceRef, IsPartOf)129 $('.result a.internal, .mdrecord-detail a.internal').live('click', function(event) {130 event.preventDefault();131 132 var uri = $(this).attr('href'); // + " body";133 notifyUser('internal-link: ' + uri,'debug' );134 $.get(uri, showDetail,'html');135 });136 137 $('.result a.external, .mdrecord-detail a.external').live('click', function(event) {138 139 //event.preventDefault();140 var uri = $(this).attr('href'); // + " body";141 notifyUser('resource-link: ' + uri,'debug' );142 // $.get(uri, showDetail,'html'); */143 });144 145 $('.result .cmd_detail').live('click', function(event) {146 //var qid = $(this).closest('.query_wrapper').attr('id');147 //var query = queryset.getQuery(qid);148 149 var uri = $(this).parent().find("a").attr('href'); // + " body";150 $.get(uri, showDetail,'html');151 });152 195 153 196 $('a.open-in-context').live('click', function(event) { … … 321 364 322 365 323 $('.cmd_down').live('click', function(event) { 324 $(this).closest('.query_wrapper').find('.result').show(); 325 $(this).toggleClass('cmd_down cmd_up'); 326 }); 327 $('.cmd_up').live('click', function(event) { 328 $(this).closest('.query_wrapper').find('.result').hide(); 329 $(this).toggleClass('cmd_up cmd_down'); 330 }); 366 331 367 $('.cmd_sc_delete').live('click', function(event) { 332 368 var i = $(this).closest('.sc-i').attr('id'); … … 616 652 } 617 653 618 function addToDetailList(elem){ 619 $('#detailblock .content').append(elem); 654 function addToDetailList(elem, did){ 655 var exists = false; 656 $('#detailblock').children('.content').children().each(function(){ 657 if ($(this).attr("id") == did){ 658 exists = true; 659 } 660 }); 661 if (!exists) { 662 $('#detailblock').children('.content').append(elem); 663 } else { 664 $('#detailblock').children('.content').children().each(function(){ 665 if ($(this).attr("id") == did){ 666 $(this).show(); 667 } 668 }); 669 } 620 670 } 671 621 672 function addToSClist (div, i, j, rel) { 622 673 … … 694 745 }; 695 746 747 function showDetail(_data, textStatus, xmlhttpreq) { 748 try { 749 var data = _data; 750 var blankdata = "<html><\html>"; 751 752 if(typeof xmlhttpreq!='undefined') 753 { 754 if (xmlhttpreq.responseXML != null){ 755 var isinfo = xmlhttpreq.responseXML.baseURI.split("/static/info.xml?id="); 756 if (isinfo != "undefined"){ 757 if ( isinfo.length = 2){ 758 var infoid = new RegExp('[\\?]id=([^&#]*)').exec(xmlhttpreq.responseXML.baseURI); 759 infoid = infoid[1] || 0; 760 infoid = infoid + "-info"; 761 data = $(_data).find('#' + infoid); 762 } 763 } 764 } 765 } 766 /* 767 if (data == null){ 768 addToDetailList(blankdata); 769 } else { 770 addToDetailList(data); 771 } 772 */ 773 774 if (data == null){ 775 var title = ""; 776 $('#detail-float').html(blankdata); 777 778 //addToDetailList(blankdata); 779 780 if ( $('#detail-float').dialog("isOpen")) { 781 var up = $('#detail-float').siblings('div.ui-dialog-titlebar').find('.ui-dialog-titlebar-up'); 782 up.removeClass('.cmd_up .ui-dialog-titlebar-up'); 783 up.addClass('.cmd_get .ui-dialog-titlebar-get'); 784 var down = $('#detail-float').siblings('div.ui-dialog-titlebar').find('.ui-dialog-titlebar-down'); 785 down.removeClass('.cmd_down .ui-dialog-titlebar-down'); 786 down.addClass('.cmd_get .ui-dialog-titlebar-get'); 787 788 $('#detail-float').siblings('div.ui-dialog-titlebar').find('.ui-dialog-title').text(title); 789 } else { 790 $('#detail-float').dialog('open'); 791 $('#detail-float').siblings('div.ui-dialog-titlebar').addClass('ui-state-default'); 792 $('#detail-float').siblings('div.ui-dialog-titlebar').children().remove(); 793 var x = '<span class="cmd cmd_del ui-dialog-titlebar-del "/><span class="cmd cmd_get ui-dialog-titlebar-get"/><span class="ui-dialog-title">' + "" +'</span>'; 794 $('#detail-float').siblings('div.ui-dialog-titlebar').prepend(x); 795 796 } 797 798 } else 799 { 800 //addToDetailList(data); 801 $('#detail-float').html(data); 802 var title = $('#detail-float').find('.inner-title').attr('value'); 803 if (title == undefined) title = $('#detail-float').find('.title, .inner-title').first().text(); 804 $('#detail-float').dialog( "option", "title", title ); 805 806 $('#detail-float').find('.detail-header').hide(); 807 $('#detail-float').find('.detail-content').show(); 808 809 if ( $('#detail-float').dialog("isOpen")) { 810 var get = $('#detail-float').siblings('div.ui-dialog-titlebar').find('.cmd_get'); 811 get.removeClass('cmd_get'); 812 get.removeClass('ui-dialog-titlebar-get'); 813 get.addClass('cmd_up'); 814 get.addClass('ui-dialog-titlebar-up'); 815 816 $('#detail-float').siblings('div.ui-dialog-titlebar').find('.ui-dialog-title').text(title); 817 } else { 818 //ui-state-default 819 $('#detail-float').dialog('open'); 820 $('#detail-float').siblings('div.ui-dialog-titlebar').addClass('ui-state-default'); 821 $('#detail-float').siblings('div.ui-dialog-titlebar').children().remove(); 822 var x = '<span class="cmd cmd_del ui-dialog-titlebar-del "/><span class="cmd cmd_up ui-dialog-titlebar-up"/><span class="ui-dialog-title">' + title +'</span>'; 823 $('#detail-float').siblings('div.ui-dialog-titlebar').prepend(x); 824 825 notifyUser("query processed:" + textStatus); 826 } 827 } 828 829 } catch (e) { 830 notifyUser(e,'debug'); 831 } 832 } -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_settings.js
r1125 r1153 224 224 225 225 }; 226 226 // type = [floating, pane, inline] 227 227 var blocks_settings = { 228 228 querysearch:{ … … 239 239 block:['cmd_close'] 240 240 } 241 }, 242 collections:{ 243 id: "#collections", 244 detail: { 245 parent: "", 246 type: "pane" 247 } 248 }, 249 terms:{ 250 id: "#terms", 251 detail: { 252 parent: "", 253 type: "pane" 254 } 255 }, 256 columns:{ 257 id: "#columns", 258 detail: { 259 parent: "", 260 type: "pane" 261 } 262 }, 263 values:{ 264 id: "#values", 265 detail: { 266 parent: "", 267 type: "floating" 268 } 269 }, 270 query:{ 271 id: "#query", 272 detail: { 273 parent: "", 274 type: "pane" 275 } 276 }, 277 record:{ 278 id: "#records", 279 detail: { 280 parent: "", 281 type: "pane" 282 } 241 283 } 242 284 };
Note: See TracChangeset
for help on using the changeset viewer.
