Changeset 22829 for main/trunk/greenstone3/web/interfaces
- Timestamp:
- 2010-09-01T14:47:03+12:00 (14 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/oran
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/oran/js/gui_div.js
r22768 r22829 47 47 48 48 $(".element_type_gsf_metadata").draggable({ 49 connectToSortable: '.gsf_choose_metadata, .gsf_ template, .gsf_when, .gsf_otherwise, .td',49 connectToSortable: '.gsf_choose_metadata, .gsf_when, .gsf_otherwise, .td-div', 50 50 helper: 'clone', 51 51 revert: 'invalid' … … 132 132 133 133 $('td').click(function () { 134 console.log('td click ');134 console.log('td click *'); 135 135 return false; 136 136 }); 137 137 138 $(".td ").resizable({138 $(".td-div").resizable({ 139 139 alsoResize: 'parent', 140 140 //containment: 'parent', … … 152 152 deactivate: function(event, ui) { $(this).removeClass("droppable_hl"); }, // console.log("droppable deactivated")}, 153 153 drop: function(event, ui) { 154 var span = document.createElement("div"); 155 span.setAttribute("class","td"); 156 span.setAttribute("style","height:50px"); 157 span.setAttribute("style","display:block"); 154 var neverempty = document.createElement("div"); 155 neverempty.setAttribute("class","neverempty block"); 156 neverempty.setAttribute("style","height:50px"); 157 neverempty.setAttribute("style","display:block"); 158 var text = document.createTextNode('NEVER EMPTY'); 159 neverempty.appendChild(text); 158 160 var td = document.createElement("td"); 159 161 var div = document.createElement("div"); // class=\"td block\" title=\"td-div\""); 160 162 div.setAttribute("title","td-div"); 161 div.setAttribute("class","td block");163 div.setAttribute("class","td-div block"); 162 164 div.setAttribute("style","margin-left:0px"); 163 165 div.setAttribute("width","25px"); 164 166 td.appendChild(div); 165 div.appendChild( span);167 div.appendChild(neverempty); 166 168 var sep = document.createElement("td"); 167 169 sep.setAttribute("class","droppable"); … … 172 174 resize_tables($(this)); 173 175 bind_td_sortable(); 176 bind_block_mouseover(); 174 177 //bind_all_sortables(); 175 178 } … … 236 239 { 237 240 console.log('function bind_td_sortable()'); 238 $('.td ').sortable({241 $('.td-div').sortable({ 239 242 'cursor':'pointer', 240 243 'tolerance': 'pointer', … … 250 253 }); 251 254 252 $('.td ').click(function () {255 $('.td-div').click(function () { 253 256 console.log('td class click'); 254 return false; 255 }); 256 257 258 259 } 257 return true; 258 }); 259 260 261 262 } 263 260 264 261 265 function bind_choose_metadata_sortable() … … 280 284 $('.gsf_link').sortable({ 281 285 'cursor':'pointer', 282 'tolerance': ' pointer',286 'tolerance': 'fit', 283 287 'items':'.gsf_icon', 284 288 'placeholder':'placeholder', 289 'connectWith':'.gsf_link', 285 290 //'nested':'.gsf:metadata' 286 291 stop: function(event, ui) { -
main/trunk/greenstone3/web/interfaces/oran/transform/layouts/main.xsl
r22783 r22829 36 36 <script type="text/javascript" src="interfaces/oran/js/jquery-1.4.2.js"><xsl:text> </xsl:text></script> 37 37 <!-- <script type="text/javascript" src="interfaces/oran/js/jquery-ui-1.8.2.custom.min.js"><xsl:text> </xsl:text></script> --> 38 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.js"><xsl:text> </xsl:text></script> 38 <script type="text/javascript" src="interfaces/oran/js/jquery-ui-1.8rc1/ui/jquery-ui.js"><xsl:text> </xsl:text></script> 39 <!-- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.js"><xsl:text> </xsl:text></script> --> 39 40 <!-- <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.2.min.js"><xsl:text> </xsl:text></script> --> 40 41 <!-- <script type="text/javascript" src="interfaces/oran/js/jquery-ui-1.8rc1/jquery-1.4.1.js"><xsl:text> </xsl:text></script> --> -
main/trunk/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui-templates.xsl
r22676 r22829 36 36 <!-- ********** GSF:CHOOSE-METADATA ********** --> 37 37 <xsl:variable name="choose_metadata"> 38 <div class="gsf_choose_metadata css_gsf_choose_metadata block" title="gsf:choose-metadata">CHOOSE <a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a></div> 38 <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 40 </xsl:variable> 40 41 -
main/trunk/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui.xsl
r22768 r22829 217 217 <tbody> 218 218 <tr class="tr"> 219 <td class="droppable" width="10px" />219 <td class="droppable" width="10px"></td> 220 220 <xsl:apply-templates mode="xml-to-gui"> 221 221 <xsl:with-param name="depth" select="$depth"/> … … 341 341 <!-- <td class="td block resizable" title="td" valign="{@valign}" style='overflow: hidden;'> --> 342 342 <td valign="{@valign}" title="td"> 343 <div class="td block" title="td-div"> 343 <div class="td-div block" title="td-div"> 344 <div class="neverempty block" style="height:50px">NEVER EMPTY</div> 345 344 346 <!-- <xsl:text><td</xsl:text>valign=<xsl:value-of select="@valign"/><xsl:text>></xsl:text><a href="#" class="minmax">[-]</a><a href="#" class="remove">[x]</a> --> 345 347 <xsl:apply-templates mode="xml-to-gui">
Note:
See TracChangeset
for help on using the changeset viewer.