Changeset 22987

Show
Ignore:
Timestamp:
29.09.2010 17:22:21 (9 years ago)
Author:
sjb48
Message:
 
Location:
main/trunk/greenstone3/web/interfaces/oran
Files:
4 modified

Legend:

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

    r22983 r22987  
    217217    $('.gsf_template').sortable({ 
    218218            'cursor':'pointer', 
     219            'tolerance': 'pointer', 
    219220            'items':'.table', //.gsf_choose_metadata, .gsf_metadata', 
    220221            'placeholder':'placeholder', 
     
    242243    $('.td-div').sortable({ 
    243244            'cursor':'pointer', 
     245            'tolerance': 'pointer', 
    244246            'items':'.gsf_metadata, .gsf_choose_metadata, .gsf_link, .gsf_switch', 
    245247            'placeholder':'placeholder', 
     
    269271    $('.gsf_choose_metadata').sortable({ 
    270272            'cursor':'pointer', 
     273            'tolerance': 'pointer', 
    271274            'items':'.gsf_metadata, .gsf_default', 
    272275            'placeholder':'placeholder', 
     
    285288    $('.gsf_link').sortable({ 
    286289            'cursor':'pointer', 
    287             //'tolerance': 'pointer', 
     290            'tolerance': 'pointer', 
    288291            'items':'.gsf_icon, .gsf_text', 
    289292            'placeholder':'placeholder', 
     
    302305    $('.gsf_switch').sortable({ 
    303306            'cursor':'pointer', 
    304             //'tolerance': 'pointer', 
     307            'tolerance': 'pointer', 
    305308            'items':'.gsf_metadata, .gsf_when, .gsf_otherwise', 
    306309            'placeholder':'placeholder', 
     
    319322    $('.gsf_when').sortable({ 
    320323            'cursor':'pointer', 
    321             //'tolerance': 'pointer', 
     324            'tolerance': 'pointer', 
    322325            'items':'.leaf', 
    323326            'placeholder':'placeholder', 
     
    334337    $('.gsf_otherwise').sortable({ 
    335338            'cursor':'pointer', 
    336             //'tolerance': 'pointer', 
     339            'tolerance': 'pointer', 
    337340            'items':'.leaf', 
    338341            'placeholder':'placeholder', 
  • main/trunk/greenstone3/web/interfaces/oran/transform/layouts/main.xsl

    r22983 r22987  
    151151        } 
    152152 
    153         .header { background-color: #AFCCAF; border: solid 1px #117711; padding: 10px;} 
     153        .header { background-color: #AFCCAF; border: solid 1px #117711; padding: 5px;} 
    154154 
    155155        .resizable { width: 150px; height: 150px; padding: 0.5em; }  
  • main/trunk/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui-templates.xsl

    r22983 r22987  
    3737        <xsl:variable name="choose_metadata"> 
    3838            <table class="header"><tbody><tr><td>CHOOSE</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
    39             <div class="gsf_choose_metadata css_gsf_choose_metadata block" title="gsf:choose-metadata"><table class="header"><tbody><tr><td>CHOOSE</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table></div> 
     39            <div class="gsf_choose_metadata css_gsf_choose_metadata block" title="gsf:choose-metadata"><table class="header"><tbody><tr><td class="header">CHOOSE</td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table></div> 
    4040        </xsl:variable> 
    4141 
     
    4747    <!-- ********** GSF:METADATA ********** --> 
    4848        <xsl:variable name="metadata"> 
    49         <div class="gsf_metadata css_gsf_metadata block leaf" title="gsf:metadata"><table class="header"><tbody><tr><td><xsl:call-template name="meta-to-combo"> 
     49        <div class="gsf_metadata css_gsf_metadata block leaf" title="gsf:metadata"><table class="header"><tbody><tr><td class="header"><xsl:call-template name="meta-to-combo"> 
    5050                        <xsl:with-param name="metadataSets" select="$metadataSets"/> 
    5151                        <xsl:with-param name="current" select="ex.title"/> 
    52                      </xsl:call-template></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table></div> 
     52                     </xsl:call-template></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table></div> 
    5353                    <!-- <a href="#" class="remove">[x]</a></div> --> 
    5454        </xsl:variable> 
     
    6161    <!-- ********** GSF:LINK ********** --> 
    6262        <xsl:variable name="link"> 
    63         <div class="gsf_link css_gsf_link block" title="gsf:link">LINK[type=<select> 
     63        <div class="gsf_link css_gsf_link block" title="gsf:link"><table class="header"><tbody><tr><td class="header">LINK<select> 
    6464                            <option value = "document" selected = "document">Document</option> 
    6565                            <option value = "classifier">Classifier</option> 
    6666                            <option value = "source">Source</option> 
    6767                            <option value = "horizontal">Horizontal</option> 
    68                 </select>]<a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a></div>  
     68                </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>  
    6969        </xsl:variable> 
    7070 
     
    7777 
    7878        <xsl:variable name="template"> 
    79         <div class="gsf_template block" title="gsf:template">MATCH=<input type="text" name="rawtextinput" size="10"/><a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a><table border="1"><tr class="tr"></tr></table></div><br/> 
     79        <div class="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"></tr></table></div><br/> 
    8080        </xsl:variable> 
    8181 
     
    8888 
    8989        <xsl:variable name="switch"> 
    90         <div class="gsf_switch css_gsf_switch block" title="gsf:switch"> SWITCH <a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a></div> 
     90        <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> 
    9191        </xsl:variable> 
    9292 
     
    9999 
    100100        <xsl:variable name="when"> 
    101         <div class="gsf_when css_gsf_when block" title="gsf:when">WHEN[test=<input type="text" name="rawtextinput" size="10"/>]<a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a></div> 
     101        <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> 
    102102        </xsl:variable> 
    103103 
     
    109109 
    110110        <xsl:variable name="otherwise"> 
    111         <div class="gsf_otherwise css_gsf_otherwise block" title="gsf:otherwise">OTHERWISE<a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a></div> 
     111        <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> 
    112112        </xsl:variable> 
    113113 
     
    119119     
    120120        <xsl:variable name="icon"> 
    121         <div class="gsf_icon css_gsf_icon block leaf" title="gsf:icon"> ICON[type=<select><option value = "document" selected = "document">Document</option><option value = "classifier">Classifier</option><option value = "source">Source</option></select>]<a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a></div> 
     121        <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> 
    122122        </xsl:variable> 
    123123 
  • main/trunk/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui.xsl

    r22933 r22987  
    119119 
    120120        <div class="gsf_choose_metadata css_gsf_choose_metadata block" title="gsf:choose-metadata"> 
    121         <table class="header"><tbody><tr><td>CHOOSE</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
     121        <table class="header"><tbody><tr><td class="header">CHOOSE</td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
    122122                <xsl:apply-templates mode="xml-to-gui"> 
    123123                    <xsl:with-param name="depth" select="$depth"/> 
     
    140140                     </xsl:call-template> 
    141141            </xsl:variable> 
    142         <table class="header"><tbody><tr><td><xsl:copy-of select="$combo"/></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
     142        <table class="header"><tbody><tr><td class="header"><xsl:copy-of select="$combo"/></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
    143143        </div> 
    144144    </xsl:template> 
     
    152152        <div class="gsf_link css_gsf_link block" title="gsf:link"> 
    153153        <xsl:variable name="link"> 
    154                 LINK[type= 
    155                 <select> 
     154                LINK<select> 
    156155                    <xsl:choose> 
    157156                        <xsl:when test="@type='document'"> 
     
    177176                        </xsl:when> 
    178177                  </xsl:choose> 
    179                 </select>] 
     178                </select> 
    180179        </xsl:variable> 
    181         <table class="header"><tbody><tr><td><xsl:copy-of select="$link"/></td><td><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
     180        <table class="header"><tbody><tr><td class="header"><xsl:copy-of select="$link"/></td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
    182181                <xsl:apply-templates mode="xml-to-gui"> 
    183182                    <xsl:with-param name="depth" select="$depth"/> 
     
    212211     
    213212                    <!-- <a href="#" class="minmax">[+]</a><a href="#" class="remove">[x]</a><a href="#" class="remove"><img src="interfaces/oran/images/green_button_close.png" alt="[x]" title="Click me to remove"/></a><a href="[myhref]" class="ui-state-default ui-corner-all"><span class="ui-icon ui-icon-home" style="float:left;"></span>Home</a> --> 
    214             <table class="header"><tbody><tr><td>MATCH=<input type="text" name="rawtextinput" size="10" value="{@match}"/></td><td><xsl:copy-of select="$mode"/></td><td><a href="#" class="minmax ui-icon ui-icon-plusthick" title="Click me to expand">[+]</a></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
     213            <table class="header"><tbody><tr><td class="header">MATCH=<input type="text" name="rawtextinput" size="10" value="{@match}"/></td><td class="header"><xsl:copy-of select="$mode"/></td><td class="header"><a href="#" class="minmax ui-icon ui-icon-plusthick" title="Click me to expand">[+]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
    215214 
    216215                <table class="table" border="1"> 
     
    234233 
    235234        <div class="gsf_switch css_gsf_switch block" title="gsf:switch"> 
    236                 <table class="header"><tbody><tr><td>SWITCH</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
     235                <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> 
    237236                <xsl:apply-templates mode="xml-to-gui"> 
    238237                    <xsl:with-param name="depth" select="$depth"/> 
     
    249248 
    250249        <div class="gsf_when css_gsf_when block" title="gsf:when">  
    251                 <table class="header"><tbody><tr><td>WHEN[test=<xsl:value-of select="@test"/>]</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
     250                <table class="header"><tbody><tr><td class="header">WHEN<xsl:value-of select="@test"/></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> 
    252251                <xsl:apply-templates mode="xml-to-gui"> 
    253252                  <xsl:with-param name="depth" select="$depth"/> 
     
    264263 
    265264        <div class="gsf_otherwise css_gsf_otherwise block" title="gsf:otherwise"> 
    266                 <table><tbody><tr><td>OTHERWISE</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick">[-]</a></td><td><a href="#" class="remove">[x]</a></td><td><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
     265                <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">[x]</a></td><td><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
    267266                <xsl:apply-templates mode="xml-to-gui"> 
    268267                    <xsl:with-param name="depth" select="$depth"/> 
     
    280279        <div class="gsf_icon css_gsf_icon block leaf" title="gsf:icon"> 
    281280            <xsl:variable name="icon"> 
    282                 ICON[type= 
    283                 <select> 
     281                ICON<select> 
    284282                    <xsl:choose> 
    285283                        <xsl:when test="@type='document'"> 
     
    299297                        </xsl:when> 
    300298                  </xsl:choose> 
    301                 </select>] 
     299                </select> 
    302300                </xsl:variable> 
    303             <table class="header"><tbody><tr><td><xsl:copy-of select="$icon"/></td><td><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
     301            <table class="header"><tbody><tr><td class="header"><xsl:copy-of select="$icon"/></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table> 
    304302        </div> 
    305303    </xsl:template> 
     
    312310 
    313311        <div class="block gsf_default" title="gsf:default"> 
    314                 <table class="header"><tbody><tr><td>DEFAULT</td><td><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
     312                <table class="header"><tbody><tr><td class="header">DEFAULT</td><td class="header"><a href="#" class="minmax ui-icon ui-icon-minusthick" title="Click me to expand">[-]</a></td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
    315313                <xsl:apply-templates mode="xml-to-gui"> 
    316314                    <xsl:with-param name="depth" select="$depth"/> 
     
    328326        <div class="block leaf gsf_text" title="gsf:text"> 
    329327                <xsl:variable name="rawtext"><xsl:value-of select="."/></xsl:variable> 
    330                 <table class="header"><tbody><tr><td><input type="text" name="rawtextinput" size="10" value="{$rawtext}"/></td><td><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
     328                <table class="header"><tbody><tr><td class="header"><input type="text" name="rawtextinput" size="10" value="{$rawtext}"/></td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table> 
    331329        </div> 
    332330    </xsl:template> 
     
    361359        <xsl:param name="metadataSets"/> 
    362360 
    363         <xsl:text>&lt;br/&gt;</xsl:text> <br/> 
     361        <!-- <xsl:text>&lt;br/&gt;</xsl:text> <br/> --> 
    364362     
    365363        <xsl:apply-templates mode="xml-to-gui">