2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8d8429484ac3/ Changeset: 8d8429484ac3 Branch: next-stable User: carlfeberhard Date: 2013-08-08 16:40:27 Summary: History view: fix broken scrollbar Affected #: 1 file diff -r 8ee4176d44bad2c1029356e869d601752ae54cd0 -r 8d8429484ac3ffef21fedd1077acf050c8aed459 templates/webapps/galaxy/history/view.mako --- a/templates/webapps/galaxy/history/view.mako +++ b/templates/webapps/galaxy/history/view.mako @@ -27,6 +27,7 @@ <style type="text/css"> + /* these don't appear to be used? */ .page-body { padding: 10px; @@ -44,20 +45,38 @@ border-top: 4px solid #DDDDDD; } + + body { + padding: 0px; + margin: 0px; + } + div.unified-panel-body { - position: relative; + position: absolute; top: 0px; - width: auto; + width: 100%; + } + + #history-name-area { + margin: 12px 0px 0px 16px; + font-size: 120%; + } + #top-links { + margin: 4px 0px 8px 16px; } .historyItemContainer { - padding-right: 3px; - border-right-style: solid; - border-right-color: #66AA66; + /*padding-right: 3px;*/ } .historyItemBody { display: none; } + div.historyItemWrapper { + margin: 0px 4px 0px 4px ; + border-left: 1px solid #999999; + border-right: 1px solid #999999; + } + /* TODO: unify with other history css and into .less */ </style><noscript> @@ -92,14 +111,13 @@ href_to_user_histories = h.url_for( controller='/history', action='list_published' )##should this instead be be None or empty string? %> - %if context.get( 'use_panels' ): - <div class="unified-panel-header" unselectable="on"> - </div> - %endif - <div class="unified-panel-body"> - <div class="wrapping" style="overflow: auto; height: 100%;"> + <div style="overflow: auto; height: 100%;"> ## Render view of history. + <div id="history-name-area" class="historyLinks" style="color: gray; font-weight: bold; padding: 0px 0px 5px 0px"> + <div id="history-name">${history.get_display_name()}</div> + </div> + <div id="top-links" class="historyLinks" style="padding: 0px 0px 5px 0px"> %if not history.purged: <a href="${h.url_for(controller='history', action='imp', id=trans.security.encode_id(history.id) )}">import and start using history</a> | @@ -113,10 +131,6 @@ <a href="#" class="toggle">collapse all</a></div> - <div id="history-name-area" class="historyLinks" style="color: gray; font-weight: bold; padding: 0px 0px 5px 0px"> - <div id="history-name">${history.get_display_name()}</div> - </div> - %if history.deleted: <div class="warningmessagesmall"> ${_('You are currently viewing a deleted history!')} https://bitbucket.org/galaxy/galaxy-central/commits/f46505803e8f/ Changeset: f46505803e8f User: carlfeberhard Date: 2013-08-08 16:41:18 Summary: merge next-stable Affected #: 2 files diff -r 3f8f52fa01f807b624ce05ef2186284b947c2e34 -r f46505803e8f0efd26be16f9e18353fbdc969205 templates/webapps/galaxy/history/view.mako --- a/templates/webapps/galaxy/history/view.mako +++ b/templates/webapps/galaxy/history/view.mako @@ -27,6 +27,7 @@ <style type="text/css"> + /* these don't appear to be used? */ .page-body { padding: 10px; @@ -44,20 +45,38 @@ border-top: 4px solid #DDDDDD; } + + body { + padding: 0px; + margin: 0px; + } + div.unified-panel-body { - position: relative; + position: absolute; top: 0px; - width: auto; + width: 100%; + } + + #history-name-area { + margin: 12px 0px 0px 16px; + font-size: 120%; + } + #top-links { + margin: 4px 0px 8px 16px; } .historyItemContainer { - padding-right: 3px; - border-right-style: solid; - border-right-color: #66AA66; + /*padding-right: 3px;*/ } .historyItemBody { display: none; } + div.historyItemWrapper { + margin: 0px 4px 0px 4px ; + border-left: 1px solid #999999; + border-right: 1px solid #999999; + } + /* TODO: unify with other history css and into .less */ </style><noscript> @@ -92,14 +111,13 @@ href_to_user_histories = h.url_for( controller='/history', action='list_published' )##should this instead be be None or empty string? %> - %if context.get( 'use_panels' ): - <div class="unified-panel-header" unselectable="on"> - </div> - %endif - <div class="unified-panel-body"> - <div class="wrapping" style="overflow: auto; height: 100%;"> + <div style="overflow: auto; height: 100%;"> ## Render view of history. + <div id="history-name-area" class="historyLinks" style="color: gray; font-weight: bold; padding: 0px 0px 5px 0px"> + <div id="history-name">${history.get_display_name()}</div> + </div> + <div id="top-links" class="historyLinks" style="padding: 0px 0px 5px 0px"> %if not history.purged: <a href="${h.url_for(controller='history', action='imp', id=trans.security.encode_id(history.id) )}">import and start using history</a> | @@ -113,10 +131,6 @@ <a href="#" class="toggle">collapse all</a></div> - <div id="history-name-area" class="historyLinks" style="color: gray; font-weight: bold; padding: 0px 0px 5px 0px"> - <div id="history-name">${history.get_display_name()}</div> - </div> - %if history.deleted: <div class="warningmessagesmall"> ${_('You are currently viewing a deleted history!')} 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.