# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Greg Von Kuster <greg@bx.psu.edu> # Date 1278087396 14400 # Node ID fad6bc5478fa9a4ac4e9d368bcfae1651528deac # Parent 8f2e44ed27f6a17586854c8e423d2b7b42ca0ae1 Add new state colors to blue_colors.ini so that it is synced with the styles, and clean up and add comments to make_style.py. --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -73,8 +73,8 @@ span.toolParameterExpandableCollapsable{ ul.toolParameterExpandableCollapsable{list-style:none;} ul.manage-table-actions{float:right;margin-top:-2.5em;} ul.manage-table-actions li{display:block;float:left;margin-left:0.5em;} -.state-color-new{border-color:#A86030;background:#FFB030;} -.state-color-upload{border-color:#990099;background:#D090D0;} +.state-color-new{border-color:#A86030;background:FFB030;} +.state-color-upload{border-color:#6666AA;background:#CCCCFF;} .state-color-waiting{border-color:#A86030;background:#E8C060;} .state-color-queued{border-color:#888888;background:#EEEEEE;} .state-color-running{border-color:#AAAA66;background:#FFFFCC;} --- a/static/june_2007_style/blue_colors.ini +++ b/static/june_2007_style/blue_colors.ini @@ -33,7 +33,15 @@ table_border=#d8b365 footer_bg=#023858 footer_title_bg=#023858 footer_title_hatch=#000000 -# History +# History - these are actually Job states (used in the reports webapp), but the same styles are used for Tool states in the community webapp +history_new_border=#A86030 +history_new_bg=FFB030 +history_upload_border=#990099 +history_upload_bg=#D090D0 +history_waiting_border=#A86030 +history_waiting_bg=#E8C060 +history_deleted_border=#330066 +history_deleted_bg=#3399FF history_error_border=#AA6666 history_error_bg=#FFCCCC history_running_border=#AAAA66 --- a/static/june_2007_style/process_css.py +++ b/static/june_2007_style/process_css.py @@ -9,9 +9,18 @@ CSS processor for Galaxy style sheets. S """ -import sys, string, os.path +import sys, string, os.path, os + +new_path = [ os.path.join( os.getcwd(), '..', '..', "lib" ) ] +new_path.extend( sys.path[1:] ) # remove scripts/ from the path +sys.path = new_path + +from galaxy import eggs +import pkg_resources +from galaxy.util.odict import odict + from pyparsing import * -from odict import odict +#from odict import odict try: import Image --- a/static/june_2007_style/make_style.py +++ b/static/june_2007_style/make_style.py @@ -1,13 +1,6 @@ #!/usr/bin/env python -#from galaxy import eggs -#import pkg_resources -#pkg_resources.require("Cheetah") - import sys, string, os.path, tempfile, subprocess -#from galaxy import eggs -# import pkg_resources -# pkg_resources.require( "Cheetah" ) # from Cheetah.Template import Template from subprocess import Popen, PIPE @@ -15,7 +8,12 @@ from subprocess import Popen, PIPE assert sys.version_info[:2] >= ( 2, 4 ) # To create a new style ( this is an example ): -# python make_style.py blue_colors.ini blue +# In case you have not yet installed required packages: +# % sudo easy_install pyparsing +# % sudo easy_install http://effbot.org/downloads/Imaging-1.1.7.tar.gz +# When you have the above installed, add whatever new style you want to /static/june_2007_style/blue_colors.ini and then: +# % cd ~/static/june_2007_style/ +# % python make_style.py blue_colors.ini blue def run( cmd ): return Popen( cmd, stdout=PIPE).communicate()[0] @@ -29,7 +27,8 @@ templates = [ ( "base.css.tmpl", "base.c ( "iphone.css.tmpl", "iphone.css" ), ( "reset.css.tmpl", "reset.css" ), ( "autocomplete_tagging.css.tmpl", "autocomplete_tagging.css") ] - + +# TODO: Are these images still being used? If not, clean this code up! images = [ ( "./gradient.py 9 30 $panel_header_bg_top - $panel_header_bg_bottom 0 0 $panel_header_bg_bottom 1 1", "panel_header_bg.png" ), ( "./gradient.py 9 30 $panel_header_bg_bottom - $panel_header_bg_top 0 0 $panel_header_bg_top 1 1", "panel_header_bg_pressed.png" ), @@ -49,6 +48,7 @@ images = [ ( "./circle.py 12 #FFFFFF #D8B365 none> workflow_circle_drag.png" ), ] +# TODO: Are these shared_images still being used? If not, clean this code up! shared_images = [ # Dialog boxes ( "ok_large.png", "done_message_bg", "done_message_icon.png" ),