Changeset 24420


Ignore:
Timestamp:
08/18/11 12:55:30 (9 years ago)
Author:
sjm84
Message:

More fixes to the format manager

Location:
main/trunk/greenstone3/web/interfaces/oran
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/oran/js/gui_div.js

    r24417 r24420  
    398398    }
    399399
     400    //Retrieve the collection metadataset using ajax
    400401    $.ajax
    401402    ({
     
    404405        success: function(data)
    405406        {
    406             var selectorArea = document.getElementById("metadataSelector");
    407             var newSelectBox = document.createElement("SELECT");
    408             selectorArea.appendChild(newSelectBox);
     407            var str = "<select name=\"meta_select\" onChange=\"onSelectChange(this)\">";
     408           
     409            var selectorArea = document.getElementById("metadataSelector");     
    409410            var metadataSets = data.getElementsByTagName("metadataSet");
    410411            for(var i = 0; i < metadataSets.length; i++)
     
    413414                for(var j = 0; j < metadata.length; j++)
    414415                {
    415                     var option = document.createElement("OPTION");
    416                     option.setAttribute("value", metadataSets[i].getAttribute("name") + "." + metadata[j].getAttribute("name"));
    417                     option.innerHTML = metadataSets[i].getAttribute("name") + "." + metadata[j].getAttribute("name");
    418                     newSelectBox.appendChild(option);
     416                    var metaValue = metadataSets[i].getAttribute("name") + "." + metadata[j].getAttribute("name");
     417                    str += "<option value=\"" + metaValue + "\">" + metaValue + "</option>";
    419418                }
    420419            }
     420           
     421            str += "</select>";
     422
     423            selectorArea.innerHTML = str;
     424            gsf_metadata_element = str;
    421425        }
    422426    });
     427   
     428    $.ui.plugin.add("draggable", "connectToSortable", {
     429    start: function(event, ui) {
     430        //console.log("FUNCTION start draggable connectToSortable");
     431        var inst = $(this).data("draggable"), o = inst.options,
     432            uiSortable = $.extend({}, ui, { item: inst.element });
     433        inst.sortables = [];
     434        $(o.connectToSortable).each(function() {
     435            var sortable = $.data(this, 'sortable');
     436            if (sortable && !sortable.options.disabled) {
     437                inst.sortables.push({
     438                    instance: sortable,
     439                    shouldRevert: sortable.options.revert
     440                });
     441                sortable._refreshItems();   //Do a one-time refresh at start to refresh the containerCache
     442                sortable._trigger("activate", event, uiSortable);
     443            }
     444        });
     445
     446    },
     447    stop: function(event, ui) {
     448
     449        //console.log("FUNCTION stop draggable connectToSortable");
     450        //If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
     451        var inst = $(this).data("draggable"),
     452            uiSortable = $.extend({}, ui, { item: inst.element });
     453
     454        $.each(inst.sortables, function() {
     455            if(this.instance.isOver) {
     456
     457                this.instance.isOver = 0;
     458
     459                inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
     460                this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
     461
     462                //The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid'
     463                if(this.shouldRevert) this.instance.options.revert = true;
     464
     465                //Trigger the stop of the sortable
     466                //console.log("Draggable tells sortable to stop");
     467                this.instance._mouseStop(event);
     468
     469                this.instance.options.helper = this.instance.options._helper;
     470
     471                //If the helper has been the original item, restore properties in the sortable
     472                if(inst.options.helper == 'original')
     473                    this.instance.currentItem.css({ top: 'auto', left: 'auto' });
     474
     475            } else {
     476                this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
     477                this.instance._trigger("deactivate", event, uiSortable);
     478            }
     479
     480        });
     481
     482    },
     483    drag: function(event, ui) {
     484        //console.log("FUNCTION drag draggable connectToSortable");
     485
     486        var inst = $(this).data("draggable"), self = this;
     487
     488        var checkPos = function(o) {
     489            var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
     490            var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
     491            var itemHeight = o.height, itemWidth = o.width;
     492            var itemTop = o.top, itemLeft = o.left;
     493
     494            return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
     495        };
     496
     497        var intersecting_items = new Array();
     498
     499        $.each(inst.sortables, function(i) {
     500           
     501            //Copy over some variables to allow calling the sortable's native _intersectsWith
     502            this.instance.positionAbs = inst.positionAbs;
     503            this.instance.helperProportions = inst.helperProportions;
     504            this.instance.offset.click = inst.offset.click;
     505           
     506            if(this.instance._intersectsWith(this.instance.containerCache)) {
     507
     508                //If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
     509                //if(!this.instance.isOver) {
     510
     511                    //console.log('Line 1113');
     512
     513                //  this.instance.isOver = 1;
     514
     515                    intersecting_items.push(this.instance); // sam
     516                //} //sam
     517
     518                    //Now we fake the start of dragging for the sortable instance,
     519                    //by cloning the list group item, appending it to the sortable and using it as inst.currentItem
     520                    //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
     521                    //sam this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
     522                    //sam this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
     523                    //sam this.instance.options.helper = function() { return ui.helper[0]; };
     524
     525                    //sam event.target = this.instance.currentItem[0];
     526                    //sam this.instance._mouseCapture(event, true);
     527                    //sam this.instance._mouseStart(event, true, true);
     528
     529                    //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
     530                    //sam this.instance.offset.click.top = inst.offset.click.top;
     531                    //sam this.instance.offset.click.left = inst.offset.click.left;
     532                    //sam this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
     533                    //sam this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
     534
     535                    //sam inst._trigger("toSortable", event);
     536                    //sam inst.dropped = this.instance.element; //draggable revert needs that
     537                    //hack so receive/update callbacks work (mostly)
     538                    //sam inst.currentItem = inst.element;
     539                    //sam this.instance.fromOutside = inst;
     540
     541                //sam brace
     542
     543                //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
     544                //sam if(this.instance.currentItem) this.instance._mouseDrag(event);
     545
     546            } else {
     547
     548                //If it doesn't intersect with the sortable, and it intersected before,
     549                //we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
     550                if(this.instance.isOver) {
     551
     552                    console.log("UNSETTING ISOVER");
     553                    console.log("ON ITEM="+this.instance.currentItem[0].getAttribute('class'))
     554                    this.instance.isOver = 0;
     555                    this.instance.cancelHelperRemoval = true;
     556                   
     557                    //Prevent reverting on this forced stop
     558                    this.instance.options.revert = false;
     559                   
     560                    // The out event needs to be triggered independently
     561                    this.instance._trigger('out', event, this.instance._uiHash(this.instance));
     562                   
     563                    this.instance._mouseStop(event, true);
     564                    this.instance.options.helper = this.instance.options._helper;
     565
     566                    //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
     567                    //console.log("DO WE GET HERE?");
     568                    this.instance.currentItem.remove();
     569                    if(this.instance.placeholder) this.instance.placeholder.remove();
     570
     571                    inst._trigger("fromSortable", event);
     572                    inst.dropped = false; //draggable revert needs that
     573               
     574                }
     575       
     576            }
     577        });
     578
     579        //sam
     580        //console.log("Contents of intersecting_items");
     581        var innermostContainer = null, innermostIndex = null;       
     582        for (i=0;i<intersecting_items.length;i++)
     583        {
     584            //console.log('ITEM: '+intersecting_items[i].element[0].getAttribute('class'));
     585   
     586            if(innermostContainer && $.ui.contains(intersecting_items[i].element[0], innermostContainer.element[0]))
     587                continue;
     588                       
     589            innermostContainer = intersecting_items[i];
     590            innermostIndex = i;
     591                   
     592        }
     593
     594        for (i=0;i<intersecting_items.length;i++)
     595        {
     596            if(intersecting_items[i] != innermostContainer)
     597                if(intersecting_items[i].isOver) {
     598
     599                    console.log("UNSETTING ISOVER");
     600                    console.log("ON ITEM="+intersecting_items[i].currentItem[0].getAttribute('class'))
     601                    intersecting_items[i].isOver = 0;
     602                    intersecting_items[i].cancelHelperRemoval = true;
     603
     604                    //Prevent reverting on this forced stop
     605                    intersecting_items[i].options.revert = false;
     606
     607                    // The out event needs to be triggered independently
     608                    intersecting_items[i]._trigger('out', event, intersecting_items[i]._uiHash(intersecting_items[i]));
     609
     610                    intersecting_items[i]._mouseStop(event, true);
     611                    intersecting_items[i].options.helper = intersecting_items[i].options._helper;
     612
     613                    //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
     614                    //console.log("DO WE GET HERE?");
     615                    if(intersecting_items[i].currentItem) intersecting_items[i].currentItem.remove();
     616                    if(intersecting_items[i].placeholder) intersecting_items[i].placeholder.remove();
     617
     618                    inst._trigger("fromSortable", event);
     619                    inst.dropped = false; //draggable revert needs that
     620                }
     621
     622                intersecting_items[i].isOver = 0;
     623           
     624        }
     625
     626        if(innermostContainer && !innermostContainer.isOver)
     627        {
     628            console.log("INNER="+innermostContainer.element[0].getAttribute('class'));
     629            console.log("SETTING ISOVER");
     630            innermostContainer.isOver = 1;
     631
     632            //Now we fake the start of dragging for the sortable instance,
     633            //by cloning the list group item, appending it to the sortable and using it as inst.currentItem
     634            //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
     635
     636            if(innermostContainer.currentItem) innermostContainer.currentItem.remove();
     637            if(innermostContainer.placeholder) innermostContainer.placeholder.remove();
     638
     639            innermostContainer.currentItem = $(self).clone().appendTo(innermostContainer.element).data("sortable-item", true);
     640           
     641            innermostContainer.options._helper = innermostContainer.options.helper; //Store helper option to later restore it
     642            innermostContainer.options.helper = function() { return ui.helper[0]; };
     643
     644            console.log("EVENT TARGET="+innermostContainer.currentItem[0].getAttribute('class'));
     645            event.target = innermostContainer.currentItem[0];
     646            innermostContainer._mouseCapture(event, true);
     647            innermostContainer._mouseStart(event, true, true);
     648
     649            //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
     650            innermostContainer.offset.click.top = inst.offset.click.top;
     651            innermostContainer.offset.click.left = inst.offset.click.left;
     652            innermostContainer.offset.parent.left -= inst.offset.parent.left - innermostContainer.offset.parent.left;
     653            innermostContainer.offset.parent.top -= inst.offset.parent.top - innermostContainer.offset.parent.top;
     654
     655            inst._trigger("toSortable", event);
     656            inst.dropped = innermostContainer.element; //draggable revert needs that
     657            //hack so receive/update callbacks work (mostly)
     658            inst.currentItem = inst.element;
     659            innermostContainer.fromOutside = inst;
     660
     661            //sam brace
     662        }
     663
     664        if(innermostContainer)
     665        {
     666            //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
     667            if(innermostContainer.currentItem) innermostContainer._mouseDrag(event);
     668        }
     669
     670    }
     671});
    423672
    424673    /*
  • main/trunk/greenstone3/web/interfaces/oran/transform/layouts/formatmanager.xsl

    r24417 r24420  
    1010    <xsl:include href="xml-to-gui.xsl"/>
    1111    <xsl:include href="xml-to-gui-templates.xsl"/>
     12   
     13    <xsl:output method="html" omit-xml-declaration="yes"/>
    1214
    1315    <xsl:template name="formatmanagerpre">
     
    5052            .placeholder_td{margin-left: 10px; border: dashed 1px #ccc; background-color:#FFFFCC; width:20px; }
    5153
    52             .header { background-color: #AFCCAF; border: solid 1px #117711; padding: 5px; padding-left: 10px;}
     54            .header { background-color: #AFCCAF; border: solid 1px #117711; padding: 5px; padding-left: 10px; }
    5355
    5456            .resizable { width: 150px; height: 150px; padding: 0.5em; }
     
    7476
    7577        <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/themes/base/jquery-ui.css"/>
    76 
    77 
    7878
    7979        <table width="100%" border="1">
     
    156156                            <tr>
    157157                                <td class="header">MATCH=<input type="text" name="rawtextinput" size="10"/></td>
    158                                 <!--<td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
    159                                 <td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td>-->
     158                                <td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
     159                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick">[x]</a></td>
    160160                            </tr>
    161161                        </tbody>
     
    168168                            <tr>
    169169                                <td class="header">CHOOSE</td>
    170                                 <!--<td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td>
    171                                 <td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td>-->
     170                                <td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td>
     171                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick" title="Click me to remove"/></td>
    172172                            </tr>
    173173                        </tbody>
     
    179179                        <tbody>
    180180                            <tr>
     181                                <td class="header" style="font-size: 0.8em;">METADATA</td>
    181182                                <td class="header" id="metadataSelector">
    182183                                    <!--<xsl:call-template name="meta-to-combo">
     
    185186                                    </xsl:call-template>-->
    186187                                </td>
    187                                 <!--<td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td>-->
     188                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick" title="Click me to remove"/></td>
    188189                            </tr>
    189190                        </tbody>
     
    195196                        <tbody>
    196197                            <tr>
    197                                 <td class="header">LINK<select>
     198                                <td class="header">LINK</td>
     199                                <td class="header"><select>
    198200                                    <option value = "document" selected = "document">Document</option>
    199201                                    <option value = "classifier">Classifier</option>
     
    201203                                    <option value = "horizontal">Horizontal</option>
    202204                                </select></td>
    203                                 <!--<td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
    204                                 <td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td>-->
     205                                <td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
     206                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick">[x]</a></td>
    205207                            </tr>
    206208                        </tbody>
     
    213215                            <tr>
    214216                                <td class="header">SWITCH</td>
    215                                 <!--<td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
    216                                 <td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td>-->
     217                                <td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
     218                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick">[x]</a></td>
    217219                            </tr>
    218220                        </tbody>
     
    224226                        <tbody>
    225227                            <tr>
    226                                 <td class="header">WHEN<xsl:value-of select="@test"/></td>
    227                                 <!--<td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
    228                                 <td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td>-->
     228                                <td class="header">WHEN <xsl:value-of select="@test"/></td>
     229                                <td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
     230                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick"/></td>
    229231                            </tr>
    230232                        </tbody>
     
    237239                            <tr>
    238240                                <td class="header">OTHERWISE</td>
    239                                 <!--<td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
    240                                 <td><a href="#" class="ui-icon ui-icon-closethick"/></td>-->
     241                                <td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td>
     242                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick"/></td>
    241243                            </tr>
    242244                        </tbody>
     
    248250                        <tbody>
    249251                            <tr>
    250                                 <td class="header">ICON<select>
     252                                <td class="header">ICON</td>
     253                                <td class="header"><select>
    251254                                    <option value="document" selected="document">Document</option>
    252255                                    <option value="classifier">Classifier</option>
    253256                                    <option value="source">Source</option>
    254257                                </select></td>
    255                                 <!--<td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td>-->
     258                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick">[x]</a></td>
    256259                            </tr>
    257260                        </tbody>
     
    262265                        <tbody>
    263266                            <tr>
     267                                <td class="header">TEXT</td>
    264268                                <td class="header"><input type="text" name="rawtextinput" size="10" value=""/></td>
    265                                 <!--<td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td>-->
     269                                <td class="header"><a href="#" class="ui-icon ui-icon-closethick"/></td>
    266270                            </tr>
    267271                        </tbody>
  • main/trunk/greenstone3/web/interfaces/oran/transform/layouts/header.xsl

    r24397 r24420  
    2626        <link rel="stylesheet" href="interfaces/{$interface_name}/style/core.css" type="text/css"/>
    2727        <link rel="shortcut icon" href="favicon.ico"/>
    28         <!--<script type="text/javascript" src="interfaces/oran/js/jquery-1.4.2.js"><xsl:text> </xsl:text></script>
    29         <script type="text/javascript" src="interfaces/oran/js/jquery-ui-1.8rc1/ui/jquery-ui.js"><xsl:text> </xsl:text></script>
    30         <script type="text/javascript" src="interfaces/oran/js/jquery.selectboxes.js"><xsl:text> </xsl:text></script>-->
    3128    </xsl:template>
    3229       
     
    131128        <td id="titlearea">
    132129            <h2>
    133                 <!-- Resize the title based on how long it is -->
     130                <!-- Resize the title based on how long it is (There's probably a better way to do this) -->
    134131                <xsl:attribute name="style">
    135132                    <xsl:choose>
  • main/trunk/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui-templates.xsl

    r23298 r24420  
    7070                            <option value = "source">Source</option>
    7171                            <option value = "horizontal">Horizontal</option>
    72                 </select></td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
     72                </select></td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
    7373        </xsl:variable>
    7474
     
    8181
    8282        <xsl:variable name="template">
    83         <div class="gsf_template css_gsf_template block" title="gsf:template"><table class="header"><tbody><tr><td class="header">MATCH=<input type="text" name="rawtextinput" size="10"/></td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table><table border="1"><tr class="tr"><td class="droppable" width="10px"></td></tr></table></div><br/>
     83        <div class="gsf_template css_gsf_template block" title="gsf:template"><table class="header"><tbody><tr><td class="header">MATCH=<input type="text" name="rawtextinput" size="10"/></td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table><table border="1"><tr class="tr"><td class="droppable" width="10px"></td></tr></table></div><br/>
    8484        </xsl:variable>
    8585
     
    9292
    9393        <xsl:variable name="switch">
    94         <div class="gsf_switch css_gsf_switch block" title="gsf:switch"><table class="header"><tbody><tr><td class="header">SWITCH</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
     94        <div class="gsf_switch css_gsf_switch block" title="gsf:switch"><table class="header"><tbody><tr><td class="header">SWITCH</td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
    9595        </xsl:variable>
    9696
     
    103103
    104104        <xsl:variable name="when">
    105         <div class="gsf_when css_gsf_when block" title="gsf:when"><table class="header"><tbody><tr><td class="header">WHEN<input type="text" name="rawtextinput" size="10"/></td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
     105        <div class="gsf_when css_gsf_when block" title="gsf:when"><table class="header"><tbody><tr><td class="header">WHEN<input type="text" name="rawtextinput" size="10"/></td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
    106106        </xsl:variable>
    107107
     
    113113
    114114        <xsl:variable name="otherwise">
    115         <div class="gsf_otherwise css_gsf_otherwise block" title="gsf:otherwise"><table class="header"><tbody><tr><td class="header">OTHERWISE</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
     115        <div class="gsf_otherwise css_gsf_otherwise block" title="gsf:otherwise"><table class="header"><tbody><tr><td class="header">OTHERWISE</td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
    116116        </xsl:variable>
    117117
     
    123123   
    124124        <xsl:variable name="icon">
    125         <div class="gsf_icon css_gsf_icon block leaf" title="gsf:icon"><table class="header"><tbody><tr><td class="header">ICON<select><option value = "document" selected = "document">Document</option><option value = "classifier">Classifier</option><option value = "source">Source</option></select></td><td><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
     125        <div class="gsf_icon css_gsf_icon block leaf" title="gsf:icon"><table class="header"><tbody><tr><td class="header">ICON<select><option value = "document" selected = "document">Document</option><option value = "classifier">Classifier</option><option value = "source">Source</option></select></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick">[x]</a></td></tr></tbody></table></div>
    126126        </xsl:variable>
    127127
  • main/trunk/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui.xsl

    r24243 r24420  
    263263
    264264        <div class="gsf_switch css_gsf_switch block" title="gsf:switch">
    265                 <table class="header"><tbody><tr><td class="header">SWITCH</td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table>
     265                <table class="header"><tbody><tr><td class="header">SWITCH</td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td class="header"><a href="#" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table>
    266266                <xsl:apply-templates mode="xml-to-gui">
    267267                    <xsl:with-param name="depth" select="$depth"/>
     
    380380        <xsl:param name="metadataSets"/>
    381381       
    382 
    383382        <td class="column" valign="{@valign}" title="td">
    384             <div class="td-div block" title="td-div">
    385             <div class="neverempty block" style="height:50px">NEVER EMPTY</div>
     383            <div class="td-div" title="td-div">
     384            <div class="neverempty block" style="height:25px">NEVER EMPTY</div>
    386385
    387386                <xsl:apply-templates mode="xml-to-gui">
Note: See TracChangeset for help on using the changeset viewer.