Changeset 560

Timestamp:

06/30/10 23:29:04 (14 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2

Files:

• WebContent/index.jsp (modified) (2 diffs)
• WebContent/scripts/jquery/jquery-treeview/jquery.treeview.css (modified) (1 diff)
• WebContent/scripts/jquery/jquery-treeview/jquery.treeview.js (modified) (2 diffs)
• WebContent/scripts/mdservice2_ui.js (modified) (3 diffs)
• build.properties (modified) (1 diff)
• src/xsl/collection2view.xsl (modified) (2 diffs)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -17 +17 @@
 <script src="scripts/jquery/js/jquery-ui-1.8.1.custom.min.js" type="text/javascript"></script>
 <script src="scripts/jquery/jquery-treeview/jquery.treeview.js" type="text/javascript"></script>
+<script src="scripts/jquery/jquery-checkboxtree/jquery.checkboxtree.js" type="text/javascript"></script>
 <script src="scripts/mdservice_model.js" type="text/javascript"></script>
 <script src="scripts/mdservice2_ui.js" type="text/javascript"></script>
@@ -62 +63 @@
         <s:form action="searchretrieve">
                 <s:textfield name="query" label="Query" size="50"/>     
+                <!-- <s:label name="collections" value="Collections: 0 items selected."/> -->
                 <s:submit value="Submit" />
         </s:form>

MDService2/trunk/MDService2/WebContent/scripts/jquery/jquery-treeview/jquery.treeview.css

@@ -67 +67 @@
 .filetree li.expandable span.folder { background: url(images/folder-closed.gif) 0 0 no-repeat; }
 .filetree span.file { background: url(images/file.gif) 0 0 no-repeat; }
+
+.treeview .showselection[some_selection="1"] {color: red}
+.treeview .showselection[some_selection="0"] {color: white}

MDService2/trunk/MDService2/WebContent/scripts/jquery/jquery-treeview/jquery.treeview.js

@@ -93 +93 @@
                 },
                 treeview: function(settings) {
-                        
+                
                         settings = $.extend({
                                 cookieId: "treeview"
@@ -109 +109 @@
                         }
                 
+                        //treeview children selection
+                        //treeview parent selection
+                        // todo - use class instead of css
+                        $(this).find(".showselection").css("color","white");
+                        $(".selection").click(function() {
+                                var checked_status = this.checked;
+                                
+                                // select or deselect all children according to parent
+                                $(this).next().next().find(".selection").attr("checked",checked_status);
+                                /*
+                                if (checked_status == "true"){
+                                        $(this).next().next().find(".selection").attr("child","checked_child");
+                                } else {
+                                        $(this).next().next().find(".selection").attr("child","undefined");
+                                }
+                                console.log($(this).next().next().find(".selection").attr("child") );
+                                                */
+                                
+                                
+                                // deselect parents
+                                if (checked_status===false){
+                                        $(this).parent().parents("li").each(function(){
+                                                $(this).children(".selection").attr("checked",false);
+                                        });
+                                }
+                        
+                                
+                                // refresh sign of existent selection
+                                // first reset childrens settings
+                                $(this).next().next().find(".showselection").css("color","white");
+                                $(this).next().next().find(".showselection").attr("some_selection","0");
+                                // then refresh selections
+                                $(this).parents("li").each(function(){
+                                        var count_selected = $(this).find("ul li .selection:checked").size();
+                                        if (count_selected > 0){
+                                                $(this).children(".showselection").attr("some_selection","1");//css("color","red");
+                                    } else {
+                                                $(this).children(".showselection").attr("some_selection","0");//css("color","white");
+                                }
+                                
+                                        //TODO move into .css
+                                        if (count_selected > 0){
+                                                $(this).children(".showselection").css("color","red");
+                                    } else {
+                                                $(this).children(".showselection").css("color","white");
+                                        }
+                                        
+                                        $(this).children(".showselection").attr("count",count_selected);
+                                                                //console.log(count_selected);
+                                });
+
+                                // uncheck parents node + param settings
+                                $(this).parent().parents("li").each(function(){
+                                        $(this).find(".selection").attr("child","undefined");
+                                        $(this).children(".selection").attr("checked",false);
+                                });
+                                // sett the parent_selection attr
+                                $(this).parents("li").each(function(){
+                                        $(this).find(".selection").each(function(){
+                                                if (($(this).attr("checked")===true) &&
+                                                        ($(this).parent().parent().parent().children(".selection").attr("checked")===false)
+                                                        ){
+                                                        $(this).attr("child","parent_selection");
+                                                }
+                                        });                                     
+                                });
+                        });             
+        
+                        
+                        
                         // factory for treecontroller
                         function treeController(tree, control) {

MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js

@@ -49 +49 @@
 // POPULATE/LOAD VIEWS/BOXES;           
                         
-// COLLECTIONS getCollections   
-        //$('#collections').load(link('collections','xml'));
-
+// COLLECTIONS getCollections           
         $('#collections').load(link('collections','htmllist'), //profile.collections.base_uri,
                         function() {
@@ -61 +59 @@
                 }
         );
-
-        
-        
+        /*
+        $("#collections .selection").live("onchange", function() { 
+                var $base = $("#collections .treeview");
+                var collection_count = $(".selection",$base).find("child:undefined").size();
+                $('#searchretrieve_collections').val("Collections: " + collection_count + " items selected.");
+        });
+        
+        */
 // COMPONENTS ComponentRegistry                 
         
@@ -218 +221 @@
         $(target_container).load(uri, handler );        
 }
-
+// TODO multiple collections
 function submit_query (query) {
         notifyUser("processing query");
-        
-        var q = new Query(actions.collections.current, query );
+
+        var $treeview = $(".treeview","#collections");
+        var collection = $("li",$treeview).find("input:checked[child='parent_selection']").next().text();
+        console.log("collection:" + collection);
+        
+        var q = new Query(collection, query); //actions.collections.current, query );
         console.log("submit_query:" + q.query_uri());
         queryset.addquery(q);

MDService2/trunk/MDService2/build.properties

@@ -26 +26 @@
 build.home=./build
 dist.home=./dist
-deploy.dir = C:/apps/ApacheTomcat/webapps
+#deploy.dir = C:/apps/ApacheTomcat/webapps
+deploy.dir = C:/apache-tomcat-6.0.26/webapps
 
 

MDService2/trunk/MDService2/src/xsl/collection2view.xsl

@@ -34 +34 @@
 <xsl:template name="continue-root" >
         <div>
-        <ul class="filetree treeview">
+        <ul class="treeview">
                 <xsl:apply-templates select="*" >                                                       
                 </xsl:apply-templates>                  
@@ -44 +44 @@
         <xsl:variable name="lv" select="count(ancestor::c)" />
         
-        <li><span class="folder"><xsl:value-of select="@n" />(<xsl:value-of select="@cnt" />)</span>            
+        <li>
+         <label class="showselection" count="0" some_selection="0" >o</label> 
+         <input type="checkbox" class="selection" child="undefined" />    
+     <label class="folder"><xsl:value-of select="@n" /></label> 
+        <!-- 
+        <span class="folder"><xsl:value-of select="@n" />(<xsl:value-of select="@cnt" />)
+        </span> 
+         -->    
         
                 <xsl:if test="c and ($lv&lt;$max_depth or $max_depth=0)">