1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c714feaad115/ changeset: c714feaad115 user: james_taylor date: 2013-02-04 04:57:32 summary: base_panels: no longer need to specify has_(left|right)_panel, determined depending on whether the blocks are set. Moved some CSS into base.css affected #: 6 files diff -r d2b192832826f531e7702461826822dbb8179acb -r c714feaad11541377edd84af1179869c1a8e4f47 lib/galaxy/webapps/galaxy/controllers/library.py --- a/lib/galaxy/webapps/galaxy/controllers/library.py +++ b/lib/galaxy/webapps/galaxy/controllers/library.py @@ -79,6 +79,7 @@ default_action=default_action, message=message, status=status ) + @web.expose def browse_libraries( self, trans, **kwd ): if 'operation' in kwd: diff -r d2b192832826f531e7702461826822dbb8179acb -r c714feaad11541377edd84af1179869c1a8e4f47 static/june_2007_style/base.less --- a/static/june_2007_style/base.less +++ b/static/june_2007_style/base.less @@ -31,8 +31,19 @@ background-repeat: repeat-x; background-position: top; margin: 10px; + + // For panel layout pages + &.full-content { + overflow: hidden; + margin: 0; + padding: 0; + width: 100%; + height: 100%; + } + } + img { border: 0; } @@ -410,7 +421,7 @@ width:100%; min-width:900px; height:32px; - // background: @masthead_bg; + background: @masthead_bg; // color:#fff; border-bottom: solid @layout_masthead_border 1px; z-index: 15000; diff -r d2b192832826f531e7702461826822dbb8179acb -r c714feaad11541377edd84af1179869c1a8e4f47 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -892,7 +892,7 @@ .clear:after{clear:both;} .clear:before,.clear:after{display:table;content:"";line-height:0;} .clear:after{clear:both;} -body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;} +body{background:#ffffff;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;}body.full-content{overflow:hidden;margin:0;padding:0;width:100%;height:100%;} img{border:0;} a,a:link,a:visited,a:active{text-decoration:underline;color:#303030;} .nav-tabs a{text-decoration:none;} @@ -936,7 +936,7 @@ .panel-warning-message{background-image:url(warn_small.png);background-color:#ffffcc;} .panel-done-message{background-image:url(ok_small.png);background-color:#ccffcc;} .panel-info-message{background-image:url(info_small.png);background-color:#d9edf7;} -#masthead{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;overflow:visible;margin-bottom:16px;*position:relative;*z-index:2;position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;border-bottom:solid #444444 1px;z-index:15000;padding:0;}#masthead .nav{z-index:10000;background-color:#2c3143;} +#masthead{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;overflow:visible;margin-bottom:16px;*position:relative;*z-index:2;position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;background:#2c3143;border-bottom:solid #444444 1px;z-index:15000;padding:0;}#masthead .nav{z-index:10000;background-color:#2c3143;} #masthead .nav>li>a{padding:8px 10px 8px;cursor:pointer;}#masthead .nav>li>a:hover{color:gold;} #masthead .dropdown-menu a,#masthead .dropdown-menu a:hover{text-decoration:none;} #masthead .dropdown-toggle .caret{margin-top:7px;} diff -r d2b192832826f531e7702461826822dbb8179acb -r c714feaad11541377edd84af1179869c1a8e4f47 static/june_2007_style/galaxy_bootstrap.less --- a/static/june_2007_style/galaxy_bootstrap.less +++ b/static/june_2007_style/galaxy_bootstrap.less @@ -107,7 +107,6 @@ margin-left: -330px; } - .modal:after { content: ""; height: 0px; @@ -115,8 +114,7 @@ top: 50px; display: block; border: solid transparent 1px; -}; - +} .modal-body { height: auto; @@ -203,4 +201,4 @@ border-width: 0 @tooltipArrowWidth @tooltipArrowWidth; border-bottom-color: @tooltipArrowColor; } -} \ No newline at end of file +} diff -r d2b192832826f531e7702461826822dbb8179acb -r c714feaad11541377edd84af1179869c1a8e4f47 templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -1,8 +1,8 @@ <!DOCTYPE HTML><% - self.has_left_panel=True - self.has_right_panel=True + self.has_left_panel = hasattr( self, 'left_panel' ) + self.has_right_panel = hasattr( self, 'right_panel' ) self.message_box_visible=False self.overlay_visible=False self.message_box_class="" @@ -17,15 +17,8 @@ ## Default stylesheets <%def name="stylesheets()"> - ${h.css('base','panel_layout','jquery.rating')} + ${h.css('base','jquery.rating')} <style type="text/css"> - body, html { - overflow: hidden; - margin: 0; - padding: 0; - width: 100%; - height: 100%; - } #center { %if not self.has_left_panel: left: 0 !important; @@ -270,7 +263,7 @@ ${self.javascripts()} </head> - <body scroll="no" class="${self.body_class}"> + <body scroll="no" class="full-content ${self.body_class}"> %if self.require_javascript: <noscript><div class="overlay overlay-background"> diff -r d2b192832826f531e7702461826822dbb8179acb -r c714feaad11541377edd84af1179869c1a8e4f47 templates/workflow/index.mako --- a/templates/workflow/index.mako +++ b/templates/workflow/index.mako @@ -2,10 +2,7 @@ <%def name="init()"><% - self.has_left_panel=False - self.has_right_panel=False self.active_view="workflow" - self.message_box_visible=False %></%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.