September 2013 - galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: guerler: Shift galaxy.upload.css to less format, update modal window according to new bootstrap version
by commits-noreply＠bitbucket.org 14 Sep '13

14 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b65602624e25/ Changeset: b65602624e25 User: guerler Date: 2013-09-14 17:38:27 Summary: Shift galaxy.upload.css to less format, update modal window according to new bootstrap version Affected #: 6 files diff -r a598d4d47dce07864f5211f9c8f7847ab39bce75 -r b65602624e257d96d90fe94de13b483fd70d2f7e static/scripts/galaxy.modal.js --- a/static/scripts/galaxy.modal.js +++ b/static/scripts/galaxy.modal.js @@ -68,7 +68,7 @@ $(this.el_main).append($(this.el)); // link elements - var footer = (this.$el).find('.footer'); + var footer = (this.$el).find('.buttons'); // append buttons var self = this; @@ -91,15 +91,17 @@ // fill regular modal template template: function(title, body) { - return '<div class="modal">' + - '<div class="modal-backdrop"></div>' + - '<div class="modal-dialog galaxy-corner">' + + return '<div class="modal in">' + + '<div class="modal-backdrop in" style="z-index: -1;"></div>' + + '<div class="modal-dialog">' + '<div class="modal-content">' + - '<div class="header">' + + '<div class="modal-header">' + '<span><h3 class="title">' + title + '</h3></span>' + '</div>' + - '<div class="body">' + body + '</div>' + - '<div class="footer"></div>' + + '<div class="modal-body style="min-width: 540px; max-height: 445px;">' + body + '</div>' + + '<div class="modal-footer">' + + '<div class="buttons" style="float: right;"></div>' + + '</div>' + '</div' + '</div>' + '</div>'; diff -r a598d4d47dce07864f5211f9c8f7847ab39bce75 -r b65602624e257d96d90fe94de13b483fd70d2f7e static/scripts/galaxy.upload.js --- a/static/scripts/galaxy.upload.js +++ b/static/scripts/galaxy.upload.js @@ -3,7 +3,7 @@ */ // dependencies -define(["utils/galaxy.css", "galaxy.modal", "galaxy.master", "utils/galaxy.uploadbox", "libs/backbone/backbone-relational"], function(css, mod_modal, mod_master) { +define(["galaxy.modal", "galaxy.master", "utils/galaxy.uploadbox", "libs/backbone/backbone-relational"], function(mod_modal, mod_master) { // galaxy upload var GalaxyUpload = Backbone.View.extend( @@ -20,9 +20,6 @@ // initialize initialize : function() { - // load required css files - css.load_file("static/style/galaxy.upload.css"); - // add activate icon var self = this; this.button_show = new mod_master.GalaxyMasterIcon ( @@ -47,13 +44,13 @@ // mouse over event_mouseover : function (e) { - $('#galaxy-upload-box').addClass('galaxy-upload-highlight'); + $('#galaxy-upload-box').addClass('highlight'); }, // mouse left event_mouseleave : function (e) { - $('#galaxy-upload-box').removeClass('galaxy-upload-highlight'); + $('#galaxy-upload-box').removeClass('highlight'); }, // start @@ -110,7 +107,7 @@ var el = $('#galaxy-upload-file-' + index); // update progress frame - el.find('.progress-frame').addClass("failed"); + el.find('.progress-frame').addClass('failed'); // update error message el.find('.error').html("<strong>Failed:</strong> " + message); @@ -141,10 +138,14 @@ if (!this.modal) { // make modal + var self = this; this.modal = new mod_modal.GalaxyModal( { title : 'Upload files from your local drive', - body : this.template() + body : this.template(), + buttons : { + 'Close' : function() {self.modal.hide()} + } }); // get current history @@ -198,16 +199,16 @@ // load html template template: function() { - return '<form id="galaxy-upload-box" class="galaxy-upload-box galaxy-corner"></form>'; + return '<form id="galaxy-upload-box" class="galaxy-upload-box"></form>'; }, // load html template template_file: function(id) { - return '<div id="' + id.substr(1) + '" class="galaxy-upload-file galaxy-corner-soft galaxy-shadow">' + + return '<div id="' + id.substr(1) + '" class="file corner-soft shadow">' + '<div class="title"></div>' + '<div class="error"></div>' + - '<div class="progress-frame galaxy-corner-soft">' + + '<div class="progress-frame corner-soft">' + '<div class="progress"></div>' + '</div>' + '<div class="info"></div>' + diff -r a598d4d47dce07864f5211f9c8f7847ab39bce75 -r b65602624e257d96d90fe94de13b483fd70d2f7e static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1124,6 +1124,15 @@ .galaxy-frame .frame .f-close{right:5px;top:1px} .galaxy-frame .frame .f-pin{left:6px;top:1px} .galaxy-frame .frame .f-resize{background:#fff;width:16px;height:16px;color:#2c3143;right:0px;bottom:0px;text-align:center;line-height:16px;border:0px} +.galaxy-upload-box{width:100%;height:200px;max-height:200px;padding:10px 0px 0px 0px;text-align:center;cursor:pointer;overflow:scroll;font-size:12px;line-height:1.428571429;-moz-border-radius:5px;border-radius:5px;border:1px dashed #bfbfbf}.galaxy-upload-box .corner-soft{-moz-border-radius:3px;border-radius:3px} +.galaxy-upload-box .shadow{-webkit-box-shadow:0 0 2px rgba(0,0,0,0.3)} +.galaxy-upload-box .highlight{border:1px dashed #333} +.galaxy-upload-box .file{position:relative;margin:5px 20px 5px 20px;border:1px solid #bfbfbf;color:#333}.galaxy-upload-box .file .title{margin:3px 130px 0px 5px;text-align:left;overflow:hidden;border:0px} +.galaxy-upload-box .file .progress-frame{border:0px;margin:0px 5px 3px 5px;height:7px;background:#bfbfbf} +.galaxy-upload-box .file .progress{background:#5cb85c;height:100%;width:0%} +.galaxy-upload-box .file .failed{background:#d9534f} +.galaxy-upload-box .file .error{font-size:11px;text-align:left;overflow:hidden;margin:0px 5px 0px 5px} +.galaxy-upload-box .file .info{position:absolute;top:4px;right:5px;font-size:11px;text-align:right;overflow:hidden;max-width:100px;max-height:12px} .unselectable{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none} .parent-width{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;*width:90%} .clear:before,.clear:after{content:" ";display:table;} @@ -1162,7 +1171,7 @@ .panel-warning-message{background-image:url(warn_small.png);background-color:#fce1ba} .panel-done-message{background-image:url(ok_small.png);background-color:#aff1af} .panel-info-message{background-image:url(info_small.png);background-color:#a6e4f7} -#masthead{position:absolute;top:0;left:0;width:100%;min-width:920px;padding:0}#masthead .nav{z-index:15001} +#masthead{position:absolute;top:0;left:0;width:100%;min-width:980px;padding:0}#masthead .nav{z-index:15001} #masthead .nav>li>a{cursor:pointer;text-decoration:none}#masthead .nav>li>a:hover{color:gold} #masthead li.dropdown>a:hover .caret{border-top-color:gold;border-bottom-color:gold} #masthead .navbar-brand{position:absolute;left:0;top:0;font-family:verdana;font-weight:bold;font-size:20px;line-height:1;color:white;padding:5px 20px 12px;margin-left:-15px;z-index:2000}#masthead .navbar-brand img{display:inline;width:26px;vertical-align:top} diff -r a598d4d47dce07864f5211f9c8f7847ab39bce75 -r b65602624e257d96d90fe94de13b483fd70d2f7e static/style/blue/galaxy.upload.css --- a/static/style/blue/galaxy.upload.css +++ /dev/null @@ -1,97 +0,0 @@ -/* - upload box -*/ - -.galaxy-upload-button -{ - z-index : 34010; - position : absolute; - top : 8px; - right : 210px; - cursor : pointer; - color : #D0D0D0; -} - -.galaxy-upload-box -{ - margin : -5px; - width : 100%; - height : 200px; - max-height : 200px; - border : 1px dashed #D0D0D0; - font-weight : bold; - line-height : 16px; - color : #5C5858; - padding : 10px 0px 0px 0px; - text-align : center; - font-size : 12px; - cursor : pointer; - overflow : scroll; -} - -.galaxy-upload-highlight -{ - border : 1px dashed #5C5858; - color : #5C5858; -} - -.galaxy-upload-file -{ - position : relative; - margin : 5px 20px 5px 20px; - border : 1px solid #D0D0D0; -} - -.galaxy-upload-file .title -{ - font-weight : normal; - font-size : 12px; - color : #5C5858; - margin : 3px 130px 0px 5px; - text-align : left; - overflow : hidden; -} - -.galaxy-upload-file .progress-frame -{ - border : 0px; - margin : 0px 5px 3px 5px; - height : 7px; - background : #D0D0D0; -} - -.galaxy-upload-file .progress -{ - background : #CCFFCC; - height : 100%; - width : 0%; -} - -.galaxy-upload-file .failed -{ - background : #FFCCCC; -} - -.galaxy-upload-file .error -{ - font-weight : normal; - font-size : 10px; - color : #5C5858; - text-align : left; - overflow : hidden; - margin : 0px 5px 0px 5px; -} - -.galaxy-upload-file .info -{ - position : absolute; - top : 4px; - right : 5px; - font-weight : normal; - font-size : 10px; - color : #5C5858; - text-align : right; - overflow : hidden; - max-width : 100px; - max-height : 12px; -} \ No newline at end of file diff -r a598d4d47dce07864f5211f9c8f7847ab39bce75 -r b65602624e257d96d90fe94de13b483fd70d2f7e static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -18,6 +18,9 @@ // load galaxy frame styles @import "frame.less"; +// load galaxy upload styles +@import "upload.less"; + // Mixins .unselectable { @@ -321,7 +324,7 @@ top:0; left:0; width:100%; - min-width:920px; + min-width:980px; padding: 0; .nav { diff -r a598d4d47dce07864f5211f9c8f7847ab39bce75 -r b65602624e257d96d90fe94de13b483fd70d2f7e static/style/src/less/upload.less --- /dev/null +++ b/static/style/src/less/upload.less @@ -0,0 +1,87 @@ +.galaxy-upload-box +{ + width : 100%; + height : 200px; + max-height : 200px; + padding : 10px 0px 0px 0px; + text-align : center; + cursor : pointer; + overflow : scroll; + font-size : @font-size-base; + line-height : @line-height-base; + -moz-border-radius: @border-radius-large; + border-radius: @border-radius-large; + border : 1px dashed @btn-default-border; + + .corner-soft + { + -moz-border-radius: @border-radius-base; + border-radius: @border-radius-base; + } + + .shadow + { + -webkit-box-shadow: 0 0 2px rgba(0,0,0,0.3); + } + + .highlight + { + border : 1px dashed @btn-default-color; + } + + .file + { + position : relative; + margin : 5px 20px 5px 20px; + border : 1px solid @btn-default-border; + color : @btn-default-color; + + .title + { + margin : 3px 130px 0px 5px; + text-align : left; + overflow : hidden; + border : 0px; + } + + .progress-frame + { + border : 0px; + margin : 0px 5px 3px 5px; + height : 7px; + background : @btn-default-border; + } + + .progress + { + background : @bs-success; + height : 100%; + width : 0%; + } + + .failed + { + background : @bs-danger; + } + + .error + { + font-size : @font-size-small; + text-align : left; + overflow : hidden; + margin : 0px 5px 0px 5px; + } + + .info + { + position : absolute; + top : 4px; + right : 5px; + font-size : @font-size-small; + text-align : right; + overflow : hidden; + max-width : 100px; + max-height : 12px; + } + } +} \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 13 Sep '13

13 Sep '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2891d0f88eff/ Changeset: 2891d0f88eff User: jgoecks Date: 2013-09-13 19:43:59 Summary: Use select2 rather than custom combobox for Trackster dbkey select. Affected #: 1 file diff -r 91352b6afa44a1cf29aa3963b6b30642e351e336 -r 2891d0f88eff34d6dabcbcfbfb056c60a5471007 static/scripts/viz/trackster.js --- a/static/scripts/viz/trackster.js +++ b/static/scripts/viz/trackster.js @@ -13,7 +13,7 @@ 'libs/jquery/jquery.event.hover', 'libs/jquery/jquery.mousewheel', 'libs/jquery/jquery-ui', - 'libs/jquery/jquery-ui-combobox', + 'libs/jquery/select2', 'libs/farbtastic', 'libs/jquery/jquery.form', 'libs/jquery/jquery.rating', @@ -127,11 +127,7 @@ // change focus $("#new-title").focus(); - $("select[name='dbkey']").combobox( - { - appendTo: $("#overlay"), - size: 40 - }); + $("select[name='dbkey']").select2(); // to support the large number of options for dbkey, enable scrolling in overlay. $("#overlay").css("overflow", "auto"); https://bitbucket.org/galaxy/galaxy-central/commits/a598d4d47dce/ Changeset: a598d4d47dce User: jgoecks Date: 2013-09-13 19:49:39 Summary: Remove custom combobox (search + select) code because it has been replaced with select2. Pack scripts. Affected #: 5 files diff -r 2891d0f88eff34d6dabcbcfbfb056c60a5471007 -r a598d4d47dce07864f5211f9c8f7847ab39bce75 static/scripts/libs/jquery/jquery-ui-combobox.js --- a/static/scripts/libs/jquery/jquery-ui-combobox.js +++ /dev/null @@ -1,142 +0,0 @@ -/** - * A generic search + select combobox based on jQueryUI button and autocomplete. - * Code is derived from http://jqueryui.com/autocomplete/ - * - * Options: - * appendTo - element to attach autocomplete options to; default is <body> - * size - text input's size; default is 20 - */ - -(function( $ ) { - $.widget( "ui.combobox", { - _create: function() { - var input, - that = this, - select = this.element.hide(), - selected = select.children( ":selected" ), - value = selected.val() ? selected.text() : "", - wrapper = this.wrapper = $( "<span>" ) - .addClass( "ui-combobox" ) - .insertAfter( select ); - - function removeIfInvalid(element) { - var value = $( element ).val(), - matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( value ) + "$", "i" ), - valid = false; - select.children( "option" ).each(function() { - if ( $( this ).text().match( matcher ) ) { - this.selected = valid = true; - return false; - } - }); - if ( !valid ) { - // remove invalid value, as it didn't match anything - $( element ) - .val( "" ) - .attr( "title", value + " didn't match any item" ) - .tooltip( "open" ); - select.val( "" ); - setTimeout(function() { - input.tooltip( "close" ).attr( "title", "" ); - }, 2500 ); - input.data( "autocomplete" ).term = ""; - return false; - } - } - - var size = ( this.options.size ? this.options.size : 20 ); - input = $( "<input>" ) - .appendTo( wrapper ) - .val( value ) - .click( function() { - this.select(); - }) - .attr( "title", "" ) - .attr( "size", size ) - .addClass( "ui-state-default ui-combobox-input" ) - .autocomplete({ - appendTo: this.options.appendTo, - delay: 0, - minLength: 0, - source: function( request, response ) { - var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" ); - response( select.children( "option" ).map(function() { - var text = $( this ).text(); - if ( this.value && ( !request.term || matcher.test(text) ) ) - return { - label: text.replace( - new RegExp( - "(?![^&;]+;)(?!<[^<>]*)(" + - $.ui.autocomplete.escapeRegex(request.term) + - ")(?![^<>]*>)(?![^&;]+;)", "gi" - ), "<strong>$1</strong>" ), - value: text, - option: this - }; - }) ); - }, - select: function( event, ui ) { - ui.item.option.selected = true; - that._trigger( "selected", event, { - item: ui.item.option - }); - }, - change: function( event, ui ) { - if ( !ui.item ) - return removeIfInvalid( this ); - } - }) - .addClass( "ui-widget ui-widget-content ui-corner-left" ); - - input.data( "autocomplete" )._renderItem = function( ul, item ) { - return $( "<li>" ) - .data( "item.autocomplete", item ) - .append( "<a>" + item.label + "</a>" ) - .appendTo( ul ); - }; - - $( "<a>" ) - .attr( "tabIndex", -1 ) - .attr( "title", "Show All Items" ) - .tooltip() - .appendTo( wrapper ) - .button({ - icons: { - primary: "ui-icon-triangle-1-s" - }, - text: false - }) - .removeClass( "ui-corner-all" ) - .addClass( "ui-corner-right ui-combobox-toggle" ) - .click(function() { - // close if already visible - if ( input.autocomplete( "widget" ).is( ":visible" ) ) { - input.autocomplete( "close" ); - removeIfInvalid( input ); - return; - } - - // work around a bug (likely same cause as #5265) - $( this ).blur(); - - // pass empty string as value to search for, displaying all results - input.autocomplete( "search", "" ); - input.focus(); - }); - - input - .tooltip({ - position: { - of: this.button - }, - tooltipClass: "ui-state-highlight" - }); - }, - - destroy: function() { - this.wrapper.remove(); - this.element.show(); - $.Widget.prototype.destroy.call( this ); - } - }); -})( jQuery ); \ No newline at end of file diff -r 2891d0f88eff34d6dabcbcfbfb056c60a5471007 -r a598d4d47dce07864f5211f9c8f7847ab39bce75 static/scripts/packed/galaxy.frame.js --- a/static/scripts/packed/galaxy.frame.js +++ b/static/scripts/packed/galaxy.frame.js @@ -1,1 +1,1 @@ -define(["utils/galaxy.css","galaxy.master","libs/backbone/backbone-relational"],function(b,c){var a=Backbone.View.extend({el_main:"#everything",options:{frame:{cols:6,rows:3},rows:1000,cell:130,margin:5,scroll:5,top_min:40,frame_max:9},cols:0,top:0,top_max:0,frame_counter:0,frame_counter_id:0,frame_list:[],galaxy_frame_shadow:null,visible:false,active:false,button_active:null,button_load:null,initialize:function(e){var d=this;this.button_active=new c.GalaxyMasterIcon({icon:"fa-icon-th",tooltip:"Enable/Disable Scratchbook",on_click:function(g){d.event_panel_active(g)}});Galaxy.master.append(this.button_active);this.button_load=new c.GalaxyMasterIcon({icon:"fa-icon-eye-open",tooltip:"Show/Hide Scratchbook",on_click:function(g){d.event_panel_load(g)},with_number:true});Galaxy.master.append(this.button_load);b.load_file("static/style/galaxy.frame.css");if(e){this.options=_.defaults(e,this.options)}this.top=this.top_max=this.options.top_min;$(this.el).append(this.frame_template_background());$(this.el).append(this.frame_template_menu());$(this.el_main).append($(this.el));var f="#galaxy-frame-shadow";$(this.el).append(this.frame_template_shadow(f.substring(1)));this.galaxy_frame_shadow={id:f,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};this.frame_resize(this.galaxy_frame_shadow,{width:0,height:0});this.frame_list[f]=this.galaxy_frame_shadow;this.panel_refresh();var d=this;$(window).resize(function(){if(d.visible){d.panel_refresh()}});window.onbeforeunload=function(){if(d.frame_counter>0){return"You opened "+d.frame_counter+" frame(s) which will be lost."}}},event:{type:null,target:null,xy:null},events:{mousemove:"event_frame_mouse_move",mouseup:"event_frame_mouse_up",mouseleave:"event_frame_mouse_up",mousewheel:"event_panel_scroll",DOMMouseScroll:"event_panel_scroll","mousedown .galaxy-frame":"event_frame_mouse_down","mousedown .galaxy-frame-background":"event_panel_load","mousedown .galaxy-frame-scroll-up":"event_panel_scroll_up","mousedown .galaxy-frame-scroll-down":"event_panel_scroll_down","mousedown .f-close":"event_frame_close","mousedown .f-pin":"event_frame_lock"},event_frame_mouse_down:function(d){if(this.event.type!==null){return}if($(d.target).hasClass("f-header")||$(d.target).hasClass("f-title")){this.event.type="drag"}if($(d.target).hasClass("f-resize")){this.event.type="resize"}if(this.event.type===null){return}d.preventDefault();this.event.target=this.event_get_frame(d.target);if(this.event.target.grid_lock){this.event.type=null;return}this.event.xy={x:d.originalEvent.pageX,y:d.originalEvent.pageY};this.frame_drag_start(this.event.target)},event_frame_mouse_move:function(j){if(this.event.type!="drag"&&this.event.type!="resize"){return}var h={x:j.originalEvent.pageX,y:j.originalEvent.pageY};var f={x:h.x-this.event.xy.x,y:h.y-this.event.xy.y};this.event.xy=h;var i=this.frame_screen(this.event.target);if(this.event.type=="resize"){i.width+=f.x;i.height+=f.y;var g=this.options.cell-this.options.margin-1;i.width=Math.max(i.width,g);i.height=Math.max(i.height,g);this.frame_resize(this.event.target,i);i.width=this.to_grid_coord("width",i.width)+1;i.height=this.to_grid_coord("height",i.height)+1;i.width=this.to_pixel_coord("width",i.width);i.height=this.to_pixel_coord("height",i.height);this.frame_resize(this.galaxy_frame_shadow,i);this.frame_insert(this.galaxy_frame_shadow,{top:this.to_grid_coord("top",i.top),left:this.to_grid_coord("left",i.left)})}if(this.event.type=="drag"){i.left+=f.x;i.top+=f.y;this.frame_offset(this.event.target,i);var d={top:this.to_grid_coord("top",i.top),left:this.to_grid_coord("left",i.left)};if(d.left!==0){d.left++}this.frame_insert(this.galaxy_frame_shadow,d)}},event_frame_mouse_up:function(d){if(this.event.type!="drag"&&this.event.type!="resize"){return}this.frame_drag_stop(this.event.target);this.event.type=null},event_frame_close:function(f){if(this.event.type!==null){return}f.preventDefault();var g=this.event_get_frame(f.target);var d=this;$(g.id).fadeOut("fast",function(){$(g.id).remove();delete d.frame_list[g.id];d.frame_counter--;d.panel_refresh(true);d.panel_animation_complete();if(d.visible&&d.frame_counter==0){d.panel_show_hide()}})},event_frame_lock:function(d){if(this.event.type!==null){return}d.preventDefault();var f=this.event_get_frame(d.target);if(f.grid_lock){f.grid_lock=false;$(f.id).find(".f-pin").removeClass("galaxy-toggle");$(f.id).find(".f-header").removeClass("f-not-allowed");$(f.id).find(".f-title").removeClass("f-not-allowed");$(f.id).find(".f-resize").show();$(f.id).find(".f-close").show()}else{f.grid_lock=true;$(f.id).find(".f-pin").addClass("galaxy-toggle");$(f.id).find(".f-header").addClass("f-not-allowed");$(f.id).find(".f-title").addClass("f-not-allowed");$(f.id).find(".f-resize").hide();$(f.id).find(".f-close").hide()}},event_panel_load:function(d){if(this.event.type!==null){return}this.panel_show_hide()},event_panel_active:function(d){if(this.event.type!==null){return}this.panel_active_disable()},event_panel_scroll:function(d){if(this.event.type!==null||!this.visible){return}d.preventDefault();var f=d.originalEvent.detail?d.originalEvent.detail:d.originalEvent.wheelDelta/-3;this.panel_scroll(f)},event_panel_scroll_up:function(d){if(this.event.type!==null){return}d.preventDefault();this.panel_scroll(-this.options.scroll)},event_panel_scroll_down:function(d){if(this.event.type!==null){return}d.preventDefault();this.panel_scroll(this.options.scroll)},event_get_frame:function(d){return this.frame_list["#"+$(d).closest(".galaxy-frame").attr("id")]},frame_drag_start:function(e){this.frame_focus(e,true);var d=this.frame_screen(e);this.frame_resize(this.galaxy_frame_shadow,d);this.frame_grid(this.galaxy_frame_shadow,e.grid_location);e.grid_location=null;$(this.galaxy_frame_shadow.id).show();$(".f-cover").show()},frame_drag_stop:function(e){this.frame_focus(e,false);var d=this.frame_screen(this.galaxy_frame_shadow);this.frame_resize(e,d);this.frame_grid(e,this.galaxy_frame_shadow.grid_location,true);this.galaxy_frame_shadow.grid_location=null;$(this.galaxy_frame_shadow.id).hide();$(".f-cover").hide();this.panel_animation_complete()},to_grid_coord:function(f,e){var d=(f=="width"||f=="height")?1:-1;if(f=="top"){e-=this.top}return parseInt((e+d*this.options.margin)/this.options.cell,10)},to_pixel_coord:function(f,h){var d=(f=="width"||f=="height")?1:-1;var e=(h*this.options.cell)-d*this.options.margin;if(f=="top"){e+=this.top}return e},to_grid:function(d){return{top:this.to_grid_coord("top",d.top),left:this.to_grid_coord("left",d.left),width:this.to_grid_coord("width",d.width),height:this.to_grid_coord("height",d.height)}},to_pixel:function(d){return{top:this.to_pixel_coord("top",d.top),left:this.to_pixel_coord("left",d.left),width:this.to_pixel_coord("width",d.width),height:this.to_pixel_coord("height",d.height)}},is_collision:function(f){function d(i,g){return !(i.left>g.left+g.width-1||i.left+i.width-1<g.left||i.top>g.top+g.height-1||i.top+i.height-1<g.top)}for(var e in this.frame_list){var h=this.frame_list[e];if(h.grid_location===null){continue}if(d(f,h.grid_location)){return true}}return false},location_rank:function(d){return(d.top*this.cols)+d.left},menu_refresh:function(){this.button_load.number(this.frame_counter);if(this.frame_counter==0){this.button_load.hide()}else{this.button_load.show()}if(this.top==this.options.top_min){$(".galaxy-frame-scroll-up").hide()}else{$(".galaxy-frame-scroll-up").show()}if(this.top==this.top_max){$(".galaxy-frame-scroll-down").hide()}else{$(".galaxy-frame-scroll-down").show()}},panel_animation_complete:function(){var d=this;$(".galaxy-frame").promise().done(function(){d.panel_scroll(0,true)})},panel_refresh:function(d){this.cols=parseInt($(window).width()/this.options.cell,10)+1;this.frame_insert(null,null,d)},panel_scroll:function(j,d){var f=this.top-this.options.scroll*j;f=Math.max(f,this.top_max);f=Math.min(f,this.options.top_min);if(this.top!=f){for(var e in this.frame_list){var h=this.frame_list[e];if(h.grid_location!==null){var g={top:h.screen_location.top-(this.top-f),left:h.screen_location.left};this.frame_offset(h,g,d)}}this.top=f}this.menu_refresh()},panel_show_hide:function(){if(this.visible){this.visible=false;$(".galaxy-frame").fadeOut("fast");this.button_load.icon("fa-icon-eye-close");this.button_load.untoggle();$(".galaxy-frame-background").hide();$(".galaxy-frame-menu").hide()}else{this.visible=true;$(".galaxy-frame").fadeIn("fast");this.button_load.icon("fa-icon-eye-open");this.button_load.toggle();$(this.galaxy_frame_shadow.id).hide();$(".galaxy-frame-background").show();this.panel_refresh()}},panel_active_disable:function(){if(this.active){this.active=false;this.button_active.untoggle();if(this.visible){this.panel_show_hide()}}else{this.active=true;this.button_active.toggle()}},frame_new:function(e){if(!this.active){if(e.location=="center"){var d=$(window.parent.document).find("iframe#galaxy_main");d.attr("src",e.content)}else{window.location=e.content}return}if(this.frame_counter>=this.options.frame_max){alert("You have reached the maximum number of allowed frames ("+this.options.frame_max+").");return}var f="#galaxy-frame-"+(this.frame_counter_id++);if($(f).length!==0){alert("This frame already exists. This page might contain multiple frame managers.");return}this.top=this.options.top_min;$(this.el).append(this.frame_template(f.substring(1),e.title,e.type,e.content));var g={id:f,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};e.width=this.to_pixel_coord("width",this.options.frame.cols);e.height=this.to_pixel_coord("height",this.options.frame.rows);this.frame_list[f]=g;this.frame_counter++;this.frame_resize(g,{width:e.width,height:e.height});this.frame_insert(g,{top:0,left:0},true);if(!this.visible){this.panel_show_hide()}},frame_insert:function(k,d,g){var e=[];if(k){k.grid_location=null;e.push([k,this.location_rank(d)])}var h=null;for(h in this.frame_list){var j=this.frame_list[h];if(j.grid_location!==null&&!j.grid_lock){j.grid_location=null;e.push([j,j.grid_rank])}}e.sort(function(l,f){var n=l[1];var m=f[1];return n<m?-1:(n>m?1:0)});for(h=0;h<e.length;h++){this.frame_place(e[h][0],g)}this.top_max=0;for(var h in this.frame_list){var k=this.frame_list[h];if(k.grid_location!==null){this.top_max=Math.max(this.top_max,k.grid_location.top+k.grid_location.height)}}this.top_max=$(window).height()-this.top_max*this.options.cell-2*this.options.margin;this.top_max=Math.min(this.top_max,this.options.top_min);this.menu_refresh()},frame_place:function(l,e){l.grid_location=null;var k=this.to_grid(this.frame_screen(l));var d=false;for(var h=0;h<this.options.rows;h++){for(var f=0;f<Math.max(1,this.cols-k.width);f++){k.top=h;k.left=f;if(!this.is_collision(k)){d=true;break}}if(d){break}}if(d){this.frame_grid(l,k,e)}else{console.log("Grid dimensions exceeded.")}},frame_focus:function(f,d){var e=parseInt(b.get_attribute("galaxy-frame","z-index"))+(d?1:0);$(f.id).css("z-index",e)},frame_offset:function(g,f,e){g.screen_location.left=f.left;g.screen_location.top=f.top;if(e){this.frame_focus(g,true);var d=this;$(g.id).animate({top:f.top,left:f.left},"fast",function(){d.frame_focus(g,false)})}else{$(g.id).css({top:f.top,left:f.left})}},frame_resize:function(e,d){$(e.id).css({width:d.width,height:d.height});e.screen_location.width=d.width;e.screen_location.height=d.height},frame_grid:function(f,d,e){f.grid_location=d;this.frame_offset(f,this.to_pixel(d),e);f.grid_rank=this.location_rank(d)},frame_screen:function(e){var d=e.screen_location;return{top:d.top,left:d.left,width:d.width,height:d.height}},frame_template:function(g,f,d,e){if(!f){f=""}if(d=="url"){e='<iframe scrolling="auto" class="f-iframe" src="'+e+'"></iframe>'}return'<div id="'+g+'" class="galaxy-frame galaxy-corner"><div class="f-header galaxy-corner"><span class="f-title">'+f+'</span><span class="f-icon f-pin fa-icon-pushpin"></span><span class="f-icon f-close fa-icon-trash"></span></div><div class="f-content galaxy-corner">'+e+'<div class="f-cover"></div></div><span class="f-resize f-icon galaxy-corner fa-icon-resize-full"></span></div>'},frame_template_shadow:function(d){return'<div id="'+d+'" class="galaxy-frame-shadow galaxy-corner"></div>'},frame_template_background:function(){return'<div class="galaxy-frame-background"></div>'},frame_template_header:function(){return'<div class="galaxy-frame-load f-corner"><div class="number f-corner">0</div><div class="icon fa-icon-2x"></div></div><div class="galaxy-frame-active f-corner"><div class="icon fa-icon-2x fa-icon-th"></div></div>'},frame_template_menu:function(){return'<div class="galaxy-frame-scroll-up galaxy-frame-menu fa-icon-chevron-up fa-icon-2x"></div><div class="galaxy-frame-scroll-down galaxy-frame-menu fa-icon-chevron-down fa-icon-2x"></div>'}});return{GalaxyFrameManager:a}}); \ No newline at end of file +define(["galaxy.master","libs/backbone/backbone-relational"],function(b){var a=Backbone.View.extend({el_main:"#everything",options:{frame:{cols:6,rows:3},rows:1000,cell:130,margin:5,scroll:5,top_min:40,frame_max:9},cols:0,top:0,top_max:0,frame_z:0,frame_counter:0,frame_counter_id:0,frame_list:[],frame_shadow:null,visible:false,active:false,button_active:null,button_load:null,initialize:function(d){var c=this;this.button_active=new b.GalaxyMasterIcon({icon:"fa-icon-th",tooltip:"Enable/Disable Scratchbook",on_click:function(f){c.event_panel_active(f)}});Galaxy.master.append(this.button_active);this.button_load=new b.GalaxyMasterIcon({icon:"fa-icon-eye-open",tooltip:"Show/Hide Scratchbook",on_click:function(f){c.event_panel_load(f)},with_number:true});Galaxy.master.append(this.button_load);if(d){this.options=_.defaults(d,this.options)}this.top=this.top_max=this.options.top_min;this.setElement(this.template());$(this.el).append(this.template_background());$(this.el).append(this.template_menu());$(this.el_main).append($(this.el));var e="#frame-shadow";$(this.el).append(this.template_shadow(e.substring(1)));this.frame_shadow={id:e,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};this.frame_resize(this.frame_shadow,{width:0,height:0});this.frame_list[e]=this.frame_shadow;this.panel_refresh();var c=this;$(window).resize(function(){if(c.visible){c.panel_refresh()}});window.onbeforeunload=function(){if(c.frame_counter>0){return"You opened "+c.frame_counter+" frame(s) which will be lost."}}},event:{type:null,target:null,xy:null},events:{mousemove:"event_frame_mouse_move",mouseup:"event_frame_mouse_up",mouseleave:"event_frame_mouse_up",mousewheel:"event_panel_scroll",DOMMouseScroll:"event_panel_scroll","mousedown .frame":"event_frame_mouse_down","mousedown .frame-background":"event_panel_load","mousedown .frame-scroll-up":"event_panel_scroll_up","mousedown .frame-scroll-down":"event_panel_scroll_down","mousedown .f-close":"event_frame_close","mousedown .f-pin":"event_frame_lock"},event_frame_mouse_down:function(c){if(this.event.type!==null){return}if($(c.target).hasClass("f-header")||$(c.target).hasClass("f-title")){this.event.type="drag"}if($(c.target).hasClass("f-resize")){this.event.type="resize"}if(this.event.type===null){return}c.preventDefault();this.event.target=this.event_get_frame(c.target);if(this.event.target.grid_lock){this.event.type=null;return}this.event.xy={x:c.originalEvent.pageX,y:c.originalEvent.pageY};this.frame_drag_start(this.event.target)},event_frame_mouse_move:function(i){if(this.event.type!="drag"&&this.event.type!="resize"){return}var g={x:i.originalEvent.pageX,y:i.originalEvent.pageY};var d={x:g.x-this.event.xy.x,y:g.y-this.event.xy.y};this.event.xy=g;var h=this.frame_screen(this.event.target);if(this.event.type=="resize"){h.width+=d.x;h.height+=d.y;var f=this.options.cell-this.options.margin-1;h.width=Math.max(h.width,f);h.height=Math.max(h.height,f);this.frame_resize(this.event.target,h);h.width=this.to_grid_coord("width",h.width)+1;h.height=this.to_grid_coord("height",h.height)+1;h.width=this.to_pixel_coord("width",h.width);h.height=this.to_pixel_coord("height",h.height);this.frame_resize(this.frame_shadow,h);this.frame_insert(this.frame_shadow,{top:this.to_grid_coord("top",h.top),left:this.to_grid_coord("left",h.left)})}if(this.event.type=="drag"){h.left+=d.x;h.top+=d.y;this.frame_offset(this.event.target,h);var c={top:this.to_grid_coord("top",h.top),left:this.to_grid_coord("left",h.left)};if(c.left!==0){c.left++}this.frame_insert(this.frame_shadow,c)}},event_frame_mouse_up:function(c){if(this.event.type!="drag"&&this.event.type!="resize"){return}this.frame_drag_stop(this.event.target);this.event.type=null},event_frame_close:function(d){if(this.event.type!==null){return}d.preventDefault();var f=this.event_get_frame(d.target);var c=this;$(f.id).fadeOut("fast",function(){$(f.id).remove();delete c.frame_list[f.id];c.frame_counter--;c.panel_refresh(true);c.panel_animation_complete();if(c.visible&&c.frame_counter==0){c.panel_show_hide()}})},event_frame_lock:function(c){if(this.event.type!==null){return}c.preventDefault();var d=this.event_get_frame(c.target);if(d.grid_lock){d.grid_lock=false;$(d.id).find(".f-pin").removeClass("toggle");$(d.id).find(".f-header").removeClass("f-not-allowed");$(d.id).find(".f-title").removeClass("f-not-allowed");$(d.id).find(".f-resize").show();$(d.id).find(".f-close").show()}else{d.grid_lock=true;$(d.id).find(".f-pin").addClass("toggle");$(d.id).find(".f-header").addClass("f-not-allowed");$(d.id).find(".f-title").addClass("f-not-allowed");$(d.id).find(".f-resize").hide();$(d.id).find(".f-close").hide()}},event_panel_load:function(c){if(this.event.type!==null){return}this.panel_show_hide()},event_panel_active:function(c){if(this.event.type!==null){return}this.panel_active_disable()},event_panel_scroll:function(c){if(this.event.type!==null||!this.visible){return}c.preventDefault();var d=c.originalEvent.detail?c.originalEvent.detail:c.originalEvent.wheelDelta/-3;this.panel_scroll(d)},event_panel_scroll_up:function(c){if(this.event.type!==null){return}c.preventDefault();this.panel_scroll(-this.options.scroll)},event_panel_scroll_down:function(c){if(this.event.type!==null){return}c.preventDefault();this.panel_scroll(this.options.scroll)},event_get_frame:function(c){return this.frame_list["#"+$(c).closest(".frame").attr("id")]},frame_drag_start:function(d){this.frame_focus(d,true);var c=this.frame_screen(d);this.frame_resize(this.frame_shadow,c);this.frame_grid(this.frame_shadow,d.grid_location);d.grid_location=null;$(this.frame_shadow.id).show();$(".f-cover").show()},frame_drag_stop:function(d){this.frame_focus(d,false);var c=this.frame_screen(this.frame_shadow);this.frame_resize(d,c);this.frame_grid(d,this.frame_shadow.grid_location,true);this.frame_shadow.grid_location=null;$(this.frame_shadow.id).hide();$(".f-cover").hide();this.panel_animation_complete()},to_grid_coord:function(e,d){var c=(e=="width"||e=="height")?1:-1;if(e=="top"){d-=this.top}return parseInt((d+c*this.options.margin)/this.options.cell,10)},to_pixel_coord:function(e,f){var c=(e=="width"||e=="height")?1:-1;var d=(f*this.options.cell)-c*this.options.margin;if(e=="top"){d+=this.top}return d},to_grid:function(c){return{top:this.to_grid_coord("top",c.top),left:this.to_grid_coord("left",c.left),width:this.to_grid_coord("width",c.width),height:this.to_grid_coord("height",c.height)}},to_pixel:function(c){return{top:this.to_pixel_coord("top",c.top),left:this.to_pixel_coord("left",c.left),width:this.to_pixel_coord("width",c.width),height:this.to_pixel_coord("height",c.height)}},is_collision:function(e){function c(h,g){return !(h.left>g.left+g.width-1||h.left+h.width-1<g.left||h.top>g.top+g.height-1||h.top+h.height-1<g.top)}for(var d in this.frame_list){var f=this.frame_list[d];if(f.grid_location===null){continue}if(c(e,f.grid_location)){return true}}return false},location_rank:function(c){return(c.top*this.cols)+c.left},menu_refresh:function(){this.button_load.number(this.frame_counter);if(this.frame_counter==0){this.button_load.hide()}else{this.button_load.show()}if(this.top==this.options.top_min){$(".frame-scroll-up").hide()}else{$(".frame-scroll-up").show()}if(this.top==this.top_max){$(".frame-scroll-down").hide()}else{$(".frame-scroll-down").show()}},panel_animation_complete:function(){var c=this;$(".frame").promise().done(function(){c.panel_scroll(0,true)})},panel_refresh:function(c){this.cols=parseInt($(window).width()/this.options.cell,10)+1;this.frame_insert(null,null,c)},panel_scroll:function(h,c){var e=this.top-this.options.scroll*h;e=Math.max(e,this.top_max);e=Math.min(e,this.options.top_min);if(this.top!=e){for(var d in this.frame_list){var g=this.frame_list[d];if(g.grid_location!==null){var f={top:g.screen_location.top-(this.top-e),left:g.screen_location.left};this.frame_offset(g,f,c)}}this.top=e}this.menu_refresh()},panel_show_hide:function(){if(this.visible){this.visible=false;$(".frame").fadeOut("fast");this.button_load.icon("fa-icon-eye-close");this.button_load.untoggle();$(".frame-background").hide();$(".frame-menu").hide()}else{this.visible=true;$(".frame").fadeIn("fast");this.button_load.icon("fa-icon-eye-open");this.button_load.toggle();$(this.frame_shadow.id).hide();$(".frame-background").show();this.panel_refresh()}},panel_active_disable:function(){if(this.active){this.active=false;this.button_active.untoggle();if(this.visible){this.panel_show_hide()}}else{this.active=true;this.button_active.toggle()}},frame_new:function(d){if(!this.active){if(d.location=="center"){var c=$(window.parent.document).find("iframe#galaxy_main");c.attr("src",d.content)}else{window.location=d.content}return}if(this.frame_counter>=this.options.frame_max){alert("You have reached the maximum number of allowed frames ("+this.options.frame_max+").");return}var e="#frame-"+(this.frame_counter_id++);if($(e).length!==0){alert("This frame already exists. This page might contain multiple frame managers.");return}this.top=this.options.top_min;$(this.el).append(this.template_frame(e.substring(1),d.title,d.type,d.content));var f={id:e,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};d.width=this.to_pixel_coord("width",this.options.frame.cols);d.height=this.to_pixel_coord("height",this.options.frame.rows);this.frame_z=parseInt($(f.id).css("z-index"));this.frame_list[e]=f;this.frame_counter++;this.frame_resize(f,{width:d.width,height:d.height});this.frame_insert(f,{top:0,left:0},true);if(!this.visible){this.panel_show_hide()}},frame_insert:function(j,c,e){var d=[];if(j){j.grid_location=null;d.push([j,this.location_rank(c)])}var g=null;for(g in this.frame_list){var h=this.frame_list[g];if(h.grid_location!==null&&!h.grid_lock){h.grid_location=null;d.push([h,h.grid_rank])}}d.sort(function(k,f){var m=k[1];var l=f[1];return m<l?-1:(m>l?1:0)});for(g=0;g<d.length;g++){this.frame_place(d[g][0],e)}this.top_max=0;for(var g in this.frame_list){var j=this.frame_list[g];if(j.grid_location!==null){this.top_max=Math.max(this.top_max,j.grid_location.top+j.grid_location.height)}}this.top_max=$(window).height()-this.top_max*this.options.cell-2*this.options.margin;this.top_max=Math.min(this.top_max,this.options.top_min);this.menu_refresh()},frame_place:function(k,d){k.grid_location=null;var h=this.to_grid(this.frame_screen(k));var c=false;for(var f=0;f<this.options.rows;f++){for(var e=0;e<Math.max(1,this.cols-h.width);e++){h.top=f;h.left=e;if(!this.is_collision(h)){c=true;break}}if(c){break}}if(c){this.frame_grid(k,h,d)}else{console.log("Grid dimensions exceeded.")}},frame_focus:function(e,c){var d=this.frame_z+(c?1:0);$(e.id).css("z-index",d)},frame_offset:function(f,e,d){f.screen_location.left=e.left;f.screen_location.top=e.top;if(d){this.frame_focus(f,true);var c=this;$(f.id).animate({top:e.top,left:e.left},"fast",function(){c.frame_focus(f,false)})}else{$(f.id).css({top:e.top,left:e.left})}},frame_resize:function(d,c){$(d.id).css({width:c.width,height:c.height});d.screen_location.width=c.width;d.screen_location.height=c.height},frame_grid:function(e,c,d){e.grid_location=c;this.frame_offset(e,this.to_pixel(c),d);e.grid_rank=this.location_rank(c)},frame_screen:function(d){var c=d.screen_location;return{top:c.top,left:c.left,width:c.width,height:c.height}},template:function(){return'<div class="galaxy-frame"></div>'},template_frame:function(f,e,c,d){if(!e){e=""}if(c=="url"){d='<iframe scrolling="auto" class="f-iframe" src="'+d+'"></iframe>'}return'<div id="'+f+'" class="frame corner"><div class="f-header corner"><span class="f-title">'+e+'</span><span class="f-icon f-pin fa-icon-pushpin"></span><span class="f-icon f-close fa-icon-trash"></span></div><div class="f-content corner">'+d+'<div class="f-cover"></div></div><span class="f-resize f-icon corner fa-icon-resize-full"></span></div>'},template_shadow:function(c){return'<div id="'+c+'" class="frame-shadow corner"></div>'},template_background:function(){return'<div class="frame-background"></div>'},template_menu:function(){return'<div class="frame-scroll-up frame-menu fa-icon-chevron-up fa-icon-2x"></div><div class="frame-scroll-down frame-menu fa-icon-chevron-down fa-icon-2x"></div>'}});return{GalaxyFrameManager:a}}); \ No newline at end of file diff -r 2891d0f88eff34d6dabcbcfbfb056c60a5471007 -r a598d4d47dce07864f5211f9c8f7847ab39bce75 static/scripts/packed/libs/jquery/jquery-ui-combobox.js --- a/static/scripts/packed/libs/jquery/jquery-ui-combobox.js +++ /dev/null @@ -1,1 +0,0 @@ -(function(a){a.widget("ui.combobox",{_create:function(){var c,g=this,b=this.element.hide(),f=b.children(":selected"),h=f.val()?f.text():"",i=this.wrapper=a("<span>").addClass("ui-combobox").insertAfter(b);function e(j){var l=a(j).val(),m=new RegExp("^"+a.ui.autocomplete.escapeRegex(l)+"$","i"),k=false;b.children("option").each(function(){if(a(this).text().match(m)){this.selected=k=true;return false}});if(!k){a(j).val("").attr("title",l+" didn't match any item").tooltip("open");b.val("");setTimeout(function(){c.tooltip("close").attr("title","")},2500);c.data("autocomplete").term="";return false}}var d=(this.options.size?this.options.size:20);c=a("<input>").appendTo(i).val(h).click(function(){this.select()}).attr("title","").attr("size",d).addClass("ui-state-default ui-combobox-input").autocomplete({appendTo:this.options.appendTo,delay:0,minLength:0,source:function(k,j){var l=new RegExp(a.ui.autocomplete.escapeRegex(k.term),"i");j(b.children("option").map(function(){var m=a(this).text();if(this.value&&(!k.term||l.test(m))){return{label:m.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+a.ui.autocomplete.escapeRegex(k.term)+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>"),value:m,option:this}}}))},select:function(j,k){k.item.option.selected=true;g._trigger("selected",j,{item:k.item.option})},change:function(j,k){if(!k.item){return e(this)}}}).addClass("ui-widget ui-widget-content ui-corner-left");c.data("autocomplete")._renderItem=function(j,k){return a("<li>").data("item.autocomplete",k).append("<a>"+k.label+"</a>").appendTo(j)};a("<a>").attr("tabIndex",-1).attr("title","Show All Items").tooltip().appendTo(i).button({icons:{primary:"ui-icon-triangle-1-s"},text:false}).removeClass("ui-corner-all").addClass("ui-corner-right ui-combobox-toggle").click(function(){if(c.autocomplete("widget").is(":visible")){c.autocomplete("close");e(c);return}a(this).blur();c.autocomplete("search","");c.focus()});c.tooltip({position:{of:this.button},tooltipClass:"ui-state-highlight"})},destroy:function(){this.wrapper.remove();this.element.show();a.Widget.prototype.destroy.call(this)}})})(jQuery); \ No newline at end of file diff -r 2891d0f88eff34d6dabcbcfbfb056c60a5471007 -r a598d4d47dce07864f5211f9c8f7847ab39bce75 static/scripts/packed/viz/trackster.js --- a/static/scripts/packed/viz/trackster.js +++ b/static/scripts/packed/viz/trackster.js @@ -1,1 +1,1 @@ -var ui=null;var view=null;var browser_router=null;require(["utils/galaxy.css","libs/jquery/jstorage","libs/jquery/jquery.event.drag","libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel","libs/jquery/jquery-ui","libs/jquery/jquery-ui-combobox","libs/farbtastic","libs/jquery/jquery.form","libs/jquery/jquery.rating","mvc/ui"],function(a){a.load_file("static/style/jquery.rating.css");a.load_file("static/style/autocomplete_tagging.css");a.load_file("static/style/jquery-ui/smoothness/jquery-ui.css");a.load_file("static/style/library.css");a.load_file("static/style/trackster.css")});define(["libs/backbone/backbone-relational","viz/visualization","viz/trackster_ui"],function(c,a,b){var d=Backbone.View.extend({initialize:function(){ui=new b.TracksterUI(galaxy_config.root);ui.createButtonMenu();ui.buttonMenu.$el.attr("style","float: right");$("#center .unified-panel-header-inner").append(ui.buttonMenu.$el);$("#right .unified-panel-title").append("Bookmarks");$("#right .unified-panel-icons").append("<a id='add-bookmark-button' class='icon-button menu-button plus-button' href='javascript:void(0);' title='Add bookmark'></a>");$("#right-border").click(function(){view.resize_window()});force_right_panel("hide");if(galaxy_config.app.id){this.view_existing()}else{this.view_new()}},set_up_router:function(e){browser_router=new a.TrackBrowserRouter(e);Backbone.history.start()},view_existing:function(){var e=galaxy_config.app.viz_config;view=ui.create_visualization({container:$("#center .unified-panel-body"),name:e.title,vis_id:e.vis_id,dbkey:e.dbkey},e.viewport,e.tracks,e.bookmarks,true);this.init_editor()},view_new:function(){var e=this;$.ajax({url:galaxy_config.root+"api/genomes?chrom_info=True",data:{},error:function(){alert("Couldn't create new browser.")},success:function(f){show_modal("New Visualization",e.template_view_new(f),{Cancel:function(){window.location=galaxy_config.root+"visualization/list"},Create:function(){e.create_browser($("#new-title").val(),$("#new-dbkey").val())}});if(galaxy_config.app.default_dbkey){$("#new-dbkey option[value='"+galaxy_config.app.default_dbkey+"']").attr("selected",true)}$("#new-title").focus();$("select[name='dbkey']").combobox({appendTo:$("#overlay"),size:40});$("#overlay").css("overflow","auto")}})},template_view_new:function(e){var g='<form id="new-browser-form" action="javascript:void(0);" method="post" onsubmit="return false;"><div class="form-row"><label for="new-title">Browser name:</label><div class="form-row-input"><input type="text" name="title" id="new-title" value="Unnamed"></input></div><div style="clear: both;"></div></div><div class="form-row"><label for="new-dbkey">Reference genome build (dbkey): </label><div class="form-row-input"><select name="dbkey" id="new-dbkey">';for(var f in e){g+='<option value="'+e[f][1]+'">'+e[f][0]+"</option>"}g+='</select></div><div style="clear: both;"></div></div><div class="form-row">Is the build not listed here? <a href="'+galaxy_config.root+'user/dbkeys?use_panels=True">Add a Custom Build</a></div></form>';return g},create_browser:function(f,e){$(document).trigger("convert_to_values");view=ui.create_visualization({container:$("#center .unified-panel-body"),name:f,dbkey:e},galaxy_config.app.gene_region);this.init_editor();view.editor=true;hide_modal()},init_editor:function(){$("#center .unified-panel-title").text(view.name+" ("+view.dbkey+")");if(galaxy_config.app.add_dataset){$.ajax({url:galaxy_config.root+"api/datasets/"+galaxy_config.app.add_dataset,data:{hda_ldda:"hda",data_type:"track_config"},dataType:"json",success:function(e){view.add_drawable(b.object_from_template(e,view,view))}})}$("#add-bookmark-button").click(function(){var f=view.chrom+":"+view.low+"-"+view.high,e="Bookmark description";return ui.add_bookmark(f,e,true)});ui.init_keyboard_nav(view);this.set_up_router({view:view})}});return{GalaxyApp:d}}); \ No newline at end of file +var ui=null;var view=null;var browser_router=null;require(["utils/galaxy.css","libs/jquery/jstorage","libs/jquery/jquery.event.drag","libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel","libs/jquery/jquery-ui","libs/jquery/select2","libs/farbtastic","libs/jquery/jquery.form","libs/jquery/jquery.rating","mvc/ui"],function(a){a.load_file("static/style/jquery.rating.css");a.load_file("static/style/autocomplete_tagging.css");a.load_file("static/style/jquery-ui/smoothness/jquery-ui.css");a.load_file("static/style/library.css");a.load_file("static/style/trackster.css")});define(["libs/backbone/backbone-relational","viz/visualization","viz/trackster_ui"],function(c,a,b){var d=Backbone.View.extend({initialize:function(){ui=new b.TracksterUI(galaxy_config.root);ui.createButtonMenu();ui.buttonMenu.$el.attr("style","float: right");$("#center .unified-panel-header-inner").append(ui.buttonMenu.$el);$("#right .unified-panel-title").append("Bookmarks");$("#right .unified-panel-icons").append("<a id='add-bookmark-button' class='icon-button menu-button plus-button' href='javascript:void(0);' title='Add bookmark'></a>");$("#right-border").click(function(){view.resize_window()});force_right_panel("hide");if(galaxy_config.app.id){this.view_existing()}else{this.view_new()}},set_up_router:function(e){browser_router=new a.TrackBrowserRouter(e);Backbone.history.start()},view_existing:function(){var e=galaxy_config.app.viz_config;view=ui.create_visualization({container:$("#center .unified-panel-body"),name:e.title,vis_id:e.vis_id,dbkey:e.dbkey},e.viewport,e.tracks,e.bookmarks,true);this.init_editor()},view_new:function(){var e=this;$.ajax({url:galaxy_config.root+"api/genomes?chrom_info=True",data:{},error:function(){alert("Couldn't create new browser.")},success:function(f){show_modal("New Visualization",e.template_view_new(f),{Cancel:function(){window.location=galaxy_config.root+"visualization/list"},Create:function(){e.create_browser($("#new-title").val(),$("#new-dbkey").val())}});if(galaxy_config.app.default_dbkey){$("#new-dbkey option[value='"+galaxy_config.app.default_dbkey+"']").attr("selected",true)}$("#new-title").focus();$("select[name='dbkey']").select2();$("#overlay").css("overflow","auto")}})},template_view_new:function(e){var g='<form id="new-browser-form" action="javascript:void(0);" method="post" onsubmit="return false;"><div class="form-row"><label for="new-title">Browser name:</label><div class="form-row-input"><input type="text" name="title" id="new-title" value="Unnamed"></input></div><div style="clear: both;"></div></div><div class="form-row"><label for="new-dbkey">Reference genome build (dbkey): </label><div class="form-row-input"><select name="dbkey" id="new-dbkey">';for(var f in e){g+='<option value="'+e[f][1]+'">'+e[f][0]+"</option>"}g+='</select></div><div style="clear: both;"></div></div><div class="form-row">Is the build not listed here? <a href="'+galaxy_config.root+'user/dbkeys?use_panels=True">Add a Custom Build</a></div></form>';return g},create_browser:function(f,e){$(document).trigger("convert_to_values");view=ui.create_visualization({container:$("#center .unified-panel-body"),name:f,dbkey:e},galaxy_config.app.gene_region);this.init_editor();view.editor=true;hide_modal()},init_editor:function(){$("#center .unified-panel-title").text(view.name+" ("+view.dbkey+")");if(galaxy_config.app.add_dataset){$.ajax({url:galaxy_config.root+"api/datasets/"+galaxy_config.app.add_dataset,data:{hda_ldda:"hda",data_type:"track_config"},dataType:"json",success:function(e){view.add_drawable(b.object_from_template(e,view,view))}})}$("#add-bookmark-button").click(function(){var f=view.chrom+":"+view.low+"-"+view.high,e="Bookmark description";return ui.add_bookmark(f,e,true)});ui.init_keyboard_nav(view);this.set_up_router({view:view})}});return{GalaxyApp:d}}); \ No newline at end of file diff -r 2891d0f88eff34d6dabcbcfbfb056c60a5471007 -r a598d4d47dce07864f5211f9c8f7847ab39bce75 templates/display_base.mako --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -35,8 +35,7 @@ ${h.js( "libs/jquery/jstorage", "libs/jquery/jquery.autocomplete", "libs/jquery/jquery.rating", "galaxy.autocom_tagging" )} - ${h.js( "galaxy.panels", "libs/jquery/jstorage", "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel", "libs/jquery/jquery-ui", "libs/jquery/jquery-ui-combobox", - "libs/require", "libs/farbtastic" )} + ${h.js( "galaxy.panels", "libs/jquery/jstorage", "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel", "libs/jquery/jquery-ui", "libs/require", "libs/farbtastic" )} <script type="text/javascript"> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: guerler: Convert galaxy.frame.css into less-file and import into base.less
by commits-noreply＠bitbucket.org 12 Sep '13

12 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/91352b6afa44/ Changeset: 91352b6afa44 User: guerler Date: 2013-09-12 21:26:18 Summary: Convert galaxy.frame.css into less-file and import into base.less Affected #: 5 files diff -r ea9b0279ccfe94e8e82d90affac946b25e81e515 -r 91352b6afa44a1cf29aa3963b6b30642e351e336 static/scripts/galaxy.frame.js --- a/static/scripts/galaxy.frame.js +++ b/static/scripts/galaxy.frame.js @@ -3,7 +3,7 @@ */ // dependencies -define(["utils/galaxy.css", "galaxy.master", "libs/backbone/backbone-relational"], function(css, mod_master) { +define(["galaxy.master", "libs/backbone/backbone-relational"], function(mod_master) { // frame manager var GalaxyFrameManager = Backbone.View.extend( @@ -49,6 +49,9 @@ // maximum viewport top_max: 0, + // frame z-index + frame_z : 0, + // frame counter frame_counter: 0, @@ -59,7 +62,7 @@ frame_list: [], // frame shadow - galaxy_frame_shadow: null, + frame_shadow: null, // frame panel visible visible: false, @@ -101,9 +104,6 @@ // add to master Galaxy.master.append(this.button_load); - - // load required css files - css.load_file("static/style/galaxy.frame.css"); // read in defaults if (options) @@ -112,25 +112,28 @@ // initialize top this.top = this.top_max = this.options.top_min; + // create + this.setElement(this.template()); + // load background - $(this.el).append(this.frame_template_background()); + $(this.el).append(this.template_background()); // load menu buttons - $(this.el).append(this.frame_template_menu()); + $(this.el).append(this.template_menu()); // load to main frame $(this.el_main).append($(this.el)); - + // // define shadow frame // - var id_shadow = '#galaxy-frame-shadow'; + var id_shadow = '#frame-shadow'; // add shadow template - $(this.el).append(this.frame_template_shadow(id_shadow.substring(1))); + $(this.el).append(this.template_shadow(id_shadow.substring(1))); // initialize frame - this.galaxy_frame_shadow = { + this.frame_shadow = { id : id_shadow, screen_location : {}, grid_location : {}, @@ -139,10 +142,10 @@ }; // initialize size - this.frame_resize(this.galaxy_frame_shadow, {width: 0, height: 0}); + this.frame_resize(this.frame_shadow, {width: 0, height: 0}); // add shadow to frame list - this.frame_list[id_shadow] = this.galaxy_frame_shadow; + this.frame_list[id_shadow] = this.frame_shadow; // initialize panel this.panel_refresh(); @@ -179,19 +182,19 @@ events: { // global frame events - 'mousemove' : 'event_frame_mouse_move', - 'mouseup' : 'event_frame_mouse_up', - 'mouseleave' : 'event_frame_mouse_up', - 'mousewheel' : 'event_panel_scroll', - 'DOMMouseScroll' : 'event_panel_scroll', + 'mousemove' : 'event_frame_mouse_move', + 'mouseup' : 'event_frame_mouse_up', + 'mouseleave' : 'event_frame_mouse_up', + 'mousewheel' : 'event_panel_scroll', + 'DOMMouseScroll' : 'event_panel_scroll', // events fixed to elements - 'mousedown .galaxy-frame' : 'event_frame_mouse_down', - 'mousedown .galaxy-frame-background' : 'event_panel_load', - 'mousedown .galaxy-frame-scroll-up' : 'event_panel_scroll_up', - 'mousedown .galaxy-frame-scroll-down' : 'event_panel_scroll_down', - 'mousedown .f-close' : 'event_frame_close', - 'mousedown .f-pin' : 'event_frame_lock' + 'mousedown .frame' : 'event_frame_mouse_down', + 'mousedown .frame-background' : 'event_panel_load', + 'mousedown .frame-scroll-up' : 'event_panel_scroll_up', + 'mousedown .frame-scroll-down' : 'event_panel_scroll_down', + 'mousedown .f-close' : 'event_frame_close', + 'mousedown .f-pin' : 'event_frame_lock' }, // drag start @@ -281,10 +284,10 @@ p.height = this.to_pixel_coord('height', p.height); // apply - this.frame_resize(this.galaxy_frame_shadow, p); + this.frame_resize(this.frame_shadow, p); // fix position - this.frame_insert(this.galaxy_frame_shadow, { + this.frame_insert(this.frame_shadow, { top : this.to_grid_coord('top', p.top), left : this.to_grid_coord('left', p.left) }); @@ -311,7 +314,7 @@ l.left++; // fix position - this.frame_insert(this.galaxy_frame_shadow, l); + this.frame_insert(this.frame_shadow, l); } }, @@ -387,7 +390,7 @@ frame.grid_lock = false; // remove class - $(frame.id).find('.f-pin').removeClass('galaxy-toggle'); + $(frame.id).find('.f-pin').removeClass('toggle'); $(frame.id).find('.f-header').removeClass('f-not-allowed'); $(frame.id).find('.f-title').removeClass('f-not-allowed'); $(frame.id).find('.f-resize').show(); @@ -397,7 +400,7 @@ frame.grid_lock = true; // add class - $(frame.id).find('.f-pin').addClass('galaxy-toggle'); + $(frame.id).find('.f-pin').addClass('toggle'); $(frame.id).find('.f-header').addClass('f-not-allowed'); $(frame.id).find('.f-title').addClass('f-not-allowed'); $(frame.id).find('.f-resize').hide(); @@ -475,7 +478,7 @@ // identify event_get_frame: function(target) { - return this.frame_list['#' + $(target).closest('.galaxy-frame').attr('id')]; + return this.frame_list['#' + $(target).closest('.frame').attr('id')]; }, /* @@ -492,14 +495,14 @@ var p = this.frame_screen (frame); // initialize shadow - this.frame_resize(this.galaxy_frame_shadow, p); - this.frame_grid(this.galaxy_frame_shadow, frame.grid_location); + this.frame_resize(this.frame_shadow, p); + this.frame_grid(this.frame_shadow, frame.grid_location); // reset location frame.grid_location = null; // show shadow - $(this.galaxy_frame_shadow.id).show(); + $(this.frame_shadow.id).show(); // load frame cover $('.f-cover').show(); @@ -512,17 +515,17 @@ this.frame_focus(frame, false); // get new dimensions - var p = this.frame_screen(this.galaxy_frame_shadow); + var p = this.frame_screen(this.frame_shadow); // update frame this.frame_resize(frame, p); - this.frame_grid(frame, this.galaxy_frame_shadow.grid_location, true); + this.frame_grid(frame, this.frame_shadow.grid_location, true); // reset location of shadow - this.galaxy_frame_shadow.grid_location = null; + this.frame_shadow.grid_location = null; // hide shadow - $(this.galaxy_frame_shadow.id).hide(); + $(this.frame_shadow.id).hide(); // hide frame cover $('.f-cover').hide(); @@ -641,15 +644,15 @@ // scroll up possible? if (this.top == this.options.top_min) - $(".galaxy-frame-scroll-up").hide(); + $(".frame-scroll-up").hide(); else - $(".galaxy-frame-scroll-up").show(); + $(".frame-scroll-up").show(); // scroll down possible? if (this.top == this.top_max) - $(".galaxy-frame-scroll-down").hide(); + $(".frame-scroll-down").hide(); else - $(".galaxy-frame-scroll-down").show(); + $(".frame-scroll-down").show(); }, /* @@ -660,7 +663,7 @@ panel_animation_complete: function() { var self = this; - $(".galaxy-frame").promise().done(function() {self.panel_scroll(0, true)}); + $(".frame").promise().done(function() {self.panel_scroll(0, true)}); }, // refresh panel @@ -721,33 +724,33 @@ this.visible = false; // hide - $(".galaxy-frame").fadeOut('fast'); + $(".frame").fadeOut('fast'); // add class this.button_load.icon("fa-icon-eye-close"); this.button_load.untoggle(); // hide background - $(".galaxy-frame-background").hide(); + $(".frame-background").hide(); // hide menu - $(".galaxy-frame-menu").hide(); + $(".frame-menu").hide(); } else { // show this.visible = true; // show - $(".galaxy-frame").fadeIn('fast'); + $(".frame").fadeIn('fast'); // add class this.button_load.icon("fa-icon-eye-open"); this.button_load.toggle(); // hide shadow - $(this.galaxy_frame_shadow.id).hide(); + $(this.frame_shadow.id).hide(); // show background - $(".galaxy-frame-background").show(); + $(".frame-background").show(); // show panel this.panel_refresh(); @@ -807,7 +810,7 @@ } // generate frame identifier - var frame_id = '#galaxy-frame-' + (this.frame_counter_id++); + var frame_id = '#frame-' + (this.frame_counter_id++); // check if frame exists if ($(frame_id).length !== 0) @@ -820,8 +823,8 @@ this.top = this.options.top_min; // append - $(this.el).append(this.frame_template(frame_id.substring(1), options.title, options.type, options.content)); - + $(this.el).append(this.template_frame(frame_id.substring(1), options.title, options.type, options.content)); + // construct a new frame var frame = { id : frame_id, @@ -835,6 +838,9 @@ options.width = this.to_pixel_coord('width', this.options.frame.cols); options.height = this.to_pixel_coord('height', this.options.frame.rows); + // default z-index + this.frame_z = parseInt($(frame.id).css('z-index')); + // add to frame list this.frame_list[frame_id] = frame; @@ -964,7 +970,7 @@ frame_focus: function(frame, has_focus) { // get new z-value - var z = parseInt(css.get_attribute('galaxy-frame', 'z-index')) + (has_focus ? 1 : 0); + var z = this.frame_z + (has_focus ? 1 : 0); // update $(frame.id).css('z-index', z); @@ -1032,8 +1038,14 @@ HTML TEMPLATES */ + // main element + template: function() + { + return '<div class="galaxy-frame"></div>'; + }, + // fill regular frame template - frame_template: function(id, title, type, content) + template_frame: function(id, title, type, content) { // check title if (!title) @@ -1044,48 +1056,36 @@ content = '<iframe scrolling="auto" class="f-iframe" src="' + content + '"></iframe>'; // load template - return '<div id="' + id + '" class="galaxy-frame galaxy-corner">' + - '<div class="f-header galaxy-corner">' + + return '<div id="' + id + '" class="frame corner">' + + '<div class="f-header corner">' + '<span class="f-title">' + title + '</span>' + '<span class="f-icon f-pin fa-icon-pushpin"></span>' + '<span class="f-icon f-close fa-icon-trash"></span>' + '</div>' + - '<div class="f-content galaxy-corner">' + content + + '<div class="f-content corner">' + content + '<div class="f-cover"></div>' + '</div>' + - '<span class="f-resize f-icon galaxy-corner fa-icon-resize-full"></span>' + + '<span class="f-resize f-icon corner fa-icon-resize-full"></span>' + '</div>'; }, // fill shadow template - frame_template_shadow: function(id) + template_shadow: function(id) { - return '<div id="' + id + '" class="galaxy-frame-shadow galaxy-corner"></div>'; + return '<div id="' + id + '" class="frame-shadow corner"></div>'; }, // fill background template in order to cover underlying iframes - frame_template_background: function() + template_background: function() { - return '<div class="galaxy-frame-background"></div>'; - }, - - // fill load button template - frame_template_header: function() - { - return '<div class="galaxy-frame-load f-corner">' + - '<div class="number f-corner">0</div>' + - '<div class="icon fa-icon-2x"></div>' + - '</div>' + - '<div class="galaxy-frame-active f-corner">' + - '<div class="icon fa-icon-2x fa-icon-th"></div>' + - '</div>'; + return '<div class="frame-background"></div>'; }, // fill menu button template - frame_template_menu: function() + template_menu: function() { - return '<div class="galaxy-frame-scroll-up galaxy-frame-menu fa-icon-chevron-up fa-icon-2x"></div>' + - '<div class="galaxy-frame-scroll-down galaxy-frame-menu fa-icon-chevron-down fa-icon-2x"></div>'; + return '<div class="frame-scroll-up frame-menu fa-icon-chevron-up fa-icon-2x"></div>' + + '<div class="frame-scroll-down frame-menu fa-icon-chevron-down fa-icon-2x"></div>'; } }); diff -r ea9b0279ccfe94e8e82d90affac946b25e81e515 -r 91352b6afa44a1cf29aa3963b6b30642e351e336 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1107,6 +1107,23 @@ .select2-display-none{display:none} .select2-measure-scrollbar{position:absolute;top:-10000px;left:-10000px;width:100px;height:100px;overflow:scroll} @media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){.select2-search input,.select2-search-choice-close,.select2-container .select2-choice abbr,.select2-container .select2-choice .select2-arrow b{background-image:url('../images/select2x2.png') !important;background-repeat:no-repeat !important;background-size:60px 40px !important} .select2-search input{background-position:100% -21px !important}}.select2-container{min-width:256px} +.galaxy-frame{}.galaxy-frame .corner{-moz-border-radius:5px;border-radius:5px} +.galaxy-frame .toggle{color:#BCC800} +.galaxy-frame .frame-background{z-index:1000;position:absolute;display:none;top:0px;left:0px;height:100%;width:100%;opacity:0.6;background:#000;overflow:auto} +.galaxy-frame .frame-shadow{z-index:1001;position:absolute;display:none;top:0px;left:0px;opacity:0.5;background:#2c3143;border:1px solid #888} +.galaxy-frame .frame-menu{z-index:1005;position:absolute;cursor:pointer;color:#BCC800;right:10px} +.galaxy-frame .frame-scroll-up{top:50px} +.galaxy-frame .frame-scroll-down{bottom:20px} +.galaxy-frame .frame{z-index:1002;overflow:hidden;position:absolute;background:#fff;border:1px solid #888;-webkit-box-shadow:0 0 5px rgba(0,0,0,0.3);}.galaxy-frame .frame .f-content{position:absolute;overflow:hidden;background:#fff;border:none;top:24px;bottom:3px;left:3px;right:3px} +.galaxy-frame .frame .f-cover{position:absolute;display:none;top:0px;left:0px;height:100%;width:100%;opacity:0.0;background:#fff} +.galaxy-frame .frame .f-iframe{border:none;width:100%;height:100%} +.galaxy-frame .frame .f-header{height:17px;margin:2px;cursor:pointer;border:1px solid #000;background:#2c3143;color:#fff;font-weight:bold} +.galaxy-frame .frame .f-title{position:absolute;top:2px;left:16px;right:16px;font-size:12px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;text-align:center} +.galaxy-frame .frame .f-icon{position:absolute;cursor:pointer;font-style:normal} +.galaxy-frame .frame .f-not-allowed{cursor:not-allowed} +.galaxy-frame .frame .f-close{right:5px;top:1px} +.galaxy-frame .frame .f-pin{left:6px;top:1px} +.galaxy-frame .frame .f-resize{background:#fff;width:16px;height:16px;color:#2c3143;right:0px;bottom:0px;text-align:center;line-height:16px;border:0px} .unselectable{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none} .parent-width{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;*width:90%} .clear:before,.clear:after{content:" ";display:table;} @@ -1128,7 +1145,7 @@ .unified-panel-footer{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;position:absolute;bottom:0;height:25px;line-height:25px;width:100%;z-index:1000;border-top:solid #999 1px;background:#eee;color:#555}.unified-panel-footer a{color:#555} .unified-panel-footer .drag{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;cursor:w-resize} #right>.unified-panel-footer .drag{left:0} -.panel-collapse{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;position:absolute;width:100%;z-index:1000;background:#eee;color:#555;font-family:FontAwesome;font-size:1.1666666666666667em;background-image:none !important;background-position:0% 0%;background-repeat:repeat;font-size:1.3333333333333333em;z-index:10000;display:block;position:fixed;left:0;top:inherit;bottom:0;padding:0 5px;text-align:center;height:25px;line-height:25px;width:20px;background:none;border-right:solid #999 1px;border-top:solid #999 1px;background:#eee}.panel-collapse a{color:#555} +.panel-collapse{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;position:absolute;width:100%;z-index:1000;background:#eee;color:#555;font-family:FontAwesome;font-size:1.1666666666666667em;background-image:none !important;background-position:0% 0%;background-repeat:repeat;font-size:1.3333333333333333em;z-index:201;display:block;position:fixed;left:0;top:inherit;bottom:0;padding:0 5px;text-align:center;height:25px;line-height:25px;width:20px;background:none;border-right:solid #999 1px;border-top:solid #999 1px;background:#eee}.panel-collapse a{color:#555} .panel-collapse .drag{position:absolute;top:0;right:0;padding:0 5px;text-align:center;height:25px;width:20px;background-image:url(../images/visualization/draggable_horizontal.png);background-repeat:no-repeat;background-position:50% 50%;cursor:w-resize} .panel-collapse:before{content:'\f053'} .panel-collapse.hidden:before{content:'\f054'} @@ -1150,7 +1167,7 @@ #masthead li.dropdown>a:hover .caret{border-top-color:gold;border-bottom-color:gold} #masthead .navbar-brand{position:absolute;left:0;top:0;font-family:verdana;font-weight:bold;font-size:20px;line-height:1;color:white;padding:5px 20px 12px;margin-left:-15px;z-index:2000}#masthead .navbar-brand img{display:inline;width:26px;vertical-align:top} #masthead .navbar-brand a{color:white;text-decoration:none} -#masthead .iconbar{position:absolute;top:2px;right:110px;cursor:pointer;color:#ccc;overflow:hidden}#masthead .iconbar .symbol{float:left;margin:0px 8px} +#masthead .iconbar{position:absolute;top:2px;right:110px;cursor:pointer;color:#999;overflow:hidden}#masthead .iconbar .symbol{float:left;margin:0px 8px} #masthead .iconbar .symbol .number{font-weight:bold;font-size:12px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;position:relative;left:23px;top:-18px} #masthead .iconbar .toggle{color:#BCC800} .quota-meter-container{position:absolute;top:0;right:0;height:32px} diff -r ea9b0279ccfe94e8e82d90affac946b25e81e515 -r 91352b6afa44a1cf29aa3963b6b30642e351e336 static/style/blue/galaxy.frame.css --- a/static/style/blue/galaxy.frame.css +++ /dev/null @@ -1,186 +0,0 @@ -/* - galaxy generic styles -*/ - -.galaxy-corner -{ - -moz-border-radius: 4px; - border-radius: 4px; -} - -.galaxy-corner-soft -{ - -moz-border-radius: 2px; - border-radius: 2px; -} - -.galaxy-toggle -{ - color: #BCC800; -} - -.galaxy-shadow -{ - -webkit-box-shadow: 1px 1px 4px rgba(0,0,0,0.16); - box-shadow: 1px 1px 4px rgba(0,0,0,0.16); -} - -/* - galaxy-frames -*/ - -.galaxy-frame-background -{ - z-index : 14000; - position : absolute; - display : none; - top : 0px; - left : 0px; - height : 100%; - width : 100%; - opacity : 0.6; - background : #11131A; - overflow : auto; -} - -.galaxy-frame-shadow -{ - z-index : 14001; - position : absolute; - display : none; - top : 0px; - left : 0px; - opacity : 0.5; - background : #2C3143; - border : 1px solid #EEEEEE; -} - -.galaxy-frame -{ - z-index : 14002; - overflow : hidden; - position : absolute; - background : #FFFFFF; - border : 1px solid #D0D0D0; - -webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3); -} -/* - panel menu button -*/ -.galaxy-frame-menu -{ - z-index : 14003; - position : absolute; - cursor : pointer; - color : #BCC800; - right : 10px; -} - -.galaxy-frame-scroll-up -{ - top : 50px; -} - -.galaxy-frame-scroll-down -{ - bottom : 20px; -} - -/* - frame components -*/ -.galaxy-frame .f-content -{ - position : absolute; - overflow : hidden; - background : #FFFFFF; - border : none; - top : 24px; - bottom : 3px; - left : 3px; - right : 3px; -} - -.galaxy-frame .f-cover -{ - position : absolute; - display : none; - top : 0px; - left : 0px; - height : 100%; - width : 100%; - opacity : 0.0; - background : #FFFFFF; -} - -.galaxy-frame .f-iframe -{ - border : none; - width : 100%; - height : 100%; -} - -.galaxy-frame .f-header -{ - height : 17px; - margin : 2px; - cursor : pointer; - border : 1px solid #000000; - background : #2C3143; - color : #FFFFFF; - font-weight : bold; -} - -.galaxy-frame .f-title -{ - position : absolute; - top : 2px; - left : 16px; - right : 16px; - font-size : 12px; - font-family : Verdana, Arial; - text-align : center; -} - -/* - frame icons -*/ - -.galaxy-frame .f-icon -{ - position : absolute; - cursor : pointer; - font-style : normal; -} - -.galaxy-frame .f-not-allowed -{ - cursor : not-allowed; -} - -.galaxy-frame .f-close -{ - right : 5px; - top : 1px; -} - -.galaxy-frame .f-pin -{ - left : 6px; - top : 1px; -} - -.galaxy-frame .f-resize -{ - right : 0px; - bottom : 0px; - background : #FFFFFF; - width : 16px; - height : 16px; - color : #2C3143; - right : 0px; - bottom : 0px; - text-align : center; - line-height : 16px; - border : 0px solid #2C3143; -} \ No newline at end of file diff -r ea9b0279ccfe94e8e82d90affac946b25e81e515 -r 91352b6afa44a1cf29aa3963b6b30642e351e336 static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -15,6 +15,9 @@ min-width: 256px; } +// load galaxy frame styles +@import "frame.less"; + // Mixins .unselectable { @@ -196,7 +199,7 @@ &.hidden:before { content:'\f054'; } - z-index: 10000; + z-index: 201; display: block; position: fixed; left: 0; @@ -375,7 +378,7 @@ top : 2px; right : 110px; cursor : pointer; - color : @navbar-default-toggle-icon-bar-bg; + color : @gray-light; overflow : hidden; .symbol @@ -396,7 +399,7 @@ .toggle { - color : #BCC800;; + color : #BCC800; } } } diff -r ea9b0279ccfe94e8e82d90affac946b25e81e515 -r 91352b6afa44a1cf29aa3963b6b30642e351e336 static/style/src/less/frame.less --- /dev/null +++ b/static/style/src/less/frame.less @@ -0,0 +1,171 @@ +.galaxy-frame +{ + .corner + { + -moz-border-radius: @border-radius-large; + border-radius: @border-radius-large; + } + + .toggle + { + color: #BCC800; + } + + .frame-background + { + z-index : @zindex-navbar; + position : absolute; + display : none; + top : 0px; + left : 0px; + height : 100%; + width : 100%; + opacity : 0.6; + background : @black; + overflow : auto; + } + + .frame-shadow + { + z-index : @zindex-navbar + 1; + position : absolute; + display : none; + top : 0px; + left : 0px; + opacity : 0.5; + background : @navbar-inverse-bg; + border : 1px solid @navbar-default-border; + } + + /* + panel menu button + */ + .frame-menu + { + z-index : @zindex-navbar + 5; + position : absolute; + cursor : pointer; + color : #BCC800; + right : 10px; + } + + .frame-scroll-up + { + top : 50px; + } + + .frame-scroll-down + { + bottom : 20px; + } + + /* + frame components + */ + + .frame + { + z-index : @zindex-navbar + 2; + overflow : hidden; + position : absolute; + background : @white; + border : 1px solid @navbar-default-border; + -webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3); + + .f-content + { + position : absolute; + overflow : hidden; + background : @white; + border : none; + top : 24px; + bottom : 3px; + left : 3px; + right : 3px; + } + + .f-cover + { + position : absolute; + display : none; + top : 0px; + left : 0px; + height : 100%; + width : 100%; + opacity : 0.0; + background : @white; + } + + .f-iframe + { + border : none; + width : 100%; + height : 100%; + } + + .f-header + { + height : 17px; + margin : 2px; + cursor : pointer; + border : 1px solid @black; + background : @base-color-1; + color : @white; + font-weight : bold; + } + + .f-title + { + position : absolute; + top : 2px; + left : 16px; + right : 16px; + font-size : 12px; + font-family : @font-family-sans-serif; + text-align : center; + } + + /* + frame icons + */ + + .f-icon + { + position : absolute; + cursor : pointer; + font-style : normal; + } + + .f-not-allowed + { + cursor : not-allowed; + } + + .f-close + { + right : 5px; + top : 1px; + } + + .f-pin + { + left : 6px; + top : 1px; + } + + .f-resize + { + right : 0px; + bottom : 0px; + background : @white; + width : 16px; + height : 16px; + color : @base-color-1; + right : 0px; + bottom : 0px; + text-align : center; + line-height : 16px; + border : 0px; + } + } +} \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: carlfeberhard: Style, history panel: remove unneeded CSS reset
by commits-noreply＠bitbucket.org 12 Sep '13

12 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ea9b0279ccfe/ Changeset: ea9b0279ccfe User: carlfeberhard Date: 2013-09-12 20:53:47 Summary: Style, history panel: remove unneeded CSS reset Affected #: 2 files diff -r 5bca0c757606024bbc29c2e30d55cff9dcaae99a -r ea9b0279ccfe94e8e82d90affac946b25e81e515 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1344,7 +1344,6 @@ .icon-button.link-broken{background:url(../images/silk/link_break.png) no-repeat;cursor:pointer;float:none;display:inline-block;margin-left:10px} .workflow-invocation-complete{border:solid 1px #6A6;border-left-width:5px;margin:10px 0;padding-left:5px} body.historyPage{background:#dfe5f9;color:#000;margin:5px;border:0;padding:0} -body.historyPage>*{margin:0px;padding:0px} div.historyLinks{margin:5px 5px} div.historyItem{margin:0 -5px;padding:8px 10px;border-top:solid #bfbfbf 1px;border-right:none;word-wrap:break-word;background:#eee}div.historyItem .state-icon{display:inline-block;vertical-align:middle;width:16px;height:16px;background-position:0 1px;background-repeat:no-repeat} div.historyItem .historyItemTitle{font-weight:bold;line-height:16px} diff -r 5bca0c757606024bbc29c2e30d55cff9dcaae99a -r ea9b0279ccfe94e8e82d90affac946b25e81e515 static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -1389,11 +1389,6 @@ padding: 0; } -body.historyPage > * { - margin: 0px; - padding: 0px; -} - // Control links at top of history div.historyLinks { margin: 5px 5px; Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: carlfeberhard: QA, browser tests: update tooltip selector for Bootstrap 3
by commits-noreply＠bitbucket.org 12 Sep '13

12 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5bca0c757606/ Changeset: 5bca0c757606 User: carlfeberhard Date: 2013-09-12 20:44:11 Summary: QA, browser tests: update tooltip selector for Bootstrap 3 Affected #: 1 file diff -r b9505d30f85f6e5e49640c6428185ab427899ec4 -r 5bca0c757606024bbc29c2e30d55cff9dcaae99a test/casperjs/spaceghost.js --- a/test/casperjs/spaceghost.js +++ b/test/casperjs/spaceghost.js @@ -1109,7 +1109,7 @@ */ SpaceGhost.prototype.data = { selectors : { - tooltipBalloon : '.bs-tooltip', + tooltipBalloon : '.tooltip', editableText : '.editable-text', editableTextInput : 'input#renaming-active', Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: carlfeberhard: QA, browser tests: fix for history update with non-attribute key (fails silently now); fix for hda create when no from_ld_id is given (now 400)
by commits-noreply＠bitbucket.org 12 Sep '13

12 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b9505d30f85f/ Changeset: b9505d30f85f User: carlfeberhard Date: 2013-09-12 20:27:05 Summary: QA, browser tests: fix for history update with non-attribute key (fails silently now); fix for hda create when no from_ld_id is given (now 400) Affected #: 2 files diff -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 -r b9505d30f85f6e5e49640c6428185ab427899ec4 test/casperjs/api-hda-tests.js --- a/test/casperjs/api-hda-tests.js +++ b/test/casperjs/api-hda-tests.js @@ -371,7 +371,7 @@ // ------------------------------------------------------------------------------------------- ERRORS - this.test.comment( 'create should error with "not implemented" when the param "from_ld_id" is not used' ); + this.test.comment( 'create should error with "Please define the source" when the param "from_ld_id" is not used' ); var errored = false; try { // sending an empty object won't work @@ -379,15 +379,14 @@ } catch( err ){ errored = true; - this.test.assert( err.message.indexOf( 'Not implemented' ) !== -1, + this.test.assert( err.message.indexOf( 'Please define the source' ) !== -1, 'Error has the proper message: ' + err.message ); - this.test.assert( err.status === 501, 'Error has the proper status code: ' + err.status ); + this.test.assert( err.status === 400, 'Error has the proper status code: ' + err.status ); } if( !errored ){ this.test.fail( 'create without "from_ld_id" did not cause error' ); } - //var returned = this.api.hdas.update( lastHistory.id, hdaIndex[0].id, { deleted: true, blerp: 'blerp' }); //var returned = this.api.hdas.update( lastHistory.id, { deleted: true, blerp: 'blerp' }); //this.debug( 'returned:' + this.jsonStr( returned ) ); diff -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 -r b9505d30f85f6e5e49640c6428185ab427899ec4 test/casperjs/api-history-tests.js --- a/test/casperjs/api-history-tests.js +++ b/test/casperjs/api-history-tests.js @@ -172,8 +172,8 @@ }); this.test.assert( countKeys( returned ) === 0, "No changed returned: " + this.jsonStr( returned ) ); - this.test.comment( 'updating using a nonsense key should fail with an error' ); - var err = {}; + this.test.comment( 'updating using a nonsense key should fail silently' ); + var err = null; try { returned = this.api.histories.update( newFirstHistory.id, { konamiCode : 'uuddlrlrba' @@ -182,8 +182,7 @@ err = error; //this.debug( this.jsonStr( err ) ); } - this.test.assert( !!err.message, "Error occurred: " + err.message ); - this.test.assert( err.status === 400, "Error status is 400: " + err.status ); + this.test.assert( err === null, "No error occurred: " + this.jsonStr( err ) ); this.test.comment( 'updating by attempting to change type should cause an error' ); err = {}; Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: carlfeberhard: History API: add route/function to enable setting a current/working history; pack scripts
by commits-noreply＠bitbucket.org 12 Sep '13

12 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/85e8246c95e4/ Changeset: 85e8246c95e4 User: carlfeberhard Date: 2013-09-12 20:06:21 Summary: History API: add route/function to enable setting a current/working history; pack scripts Affected #: 5 files diff -r 8bcdf94c187a717731d714d9e7c64e747966ed36 -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 lib/galaxy/webapps/galaxy/api/histories.py --- a/lib/galaxy/webapps/galaxy/api/histories.py +++ b/lib/galaxy/webapps/galaxy/api/histories.py @@ -90,15 +90,13 @@ history_id = id deleted = string_as_bool( deleted ) - # try to load the history, by most_recently_used or the given id try: if history_id == "most_recently_used": - if trans.user and len( trans.user.galaxy_sessions ) > 0: - # Most recent active history for user sessions, not deleted - history = trans.user.galaxy_sessions[0].histories[-1].history - history_id = trans.security.encode_id( history.id ) - else: + if not trans.user or len( trans.user.galaxy_sessions ) <= 0: return None + # Most recent active history for user sessions, not deleted + history = trans.user.galaxy_sessions[0].histories[-1].history + else: history = self.get_history( trans, history_id, check_ownership=False, check_accessible=True, deleted=deleted ) @@ -119,6 +117,41 @@ return history_data @web.expose_api + def set_as_current( self, trans, id, *kwd ): + """ + set_as_current( trans, id, **kwd ) + * POST /api/histories/{id}/set_as_current: + set the history with ``id`` to the user's current history and return details + + :type id: an encoded id string + :param id: the encoded id of the history to query or the string 'most_recently_used' + + :rtype: dictionary + :returns: detailed history information from + :func:`galaxy.web.base.controller.UsesHistoryDatasetAssociationMixin.get_history_dict` + """ + # added as a non-ATOM API call to support the notion of a 'current/working' history + # - unique to the history resource + history_id = id + try: + history = self.get_history( trans, history_id, check_ownership=True, check_accessible=True ) + trans.history = history + history_data = self.get_history_dict( trans, history ) + history_data[ 'contents_url' ] = url_for( 'history_contents', history_id=history_id ) + + except HTTPBadRequest, bad_req: + trans.response.status = 400 + return str( bad_req ) + + except Exception, e: + msg = "Error in history API when switching current history: %s" % ( str( e ) ) + log.exception( e ) + trans.response.status = 500 + return msg + + return history_data + + @web.expose_api def create( self, trans, payload, **kwd ): """ create( trans, payload ) @@ -128,6 +161,8 @@ :type payload: dict :param payload: (optional) dictionary structure containing: * name: the new history's name + * current: if passed, set the new history to be the user's 'current' + history :rtype: dict :returns: element view of new history @@ -142,6 +177,11 @@ item = new_history.to_dict(view='element', value_mapper={'id':trans.security.encode_id}) item['url'] = url_for( 'history', id=item['id'] ) + #TODO: possibly default to True here - but favor explicit for now (and backwards compat) + current = string_as_bool( payload[ 'current' ] ) if 'current' in payload else False + if current: + trans.history = new_history + #TODO: copy own history #TODO: import an importable history #TODO: import from archive diff -r 8bcdf94c187a717731d714d9e7c64e747966ed36 -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -159,6 +159,10 @@ #webapp.mapper.connect( 'run_workflow', '/api/workflow/{workflow_id}/library/{library_id}', controller='workflows', action='run', workflow_id=None, library_id=None, conditions=dict(method=["GET"]) ) webapp.mapper.resource( 'search', 'search', path_prefix='/api' ) + # add as a non-ATOM API call to support the notion of a 'current/working' history unique to the history resource + webapp.mapper.connect( "set_as_current", "/api/histories/{id}/set_as_current", + controller="histories", action="set_as_current", conditions=dict( method=["POST"] ) ) + # visualizations registry generic template renderer webapp.add_route( '/visualization/show/:visualization_name', controller='visualization', action='render', visualization_name=None ) diff -r 8bcdf94c187a717731d714d9e7c64e747966ed36 -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 static/scripts/packed/galaxy.frame.js --- a/static/scripts/packed/galaxy.frame.js +++ b/static/scripts/packed/galaxy.frame.js @@ -1,1 +1,1 @@ -define(["utils/galaxy.css","galaxy.master","libs/backbone/backbone-relational"],function(b,c){var a=Backbone.View.extend({el_main:"#everything",options:{frame:{cols:6,rows:3},rows:1000,cell:130,margin:5,scroll:5,top_min:40,frame_max:10},cols:0,top:0,top_max:0,frame_counter:0,frame_counter_id:0,frame_list:[],galaxy_frame_shadow:null,visible:false,active:false,button_active:null,button_load:null,initialize:function(e){var d=this;this.button_active=new c.GalaxyMasterIcon({icon:"fa-icon-th",tooltip:"Enable/Disable Scratchbook",on_click:function(g){d.event_panel_active(g)}});Galaxy.master.append(this.button_active);this.button_load=new c.GalaxyMasterIcon({icon:"fa-icon-eye-open",tooltip:"Show/Hide Scratchbook",on_click:function(g){d.event_panel_load(g)},with_number:true});Galaxy.master.append(this.button_load);b.load_file("static/style/galaxy.frame.css");if(e){this.options=_.defaults(e,this.options)}this.top=this.top_max=this.options.top_min;$(this.el).append(this.frame_template_background());$(this.el).append(this.frame_template_menu());$(this.el_main).append($(this.el));var f="#galaxy-frame-shadow";$(this.el).append(this.frame_template_shadow(f.substring(1)));this.galaxy_frame_shadow={id:f,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};this.frame_resize(this.galaxy_frame_shadow,{width:0,height:0});this.frame_list[f]=this.galaxy_frame_shadow;this.panel_refresh();var d=this;$(window).resize(function(){if(d.visible){d.panel_refresh()}});window.onbeforeunload=function(){if(d.frame_counter>0){return"You opened "+d.frame_counter+" frame(s) which will be lost."}}},event:{type:null,target:null,xy:null},events:{mousemove:"event_frame_mouse_move",mouseup:"event_frame_mouse_up",mouseleave:"event_frame_mouse_up",mousewheel:"event_panel_scroll",DOMMouseScroll:"event_panel_scroll","mousedown .galaxy-frame":"event_frame_mouse_down","mousedown .galaxy-frame-background":"event_panel_load","mousedown .galaxy-frame-scroll-up":"event_panel_scroll_up","mousedown .galaxy-frame-scroll-down":"event_panel_scroll_down","mousedown .f-close":"event_frame_close","mousedown .f-pin":"event_frame_lock"},event_frame_mouse_down:function(d){if(this.event.type!==null){return}if($(d.target).hasClass("f-header")||$(d.target).hasClass("f-title")){this.event.type="drag"}if($(d.target).hasClass("f-resize")){this.event.type="resize"}if(this.event.type===null){return}d.preventDefault();this.event.target=this.event_get_frame(d.target);if(this.event.target.grid_lock){this.event.type=null;return}this.event.xy={x:d.originalEvent.pageX,y:d.originalEvent.pageY};this.frame_drag_start(this.event.target)},event_frame_mouse_move:function(j){if(this.event.type!="drag"&&this.event.type!="resize"){return}var h={x:j.originalEvent.pageX,y:j.originalEvent.pageY};var f={x:h.x-this.event.xy.x,y:h.y-this.event.xy.y};this.event.xy=h;var i=this.frame_screen(this.event.target);if(this.event.type=="resize"){i.width+=f.x;i.height+=f.y;var g=this.options.cell-this.options.margin-1;i.width=Math.max(i.width,g);i.height=Math.max(i.height,g);this.frame_resize(this.event.target,i);i.width=this.to_grid_coord("width",i.width)+1;i.height=this.to_grid_coord("height",i.height)+1;i.width=this.to_pixel_coord("width",i.width);i.height=this.to_pixel_coord("height",i.height);this.frame_resize(this.galaxy_frame_shadow,i);this.frame_insert(this.galaxy_frame_shadow,{top:this.to_grid_coord("top",i.top),left:this.to_grid_coord("left",i.left)})}if(this.event.type=="drag"){i.left+=f.x;i.top+=f.y;this.frame_offset(this.event.target,i);var d={top:this.to_grid_coord("top",i.top),left:this.to_grid_coord("left",i.left)};if(d.left!==0){d.left++}this.frame_insert(this.galaxy_frame_shadow,d)}},event_frame_mouse_up:function(d){if(this.event.type!="drag"&&this.event.type!="resize"){return}this.frame_drag_stop(this.event.target);this.event.type=null},event_frame_close:function(f){if(this.event.type!==null){return}f.preventDefault();var g=this.event_get_frame(f.target);var d=this;$(g.id).fadeOut("fast",function(){$(g.id).remove();delete d.frame_list[g.id];d.frame_counter--;d.panel_refresh(true);d.panel_animation_complete();if(d.visible&&d.frame_counter==0){d.panel_show_hide()}})},event_frame_lock:function(d){if(this.event.type!==null){return}d.preventDefault();var f=this.event_get_frame(d.target);if(f.grid_lock){f.grid_lock=false;$(f.id).find(".f-pin").removeClass("galaxy-toggle");$(f.id).find(".f-header").removeClass("f-not-allowed");$(f.id).find(".f-title").removeClass("f-not-allowed");$(f.id).find(".f-resize").show();$(f.id).find(".f-close").show()}else{f.grid_lock=true;$(f.id).find(".f-pin").addClass("galaxy-toggle");$(f.id).find(".f-header").addClass("f-not-allowed");$(f.id).find(".f-title").addClass("f-not-allowed");$(f.id).find(".f-resize").hide();$(f.id).find(".f-close").hide()}},event_panel_load:function(d){if(this.event.type!==null){return}this.panel_show_hide()},event_panel_active:function(d){if(this.event.type!==null){return}this.panel_active_disable()},event_panel_scroll:function(d){if(this.event.type!==null||!this.visible){return}d.preventDefault();var f=d.originalEvent.detail?d.originalEvent.detail:d.originalEvent.wheelDelta/-3;this.panel_scroll(f)},event_panel_scroll_up:function(d){if(this.event.type!==null){return}d.preventDefault();this.panel_scroll(-this.options.scroll)},event_panel_scroll_down:function(d){if(this.event.type!==null){return}d.preventDefault();this.panel_scroll(this.options.scroll)},event_get_frame:function(d){return this.frame_list["#"+$(d).closest(".galaxy-frame").attr("id")]},frame_drag_start:function(e){this.frame_focus(e,true);var d=this.frame_screen(e);this.frame_resize(this.galaxy_frame_shadow,d);this.frame_grid(this.galaxy_frame_shadow,e.grid_location);e.grid_location=null;$(this.galaxy_frame_shadow.id).show();$(".f-cover").show()},frame_drag_stop:function(e){this.frame_focus(e,false);var d=this.frame_screen(this.galaxy_frame_shadow);this.frame_resize(e,d);this.frame_grid(e,this.galaxy_frame_shadow.grid_location,true);this.galaxy_frame_shadow.grid_location=null;$(this.galaxy_frame_shadow.id).hide();$(".f-cover").hide();this.panel_animation_complete()},to_grid_coord:function(f,e){var d=(f=="width"||f=="height")?1:-1;if(f=="top"){e-=this.top}return parseInt((e+d*this.options.margin)/this.options.cell,10)},to_pixel_coord:function(f,h){var d=(f=="width"||f=="height")?1:-1;var e=(h*this.options.cell)-d*this.options.margin;if(f=="top"){e+=this.top}return e},to_grid:function(d){return{top:this.to_grid_coord("top",d.top),left:this.to_grid_coord("left",d.left),width:this.to_grid_coord("width",d.width),height:this.to_grid_coord("height",d.height)}},to_pixel:function(d){return{top:this.to_pixel_coord("top",d.top),left:this.to_pixel_coord("left",d.left),width:this.to_pixel_coord("width",d.width),height:this.to_pixel_coord("height",d.height)}},is_collision:function(f){function d(i,g){return !(i.left>g.left+g.width-1||i.left+i.width-1<g.left||i.top>g.top+g.height-1||i.top+i.height-1<g.top)}for(var e in this.frame_list){var h=this.frame_list[e];if(h.grid_location===null){continue}if(d(f,h.grid_location)){return true}}return false},location_rank:function(d){return(d.top*this.cols)+d.left},menu_refresh:function(){this.button_load.number(this.frame_counter);if(this.frame_counter==0){this.button_load.hide()}else{this.button_load.show()}if(this.top==this.options.top_min){$(".galaxy-frame-scroll-up").hide()}else{$(".galaxy-frame-scroll-up").show()}if(this.top==this.top_max){$(".galaxy-frame-scroll-down").hide()}else{$(".galaxy-frame-scroll-down").show()}},panel_animation_complete:function(){var d=this;$(".galaxy-frame").promise().done(function(){d.panel_scroll(0,true)})},panel_refresh:function(d){this.cols=parseInt($(window).width()/this.options.cell,10)+1;this.frame_insert(null,null,d)},panel_scroll:function(j,d){var f=this.top-this.options.scroll*j;f=Math.max(f,this.top_max);f=Math.min(f,this.options.top_min);if(this.top!=f){for(var e in this.frame_list){var h=this.frame_list[e];if(h.grid_location!==null){var g={top:h.screen_location.top-(this.top-f),left:h.screen_location.left};this.frame_offset(h,g,d)}}this.top=f}this.menu_refresh()},panel_show_hide:function(){if(this.visible){this.visible=false;$(".galaxy-frame").fadeOut("fast");this.button_load.icon("fa-icon-eye-close");this.button_load.untoggle();$(".galaxy-frame-background").hide();$(".galaxy-frame-menu").hide()}else{this.visible=true;$(".galaxy-frame").fadeIn("fast");this.button_load.icon("fa-icon-eye-open");this.button_load.toggle();$(this.galaxy_frame_shadow.id).hide();$(".galaxy-frame-background").show();this.panel_refresh()}},panel_active_disable:function(){if(this.active){this.active=false;this.button_active.untoggle();if(this.visible){this.panel_show_hide()}}else{this.active=true;this.button_active.toggle()}},frame_new:function(e){if(!this.active){if(e.location=="center"){var d=$(window.parent.document).find("iframe#galaxy_main");d.attr("src",e.content)}else{window.location=e.content}return}if(this.frame_counter>this.options.frame_max){alert("You have reached the maximum number of allowed frames ("+this.options.frame_max+").");return}var f="#galaxy-frame-"+(this.frame_counter_id++);if($(f).length!==0){alert("This frame already exists. This page might contain multiple frame managers.");return}this.top=this.options.top_min;$(this.el).append(this.frame_template(f.substring(1),e.title,e.type,e.content));var g={id:f,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};e.width=this.to_pixel_coord("width",this.options.frame.cols);e.height=this.to_pixel_coord("height",this.options.frame.rows);this.frame_list[f]=g;this.frame_counter++;this.frame_resize(g,{width:e.width,height:e.height});this.frame_insert(g,{top:0,left:0},true);if(!this.visible){this.panel_show_hide()}},frame_insert:function(k,d,g){var e=[];if(k){k.grid_location=null;e.push([k,this.location_rank(d)])}var h=null;for(h in this.frame_list){var j=this.frame_list[h];if(j.grid_location!==null&&!j.grid_lock){j.grid_location=null;e.push([j,j.grid_rank])}}e.sort(function(l,f){var n=l[1];var m=f[1];return n<m?-1:(n>m?1:0)});for(h=0;h<e.length;h++){this.frame_place(e[h][0],g)}this.top_max=0;for(var h in this.frame_list){var k=this.frame_list[h];if(k.grid_location!==null){this.top_max=Math.max(this.top_max,k.grid_location.top+k.grid_location.height)}}this.top_max=$(window).height()-this.top_max*this.options.cell-2*this.options.margin;this.top_max=Math.min(this.top_max,this.options.top_min);this.menu_refresh()},frame_place:function(l,e){l.grid_location=null;var k=this.to_grid(this.frame_screen(l));var d=false;for(var h=0;h<this.options.rows;h++){for(var f=0;f<Math.max(1,this.cols-k.width);f++){k.top=h;k.left=f;if(!this.is_collision(k)){d=true;break}}if(d){break}}if(d){this.frame_grid(l,k,e)}else{console.log("Grid dimensions exceeded.")}},frame_focus:function(f,d){var e=parseInt(b.get_attribute("galaxy-frame","z-index"))+(d?1:0);$(f.id).css("z-index",e)},frame_offset:function(g,f,e){g.screen_location.left=f.left;g.screen_location.top=f.top;if(e){this.frame_focus(g,true);var d=this;$(g.id).animate({top:f.top,left:f.left},"fast",function(){d.frame_focus(g,false)})}else{$(g.id).css({top:f.top,left:f.left})}},frame_resize:function(e,d){$(e.id).css({width:d.width,height:d.height});e.screen_location.width=d.width;e.screen_location.height=d.height},frame_grid:function(f,d,e){f.grid_location=d;this.frame_offset(f,this.to_pixel(d),e);f.grid_rank=this.location_rank(d)},frame_screen:function(e){var d=e.screen_location;return{top:d.top,left:d.left,width:d.width,height:d.height}},frame_template:function(g,f,d,e){if(!f){f=""}if(d=="url"){e='<iframe scrolling="auto" class="f-iframe" src="'+e+'"></iframe>'}return'<div id="'+g+'" class="galaxy-frame galaxy-corner"><div class="f-header galaxy-corner"><span class="f-title">'+f+'</span><span class="f-icon f-pin fa-icon-pushpin"></span><span class="f-icon f-close fa-icon-trash"></span></div><div class="f-content galaxy-corner">'+e+'<div class="f-cover"></div></div><span class="f-resize f-icon galaxy-corner fa-icon-resize-full"></span></div>'},frame_template_shadow:function(d){return'<div id="'+d+'" class="galaxy-frame-shadow galaxy-corner"></div>'},frame_template_background:function(){return'<div class="galaxy-frame-background"></div>'},frame_template_header:function(){return'<div class="galaxy-frame-load f-corner"><div class="number f-corner">0</div><div class="icon fa-icon-2x"></div></div><div class="galaxy-frame-active f-corner"><div class="icon fa-icon-2x fa-icon-th"></div></div>'},frame_template_menu:function(){return'<div class="galaxy-frame-scroll-up galaxy-frame-menu fa-icon-chevron-up fa-icon-2x"></div><div class="galaxy-frame-scroll-down galaxy-frame-menu fa-icon-chevron-down fa-icon-2x"></div>'}});return{GalaxyFrameManager:a}}); \ No newline at end of file +define(["utils/galaxy.css","galaxy.master","libs/backbone/backbone-relational"],function(b,c){var a=Backbone.View.extend({el_main:"#everything",options:{frame:{cols:6,rows:3},rows:1000,cell:130,margin:5,scroll:5,top_min:40,frame_max:9},cols:0,top:0,top_max:0,frame_counter:0,frame_counter_id:0,frame_list:[],galaxy_frame_shadow:null,visible:false,active:false,button_active:null,button_load:null,initialize:function(e){var d=this;this.button_active=new c.GalaxyMasterIcon({icon:"fa-icon-th",tooltip:"Enable/Disable Scratchbook",on_click:function(g){d.event_panel_active(g)}});Galaxy.master.append(this.button_active);this.button_load=new c.GalaxyMasterIcon({icon:"fa-icon-eye-open",tooltip:"Show/Hide Scratchbook",on_click:function(g){d.event_panel_load(g)},with_number:true});Galaxy.master.append(this.button_load);b.load_file("static/style/galaxy.frame.css");if(e){this.options=_.defaults(e,this.options)}this.top=this.top_max=this.options.top_min;$(this.el).append(this.frame_template_background());$(this.el).append(this.frame_template_menu());$(this.el_main).append($(this.el));var f="#galaxy-frame-shadow";$(this.el).append(this.frame_template_shadow(f.substring(1)));this.galaxy_frame_shadow={id:f,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};this.frame_resize(this.galaxy_frame_shadow,{width:0,height:0});this.frame_list[f]=this.galaxy_frame_shadow;this.panel_refresh();var d=this;$(window).resize(function(){if(d.visible){d.panel_refresh()}});window.onbeforeunload=function(){if(d.frame_counter>0){return"You opened "+d.frame_counter+" frame(s) which will be lost."}}},event:{type:null,target:null,xy:null},events:{mousemove:"event_frame_mouse_move",mouseup:"event_frame_mouse_up",mouseleave:"event_frame_mouse_up",mousewheel:"event_panel_scroll",DOMMouseScroll:"event_panel_scroll","mousedown .galaxy-frame":"event_frame_mouse_down","mousedown .galaxy-frame-background":"event_panel_load","mousedown .galaxy-frame-scroll-up":"event_panel_scroll_up","mousedown .galaxy-frame-scroll-down":"event_panel_scroll_down","mousedown .f-close":"event_frame_close","mousedown .f-pin":"event_frame_lock"},event_frame_mouse_down:function(d){if(this.event.type!==null){return}if($(d.target).hasClass("f-header")||$(d.target).hasClass("f-title")){this.event.type="drag"}if($(d.target).hasClass("f-resize")){this.event.type="resize"}if(this.event.type===null){return}d.preventDefault();this.event.target=this.event_get_frame(d.target);if(this.event.target.grid_lock){this.event.type=null;return}this.event.xy={x:d.originalEvent.pageX,y:d.originalEvent.pageY};this.frame_drag_start(this.event.target)},event_frame_mouse_move:function(j){if(this.event.type!="drag"&&this.event.type!="resize"){return}var h={x:j.originalEvent.pageX,y:j.originalEvent.pageY};var f={x:h.x-this.event.xy.x,y:h.y-this.event.xy.y};this.event.xy=h;var i=this.frame_screen(this.event.target);if(this.event.type=="resize"){i.width+=f.x;i.height+=f.y;var g=this.options.cell-this.options.margin-1;i.width=Math.max(i.width,g);i.height=Math.max(i.height,g);this.frame_resize(this.event.target,i);i.width=this.to_grid_coord("width",i.width)+1;i.height=this.to_grid_coord("height",i.height)+1;i.width=this.to_pixel_coord("width",i.width);i.height=this.to_pixel_coord("height",i.height);this.frame_resize(this.galaxy_frame_shadow,i);this.frame_insert(this.galaxy_frame_shadow,{top:this.to_grid_coord("top",i.top),left:this.to_grid_coord("left",i.left)})}if(this.event.type=="drag"){i.left+=f.x;i.top+=f.y;this.frame_offset(this.event.target,i);var d={top:this.to_grid_coord("top",i.top),left:this.to_grid_coord("left",i.left)};if(d.left!==0){d.left++}this.frame_insert(this.galaxy_frame_shadow,d)}},event_frame_mouse_up:function(d){if(this.event.type!="drag"&&this.event.type!="resize"){return}this.frame_drag_stop(this.event.target);this.event.type=null},event_frame_close:function(f){if(this.event.type!==null){return}f.preventDefault();var g=this.event_get_frame(f.target);var d=this;$(g.id).fadeOut("fast",function(){$(g.id).remove();delete d.frame_list[g.id];d.frame_counter--;d.panel_refresh(true);d.panel_animation_complete();if(d.visible&&d.frame_counter==0){d.panel_show_hide()}})},event_frame_lock:function(d){if(this.event.type!==null){return}d.preventDefault();var f=this.event_get_frame(d.target);if(f.grid_lock){f.grid_lock=false;$(f.id).find(".f-pin").removeClass("galaxy-toggle");$(f.id).find(".f-header").removeClass("f-not-allowed");$(f.id).find(".f-title").removeClass("f-not-allowed");$(f.id).find(".f-resize").show();$(f.id).find(".f-close").show()}else{f.grid_lock=true;$(f.id).find(".f-pin").addClass("galaxy-toggle");$(f.id).find(".f-header").addClass("f-not-allowed");$(f.id).find(".f-title").addClass("f-not-allowed");$(f.id).find(".f-resize").hide();$(f.id).find(".f-close").hide()}},event_panel_load:function(d){if(this.event.type!==null){return}this.panel_show_hide()},event_panel_active:function(d){if(this.event.type!==null){return}this.panel_active_disable()},event_panel_scroll:function(d){if(this.event.type!==null||!this.visible){return}d.preventDefault();var f=d.originalEvent.detail?d.originalEvent.detail:d.originalEvent.wheelDelta/-3;this.panel_scroll(f)},event_panel_scroll_up:function(d){if(this.event.type!==null){return}d.preventDefault();this.panel_scroll(-this.options.scroll)},event_panel_scroll_down:function(d){if(this.event.type!==null){return}d.preventDefault();this.panel_scroll(this.options.scroll)},event_get_frame:function(d){return this.frame_list["#"+$(d).closest(".galaxy-frame").attr("id")]},frame_drag_start:function(e){this.frame_focus(e,true);var d=this.frame_screen(e);this.frame_resize(this.galaxy_frame_shadow,d);this.frame_grid(this.galaxy_frame_shadow,e.grid_location);e.grid_location=null;$(this.galaxy_frame_shadow.id).show();$(".f-cover").show()},frame_drag_stop:function(e){this.frame_focus(e,false);var d=this.frame_screen(this.galaxy_frame_shadow);this.frame_resize(e,d);this.frame_grid(e,this.galaxy_frame_shadow.grid_location,true);this.galaxy_frame_shadow.grid_location=null;$(this.galaxy_frame_shadow.id).hide();$(".f-cover").hide();this.panel_animation_complete()},to_grid_coord:function(f,e){var d=(f=="width"||f=="height")?1:-1;if(f=="top"){e-=this.top}return parseInt((e+d*this.options.margin)/this.options.cell,10)},to_pixel_coord:function(f,h){var d=(f=="width"||f=="height")?1:-1;var e=(h*this.options.cell)-d*this.options.margin;if(f=="top"){e+=this.top}return e},to_grid:function(d){return{top:this.to_grid_coord("top",d.top),left:this.to_grid_coord("left",d.left),width:this.to_grid_coord("width",d.width),height:this.to_grid_coord("height",d.height)}},to_pixel:function(d){return{top:this.to_pixel_coord("top",d.top),left:this.to_pixel_coord("left",d.left),width:this.to_pixel_coord("width",d.width),height:this.to_pixel_coord("height",d.height)}},is_collision:function(f){function d(i,g){return !(i.left>g.left+g.width-1||i.left+i.width-1<g.left||i.top>g.top+g.height-1||i.top+i.height-1<g.top)}for(var e in this.frame_list){var h=this.frame_list[e];if(h.grid_location===null){continue}if(d(f,h.grid_location)){return true}}return false},location_rank:function(d){return(d.top*this.cols)+d.left},menu_refresh:function(){this.button_load.number(this.frame_counter);if(this.frame_counter==0){this.button_load.hide()}else{this.button_load.show()}if(this.top==this.options.top_min){$(".galaxy-frame-scroll-up").hide()}else{$(".galaxy-frame-scroll-up").show()}if(this.top==this.top_max){$(".galaxy-frame-scroll-down").hide()}else{$(".galaxy-frame-scroll-down").show()}},panel_animation_complete:function(){var d=this;$(".galaxy-frame").promise().done(function(){d.panel_scroll(0,true)})},panel_refresh:function(d){this.cols=parseInt($(window).width()/this.options.cell,10)+1;this.frame_insert(null,null,d)},panel_scroll:function(j,d){var f=this.top-this.options.scroll*j;f=Math.max(f,this.top_max);f=Math.min(f,this.options.top_min);if(this.top!=f){for(var e in this.frame_list){var h=this.frame_list[e];if(h.grid_location!==null){var g={top:h.screen_location.top-(this.top-f),left:h.screen_location.left};this.frame_offset(h,g,d)}}this.top=f}this.menu_refresh()},panel_show_hide:function(){if(this.visible){this.visible=false;$(".galaxy-frame").fadeOut("fast");this.button_load.icon("fa-icon-eye-close");this.button_load.untoggle();$(".galaxy-frame-background").hide();$(".galaxy-frame-menu").hide()}else{this.visible=true;$(".galaxy-frame").fadeIn("fast");this.button_load.icon("fa-icon-eye-open");this.button_load.toggle();$(this.galaxy_frame_shadow.id).hide();$(".galaxy-frame-background").show();this.panel_refresh()}},panel_active_disable:function(){if(this.active){this.active=false;this.button_active.untoggle();if(this.visible){this.panel_show_hide()}}else{this.active=true;this.button_active.toggle()}},frame_new:function(e){if(!this.active){if(e.location=="center"){var d=$(window.parent.document).find("iframe#galaxy_main");d.attr("src",e.content)}else{window.location=e.content}return}if(this.frame_counter>=this.options.frame_max){alert("You have reached the maximum number of allowed frames ("+this.options.frame_max+").");return}var f="#galaxy-frame-"+(this.frame_counter_id++);if($(f).length!==0){alert("This frame already exists. This page might contain multiple frame managers.");return}this.top=this.options.top_min;$(this.el).append(this.frame_template(f.substring(1),e.title,e.type,e.content));var g={id:f,screen_location:{},grid_location:{},grid_rank:null,grid_lock:false};e.width=this.to_pixel_coord("width",this.options.frame.cols);e.height=this.to_pixel_coord("height",this.options.frame.rows);this.frame_list[f]=g;this.frame_counter++;this.frame_resize(g,{width:e.width,height:e.height});this.frame_insert(g,{top:0,left:0},true);if(!this.visible){this.panel_show_hide()}},frame_insert:function(k,d,g){var e=[];if(k){k.grid_location=null;e.push([k,this.location_rank(d)])}var h=null;for(h in this.frame_list){var j=this.frame_list[h];if(j.grid_location!==null&&!j.grid_lock){j.grid_location=null;e.push([j,j.grid_rank])}}e.sort(function(l,f){var n=l[1];var m=f[1];return n<m?-1:(n>m?1:0)});for(h=0;h<e.length;h++){this.frame_place(e[h][0],g)}this.top_max=0;for(var h in this.frame_list){var k=this.frame_list[h];if(k.grid_location!==null){this.top_max=Math.max(this.top_max,k.grid_location.top+k.grid_location.height)}}this.top_max=$(window).height()-this.top_max*this.options.cell-2*this.options.margin;this.top_max=Math.min(this.top_max,this.options.top_min);this.menu_refresh()},frame_place:function(l,e){l.grid_location=null;var k=this.to_grid(this.frame_screen(l));var d=false;for(var h=0;h<this.options.rows;h++){for(var f=0;f<Math.max(1,this.cols-k.width);f++){k.top=h;k.left=f;if(!this.is_collision(k)){d=true;break}}if(d){break}}if(d){this.frame_grid(l,k,e)}else{console.log("Grid dimensions exceeded.")}},frame_focus:function(f,d){var e=parseInt(b.get_attribute("galaxy-frame","z-index"))+(d?1:0);$(f.id).css("z-index",e)},frame_offset:function(g,f,e){g.screen_location.left=f.left;g.screen_location.top=f.top;if(e){this.frame_focus(g,true);var d=this;$(g.id).animate({top:f.top,left:f.left},"fast",function(){d.frame_focus(g,false)})}else{$(g.id).css({top:f.top,left:f.left})}},frame_resize:function(e,d){$(e.id).css({width:d.width,height:d.height});e.screen_location.width=d.width;e.screen_location.height=d.height},frame_grid:function(f,d,e){f.grid_location=d;this.frame_offset(f,this.to_pixel(d),e);f.grid_rank=this.location_rank(d)},frame_screen:function(e){var d=e.screen_location;return{top:d.top,left:d.left,width:d.width,height:d.height}},frame_template:function(g,f,d,e){if(!f){f=""}if(d=="url"){e='<iframe scrolling="auto" class="f-iframe" src="'+e+'"></iframe>'}return'<div id="'+g+'" class="galaxy-frame galaxy-corner"><div class="f-header galaxy-corner"><span class="f-title">'+f+'</span><span class="f-icon f-pin fa-icon-pushpin"></span><span class="f-icon f-close fa-icon-trash"></span></div><div class="f-content galaxy-corner">'+e+'<div class="f-cover"></div></div><span class="f-resize f-icon galaxy-corner fa-icon-resize-full"></span></div>'},frame_template_shadow:function(d){return'<div id="'+d+'" class="galaxy-frame-shadow galaxy-corner"></div>'},frame_template_background:function(){return'<div class="galaxy-frame-background"></div>'},frame_template_header:function(){return'<div class="galaxy-frame-load f-corner"><div class="number f-corner">0</div><div class="icon fa-icon-2x"></div></div><div class="galaxy-frame-active f-corner"><div class="icon fa-icon-2x fa-icon-th"></div></div>'},frame_template_menu:function(){return'<div class="galaxy-frame-scroll-up galaxy-frame-menu fa-icon-chevron-up fa-icon-2x"></div><div class="galaxy-frame-scroll-down galaxy-frame-menu fa-icon-chevron-down fa-icon-2x"></div>'}});return{GalaxyFrameManager:a}}); \ No newline at end of file diff -r 8bcdf94c187a717731d714d9e7c64e747966ed36 -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 static/scripts/packed/galaxy.master.js --- a/static/scripts/packed/galaxy.master.js +++ b/static/scripts/packed/galaxy.master.js @@ -1,1 +1,1 @@ -define(["utils/galaxy.css","libs/backbone/backbone-relational"],function(b){var a=Backbone.View.extend({el_master:".masthead-inner",initialize:function(d){b.load_file("static/style/galaxy.master.css");this.setElement($(this.template()));$(this.el_master).append($(this.el))},events:{mousedown:function(d){d.preventDefault()}},append:function(d){$(this.el).append($(d.el))},prepend:function(d){$(this.el).prepend($(d.el))},template:function(){return'<div id="galaxy-master" class="galaxy-master"></div>'}});var c=Backbone.View.extend({options:{id:"galaxy-icon",icon:"fa-icon-cog",tooltip:"galaxy-icon",with_number:false,on_click:function(){alert("clicked")},visible:true},initialize:function(e){if(e){this.options=_.defaults(e,this.options)}this.setElement($(this.template(this.options)));var d=this;$(this.el).find(".icon").tooltip({title:this.options.tooltip}).on("click",d.options.on_click);if(!this.options.visible){this.hide()}},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},icon:function(d){$(this.el).find(".icon").removeClass(this.options.icon).addClass(d);this.options.icon=d},toggle:function(){$(this.el).addClass("galaxy-toggle")},untoggle:function(){$(this.el).removeClass("galaxy-toggle")},number:function(d){$(this.el).find(".number").text(d)},template:function(e){var d="<div id="+e.id+' class="galaxy-icon galaxy-corner"><div class="icon fa-icon-2x '+e.icon+'"></div>';if(e.with_number){d+='<div class="number galaxy-corner"></div>'}d+="</div>";return d}});return{GalaxyMaster:a,GalaxyMasterIcon:c}}); \ No newline at end of file +define(["libs/backbone/backbone-relational"],function(){var a=Backbone.View.extend({el_master:"#masthead",initialize:function(c){this.setElement($(this.template()));$(this.el_master).append($(this.el))},events:{mousedown:function(c){c.preventDefault()}},append:function(c){$(this.el).append($(c.el))},prepend:function(c){$(this.el).prepend($(c.el))},template:function(){return'<div class="iconbar"></div>'}});var b=Backbone.View.extend({options:{id:"galaxy-icon",icon:"fa-icon-cog",tooltip:"galaxy-icon",with_number:false,on_click:function(){alert("clicked")},visible:true},initialize:function(d){if(d){this.options=_.defaults(d,this.options)}this.setElement($(this.template(this.options)));var c=this;$(this.el).find(".icon").tooltip({title:this.options.tooltip}).on("click",c.options.on_click);if(!this.options.visible){this.hide()}},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},icon:function(c){$(this.el).find(".icon").removeClass(this.options.icon).addClass(c);this.options.icon=c},toggle:function(){$(this.el).addClass("toggle")},untoggle:function(){$(this.el).removeClass("toggle")},number:function(c){$(this.el).find(".number").text(c)},template:function(d){var c="<div id="+d.id+' class="symbol"><div class="icon fa-icon-2x '+d.icon+'"></div>';if(d.with_number){c+='<div class="number"></div>'}c+="</div>";return c}});return{GalaxyMaster:a,GalaxyMasterIcon:b}}); \ No newline at end of file diff -r 8bcdf94c187a717731d714d9e7c64e747966ed36 -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 static/scripts/packed/galaxy.modal.js --- a/static/scripts/packed/galaxy.modal.js +++ b/static/scripts/packed/galaxy.modal.js @@ -1,1 +1,1 @@ -define(["utils/galaxy.css","libs/backbone/backbone-relational"],function(a){var b=Backbone.View.extend({el_main:"#everything",options:{title:"galaxy-modal",body:"No content available."},initialize:function(d){if(!d){d=this.options}else{d=_.defaults(d,this.options)}this.setElement(this.template(d.title,d.body));$(this.el_main).append($(this.el));var e=(this.$el).find(".footer");var c=this;if(d.buttons){$.each(d.buttons,function(f,g){e.append($("<button></button>").text(f).click(g)).append(" ")})}else{e.append($("<button></button>").text("Close").click(function(){c.hide()})).append(" ")}$(this.el).hide()},events:{"mousedown .dialog":"event_default","mousedown .background":"hide"},event_default:function(c){c.preventDefault()},show:function(){this.$el.fadeIn("fast")},hide:function(){this.$el.fadeOut("fast")},destroy:function(){this.$el.remove()},template:function(d,c){return'<div class="modal"><div class="modal-backdrop"></div><div class="modal-dialog galaxy-corner"><div class="modal-content"><div class="header"><span><h3 class="title">'+d+'</h3></span></div><div class="body">'+c+'</div><div class="footer"></div></div</div></div>'}});return{GalaxyModal:b}}); \ No newline at end of file +define(["libs/backbone/backbone-relational"],function(){var a=Backbone.View.extend({el_main:"#everything",options:{title:"galaxy-modal",body:"No content available."},initialize:function(b){if(b){this.create(b);$(this.el).hide()}},show:function(b){if(b){this.create(b)}this.$el.fadeIn("fast")},hide:function(){this.$el.fadeOut("fast")},create:function(c){this.$el.remove();if(!c){c=this.options}else{c=_.defaults(c,this.options)}this.setElement(this.template(c.title,c.body));$(this.el_main).append($(this.el));var d=(this.$el).find(".footer");var b=this;if(c.buttons){$.each(c.buttons,function(e,f){d.append($("<button></button>").text(e).click(f)).append(" ")})}else{d.append($("<button></button>").text("Close").click(function(){b.hide()})).append(" ")}},template:function(c,b){return'<div class="modal"><div class="modal-backdrop"></div><div class="modal-dialog galaxy-corner"><div class="modal-content"><div class="header"><span><h3 class="title">'+c+'</h3></span></div><div class="body">'+b+'</div><div class="footer"></div></div</div></div>'}});return{GalaxyModal:a}}); \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: guerler: Remove galaxy.master.css and integrate style def into base.less
by commits-noreply＠bitbucket.org 12 Sep '13

12 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8bcdf94c187a/ Changeset: 8bcdf94c187a User: guerler Date: 2013-09-12 17:57:37 Summary: Remove galaxy.master.css and integrate style def into base.less Affected #: 7 files diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/scripts/galaxy.frame.js --- a/static/scripts/galaxy.frame.js +++ b/static/scripts/galaxy.frame.js @@ -37,7 +37,7 @@ top_min: 40, // maximum number of frames - frame_max: 10 + frame_max: 9 }, // number of columns @@ -800,7 +800,7 @@ } // check for number of frames - if (this.frame_counter > this.options.frame_max) + if (this.frame_counter >= this.options.frame_max) { alert("You have reached the maximum number of allowed frames (" + this.options.frame_max + ")."); return; diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/scripts/galaxy.master.js --- a/static/scripts/galaxy.master.js +++ b/static/scripts/galaxy.master.js @@ -3,20 +3,17 @@ */ // dependencies -define(["utils/galaxy.css", "libs/backbone/backbone-relational"], function(css) { +define(["libs/backbone/backbone-relational"], function() { // master var GalaxyMaster = Backbone.View.extend( { // base element - el_master: '.masthead-inner', + el_master: '#masthead', // initialize initialize : function(options) { - // load required css files - css.load_file("static/style/galaxy.master.css"); - // define this element this.setElement($(this.template())); @@ -49,7 +46,7 @@ // fill regular modal template template: function() { - return '<div id="galaxy-master" class="galaxy-master"></div>'; + return '<div class="iconbar"></div>'; } }); @@ -113,13 +110,13 @@ // toggle toggle: function() { - $(this.el).addClass('galaxy-toggle'); + $(this.el).addClass('toggle'); }, // untoggle untoggle: function() { - $(this.el).removeClass('galaxy-toggle'); + $(this.el).removeClass('toggle'); }, // set/get number @@ -131,10 +128,10 @@ // fill template icon template: function (options) { - var tmpl = '<div id=' + options.id + ' class="galaxy-icon galaxy-corner">' + + var tmpl = '<div id=' + options.id + ' class="symbol">' + '<div class="icon fa-icon-2x ' + options.icon + '"></div>'; if (options.with_number) - tmpl+= '<div class="number galaxy-corner"></div>'; + tmpl+= '<div class="number"></div>'; tmpl += '</div>'; // return template diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/scripts/galaxy.modal.js --- a/static/scripts/galaxy.modal.js +++ b/static/scripts/galaxy.modal.js @@ -3,7 +3,7 @@ */ // dependencies -define(["utils/galaxy.css", "libs/backbone/backbone-relational"], function(css) { +define(["libs/backbone/backbone-relational"], function() { // frame manager var GalaxyModal = Backbone.View.extend( @@ -21,6 +21,40 @@ // initialize initialize : function(options) { + // create + if (options) + { + this.create(options); + + // hide + $(this.el).hide(); + } + }, + + // adds and displays a new frame/window + show: function(options) + { + // create + if (options) + this.create(options); + + // fade out + this.$el.fadeIn('fast'); + }, + + // hide modal + hide: function() + { + // fade out + this.$el.fadeOut('fast'); + }, + + // destroy modal + create: function (options) + { + // remove element + this.$el.remove(); + // read in defaults if (!options) options = this.options; @@ -48,47 +82,6 @@ } else // default close button footer.append($('<button></button>').text('Close').click(function() { self.hide() })).append(" "); - - // hide - $(this.el).hide(); - }, - - /* - EVENT HANDLING - */ - - // event - events: - { - 'mousedown .dialog' : 'event_default', - 'mousedown .background' : 'hide' - }, - - // drag - event_default: function (e) - { - e.preventDefault(); - }, - - // adds and displays a new frame/window - show: function() - { - // fade out - this.$el.fadeIn('fast'); - }, - - // hide modal - hide: function() - { - // fade out - this.$el.fadeOut('fast'); - }, - - // destroy modal - destroy: function () - { - // remove element - this.$el.remove(); }, /* diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1145,11 +1145,14 @@ .panel-warning-message{background-image:url(warn_small.png);background-color:#fce1ba} .panel-done-message{background-image:url(ok_small.png);background-color:#aff1af} .panel-info-message{background-image:url(info_small.png);background-color:#a6e4f7} -#masthead{position:absolute;top:0;left:0;width:100%;min-width:900px;padding:0}#masthead .nav{z-index:15001} +#masthead{position:absolute;top:0;left:0;width:100%;min-width:920px;padding:0}#masthead .nav{z-index:15001} #masthead .nav>li>a{cursor:pointer;text-decoration:none}#masthead .nav>li>a:hover{color:gold} #masthead li.dropdown>a:hover .caret{border-top-color:gold;border-bottom-color:gold} #masthead .navbar-brand{position:absolute;left:0;top:0;font-family:verdana;font-weight:bold;font-size:20px;line-height:1;color:white;padding:5px 20px 12px;margin-left:-15px;z-index:2000}#masthead .navbar-brand img{display:inline;width:26px;vertical-align:top} #masthead .navbar-brand a{color:white;text-decoration:none} +#masthead .iconbar{position:absolute;top:2px;right:110px;cursor:pointer;color:#ccc;overflow:hidden}#masthead .iconbar .symbol{float:left;margin:0px 8px} +#masthead .iconbar .symbol .number{font-weight:bold;font-size:12px;font-family:"Lucida Grande",verdana,arial,helvetica,sans-serif;position:relative;left:23px;top:-18px} +#masthead .iconbar .toggle{color:#BCC800} .quota-meter-container{position:absolute;top:0;right:0;height:32px} .quota-meter{position:absolute;top:8px;right:8px;height:16px;width:100px;background-color:#f5f5f5} .quota-meter-bar{position:absolute;top:0;left:0;height:16px;background-color:#00f} diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/blue/galaxy.frame.css --- a/static/style/blue/galaxy.frame.css +++ b/static/style/blue/galaxy.frame.css @@ -2,11 +2,6 @@ galaxy generic styles */ -.bs-tooltip -{ - z-index: 34010; -} - .galaxy-corner { -moz-border-radius: 4px; @@ -92,42 +87,6 @@ } /* - panel active button -*/ -.galaxy-frame-active -{ - z-index : 34010; - position : absolute; - top : 2px; - right : 120px; - cursor : pointer; - color : #D0D0D0; -} - -/* - panel load button -*/ -.galaxy-frame-load -{ - z-index : 34010; - position : absolute; - top : 6px; - right : 170px; - cursor : pointer; - color : #BCC800; -} - -.galaxy-frame-load .number -{ - position : absolute; - font-weight : bold; - font-size : 12px; - font-family : Verdana, Arial; - top : 8px; - left : 26px; -} - -/* frame components */ .galaxy-frame .f-content @@ -175,7 +134,7 @@ .galaxy-frame .f-title { position : absolute; - top : 4px; + top : 2px; left : 16px; right : 16px; font-size : 12px; @@ -202,13 +161,13 @@ .galaxy-frame .f-close { right : 5px; - top : 4px; + top : 1px; } .galaxy-frame .f-pin { left : 6px; - top : 4px; + top : 1px; } .galaxy-frame .f-resize diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/blue/galaxy.master.css --- a/static/style/blue/galaxy.master.css +++ /dev/null @@ -1,30 +0,0 @@ -/* - galaxy master -*/ -.galaxy-master -{ - position : absolute; - top : 0px; - right : 100px; - cursor : pointer; - color : #D0D0D0; - overflow : hidden; - z-index : 34010; - padding : 8px; -} - -.galaxy-icon -{ - float : left; - margin : 0px 10px; -} - -.galaxy-icon .number -{ - font-weight : bold; - font-size : 12px; - font-family : Verdana, Arial; - position : relative; - left : 23px; - top : -9px; -} \ No newline at end of file diff -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 -r 8bcdf94c187a717731d714d9e7c64e747966ed36 static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -318,7 +318,7 @@ top:0; left:0; width:100%; - min-width:900px; + min-width:920px; padding: 0; .nav { @@ -368,6 +368,37 @@ text-decoration: none; } } + + .iconbar + { + position : absolute; + top : 2px; + right : 110px; + cursor : pointer; + color : @navbar-default-toggle-icon-bar-bg; + overflow : hidden; + + .symbol + { + float : left; + margin : 0px 8px; + } + + .symbol .number + { + font-weight : bold; + font-size : 12px; + font-family : @font-family-sans-serif; + position : relative; + left : 23px; + top : -18px; + } + + .toggle + { + color : #BCC800;; + } + } } Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: dan: Fix for unicode values in rst_to_html.
by commits-noreply＠bitbucket.org 12 Sep '13

12 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ea0c57f1cdf0/ Changeset: ea0c57f1cdf0 User: dan Date: 2013-09-12 16:55:16 Summary: Fix for unicode values in rst_to_html. Affected #: 1 file diff -r 13a0dffd3422178b5ae46afdb9aeb819680b8e61 -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -444,9 +444,9 @@ def write( self, str ): if len( str ) > 0 and not str.isspace(): log.warn( str ) - return docutils.core.publish_string(s, + return unicodify( docutils.core.publish_string( s, writer=docutils.writers.html4css1.Writer(), - settings_overrides={"embed_stylesheet": False, "template": os.path.join(os.path.dirname(__file__), "docutils_template.txt"), "warning_stream": FakeStream()}) + settings_overrides={ "embed_stylesheet": False, "template": os.path.join(os.path.dirname(__file__), "docutils_template.txt"), "warning_stream": FakeStream() } ) ) def xml_text(root, name=None): """Returns the text inside an element""" Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0

commit/galaxy-central: dan: Fix for new styles in ToolShed masthead.
by commits-noreply＠bitbucket.org 11 Sep '13

11 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/13a0dffd3422/ Changeset: 13a0dffd3422 User: dan Date: 2013-09-11 23:33:21 Summary: Fix for new styles in ToolShed masthead. Affected #: 1 file diff -r e1c5eeed1bd6ba5c66dce308e69e44e6edea920f -r 13a0dffd3422178b5ae46afdb9aeb819680b8e61 templates/webapps/tool_shed/base_panels.mako --- a/templates/webapps/tool_shed/base_panels.mako +++ b/templates/webapps/tool_shed/base_panels.mako @@ -10,11 +10,14 @@ ## Masthead <%def name="masthead()"> + ## start main tag + <div id="masthead" class="navbar navbar-fixed-top navbar-inverse"> + ## Tab area, fills entire width <div style="position: relative; right: -50%; float: left;"><div style="display: block; position: relative; right: 50%;"> - <ul class="nav" border="0" cellspacing="0"> + <ul class="nav navbar-nav" border="0" cellspacing="0"><%def name="tab( id, display, href, target='_parent', visible=True, extra_class='', menu_options=None )"><% @@ -121,7 +124,7 @@ </div> ## Logo, layered over tabs to be clickable - <div class="title"> + <div class="navbar-brand"><a href="${h.url_for( app.config.get( 'logo_url', '/' ) )}"><img border="0" src="${h.url_for('/static/images/galaxyIcon_noText.png')}"> Galaxy Tool Shed @@ -130,4 +133,7 @@ %endif </a></div> + + ## end main tag + </div></%def> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.

1 0