Changeset 1233

Timestamp:

04/22/11 14:55:18 (13 years ago)

Author:

gaba

Message:

UI changes , corrections

Location:

MDService2/trunk/MDService2/WebContent

Files:

• index.jsp (modified) (2 diffs)
• scripts/mdservice_model.js (modified) (4 diffs)
• scripts/mdservice_ui.js (modified) (7 diffs)
• scripts/mdservice_ui_detail.js (modified) (13 diffs)
• scripts/mdservice_ui_helpers.js (modified) (1 diff)
• scripts/mdservice_ui_load.js (modified) (1 diff)
• scripts/mdservice_ui_settings.js (modified) (1 diff)
• scripts/mdservice_widgets.js (modified) (2 diffs)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -117 +117 @@
                                                         <!-- ------------------------------------- -->
         
-                                                        
+                        
+                        
 <!-- QUERYLIST BLOCK -->
 <div id="querylistblock" class="cmds-ui-block">
@@ -161 +162 @@
 <div id="terms_autocomplete"></div>
 
+
 </body>
+
 </html>

MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js

@@ -502 +502 @@
 };
 
-Query.prototype.updateColumns = function(slid){
-        if (selectionlistset.getselectionlist(slid).autoSelected()){
+Query.prototype.updateColumns = function(selectionlist){
+        if (selectionlist != undefined){
+                if (selectionlist.autoSelected()){
                         this.columns = "";
                 } else
                 {
-                        this.columns = selectionlistset.getselectionlist(slid).listwidget.getListText();
-                }
-};
+                        this.columns = selectionlist.listwidget.getListText();
+                }
+        }
+};
+
 Query.prototype.next = function(pages){
         var start = 0;
@@ -729 +732 @@
         sl.listwidget.add(new ListItem($(elem).closest('.treecol').children('.column-elem').text()));
         
-        $(elem).data('query').updateColumns(slid);
+        //$(elem).data('query').updateColumns(slid);
 
 };
@@ -770 +773 @@
                 }
                 */
+                /*
                 var slid = $(this).closest('.detail-wrapper').find('.selectionlist-widget').attr("id");
                 if (slid != undefined){
-                        $(this).data('query').updateColumns(slid);
+                        $(this).data('query').updateColumns($(this).data('detail'));
                 }
+                */
+                $(this).data('query').updateColumns($(this).data('selectionlist'));
                 $(this).data('query').resubmit();
         });
@@ -803 +809 @@
         });
         //q_header.find('.cmd_add').click(function(){
-        q_header.find('.cmd_columns').data('query', query);
+        //q_header.find('.cmd_columns').data('query', query);
         q_header.find('.cmd_columns').click(function(){
                 query_wrapper_add_column($(this));
-                $(this).data('query').resubmit();
+                //$(this).data('query').resubmit();
         });
         q_header.find('.columns-wrapper').hide();

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui.js

@@ -58 +58 @@
                 searchclauseset.addsearchclause(new SearchClause("","",""),"",0,0);
                 createInfos();
+                
+                detailcaller.calldetail(undefined, "info");
         
 });
@@ -67 +69 @@
         
         $('.cmds-ui-block').children('.header').children('.cmd_info').click(function(){
-                var a = $(this).parent().next().attr('id');
-                var uri = window.location.pathname + "static/info.xml";
-                $.get(uri,{"id":a}, showDetail,'html');
+                //var a = $(this).parent().next().attr('id');
+                //var uri = window.location.pathname + "static/info.xml";
+                //$.get(uri,{"id":a}, showDetail,'html');
+                detailcaller.calldetail($(this));
                 return false;
         });     
@@ -134 +137 @@
                 
                 var uri = $(this).attr('href'); // + " body";
-                notifyUser('internal-link: ' + uri,'debug' );
-                $.get(uri, showDetail,'html');
+                //notifyUser('internal-link: ' + uri,'debug' );
+                //$.get(uri, showDetail,'html');
+                detailcaller.calldetail(undefined, "record", uri);
         });
 
@@ -705 +709 @@
         var query_elem = undefined;
         var record_elem = undefined;
+        var info_elem = undefined;
         
         $('#detailblock').children('.content').children().each(function(){
@@ -718 +723 @@
                 if ($(this).attr("id") == "detail_record"){
                         record_elem = this;
+                }
+                if ($(this).attr("id") == "detail_info"){
+                        info_elem = this;
                 }
         });
@@ -724 +732 @@
                         $('#detailblock').children('.content').append(elem);
                 } else {
-                        if (did == "detail_index") {
+                        if (did == "detail_info") {
                                 $('#detailblock').children('.content').prepend(elem);
                         } else {
-                                if (did == "detail_query") {
-                                        if (index_elem != undefined) {
-                                                $(index_elem).after(elem);
+                                if (did == "detail_index") {
+                                        if (info_elem != undefined) {
+                                                $(info_elem).after(elem);
                                         } else {
                                                 if (record_elem != undefined) {
@@ -738 +746 @@
                                         }
                                 } else {
-                                        $('#detailblock').children('.content').append(elem);
+                                        if (did == "detail_query") {
+                                                if (index_elem != undefined) {
+                                                        $(index_elem).after(elem);
+                                                } else {
+                                                        if (record_elem != undefined) {
+                                                                $(record_elem).before(elem);
+                                                        } else {
+                                                                $('#detailblock').children('.content').prepend(elem);
+                                                        }
+                                                }
+                                        } else {
+                                                $('#detailblock').children('.content').append(elem);
+                                        }
                                 }
                         }

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_detail.js

@@ -7 +7 @@
  */
 
-function Detail(detailwidget, name) {
+function Detail(detailwidget, name, url) {
         this.detailwidget = detailwidget;
         
@@ -14 +14 @@
         this.content_wrapper = '';
         
-        this.url = undefined;
+        this.url = url;
         this.type = undefined;
         this.name = name;
@@ -23 +23 @@
          
 };
-Detail.prototype.update = function(detailwidget){
+Detail.prototype.update = function(detailwidget, url){
         this.detailwidget = detailwidget;
         this.temp_id = "";
+        this.url = url;
         this.setData();
         
@@ -32 +33 @@
         
         var widget = this.detailwidget;
-        /*
-        if ($(widget).parents('.result').length > 0){
-                this.name = "record";
-        } else {
-                if ($(widget).parents('.result-summary').length > 0) {
-                        this.name = "values";
-                } else {
-                        if ($(widget).closest('.ui-widget').attr('name') == 'query'){
-                                this.name = 'query';
-                        } else {
-                                if  ($(widget).closest('.c-widget').attr('id') == 'collections-widget'){
-                                        this.name = 'collections';
-                                }
-                        }
-                }
-        }
-        */
+        
         this.type = blocks_settings[this.name].detail.type;
         switch (this.name){
@@ -63 +48 @@
         case 'record':
                 this.content = undefined;
-                this.url = $(widget).parent().find("a").attr('href');
+                if (widget != undefined){
+                        this.url = $(widget).parent().find("a").attr('href');
+                }
                 break;
         case 'values':
@@ -75 +62 @@
                 this.content = undefined;
                 this.url = 'terms/htmldetail/?q=all';
+                break;
+        case 'info':
+                this.content = undefined;
+                if (this.detailwidget == undefined){
+                        this.url = '/MDService2/docs/xml/welcome #welcome';
+                } else {
+                        //var a = $(this).parent().next().attr('id');
+                        this.url = window.location.pathname + "static/info.xml";
+                }
                 break;
         default:
@@ -103 +99 @@
                                 "<a class='cmd cmd_link' target='_blank' href='" + query.link("fullpage") + "' >link</a>";
                         $(this.content).find('.cmds').append($(links));
-                        //enrich selectionlist
+                        //enrich with selectionlist
                         var selectionlist  = new SelectionList($(this.content).find('.columns-selected'));
                         selectionlistset.add(selectionlist);
+                        //selectionlist.listwidget.query = query;
                         selectionlist.load(jsonw["WorkspaceProfile"]["CustomTermsets"]);
+                        $(this.content).find('.cmd_reload').data('selectionlist',selectionlist);
                         if (query.columns == ""){
                                 var autolist = "";
@@ -145 +143 @@
         if (this.url != undefined){
                 $(this.content_wrapper).show();
-                $(this.content_wrapper).find('.detail-content').load(this.url,function(){
+                $(this.content_wrapper).find('.detail-content').data('id', $(this.detailwidget).parent().next().attr('id'));
+                $(this.content_wrapper).find('.detail-content').load(this.url,function(responseText, textStatus, XMLHttpRequest){
+                        //find info data
+                        if ($(this).data('id') != null){
+                                if ($(this).data('id').length > 0){
+                                        $(this).html($(this).find('#' + $(this).data('id') + '-info'));
+                                }
+                        }
                         var get = $(this).parent().find('.cmd_get');                            
                         get.removeClass('cmd_get');
@@ -203 +208 @@
                         get.addClass('cmd_up');
                 }
-        default:
+        default://pane ?
         };
                 
@@ -234 +239 @@
         container: '#detaillist',
                 
-        calldetail: function(widget){
-                var name;
+        calldetail: function(widget,name, url){
+                //var name;
                 var detail;
-                var content, url;
-                
-                name = this.getdetailname(widget) ;
-                if (name == undefined) {
-                        alert("detail name -  undefined");
-                        return;
+                var content;//, url;
+                
+                if (name == undefined){
+                        name = this.getdetailname(widget) ;
+                        if (name == undefined) {
+                                alert("detail name -  undefined");
+                                return;
+                        }
                 }
                 // test for values
@@ -255 +262 @@
                 if (detail == undefined) {
                         //content = this.getdetailcontent(name, widget);
-                        detail = new Detail( widget, name );
+                        detail = new Detail( widget, name, url);
                         this.adddetail(detail);
                 } else {
                         detail.close();
                         //content = this.getdetailcontent(name, widget);
-                        detail.update( widget );
+                        detail.update( widget , url);
                 }
                 
@@ -303 +310 @@
                                                         if ($(widget).prev().hasClass("value-input")){
                                                                 name = 'values';
+                                                        } else {
+                                                                if ($(widget).hasClass("cmd_info")){
+                                                                        name = 'info';
+                                                                }
                                                         }
                                                 }
@@ -479 +490 @@
         }
 }
+/*
+function updateColumnsFromDetail(query){
+        var detail = detailcaller.getdetail("detail_query");
+        if (detail != undefined){
+                if (query.listid == detail.temp_id){
+                        
+                        if (selectionlistset.getselectionlist(slid).autoSelected()){
+                                this.columns = "";
+                        } else
+                        {
+                                this.columns = selectionlistset.getselectionlist(slid).listwidget.getListText();
+                        }
+                }
+        }
+}
+*/

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_helpers.js

@@ -365 +365 @@
         if (q["bookmark"] == "1") {
                 var uri = "/MDService2/record/htmldetail/" + q["querystring"];
-                showDetail(null,'html');
-                $.get(uri, showDetail,'html');
+                detailcaller.calldetail(undefined, "record", uri);
+                //var uri = "/MDService2/record/htmldetail/" + q["querystring"];
+                //showDetail(null,'html');
+                //$.get(uri, showDetail,'html');
         } else {
                 //hideWelcomeMessage();

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_load.js

@@ -544 +544 @@
         saveWorkspace("USER");
 }
+
+/*
+function loadWelcomeMessage(){  
+        $('#welcomedetail').load("/MDService2/docs/xml/welcome #welcome", function() { //profile.collections.base_uri,
+                $('#welcome').addClass("ui-helper-reset ui-corner-all ui-widget-content");
+        });
+}
+*/

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_settings.js

@@ -308 +308 @@
                         type: "pane"
                 }
+        },
+        info:{
+                id: "#info",
+                detail: {
+                        parent: "",
+                        type: "pane"
+                }
         }
 };

MDService2/trunk/MDService2/WebContent/scripts/mdservice_widgets.js

@@ -79 +79 @@
         this.type = type;
         
+        //this.query = undefined;
         //this.init();
         
@@ -179 +180 @@
                 lv.remove(colid);
                 //resubmit query
+                /*
                 if (lvid.beginsWith("sl")){
                         q.query.updateColumns(sl);
                         q.query.resubmit();
                 }
+                */
                 /*
                 if ($(this).parent().parent().parent().attr('class') == 'query-columns'){