1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/596d33e8af91/ Changeset: 596d33e8af91 User: carlfeberhard Date: 2014-11-14 17:43:53+00:00 Summary: History, view multiple: link to page from index.mako Affected #: 3 files
diff -r ca06c741df1ed291871571b3cbcc547a61896384 -r 596d33e8af919c113028cb943ea2251f9b2bd157 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1896,7 +1896,7 @@ .search-input .search-query{width:100%;padding-right:24px} .search-input .search-clear,.search-input .search-loading{position:relative;display:inline-block;float:right;margin-top:-24px;margin-right:4px;font-size:1.4em;line-height:23px;color:grey} .search-input .search-clear:hover{color:#303030} -#history-refresh-button,#history-options-button{display:inline-block;height:22px;width:22px;text-align:center;line-height:19px;font-size:1.2em;padding:0px} +.history-panel-header .panel-header-button{display:inline-block;height:22px;width:22px;text-align:center;line-height:19px;font-size:1.2em;padding:0px} .state-icon{font-family:FontAwesome;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;margin-right:4px;vertical-align:middle;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px} .state-icon-running{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)} 100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)} 100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)} 100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)} 100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)} 100%{transform:rotate(359deg)}}.state-icon-running:before{content:"\f110"} .state-icon-upload{overflow:hidden}.state-icon-upload:before{display:inline-block;-webkit-animation:eclipse 2s infinite linear;-moz-animation:eclipse 2s infinite linear;-o-animation:eclipse 2s infinite linear;animation:eclipse 2s infinite linear;content:"\f062"}@-moz-keyframes eclipse{0%{-moz-transform:translate(0, 16px)} 100%{-moz-transform:translate(0, -16px)}}@-webkit-keyframes eclipse{0%{-webkit-transform:translate(0, 16px)} 100%{-webkit-transform:translate(0, -16px)}}@-o-keyframes eclipse{0%{-o-transform:translate(0, 16px)} 100%{-o-transform:translate(0, -16px)}}@-ms-keyframes eclipse{0%{-ms-transform:translate(0, 16px)} 100%{-ms-transform:translate(0, -16px)}}@keyframes eclipse{0%{transform:translate(0, 16px)} 100%{transform:translate(0, -16px)}}
diff -r ca06c741df1ed291871571b3cbcc547a61896384 -r 596d33e8af919c113028cb943ea2251f9b2bd157 static/style/src/less/history.less --- a/static/style/src/less/history.less +++ b/static/style/src/less/history.less @@ -25,16 +25,17 @@ }
// ---------------------------------------------------------------------------- panel header buttons -#history-refresh-button, -#history-options-button { - display : inline-block; - height : @icon-btn-size; - width : @icon-btn-size; - text-align : center; - line-height : @icon-btn-size - 3; - font-size : 1.2em; +.history-panel-header { + .panel-header-button { + display : inline-block; + height : @icon-btn-size; + width : @icon-btn-size; + text-align : center; + line-height : @icon-btn-size - 3; + font-size : 1.2em;
- padding: 0px; + padding: 0px; + } }
diff -r ca06c741df1ed291871571b3cbcc547a61896384 -r 596d33e8af919c113028cb943ea2251f9b2bd157 templates/webapps/galaxy/root/index.mako --- a/templates/webapps/galaxy/root/index.mako +++ b/templates/webapps/galaxy/root/index.mako @@ -93,7 +93,7 @@ <%def name="right_panel()"><!-- current history panel --><div class="unified-panel-header" unselectable="on"> - <div class="unified-panel-header-inner"> + <div class="unified-panel-header-inner history-panel-header"><div style="float: right"><a id="history-refresh-button" class='panel-header-button' href="javascript:void(0)" title="${ _( 'Refresh history' ) }"> @@ -104,6 +104,13 @@ title="${ _( 'History options' ) }"><span class="fa fa-cog"></span></a> + %if trans.user: + <a id="history-view-multi-button" class='panel-header-button' + href="${h.url_for( controller='history', action='view_multiple' )}" + title="${ _( 'View all histories' ) }"> + <span class="fa fa-caret-square-o-right"></span> + </a> + %endif </div><div class="panel-header-text">${_('History')}</div></div>
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.
galaxy-commits@lists.galaxyproject.org