1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/44fac73723c9/ changeset: r5057:44fac73723c9 user: greg date: 2011-02-14 20:54:07 summary: Add 2 new sample tracking reports and 2 new workflow reports, each of which provides the total number of items per month and the total number of items per user ( per month ). Clean up the styles in the admin menu and reports menu mako templates. Clarify in the reports config that reports do not support sqlite. Render the samples checkbox ( when editing samples ) at the top of the table cell. affected #: 12 files (1.4 KB)

--- a/reports_wsgi.ini.sample Mon Feb 14 14:52:53 2011 -0500 +++ b/reports_wsgi.ini.sample Mon Feb 14 14:54:07 2011 -0500 @@ -17,8 +17,8 @@ log_level = DEBUG

# Database connection -#database_file = database/universe.sqlite -# You may use a SQLAlchemy connection string to specify an external database instead +# Galaxy reports are intended for production Galaxy instances, so sqlite is not supported. +# You may use a SQLAlchemy connection string to specify an external database. # database_connection = postgres:///galaxy_test?user=postgres&password=postgres

# Where dataset files are saved @@ -67,4 +67,3 @@ static_favicon_dir = %(here)s/static/favicon.ico static_scripts_dir = %(here)s/static/scripts/ static_style_dir = %(here)s/static/june_2007_style/blue -

--- a/templates/requests/common/common.mako Mon Feb 14 14:52:53 2011 -0500 +++ b/templates/requests/common/common.mako Mon Feb 14 14:54:07 2011 -0500 @@ -254,7 +254,7 @@ checked_str = "" %> %if display_checkboxes: - <td><input type="checkbox" name=select_sample_${sample.id} id="sample_checkbox" value="true" ${checked_str}/><input type="hidden" name=select_sample_${sample.id} id="sample_checkbox" value="true"/></td> + <td valign="top"><input type="checkbox" name=select_sample_${sample.id} id="sample_checkbox" value="true" ${checked_str}/><input type="hidden" name=select_sample_${sample.id} id="sample_checkbox" value="true"/></td> %endif <td valign="top"><input type="text" name="sample_${sample_widget_index}_name" value="${sample_widget['name']}" size="10"/>

--- a/templates/webapps/galaxy/admin/index.mako Mon Feb 14 14:52:53 2011 -0500 +++ b/templates/webapps/galaxy/admin/index.mako Mon Feb 14 14:54:07 2011 -0500 @@ -5,55 +5,25 @@

<%def name="stylesheets()"> ${parent.stylesheets()} - ## TODO: Clean up these styles and move into panel_layout.css (they are - ## used here and in the editor). + ## Include "base.css" for styling tool menu and forms (details) + ${h.css( "base", "autocomplete_tagging", "tool_menu" )} + + ## But make sure styles for the layout take precedence + ${parent.stylesheets()} + <style type="text/css"> - #left { - background: #C1C9E5 url(${h.url_for('/static/style/menu_bg.png')}) top repeat-x; - } - div.toolMenu { - margin: 5px; - margin-left: 10px; - margin-right: 10px; - } - div.toolSectionPad { - margin: 0; - padding: 0; - height: 5px; - font-size: 0px; - } - div.toolSectionDetailsInner { - margin-left: 5px; - margin-right: 5px; - } - div.toolSectionTitle { - padding-bottom: 0px; - font-weight: bold; - } - div.toolMenuGroupHeader { - font-weight: bold; - padding-top: 0.5em; - padding-bottom: 0.5em; - color: #333; - font-style: italic; - border-bottom: dotted #333 1px; - margin-bottom: 0.5em; - } - div.toolTitle { - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: square outside; - } - a:link, a:visited, a:active - { - color: #303030; - } + body { margin: 0; padding: 0; overflow: hidden; } + #left { + background: #C1C9E5 url(${h.url_for('/static/style/menu_bg.png')}) top repeat-x; + } </style></%def>

+<%def name="javascripts()"> + ${parent.javascripts()} + ${h.js( "jquery", "galaxy.base" )} +</%def> + <%def name="init()"><% self.has_left_panel=True @@ -66,7 +36,7 @@ <div class="unified-panel-header" unselectable="on"><div class='unified-panel-header-inner'>Administration</div></div> - <div class="unified-panel-body" style="overflow: auto;"> + <div class="page-container" style="padding: 10px;"><div class="toolMenu"><div class="toolSectionList"><div class="toolSectionTitle">

--- a/templates/webapps/reports/index.mako Mon Feb 14 14:52:53 2011 -0500 +++ b/templates/webapps/reports/index.mako Mon Feb 14 14:54:07 2011 -0500 @@ -1,5 +1,4 @@ <%inherit file="/webapps/reports/base_panels.mako"/> -<%namespace file="/message.mako" import="render_msg" /><%def name="init()"><% @@ -11,55 +10,25 @@

<%def name="stylesheets()"> ${parent.stylesheets()} - ## TODO: Clean up these styles and move into panel_layout.css (they are - ## used here and in the editor). + ## Include "base.css" for styling tool menu and forms (details) + ${h.css( "base", "autocomplete_tagging", "tool_menu" )} + + ## But make sure styles for the layout take precedence + ${parent.stylesheets()} + <style type="text/css"> - #left { - background: #C1C9E5 url(${h.url_for('/static/style/menu_bg.png')}) top repeat-x; - } - div.toolMenu { - margin: 5px; - margin-left: 10px; - margin-right: 10px; - } - div.toolSectionPad { - margin: 0; - padding: 0; - height: 5px; - font-size: 0px; - } - div.toolSectionDetailsInner { - margin-left: 5px; - margin-right: 5px; - } - div.toolSectionTitle { - padding-bottom: 0px; - font-weight: bold; - } - div.toolMenuGroupHeader { - font-weight: bold; - padding-top: 0.5em; - padding-bottom: 0.5em; - color: #333; - font-style: italic; - border-bottom: dotted #333 1px; - margin-bottom: 0.5em; - } - div.toolTitle { - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: square outside; - } - a:link, a:visited, a:active - { - color: #303030; - } + body { margin: 0; padding: 0; overflow: hidden; } + #left { + background: #C1C9E5 url(${h.url_for('/static/style/menu_bg.png')}) top repeat-x; + } </style></%def>

+<%def name="javascripts()"> + ${parent.javascripts()} + ${h.js( "jquery", "galaxy.base" )} +</%def> + <%def name="left_panel()"><% from datetime import datetime @@ -90,6 +59,28 @@ <div class="toolSectionPad"></div><div class="toolSectionPad"></div><div class="toolSectionTitle"> + <span>Sample Tracking</span> + </div> + <div class="toolSectionBody"> + <div class="toolSectionBg"> + <div class="toolTitle"><a target="galaxy_main" href="${h.url_for( controller='sample_tracking', action='per_month_all' )}">Sequencing requests per month</a></div> + <div class="toolTitle"><a target="galaxy_main" href="${h.url_for( controller='sample_tracking', action='per_user' )}">Sequencing requests per user</a></div> + </div> + </div> + <div class="toolSectionPad"></div> + <div class="toolSectionPad"></div> + <div class="toolSectionTitle"> + <span>Workflows</span> + </div> + <div class="toolSectionBody"> + <div class="toolSectionBg"> + <div class="toolTitle"><a target="galaxy_main" href="${h.url_for( controller='workflows', action='per_month_all' )}">Workflows per month</a></div> + <div class="toolTitle"><a target="galaxy_main" href="${h.url_for( controller='workflows', action='per_user' )}">Workflows per user</a></div> + </div> + </div> + <div class="toolSectionPad"></div> + <div class="toolSectionPad"></div> + <div class="toolSectionTitle"><span>Users</span></div><div class="toolSectionBody">

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.