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

commit/galaxy-central: james_taylor: remove accidently committed variable override
by commits-noreply＠bitbucket.org 27 Sep '13

27 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/64a8b5cdd905/ Changeset: 64a8b5cdd905 User: james_taylor Date: 2013-09-27 19:30:39 Summary: remove accidently committed variable override Affected #: 1 file diff -r ddc870bbff1505bb226cf310f068798063aa7acb -r 64a8b5cdd905978ae383a5f77ce9d34bcb91d450 templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -7,7 +7,6 @@ self.show_inactivity_warning = False if trans.webapp.name == 'galaxy' and trans.user: self.show_inactivity_warning = ( ( trans.user.active is False ) and ( app.config.user_activation_on ) and ( app.config.inactivity_box_content is not None ) ) - self.show_inactivity_warning = True self.overlay_visible=False self.active_view=None self.body_class="" 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: james_taylor: style: cleaning up display logic and styles for message and inactivity box
by commits-noreply＠bitbucket.org 27 Sep '13

27 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ddc870bbff15/ Changeset: ddc870bbff15 User: james_taylor Date: 2013-09-27 19:29:57 Summary: style: cleaning up display logic and styles for message and inactivity box Affected #: 3 files diff -r 5337e71047572cd6b7dd812d74ff1513527b6897 -r ddc870bbff1505bb226cf310f068798063aa7acb static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -755,7 +755,7 @@ pre{overflow:auto;word-wrap:normal;white-space:pre} .dropdown-menu{max-width:auto} input[type="checkbox"],input[type="radio"]{margin-left:0.5ex;margin-right:0.5ex} -.modal-dialog{width:680px} +.modal-dialog{width:690px} .modal-body{overflow:auto} .nav-tabs{margin-bottom:15px} a{text-decoration:underline} @@ -1146,6 +1146,9 @@ #center{left:250px;right:250px;overflow:hidden;z-index:1} #right-border{right:250px} #right{width:250px;right:0px;z-index:200;border-left:solid #999 1px} +body.has-message-box #left,body.has-inactivity-box #left,body.has-message-box #left-border,body.has-inactivity-box #left-border,body.has-message-box #center,body.has-inactivity-box #center,body.has-message-box #right-border,body.has-inactivity-box #right-border,body.has-message-box #right,body.has-inactivity-box #right{top:64px} +body.has-message-box.has-inactivity-box #left,body.has-message-box.has-inactivity-box #left-border,body.has-message-box.has-inactivity-box #center,body.has-message-box.has-inactivity-box #right-border,body.has-message-box.has-inactivity-box #right{top:94px} +body.has-message-box.has-inactivity-box #inactivebox{top:64px} .subnavbar{background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), color-stop(25%, #fff), to(#e6e6e6));background-image:-webkit-linear-gradient(#fff, #fff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #fff, #fff 25%, #e6e6e6);background-image:linear-gradient(#fff, #fff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-bottom:solid #bfbfbf 1px;border-top:solid #bfbfbf 1px;padding:5px;color:#555} .unified-panel-header{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;height:30px;z-index:1000;text-shadow:rgba(255,255,255,0.8) 0 1px 0;background:#eee;border-bottom:solid #999 1px;margin:0;padding:0;padding-right:10px;padding-left:10px;font-weight:bold;color:#555}.unified-panel-header a{color:#555} .unified-panel-header-inner{padding-top:8px} @@ -1165,7 +1168,7 @@ .panel-header-button .caret{margin-top:7px} .panel-header-button.popup{padding-right:1.75em;background:url(../images/dropdownarrow.png) no-repeat right 7px} #DD-helper{background:white;opacity:0;z-index:900;position:absolute;top:0;left:0;width:100%;height:100%} -.panel-error-message,.panel-warning-message,.panel-done-message,.panel-info-message{height:24px;line-height:24px;padding:0px;padding-left:26px;background-color:#f9c7c5;background-image:url(error_small.png);background-repeat:no-repeat;background-position:6px 50%} +.panel-error-message,.panel-warning-message,.panel-done-message,.panel-info-message{height:30px;line-height:30px;padding:0px;padding-left:26px;background-color:#f9c7c5;background-image:url(error_small.png);background-repeat:no-repeat;background-position:6px 50%} .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} @@ -1233,7 +1236,7 @@ .search-query:focus{border-color:rgba(24,132,218,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);outline:0;outline:thin dotted \9;} .search-spinner{position:absolute;display:none;right:6px;top:9px} #search-clear-btn{position:absolute;right:6px;top:8px;display:block;font-size:1.4em;text-decoration:none;color:#888;font-family:FontAwesome;font-size:1.1666666666666667em;background-image:none !important;background-position:0% 0%;background-repeat:repeat}#search-clear-btn:before{content:"\f057"} -.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:15px;margin-bottom:17px;border:1px solid transparent;border-radius:3px;min-height:36px;padding-left:52px;background-image:url(error_large.png);background-repeat:no-repeat;background-position:10px 10px}.errormessagelarge h4,.warningmessagelarge h4,.donemessagelarge h4,.infomessagelarge h4{margin-top:0;color:inherit} +.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:15px;margin-bottom:17px;border:1px solid transparent;border-radius:3px;min-height:36px;padding-left:52px;background-image:url(error_large.png);background-repeat:no-repeat;background-position:10px 8px}.errormessagelarge h4,.warningmessagelarge h4,.donemessagelarge h4,.infomessagelarge h4{margin-top:0;color:inherit} .errormessagelarge .alert-link,.warningmessagelarge .alert-link,.donemessagelarge .alert-link,.infomessagelarge .alert-link{font-weight:bold} .errormessagelarge>p,.warningmessagelarge>p,.donemessagelarge>p,.infomessagelarge>p,.errormessagelarge>ul,.warningmessagelarge>ul,.donemessagelarge>ul,.infomessagelarge>ul{margin-bottom:0} .errormessagelarge>p+p,.warningmessagelarge>p+p,.donemessagelarge>p+p,.infomessagelarge>p+p{margin-top:5px} diff -r 5337e71047572cd6b7dd812d74ff1513527b6897 -r ddc870bbff1505bb226cf310f068798063aa7acb static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -57,6 +57,14 @@ // ==== Panel layout styles ==== +@panel-message-height: 30px; + +@layout_top_padding: 0px; +@border-default-color_padding: 0px; + +@panel_header_height: 30px; +@panel_footer_height: 25px; + #background { position: absolute; background: #fff; @@ -74,7 +82,7 @@ top: @navbar-height + @layout_top_padding + 1; left:0; width:100%; - height: @panel_header_height !important; + height: @panel-message-height !important; overflow: hidden; border-bottom: solid #999 1px; font-size: 90%; @@ -85,18 +93,12 @@ top: @navbar-height + @layout_top_padding + 1; left:0; width:100%; - height: @panel_header_height !important; + height: @panel-message-height !important; overflow: hidden; border-bottom: solid #999 1px; font-size: 90%; } -@layout_top_padding: 0px; -@border-default-color_padding: 0px; - -@panel_header_height: 30px; -@panel_footer_height: 25px; - // Panels #left, #left-border, #center, #right-border, #right { @@ -134,6 +136,23 @@ border-left: solid @layout-border-color 1px; } +// If the message box or inactivity box is visible +body.has-message-box, body.has-inactivity-box { + #left, #left-border, #center, #right-border, #right { + top: @panel-message-height + @navbar-height + @layout_top_padding + 1; + } +} + +// If both are visible +body.has-message-box.has-inactivity-box { + #left, #left-border, #center, #right-border, #right { + top: 2 * @panel-message-height + @navbar-height + @layout_top_padding + 1; + } + #inactivebox { + top: @panel-message-height + @navbar-height + @layout_top_padding + 1; + } +} + .subnavbar { #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); border-bottom: solid @border-default-color 1px; @@ -299,8 +318,8 @@ .panel-error-message, .panel-warning-message, .panel-done-message, .panel-info-message { - height: 24px; - line-height: 24px; + height: @panel-message-height; + line-height: @panel-message-height; padding: 0px; padding-left: 26px; background-color: @state-danger-bg; @@ -731,7 +750,7 @@ padding-left: 52px; background-image: url(error_large.png); background-repeat: no-repeat; - background-position: 10px 10px; + background-position: 10px 8px; } .errormessagelarge { diff -r 5337e71047572cd6b7dd812d74ff1513527b6897 -r ddc870bbff1505bb226cf310f068798063aa7acb templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -7,6 +7,7 @@ self.show_inactivity_warning = False if trans.webapp.name == 'galaxy' and trans.user: self.show_inactivity_warning = ( ( trans.user.active is False ) and ( app.config.user_activation_on ) and ( app.config.inactivity_box_content is not None ) ) + self.show_inactivity_warning = True self.overlay_visible=False self.active_view=None self.body_class="" @@ -294,7 +295,15 @@ ${self.javascripts()} </head> - <body scroll="no" class="full-content ${self.body_class}"> + <% + body_class = self.body_class + if self.message_box_visible: + body_class += " has-message-box" + if self.show_inactivity_warning: + body_class += " has-inactivity-box" + %> + + <body scroll="no" class="full-content ${body_class}"> %if self.require_javascript: <noscript><div class="overlay overlay-background"> @@ -312,16 +321,14 @@ <div id="masthead" class="navbar navbar-fixed-top navbar-inverse"> ${self.masthead()} </div> - %if self.message_box_visible and app.config.message_box_content: <div id="messagebox" class="panel-${app.config.message_box_class}-message"> - ${app.config.message_box_content} + ${app.config.message_box_content} </div> - %endif - %if self.show_inactivity_warning: - <div id="inactivebox" class="panel-warning-message"> + %if self.show_inactivity_warning: + <div id="inactivebox" class="panel-warning-message"> ${app.config.inactivity_box_content} - </div> - %endif + </div> + %endif ${self.overlay(visible=self.overlay_visible)} %if self.has_left_panel: <div id="left"> 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: james_taylor: modal: Restore wider width, allow a close button in the title bar
by commits-noreply＠bitbucket.org 27 Sep '13

27 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5337e7104757/ Changeset: 5337e7104757 User: james_taylor Date: 2013-09-27 19:01:24 Summary: modal: Restore wider width, allow a close button in the title bar Affected #: 4 files diff -r eb61a8316af6a9886a1821cab129c1bfedb11665 -r 5337e71047572cd6b7dd812d74ff1513527b6897 static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js +++ b/static/scripts/galaxy.panels.js @@ -125,15 +125,22 @@ this.$body = this.$dialog.find( ".modal-body" ); this.$footer = this.$dialog.find( ".modal-footer" ); this.$backdrop = options.backdrop; + // Close button + this.$header.find( ".close" ).on( "click", $.proxy( this.hide, this ) ); } $.extend( Modal.prototype, { setContent: function( options ) { + this.$header.hide(); // Title if ( options.title ) { this.$header.find( ".title" ).html( options.title ); this.$header.show(); + } + if ( options.closeButton ) { + this.$header.find( ".close" ).show(); + this.$header.show(); } else { - this.$header.hide(); + this.$header.find( ".close" ).hide(); } // Buttons this.$footer.hide(); @@ -223,8 +230,8 @@ hide_modal(); $("#overlay-background").unbind( "click.overlay" ); }); - show_modal( null, $( "<div style='margin: -5px;'><img id='close_button' style='position:absolute;right:-17px;top:-15px;src='" + galaxy_config.root + "static/images/closebox.png'><iframe style='margin: 0; padding: 0;' src='" + options.url + "' width='" + width + "' height='" + height + "' scrolling='" + scroll + "' frameborder='0'></iframe></div>" ) ); - $("#close_button").bind( "click", function() { hide_modal(); } ); + modal.setContent( { closeButton: true, title: " ", body: $( "<div style='margin: -5px;'><iframe style='margin: 0; padding: 0;' src='" + options.url + "' width='" + width + "' height='" + height + "' scrolling='" + scroll + "' frameborder='0'></iframe></div>" ) } ); + modal.show( { backdrop: true } ); } function user_changed( user_email, is_admin ) { diff -r eb61a8316af6a9886a1821cab129c1bfedb11665 -r 5337e71047572cd6b7dd812d74ff1513527b6897 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -755,6 +755,7 @@ pre{overflow:auto;word-wrap:normal;white-space:pre} .dropdown-menu{max-width:auto} input[type="checkbox"],input[type="radio"]{margin-left:0.5ex;margin-right:0.5ex} +.modal-dialog{width:680px} .modal-body{overflow:auto} .nav-tabs{margin-bottom:15px} a{text-decoration:underline} diff -r eb61a8316af6a9886a1821cab129c1bfedb11665 -r 5337e71047572cd6b7dd812d74ff1513527b6897 static/style/src/less/galaxy_bootstrap/overrides.less --- a/static/style/src/less/galaxy_bootstrap/overrides.less +++ b/static/style/src/less/galaxy_bootstrap/overrides.less @@ -27,6 +27,10 @@ // Modal -- wider by default, scroll like Trello +.modal-dialog { + width: 690px; +} + /* NOTE: these styles do not currently work. diff -r eb61a8316af6a9886a1821cab129c1bfedb11665 -r 5337e71047572cd6b7dd812d74ff1513527b6897 templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -261,7 +261,8 @@ <div id="top-modal-dialog" class="modal-dialog"><div class="modal-content"><div class="modal-header"> - <span><h4 class='title'>${title}</h4></span> + <button type='button' class='close' style="display: none;">×</button> + <h4 class='title'>${title}</h4></div><div class="modal-body">${content}</div><div class="modal-footer"> 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: james_taylor: style: primary button style now works for submits and button elements, buttons get a slightly darker background by default, restoring the brand-primary color for components
by commits-noreply＠bitbucket.org 27 Sep '13

27 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/eb61a8316af6/ Changeset: eb61a8316af6 User: james_taylor Date: 2013-09-27 18:24:08 Summary: style: primary button style now works for submits and button elements, buttons get a slightly darker background by default, restoring the brand-primary color for components Affected #: 5 files diff -r dd2d48ae00ad5085fb05719b4c94b0573f4ff663 -r eb61a8316af6a9886a1821cab129c1bfedb11665 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -55,7 +55,7 @@ small{font-size:85%} cite{font-style:normal} .text-muted{color:#999} -.text-primary{color:#00f} +.text-primary{color:#5f6990} .text-warning{color:#80571e} .text-danger{color:#7e2a27} .text-success{color:#295f29} @@ -184,12 +184,12 @@ .btn:hover,.btn:focus{color:#333;text-decoration:none} .btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} .btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none} -.btn-default{color:#333;background-color:#fff;border-color:#bfbfbf}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#a1a1a1} +.btn-default{color:#333;background-color:#f2f2f2;border-color:#bfbfbf}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#dedede;border-color:#a1a1a1} .btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none} -.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#bfbfbf} -.btn-primary{color:#fff;background-color:#00f;border-color:#003}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#0000d6;border-color:#000} +.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#f2f2f2;border-color:#bfbfbf} +.btn-primary{color:#fff;background-color:#5f6990;border-color:#0e0f15}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#4e5777;border-color:#000} .btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none} -.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#00f;border-color:#003} +.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#5f6990;border-color:#0e0f15} .btn-warning{color:#fff;background-color:#bf822c;border-color:#191106}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#9d6b24;border-color:#000} .btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none} .btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#bf822c;border-color:#191106} @@ -422,8 +422,8 @@ .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:12px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto} .dropdown-menu .divider{height:1px;margin:7.5px 0;overflow:hidden;background-color:#e5e5e5} .dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap} -.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#fff;background-color:#303030} -.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#303030} +.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#fff;background-color:#5f6990} +.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#5f6990} .dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999} .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed} .open>.dropdown-menu{display:block} @@ -513,7 +513,7 @@ @media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #bfbfbf;border-radius:3px 3px 0 0} .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}} .nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px} .nav-pills>li+li{margin-left:2px} -.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#303030} +.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#5f6990} .nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0} .nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px} @media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}} @@ -597,7 +597,7 @@ .pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:3px;border-top-left-radius:3px} .pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px} .pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee} -.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#00f;border-color:#00f;cursor:default} +.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#5f6990;border-color:#5f6990;cursor:default} .pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#bfbfbf;cursor:not-allowed} .pagination-lg>li>a,.pagination-lg>li>span{padding:8px 14px;font-size:15px} .pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:5px;border-top-left-radius:5px} @@ -637,7 +637,7 @@ .alert-danger{background-color:#f9c7c5;border-color:#dd1c15;color:#7e2a27}.alert-danger hr{border-top-color:#c61913} .alert-danger .alert-link{color:#571d1b} @-webkit-keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0} to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}.progress{overflow:hidden;height:17px;margin-bottom:17px;background-color:#f5f5f5;border-radius:3px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)} -.progress-bar{float:left;width:0%;height:100%;font-size:11px;color:#fff;text-align:center;background-color:#00f;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease} +.progress-bar{float:left;width:0%;height:100%;font-size:11px;color:#fff;text-align:center;background-color:#5f6990;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease} .progress-striped .progress-bar{background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,0.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,0.15)), color-stop(.75, rgba(255,255,255,0.15)), color-stop(.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:40px 40px} .progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite} .progress-bar-success{background-color:#3f943f}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,0.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,0.15)), color-stop(.75, rgba(255,255,255,0.15)), color-stop(.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)} @@ -659,8 +659,8 @@ .list-group-item>.badge+.badge{margin-right:5px} a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333} a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5} -.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#303030;border-color:#303030}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit} -.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#969696} +.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#5f6990;border-color:#5f6990}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit} +.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#d6d9e4} .list-group-item-heading{margin-top:0;margin-bottom:5px} .list-group-item-text{margin-bottom:0;line-height:1.3} .panel{margin-bottom:17px;background-color:#fff;border:1px solid transparent;border-radius:3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)} @@ -681,8 +681,8 @@ .panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #bfbfbf} .panel-default{border-color:#bfbfbf}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#bfbfbf}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#bfbfbf} .panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bfbfbf} -.panel-primary{border-color:#00f}.panel-primary>.panel-heading{color:#fff;background-color:#00f;border-color:#00f}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#00f} -.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#00f} +.panel-primary{border-color:#5f6990}.panel-primary>.panel-heading{color:#fff;background-color:#5f6990;border-color:#5f6990}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#5f6990} +.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#5f6990} .panel-success{border-color:#20b420}.panel-success>.panel-heading{color:#295f29;background-color:#aff1af;border-color:#20b420}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#20b420} .panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#20b420} .panel-warning{border-color:#e28709}.panel-warning>.panel-heading{color:#80571e;background-color:#fce1ba;border-color:#e28709}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#e28709} @@ -753,7 +753,6 @@ .affix{position:fixed} .navbar-fixed-top .navbar-brand{font-family:Verdana;font-weight:bold;font-size:160%} pre{overflow:auto;word-wrap:normal;white-space:pre} -.btn.active,.btn:active{color:inherit} .dropdown-menu{max-width:auto} input[type="checkbox"],input[type="radio"]{margin-left:0.5ex;margin-right:0.5ex} .modal-body{overflow:auto} @@ -1179,7 +1178,7 @@ #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} +.quota-meter-bar{position:absolute;top:0;left:0;height:16px;background-color:#5f6990} .quota-meter-bar-warn{background-color:#bf822c} .quota-meter-bar-error{background-color:#b93e3a} .quota-meter-text{position:absolute;top:50%;left:0;width:100px;height:16px;margin-top:-6px;text-align:center;z-index:9001;color:#000;white-space:nowrap} @@ -1216,16 +1215,19 @@ select,input,textarea{font:inherit} .form-row select,.form-row textarea,.form-row input[type="text"],.form-row input[type="file"],.form-row input[type="password"]{max-width:90%} textarea,input[type="text"],input[type="password"]{font-size:12px;line-height:1.428571429;border:1px solid #aaa;padding:3px} -input[type="submit"],button{display:inline-block;padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:3px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;color:#333;background-color:#fff;border-color:#bfbfbf}input[type="submit"]:focus,button:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} +input[type="submit"],button{display:inline-block;padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:3px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;color:#333;background-color:#f2f2f2;border-color:#bfbfbf}input[type="submit"]:focus,button:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} input[type="submit"]:hover,button:hover,input[type="submit"]:focus,button:focus{color:#333;text-decoration:none} input[type="submit"]:active,button:active,input[type="submit"].active,button.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} input[type="submit"].disabled,button.disabled,input[type="submit"][disabled],button[disabled],fieldset[disabled] input[type="submit"],fieldset[disabled] button{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none} input[type="submit"] [class^="fa-icon-"],button [class^="fa-icon-"],input[type="submit"] [class*=" fa-icon-"],button [class*=" fa-icon-"]{display:inline;line-height:.6em}input[type="submit"] [class^="fa-icon-"].fa-icon-spin,button [class^="fa-icon-"].fa-icon-spin,input[type="submit"] [class*=" fa-icon-"].fa-icon-spin,button [class*=" fa-icon-"].fa-icon-spin{display:inline-block} input[type="submit"] [class^="fa-icon-"].pull-left.fa-icon-2x,button [class^="fa-icon-"].pull-left.fa-icon-2x,input[type="submit"] [class*=" fa-icon-"].pull-left.fa-icon-2x,button [class*=" fa-icon-"].pull-left.fa-icon-2x,input[type="submit"] [class^="fa-icon-"].pull-right.fa-icon-2x,button [class^="fa-icon-"].pull-right.fa-icon-2x,input[type="submit"] [class*=" fa-icon-"].pull-right.fa-icon-2x,button [class*=" fa-icon-"].pull-right.fa-icon-2x{margin-top:.35em} input[type="submit"] [class^="fa-icon-"].fa-icon-spin.icon-large,button [class^="fa-icon-"].fa-icon-spin.icon-large,input[type="submit"] [class*=" fa-icon-"].fa-icon-spin.icon-large,button [class*=" fa-icon-"].fa-icon-spin.icon-large{height:.75em} -input[type="submit"]:hover,button:hover,input[type="submit"]:focus,button:focus,input[type="submit"]:active,button:active,input[type="submit"].active,button.active,.open .dropdown-toggleinput[type="submit"],.open .dropdown-togglebutton{color:#333;background-color:#ebebeb;border-color:#a1a1a1} +input[type="submit"]:hover,button:hover,input[type="submit"]:focus,button:focus,input[type="submit"]:active,button:active,input[type="submit"].active,button.active,.open .dropdown-toggleinput[type="submit"],.open .dropdown-togglebutton{color:#333;background-color:#dedede;border-color:#a1a1a1} input[type="submit"]:active,button:active,input[type="submit"].active,button.active,.open .dropdown-toggleinput[type="submit"],.open .dropdown-togglebutton{background-image:none} -input[type="submit"].disabled,button.disabled,input[type="submit"][disabled],button[disabled],fieldset[disabled] input[type="submit"],fieldset[disabled] button,input[type="submit"].disabled:hover,button.disabled:hover,input[type="submit"][disabled]:hover,button[disabled]:hover,fieldset[disabled] input[type="submit"]:hover,fieldset[disabled] button:hover,input[type="submit"].disabled:focus,button.disabled:focus,input[type="submit"][disabled]:focus,button[disabled]:focus,fieldset[disabled] input[type="submit"]:focus,fieldset[disabled] button:focus,input[type="submit"].disabled:active,button.disabled:active,input[type="submit"][disabled]:active,button[disabled]:active,fieldset[disabled] input[type="submit"]:active,fieldset[disabled] button:active,input[type="submit"].disabled.active,button.disabled.active,input[type="submit"][disabled].active,button[disabled].active,fieldset[disabled] input[type="submit"].active,fieldset[disabled] button.active{background-color:#fff;border-color:#bfbfbf} +input[type="submit"].disabled,button.disabled,input[type="submit"][disabled],button[disabled],fieldset[disabled] input[type="submit"],fieldset[disabled] button,input[type="submit"].disabled:hover,button.disabled:hover,input[type="submit"][disabled]:hover,button[disabled]:hover,fieldset[disabled] input[type="submit"]:hover,fieldset[disabled] button:hover,input[type="submit"].disabled:focus,button.disabled:focus,input[type="submit"][disabled]:focus,button[disabled]:focus,fieldset[disabled] input[type="submit"]:focus,fieldset[disabled] button:focus,input[type="submit"].disabled:active,button.disabled:active,input[type="submit"][disabled]:active,button[disabled]:active,fieldset[disabled] input[type="submit"]:active,fieldset[disabled] button:active,input[type="submit"].disabled.active,button.disabled.active,input[type="submit"][disabled].active,button[disabled].active,fieldset[disabled] input[type="submit"].active,fieldset[disabled] button.active{background-color:#f2f2f2;border-color:#bfbfbf} +input[type="submit"].btn-primary,button.btn-primary{color:#fff;background-color:#5f6990;border-color:#0e0f15}input[type="submit"].btn-primary:hover,button.btn-primary:hover,input[type="submit"].btn-primary:focus,button.btn-primary:focus,input[type="submit"].btn-primary:active,button.btn-primary:active,input[type="submit"].btn-primary.active,button.btn-primary.active,.open .dropdown-toggleinput[type="submit"].btn-primary,.open .dropdown-togglebutton.btn-primary{color:#fff;background-color:#4e5777;border-color:#000} +input[type="submit"].btn-primary:active,button.btn-primary:active,input[type="submit"].btn-primary.active,button.btn-primary.active,.open .dropdown-toggleinput[type="submit"].btn-primary,.open .dropdown-togglebutton.btn-primary{background-image:none} +input[type="submit"].btn-primary.disabled,button.btn-primary.disabled,input[type="submit"].btn-primary[disabled],button.btn-primary[disabled],fieldset[disabled] input[type="submit"].btn-primary,fieldset[disabled] button.btn-primary,input[type="submit"].btn-primary.disabled:hover,button.btn-primary.disabled:hover,input[type="submit"].btn-primary[disabled]:hover,button.btn-primary[disabled]:hover,fieldset[disabled] input[type="submit"].btn-primary:hover,fieldset[disabled] button.btn-primary:hover,input[type="submit"].btn-primary.disabled:focus,button.btn-primary.disabled:focus,input[type="submit"].btn-primary[disabled]:focus,button.btn-primary[disabled]:focus,fieldset[disabled] input[type="submit"].btn-primary:focus,fieldset[disabled] button.btn-primary:focus,input[type="submit"].btn-primary.disabled:active,button.btn-primary.disabled:active,input[type="submit"].btn-primary[disabled]:active,button.btn-primary[disabled]:active,fieldset[disabled] input[type="submit"].btn-primary:active,fieldset[disabled] button.btn-primary:active,input[type="submit"].btn-primary.disabled.active,button.btn-primary.disabled.active,input[type="submit"].btn-primary[disabled].active,button.btn-primary[disabled].active,fieldset[disabled] input[type="submit"].btn-primary.active,fieldset[disabled] button.btn-primary.active{background-color:#5f6990;border-color:#0e0f15} .search-query{display:inline-block;padding:4px;font-size:12px;line-height:1.428571429;color:#555;border:1px solid #aaa;padding-left:14px !important;padding-right:14px !important;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;max-width:auto} .search-query:focus{border-color:rgba(24,132,218,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);outline:0;outline:thin dotted \9;} .search-spinner{position:absolute;display:none;right:6px;top:9px} @@ -1317,40 +1319,40 @@ .state-fg-ok{color:#66AA66} .state-fg-error{color:#AA6666} .state-fg-deleted{color:#3399FF} -button{display:inline-block;padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:3px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;color:#333;background-color:#fff;border-color:#bfbfbf}button:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} +button{display:inline-block;padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:3px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;color:#333;background-color:#f2f2f2;border-color:#bfbfbf}button:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} button:hover,button:focus{color:#333;text-decoration:none} button:active,button.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} button.disabled,button[disabled],fieldset[disabled] button{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none} button [class^="fa-icon-"],button [class*=" fa-icon-"]{display:inline;line-height:.6em}button [class^="fa-icon-"].fa-icon-spin,button [class*=" fa-icon-"].fa-icon-spin{display:inline-block} button [class^="fa-icon-"].pull-left.fa-icon-2x,button [class*=" fa-icon-"].pull-left.fa-icon-2x,button [class^="fa-icon-"].pull-right.fa-icon-2x,button [class*=" fa-icon-"].pull-right.fa-icon-2x{margin-top:.35em} button [class^="fa-icon-"].fa-icon-spin.icon-large,button [class*=" fa-icon-"].fa-icon-spin.icon-large{height:.75em} -button:hover,button:focus,button:active,button.active,.open .dropdown-togglebutton{color:#333;background-color:#ebebeb;border-color:#a1a1a1} +button:hover,button:focus,button:active,button.active,.open .dropdown-togglebutton{color:#333;background-color:#dedede;border-color:#a1a1a1} button:active,button.active,.open .dropdown-togglebutton{background-image:none} -button.disabled,button[disabled],fieldset[disabled] button,button.disabled:hover,button[disabled]:hover,fieldset[disabled] button:hover,button.disabled:focus,button[disabled]:focus,fieldset[disabled] button:focus,button.disabled:active,button[disabled]:active,fieldset[disabled] button:active,button.disabled.active,button[disabled].active,fieldset[disabled] button.active{background-color:#fff;border-color:#bfbfbf} -.action-button{display:inline-block;padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:3px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;color:#333;background-color:#fff;border-color:#bfbfbf}.action-button:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} +button.disabled,button[disabled],fieldset[disabled] button,button.disabled:hover,button[disabled]:hover,fieldset[disabled] button:hover,button.disabled:focus,button[disabled]:focus,fieldset[disabled] button:focus,button.disabled:active,button[disabled]:active,fieldset[disabled] button:active,button.disabled.active,button[disabled].active,fieldset[disabled] button.active{background-color:#f2f2f2;border-color:#bfbfbf} +.action-button{display:inline-block;padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:3px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;color:#333;background-color:#f2f2f2;border-color:#bfbfbf}.action-button:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} .action-button:hover,.action-button:focus{color:#333;text-decoration:none} .action-button:active,.action-button.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} .action-button.disabled,.action-button[disabled],fieldset[disabled] .action-button{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none} .action-button [class^="fa-icon-"],.action-button [class*=" fa-icon-"]{display:inline;line-height:.6em}.action-button [class^="fa-icon-"].fa-icon-spin,.action-button [class*=" fa-icon-"].fa-icon-spin{display:inline-block} .action-button [class^="fa-icon-"].pull-left.fa-icon-2x,.action-button [class*=" fa-icon-"].pull-left.fa-icon-2x,.action-button [class^="fa-icon-"].pull-right.fa-icon-2x,.action-button [class*=" fa-icon-"].pull-right.fa-icon-2x{margin-top:.35em} .action-button [class^="fa-icon-"].fa-icon-spin.icon-large,.action-button [class*=" fa-icon-"].fa-icon-spin.icon-large{height:.75em} -.action-button:hover,.action-button:focus,.action-button:active,.action-button.active,.open .dropdown-toggle.action-button{color:#333;background-color:#ebebeb;border-color:#a1a1a1} +.action-button:hover,.action-button:focus,.action-button:active,.action-button.active,.open .dropdown-toggle.action-button{color:#333;background-color:#dedede;border-color:#a1a1a1} .action-button:active,.action-button.active,.open .dropdown-toggle.action-button{background-image:none} -.action-button.disabled,.action-button[disabled],fieldset[disabled] .action-button,.action-button.disabled:hover,.action-button[disabled]:hover,fieldset[disabled] .action-button:hover,.action-button.disabled:focus,.action-button[disabled]:focus,fieldset[disabled] .action-button:focus,.action-button.disabled:active,.action-button[disabled]:active,fieldset[disabled] .action-button:active,.action-button.disabled.active,.action-button[disabled].active,fieldset[disabled] .action-button.active{background-color:#fff;border-color:#bfbfbf} +.action-button.disabled,.action-button[disabled],fieldset[disabled] .action-button,.action-button.disabled:hover,.action-button[disabled]:hover,fieldset[disabled] .action-button:hover,.action-button.disabled:focus,.action-button[disabled]:focus,fieldset[disabled] .action-button:focus,.action-button.disabled:active,.action-button[disabled]:active,fieldset[disabled] .action-button:active,.action-button.disabled.active,.action-button[disabled].active,fieldset[disabled] .action-button.active{background-color:#f2f2f2;border-color:#bfbfbf} a.action-button{color:#333;text-decoration:none} .action-button>img{vertical-align:middle} -.action-button:active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);color:inherit} -.menubutton{padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;border:1px solid transparent;border-radius:3px;white-space:nowrap;user-select:none;color:#333;background-color:#fff;border-color:#bfbfbf;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.menubutton:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} +.action-button:active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} +.menubutton{padding:4px 10px;margin-bottom:0;font-size:12px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;border:1px solid transparent;border-radius:3px;white-space:nowrap;user-select:none;color:#333;background-color:#f2f2f2;border-color:#bfbfbf;display:inline-block;cursor:pointer;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.menubutton:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} .menubutton:hover,.menubutton:focus{color:#333;text-decoration:none} .menubutton:active,.menubutton.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} .menubutton.disabled,.menubutton[disabled],fieldset[disabled] .menubutton{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none} .menubutton [class^="fa-icon-"],.menubutton [class*=" fa-icon-"]{display:inline;line-height:.6em}.menubutton [class^="fa-icon-"].fa-icon-spin,.menubutton [class*=" fa-icon-"].fa-icon-spin{display:inline-block} .menubutton [class^="fa-icon-"].pull-left.fa-icon-2x,.menubutton [class*=" fa-icon-"].pull-left.fa-icon-2x,.menubutton [class^="fa-icon-"].pull-right.fa-icon-2x,.menubutton [class*=" fa-icon-"].pull-right.fa-icon-2x{margin-top:.35em} .menubutton [class^="fa-icon-"].fa-icon-spin.icon-large,.menubutton [class*=" fa-icon-"].fa-icon-spin.icon-large{height:.75em} -.menubutton:hover,.menubutton:focus,.menubutton:active,.menubutton.active,.open .dropdown-toggle.menubutton{color:#333;background-color:#ebebeb;border-color:#a1a1a1} +.menubutton:hover,.menubutton:focus,.menubutton:active,.menubutton.active,.open .dropdown-toggle.menubutton{color:#333;background-color:#dedede;border-color:#a1a1a1} .menubutton:active,.menubutton.active,.open .dropdown-toggle.menubutton{background-image:none} -.menubutton.disabled,.menubutton[disabled],fieldset[disabled] .menubutton,.menubutton.disabled:hover,.menubutton[disabled]:hover,fieldset[disabled] .menubutton:hover,.menubutton.disabled:focus,.menubutton[disabled]:focus,fieldset[disabled] .menubutton:focus,.menubutton.disabled:active,.menubutton[disabled]:active,fieldset[disabled] .menubutton:active,.menubutton.disabled.active,.menubutton[disabled].active,fieldset[disabled] .menubutton.active{background-color:#fff;border-color:#bfbfbf} -.menubutton:active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);color:inherit} +.menubutton.disabled,.menubutton[disabled],fieldset[disabled] .menubutton,.menubutton.disabled:hover,.menubutton[disabled]:hover,fieldset[disabled] .menubutton:hover,.menubutton.disabled:focus,.menubutton[disabled]:focus,fieldset[disabled] .menubutton:focus,.menubutton.disabled:active,.menubutton[disabled]:active,fieldset[disabled] .menubutton:active,.menubutton.disabled.active,.menubutton[disabled].active,fieldset[disabled] .menubutton.active{background-color:#f2f2f2;border-color:#bfbfbf} +.menubutton:active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} .menubutton:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} .menubutton a{text-decoration:none} .menubutton .label,.menubutton>label{position:relative;display:inline-block;border-right:none;text-decoration:none;text-align:left;max-height:2.857142858;line-height:1.428571429;overflow:hidden;text-overflow:ellipsis} @@ -1406,7 +1408,7 @@ div.historyItemButtons .icon-button.edit:hover{background-image:url(sprite-history-buttons.png);background-position:0px -112px;width:16px;height:16px} div.historyItemButtons .icon-button.edit_disabled{background-image:url(sprite-history-buttons.png);background-position:0px -128px;width:16px;height:16px} div.historyItemBody div{padding-top:2px} -pre.peek{background:white;color:black;width:100%;font-size:10px;overflow:auto}pre.peek th{color:white;background:#00f} +pre.peek{background:white;color:black;width:100%;font-size:10px;overflow:auto}pre.peek th{color:white;background:#5f6990} pre.peek table,pre.peek th,pre.peek tr,pre.peek td{font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:10px} .toolMenuContainer{color:#000;background:#dfe5f9;min-height:100%;padding:5px 10px} div.toolSectionPad{margin:0;padding:0;height:5px;font-size:0px} diff -r dd2d48ae00ad5085fb05719b4c94b0573f4ff663 -r eb61a8316af6a9886a1821cab129c1bfedb11665 static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -671,9 +671,14 @@ padding: 3px; } +// Always style buttons and submits as bootstrap buttons input[type="submit"], button { .btn(); .btn-default(); + // The above overrides the button variants (primary, danger, etc) because it occurs later, redefine btn-primary (bit of a hack) + &.btn-primary { + .btn-primary(); + } } .search-query { diff -r dd2d48ae00ad5085fb05719b4c94b0573f4ff663 -r eb61a8316af6a9886a1821cab129c1bfedb11665 static/style/src/less/galaxy_bootstrap/overrides.less --- a/static/style/src/less/galaxy_bootstrap/overrides.less +++ b/static/style/src/less/galaxy_bootstrap/overrides.less @@ -16,10 +16,6 @@ @btn:hover(); } -.btn.active, .btn:active { - color: inherit; -} - .dropdown-menu { max-width: auto; } diff -r dd2d48ae00ad5085fb05719b4c94b0573f4ff663 -r eb61a8316af6a9886a1821cab129c1bfedb11665 static/style/src/less/galaxy_bootstrap/variables.less --- a/static/style/src/less/galaxy_bootstrap/variables.less +++ b/static/style/src/less/galaxy_bootstrap/variables.less @@ -2,9 +2,7 @@ // Caveat: currently only works for light colored backgrounds, less provides functions (contrast) that could be used to improve this // Base color -- Based on the Galaxy masthead color - @base-color-1: #2C3143; - @base-color-2: lighten(@base-color-1,25%); @base-color-3: lighten(@base-color-1,50%); @@ -164,7 +162,7 @@ @btn-font-weight: normal; @btn-default-color: #333; -@btn-default-bg: @white; +@btn-default-bg: darken(@white,5%); @btn-default-border: @border-default-color; @btn-primary-color: @white; diff -r dd2d48ae00ad5085fb05719b4c94b0573f4ff663 -r eb61a8316af6a9886a1821cab129c1bfedb11665 static/style/src/less/theme/blue.less --- a/static/style/src/less/theme/blue.less +++ b/static/style/src/less/theme/blue.less @@ -11,9 +11,6 @@ @table-border-color: darken(@table-heading-bg,20%); @link-color: #303030; -@component-active-bg: @link-color; - -@brand-primary: blue; @input-border: #aaa; 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: 3 new changesets
by commits-noreply＠bitbucket.org 27 Sep '13

27 Sep '13

3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/aa1f96836c8e/ Changeset: aa1f96836c8e User: dannon Date: 2013-09-27 17:33:44 Summary: Remove toolForm styling from cloudlaunch form -- the border looked bad in this context. Affected #: 1 file diff -r fd9270d776525fafacc2ddd8e0171483b579381c -r aa1f96836c8ef7412bfa72687299d10c5765c8ad templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -183,7 +183,7 @@ <div class="page-container" style="padding: 10px;"><div id="loading_indicator"></div><h2>Launch a Galaxy Cloud Instance</h2> - <div id="launchFormContainer" class="toolForm"> + <div id="launchFormContainer"><form id="cloudlaunch_form" action="${h.url_for( controller='/cloudlaunch', action='launch_instance')}" method="post"><p>To launch a Galaxy Cloud Cluster, enter your AWS Secret https://bitbucket.org/galaxy/galaxy-central/commits/9ed12e2315ce/ Changeset: 9ed12e2315ce User: dannon Date: 2013-09-27 17:57:11 Summary: Use bindings for ajaxStart/ajaxStop in cloudlaunch to be compliant with jquery1.9 Affected #: 1 file diff -r aa1f96836c8ef7412bfa72687299d10c5765c8ad -r 9ed12e2315ce2f6fe1eb845a8f2a21a4ca0e470b templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -118,10 +118,10 @@ }); } }); - $('#loading_indicator').ajaxStart(function(){ - $(this).show('fast'); + $(document).ajaxStart(function(){ + $('#loading_indicator').show('fast'); }).ajaxStop(function(){ - $(this).hide('fast'); + $('#loading_indicator').hide('fast'); }); $('form').ajaxForm({ type: 'POST', https://bitbucket.org/galaxy/galaxy-central/commits/dd2d48ae00ad/ Changeset: dd2d48ae00ad User: dannon Date: 2013-09-27 18:08:58 Summary: Update cloudlaunch form to properly clear error messages, as well as preventing submisison without either a cluster name or existing instance specified. Affected #: 1 file diff -r 9ed12e2315ce2f6fe1eb845a8f2a21a4ca0e470b -r dd2d48ae00ad5085fb05719b4c94b0573f4ff663 templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -127,28 +127,30 @@ type: 'POST', dataType: 'json', beforeSubmit: function(data, form){ - if ($('#id_password').val() != $('#id_password_confirm').val()){ - //Passwords don't match. - form.prepend('<div class="errormessage">Passwords do not match</div>'); - return false; - }else{ - //Clear errors - $('.errormessage').remove() - //Hide the form, show pending box with spinner. - $('#launchFormContainer').hide('fast'); - $('#responsePanel').show('fast'); - } - //Dig up zone info for selected cluster, set hidden input. - //This is not necessary to present to the user though the interface may prove useful. + // Dig up zone info for selected cluster, set hidden input. + // This is not necessary to present to the user though the interface may prove useful. var ei_val = _.find(data, function(f_obj){return f_obj.name === 'existing_instance'}); if( ei_val && (ei_val.value !== "New Cluster")){ var cluster = _.find(cloudlaunch_clusters, function(cluster){return cluster.name === ei_val.value}); var zdata = _.find(data, function(f_obj){return f_obj.name === 'zone'}); zdata.value = cluster.zone; + }else if($('#id_cluster_name').val() === ''){ + // If we're not using an existing cluster, this must be set. + form.prepend('<div class="errormessage">You must specify a cluster name</div>'); + return false; } + if ($('#id_password').val() != $('#id_password_confirm').val()){ + //Passwords don't match. + form.prepend('<div class="errormessage">Passwords do not match</div>'); + return false; + } + // Lastly, clear errors and flip to the response panel. + $('.errormessage').remove() + $('#launchFormContainer').hide('fast'); + $('#responsePanel').show('fast'); }, success: function(data){ - //Success Message, link to key download if required, link to server itself. + // Success Message, link to key download if required, link to server itself. $('#launchPending').hide('fast'); //Set appropriate fields (dns, key, ami) and then display. if(data.kp_material_tag){ 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: Dave Bouvier: Set the job walltime to 10 minutes in the automated repository install and test framework.
by commits-noreply＠bitbucket.org 27 Sep '13

27 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/fd9270d77652/ Changeset: fd9270d77652 User: Dave Bouvier Date: 2013-09-27 17:23:08 Summary: Set the job walltime to 10 minutes in the automated repository install and test framework. Affected #: 1 file diff -r fe0beae12c30d25fcd192a67043aea2b1cfddafb -r fd9270d776525fafacc2ddd8e0171483b579381c test/install_and_test_tool_shed_repositories/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/functional_tests.py @@ -134,6 +134,25 @@ </toolbox> ''' + +job_conf_xml = '''<?xml version="1.0"?> + +<job_conf> + <plugins> + <plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="4"/> + </plugins> + <handlers> + <handler id="main"/> + </handlers> + <destinations> + <destination id="local" runner="local"/> + </destinations> + <limits> + <limit type="walltime">00:10:00</limit> + </limits> +</job_conf> +''' + # If we have a tool_data_table_conf.test.xml, set it up to be loaded when the UniverseApplication is started. # This allows one to specify a set of tool data that is used exclusively for testing, and not loaded into any # Galaxy instance. By default, this will be in the test-data-repo/location directory generated by buildbot_setup.sh. @@ -588,6 +607,7 @@ shed_tool_data_table_conf_file = os.environ.get( 'GALAXY_INSTALL_TEST_SHED_TOOL_DATA_TABLE_CONF', os.path.join( galaxy_test_tmp_dir, 'test_shed_tool_data_table_conf.xml' ) ) galaxy_tool_data_table_conf_file = os.environ.get( 'GALAXY_INSTALL_TEST_TOOL_DATA_TABLE_CONF', tool_data_table_conf ) galaxy_tool_conf_file = os.environ.get( 'GALAXY_INSTALL_TEST_TOOL_CONF', os.path.join( galaxy_test_tmp_dir, 'test_tool_conf.xml' ) ) + galaxy_job_conf_file = os.environ.get( 'GALAXY_INSTALL_TEST_JOB_CONF', os.path.join( galaxy_test_tmp_dir, 'test_job_conf.xml' ) ) galaxy_shed_tool_conf_file = os.environ.get( 'GALAXY_INSTALL_TEST_SHED_TOOL_CONF', os.path.join( galaxy_test_tmp_dir, 'test_shed_tool_conf.xml' ) ) galaxy_migrated_tool_conf_file = os.environ.get( 'GALAXY_INSTALL_TEST_MIGRATED_TOOL_CONF', os.path.join( galaxy_test_tmp_dir, 'test_migrated_tool_conf.xml' ) ) galaxy_tool_sheds_conf_file = os.environ.get( 'GALAXY_INSTALL_TEST_TOOL_SHEDS_CONF', os.path.join( galaxy_test_tmp_dir, 'test_tool_sheds_conf.xml' ) ) @@ -635,6 +655,8 @@ # ---- Start up a Galaxy instance ------------------------------------------------------ # Generate the tool_conf.xml file. file( galaxy_tool_conf_file, 'w' ).write( tool_conf_xml ) + # Generate the job_conf.xml file. + file( galaxy_job_conf_file, 'w' ).write( job_conf_xml ) # Generate the tool_sheds_conf.xml file, but only if a the user has not specified an existing one in the environment. if 'GALAXY_INSTALL_TEST_TOOL_SHEDS_CONF' not in os.environ: file( galaxy_tool_sheds_conf_file, 'w' ).write( tool_sheds_conf_xml ) @@ -656,6 +678,7 @@ datatype_converters_config_file = "datatype_converters_conf.xml.sample", file_path = galaxy_file_path, id_secret = galaxy_encode_secret, + job_config_file = galaxy_job_conf_file, job_queue_workers = 5, log_destination = "stdout", migrated_tools_config = galaxy_migrated_tool_conf_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: martenson: didn't want to commit these changes...reverting
by commits-noreply＠bitbucket.org 27 Sep '13

27 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/fe0beae12c30/ Changeset: fe0beae12c30 User: martenson Date: 2013-09-27 16:14:45 Summary: didn't want to commit these changes...reverting Affected #: 1 file diff -r be8a8a9c72f8591ae6311f02314761e4df9fa8e2 -r fe0beae12c30d25fcd192a67043aea2b1cfddafb lib/galaxy/webapps/galaxy/api/library_contents.py --- a/lib/galaxy/webapps/galaxy/api/library_contents.py +++ b/lib/galaxy/webapps/galaxy/api/library_contents.py @@ -36,15 +36,8 @@ * url: the url to get detailed information on the library item """ rval = [] - params = util.Params( kwd, sanitize=False ) - # Recursive search is on by default. - load_recursively = params.get( 'load_recursively', None ) - if load_recursively is not None and load_recursively.lower() == "false": - load_recursively = False - else: - load_recursively = True current_user_roles = trans.get_current_user_roles() - def traverse( folder, load_recursively ): + def traverse( folder ): admin = trans.user_is_admin() rval = [] for subfolder in folder.active_folders: @@ -54,23 +47,20 @@ subfolder.api_path = folder.api_path + '/' + subfolder.name subfolder.api_type = 'folder' rval.append( subfolder ) - if load_recursively: - rval.extend( traverse( subfolder, load_recursively ) ) + rval.extend( traverse( subfolder ) ) for ld in folder.datasets: if not admin: can_access = trans.app.security_agent.can_access_dataset( current_user_roles, ld.library_dataset_dataset_association.dataset ) if (admin or can_access) and not ld.deleted: - log.debug( "type(folder): %s" % type( folder ) ) - log.debug( "type(api_path): %s; folder.api_path: %s" % ( type(folder.api_path), folder.api_path ) ) - log.debug( "attributes of folder: %s" % str(dir(folder)) ) + #log.debug( "type(folder): %s" % type( folder ) ) + #log.debug( "type(api_path): %s; folder.api_path: %s" % ( type(folder.api_path), folder.api_path ) ) + #log.debug( "attributes of folder: %s" % str(dir(folder)) ) ld.api_path = folder.api_path + '/' + ld.name ld.api_type = 'file' rval.append( ld ) return rval try: - if library_id[0] == 'F': - library_id = library_id[1:] decoded_library_id = trans.security.decode_id( library_id ) except TypeError: trans.response.status = 400 @@ -82,25 +72,22 @@ if not library or not ( trans.user_is_admin() or trans.app.security_agent.can_access_library( current_user_roles, library ) ): trans.response.status = 400 return "Invalid library id ( %s ) specified." % str( library_id ) - log.debug( "Root folder type: %s" % type( library.root_folder ) ) + #log.debug( "Root folder type: %s" % type( library.root_folder ) ) encoded_id = 'F' + trans.security.encode_id( library.root_folder.id ) rval.append( dict( id = encoded_id, type = 'folder', name = '/', url = url_for( 'library_content', library_id=library_id, id=encoded_id ) ) ) - log.debug( "Root folder attributes: %s" % str(dir(library.root_folder)) ) + #log.debug( "Root folder attributes: %s" % str(dir(library.root_folder)) ) library.root_folder.api_path = '' - if load_recursively: - for content in traverse( library.root_folder, load_recursively ): - encoded_id = trans.security.encode_id( content.id ) - if content.api_type == 'folder': - encoded_id = 'F' + encoded_id - rval.append( dict( id = encoded_id, - type = content.api_type, - name = content.api_path, - url = url_for( 'library_content', library_id=library_id, id=encoded_id, ) ) ) - else: # We don't load recursively, we need to pass different value to traverse. - pass + for content in traverse( library.root_folder ): + encoded_id = trans.security.encode_id( content.id ) + if content.api_type == 'folder': + encoded_id = 'F' + encoded_id + rval.append( dict( id = encoded_id, + type = content.api_type, + name = content.api_path, + url = url_for( 'library_content', library_id=library_id, id=encoded_id, ) ) ) return rval @web.expose_api 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 27 Sep '13

27 Sep '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4c52a600e88a/ Changeset: 4c52a600e88a Branch: reports_nice_disksize User: martenson Date: 2013-09-27 15:59:19 Summary: Closed branch reports_nice_disksize Affected #: 3 files diff -r 8fdd9081d1b0de8c2739b0183acd812c1c6d890d -r 4c52a600e88a125d83c8966c30063ecaa53c9fbc lib/galaxy/webapps/galaxy/api/folders.py --- a/lib/galaxy/webapps/galaxy/api/folders.py +++ b/lib/galaxy/webapps/galaxy/api/folders.py @@ -52,7 +52,7 @@ o payload's relevant params: - folder_id: This is the parent folder's id (required) """ - log.debug( "FoldersController.create: enter" ) +# log.debug( "FoldersController.create: enter" ) # TODO: Create a single point of exit if possible. For now we only # exit at the end and on exceptions. if 'folder_id' not in payload: @@ -90,7 +90,7 @@ name = v.name, url = url_for( 'folder', id=encoded_id ) ) ) else: - log.debug( "Error creating folder; setting output and status" ) +# log.debug( "Error creating folder; setting output and status" ) trans.response.status = status rval = output return rval diff -r 8fdd9081d1b0de8c2739b0183acd812c1c6d890d -r 4c52a600e88a125d83c8966c30063ecaa53c9fbc lib/galaxy/webapps/galaxy/api/libraries.py --- a/lib/galaxy/webapps/galaxy/api/libraries.py +++ b/lib/galaxy/webapps/galaxy/api/libraries.py @@ -28,7 +28,7 @@ :returns: list of dictionaries containing library information .. seealso:: :attr:`galaxy.model.Library.dict_collection_visible_keys` """ - log.debug( "LibrariesController.index: enter" ) +# log.debug( "LibrariesController.index: enter" ) query = trans.sa_session.query( trans.app.model.Library ) deleted = util.string_as_bool( deleted ) if deleted: @@ -73,7 +73,7 @@ :returns: detailed library information .. seealso:: :attr:`galaxy.model.Library.dict_element_visible_keys` """ - log.debug( "LibraryContentsController.show: enter" ) +# log.debug( "LibraryContentsController.show: enter" ) library_id = id deleted = util.string_as_bool( deleted ) try: diff -r 8fdd9081d1b0de8c2739b0183acd812c1c6d890d -r 4c52a600e88a125d83c8966c30063ecaa53c9fbc lib/galaxy/webapps/galaxy/api/library_contents.py --- a/lib/galaxy/webapps/galaxy/api/library_contents.py +++ b/lib/galaxy/webapps/galaxy/api/library_contents.py @@ -36,8 +36,15 @@ * url: the url to get detailed information on the library item """ rval = [] + params = util.Params( kwd, sanitize=False ) + # Recursive search is on by default. + load_recursively = params.get( 'load_recursively', None ) + if load_recursively is not None and load_recursively.lower() == "false": + load_recursively = False + else: + load_recursively = True current_user_roles = trans.get_current_user_roles() - def traverse( folder ): + def traverse( folder, load_recursively ): admin = trans.user_is_admin() rval = [] for subfolder in folder.active_folders: @@ -47,7 +54,8 @@ subfolder.api_path = folder.api_path + '/' + subfolder.name subfolder.api_type = 'folder' rval.append( subfolder ) - rval.extend( traverse( subfolder ) ) + if load_recursively: + rval.extend( traverse( subfolder, load_recursively ) ) for ld in folder.datasets: if not admin: can_access = trans.app.security_agent.can_access_dataset( @@ -55,12 +63,14 @@ if (admin or can_access) and not ld.deleted: log.debug( "type(folder): %s" % type( folder ) ) log.debug( "type(api_path): %s; folder.api_path: %s" % ( type(folder.api_path), folder.api_path ) ) - #log.debug( "attributes of folder: %s" % str(dir(folder)) ) + log.debug( "attributes of folder: %s" % str(dir(folder)) ) ld.api_path = folder.api_path + '/' + ld.name ld.api_type = 'file' rval.append( ld ) return rval try: + if library_id[0] == 'F': + library_id = library_id[1:] decoded_library_id = trans.security.decode_id( library_id ) except TypeError: trans.response.status = 400 @@ -80,14 +90,17 @@ url = url_for( 'library_content', library_id=library_id, id=encoded_id ) ) ) log.debug( "Root folder attributes: %s" % str(dir(library.root_folder)) ) library.root_folder.api_path = '' - for content in traverse( library.root_folder ): - encoded_id = trans.security.encode_id( content.id ) - if content.api_type == 'folder': - encoded_id = 'F' + encoded_id - rval.append( dict( id = encoded_id, - type = content.api_type, - name = content.api_path, - url = url_for( 'library_content', library_id=library_id, id=encoded_id, ) ) ) + if load_recursively: + for content in traverse( library.root_folder, load_recursively ): + encoded_id = trans.security.encode_id( content.id ) + if content.api_type == 'folder': + encoded_id = 'F' + encoded_id + rval.append( dict( id = encoded_id, + type = content.api_type, + name = content.api_path, + url = url_for( 'library_content', library_id=library_id, id=encoded_id, ) ) ) + else: # We don't load recursively, we need to pass different value to traverse. + pass return rval @web.expose_api https://bitbucket.org/galaxy/galaxy-central/commits/be8a8a9c72f8/ Changeset: be8a8a9c72f8 User: martenson Date: 2013-09-27 16:00:05 Summary: merge Affected #: 3 files diff -r e599b3d6a83347bf1f7a6f5cfadfe541c2c1e035 -r be8a8a9c72f8591ae6311f02314761e4df9fa8e2 lib/galaxy/webapps/galaxy/api/folders.py --- a/lib/galaxy/webapps/galaxy/api/folders.py +++ b/lib/galaxy/webapps/galaxy/api/folders.py @@ -52,7 +52,7 @@ o payload's relevant params: - folder_id: This is the parent folder's id (required) """ - log.debug( "FoldersController.create: enter" ) +# log.debug( "FoldersController.create: enter" ) # TODO: Create a single point of exit if possible. For now we only # exit at the end and on exceptions. if 'folder_id' not in payload: @@ -90,7 +90,7 @@ name = v.name, url = url_for( 'folder', id=encoded_id ) ) ) else: - log.debug( "Error creating folder; setting output and status" ) +# log.debug( "Error creating folder; setting output and status" ) trans.response.status = status rval = output return rval diff -r e599b3d6a83347bf1f7a6f5cfadfe541c2c1e035 -r be8a8a9c72f8591ae6311f02314761e4df9fa8e2 lib/galaxy/webapps/galaxy/api/libraries.py --- a/lib/galaxy/webapps/galaxy/api/libraries.py +++ b/lib/galaxy/webapps/galaxy/api/libraries.py @@ -28,7 +28,7 @@ :returns: list of dictionaries containing library information .. seealso:: :attr:`galaxy.model.Library.dict_collection_visible_keys` """ - log.debug( "LibrariesController.index: enter" ) +# log.debug( "LibrariesController.index: enter" ) query = trans.sa_session.query( trans.app.model.Library ) deleted = util.string_as_bool( deleted ) if deleted: @@ -73,7 +73,7 @@ :returns: detailed library information .. seealso:: :attr:`galaxy.model.Library.dict_element_visible_keys` """ - log.debug( "LibraryContentsController.show: enter" ) +# log.debug( "LibraryContentsController.show: enter" ) library_id = id deleted = util.string_as_bool( deleted ) try: diff -r e599b3d6a83347bf1f7a6f5cfadfe541c2c1e035 -r be8a8a9c72f8591ae6311f02314761e4df9fa8e2 lib/galaxy/webapps/galaxy/api/library_contents.py --- a/lib/galaxy/webapps/galaxy/api/library_contents.py +++ b/lib/galaxy/webapps/galaxy/api/library_contents.py @@ -36,8 +36,15 @@ * url: the url to get detailed information on the library item """ rval = [] + params = util.Params( kwd, sanitize=False ) + # Recursive search is on by default. + load_recursively = params.get( 'load_recursively', None ) + if load_recursively is not None and load_recursively.lower() == "false": + load_recursively = False + else: + load_recursively = True current_user_roles = trans.get_current_user_roles() - def traverse( folder ): + def traverse( folder, load_recursively ): admin = trans.user_is_admin() rval = [] for subfolder in folder.active_folders: @@ -47,7 +54,8 @@ subfolder.api_path = folder.api_path + '/' + subfolder.name subfolder.api_type = 'folder' rval.append( subfolder ) - rval.extend( traverse( subfolder ) ) + if load_recursively: + rval.extend( traverse( subfolder, load_recursively ) ) for ld in folder.datasets: if not admin: can_access = trans.app.security_agent.can_access_dataset( @@ -55,12 +63,14 @@ if (admin or can_access) and not ld.deleted: log.debug( "type(folder): %s" % type( folder ) ) log.debug( "type(api_path): %s; folder.api_path: %s" % ( type(folder.api_path), folder.api_path ) ) - #log.debug( "attributes of folder: %s" % str(dir(folder)) ) + log.debug( "attributes of folder: %s" % str(dir(folder)) ) ld.api_path = folder.api_path + '/' + ld.name ld.api_type = 'file' rval.append( ld ) return rval try: + if library_id[0] == 'F': + library_id = library_id[1:] decoded_library_id = trans.security.decode_id( library_id ) except TypeError: trans.response.status = 400 @@ -80,14 +90,17 @@ url = url_for( 'library_content', library_id=library_id, id=encoded_id ) ) ) log.debug( "Root folder attributes: %s" % str(dir(library.root_folder)) ) library.root_folder.api_path = '' - for content in traverse( library.root_folder ): - encoded_id = trans.security.encode_id( content.id ) - if content.api_type == 'folder': - encoded_id = 'F' + encoded_id - rval.append( dict( id = encoded_id, - type = content.api_type, - name = content.api_path, - url = url_for( 'library_content', library_id=library_id, id=encoded_id, ) ) ) + if load_recursively: + for content in traverse( library.root_folder, load_recursively ): + encoded_id = trans.security.encode_id( content.id ) + if content.api_type == 'folder': + encoded_id = 'F' + encoded_id + rval.append( dict( id = encoded_id, + type = content.api_type, + name = content.api_path, + url = url_for( 'library_content', library_id=library_id, id=encoded_id, ) ) ) + else: # We don't load recursively, we need to pass different value to traverse. + pass return rval @web.expose_api 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 26 Sep '13

26 Sep '13

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/be72dc359cb1/ Changeset: be72dc359cb1 User: dannon Date: 2013-09-26 23:28:16 Summary: Fix workflow multi-input workflow datasets for latest select2 update Affected #: 1 file diff -r c4b5f082ead51a655f24fe5a2478996ee3bde95c -r be72dc359cb1ed5dac86c85ebfaa00d782014969 templates/webapps/galaxy/workflow/run.mako --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -72,11 +72,12 @@ $("#new_history_cbx").click(function(){ $("#new_history_input").toggle(this.checked); }); - // The destroy on the following line is temporary and prevents - // select2 use on Input Dataset Steps, but allows elsewhere. We - // need a new widget to better handle pairwise matching. - $('span.multiinput_wrap select[name*="|input"]').removeAttr('multiple').select2("destroy").each(function(i, s) { + $('span.multiinput_wrap select[name*="|input"]').removeAttr('multiple').each(function(i, s) { var select = $(s); + // The destroy on the following line is temporary and prevents + // select2 use on Input Dataset Steps, but allows elsewhere. We + // need a new widget to better handle pairwise matching. + select.select2("destroy"); var new_width = Math.max(200, select.width()) + 20; // Find the label for this element. select.closest('.form-row').children('label').append( https://bitbucket.org/galaxy/galaxy-central/commits/e599b3d6a833/ Changeset: e599b3d6a833 User: dannon Date: 2013-09-26 23:29:32 Summary: merge Affected #: 1 file diff -r 208e514d485b5787d0a37411cf2f50aad73ae3f5 -r e599b3d6a83347bf1f7a6f5cfadfe541c2c1e035 templates/webapps/galaxy/workflow/run.mako --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -72,11 +72,12 @@ $("#new_history_cbx").click(function(){ $("#new_history_input").toggle(this.checked); }); - // The destroy on the following line is temporary and prevents - // select2 use on Input Dataset Steps, but allows elsewhere. We - // need a new widget to better handle pairwise matching. - $('span.multiinput_wrap select[name*="|input"]').removeAttr('multiple').select2("destroy").each(function(i, s) { + $('span.multiinput_wrap select[name*="|input"]').removeAttr('multiple').each(function(i, s) { var select = $(s); + // The destroy on the following line is temporary and prevents + // select2 use on Input Dataset Steps, but allows elsewhere. We + // need a new widget to better handle pairwise matching. + select.select2("destroy"); var new_width = Math.max(200, select.width()) + 20; // Find the label for this element. select.closest('.form-row').children('label').append( 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: james_taylor: style: fix progress bars in modals
by commits-noreply＠bitbucket.org 26 Sep '13

26 Sep '13

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/208e514d485b/ Changeset: 208e514d485b User: james_taylor Date: 2013-09-26 22:55:24 Summary: style: fix progress bars in modals Affected #: 2 files diff -r c4b5f082ead51a655f24fe5a2478996ee3bde95c -r 208e514d485b5787d0a37411cf2f50aad73ae3f5 static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js +++ b/static/scripts/galaxy.panels.js @@ -154,7 +154,7 @@ // Body var body = options.body; if ( body == "progress" ) { - body = $("<div class='progress progress-striped active'><div class='bar' style='width: 100%'></div></div>"); + body = $("<div class='progress progress-striped active'><div class='progress-bar' style='width: 100%'></div></div>"); } this.$body.html( body ); }, diff -r c4b5f082ead51a655f24fe5a2478996ee3bde95c -r 208e514d485b5787d0a37411cf2f50aad73ae3f5 templates/webapps/galaxy/workflow/editor.mako --- a/templates/webapps/galaxy/workflow/editor.mako +++ b/templates/webapps/galaxy/workflow/editor.mako @@ -287,7 +287,7 @@ <%def name="overlay(visible=False)"> ${parent.overlay( "Loading workflow editor...", - "<div class='progress progress-striped progress-info active'><div class='bar' style='width: 100%;'></div></div>", self.overlay_visible )} + "<div class='progress progress-striped progress-info active'><div class='progress-bar' style='width: 100%;'></div></div>", self.overlay_visible )} </%def><%def name="left_panel()"> 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