Skip to content

P
pdbfixer
Commit b69bc988 by Peter Eastman
Options

Lots of improvements to appearance of UI

parent bcc2717a
Showing with 433 additions and 3 deletions
pdbfixer/html/header.html
......@@ -42,7 +42,32 @@ function animateSpinner() {
}
</script>
<style>
body {font-family:sans-serif}
body {
margin-top: 0;
font-family:sans-serif;
background-color: rgb(217,217,217);
background-image: url("/image?name=background.jpg");
background-size: 80%;
background-repeat: repeat-y
}
input {
font-size: small
}
select {
font-size: small
}
table {
border-collapse: collapse;
border: 1pt solid black;
margin: 7pt
}
th {
padding: 2pt;
background-color: lightgray
}
td {
padding: 2pt
}
#progressParent {
position: fixed;
top: 40%;
......@@ -80,8 +105,9 @@ body {font-family:sans-serif}
This may take some time.
</div>
</div>
<div style="background-color:LightSkyBlue;font-style:italic;font-size:xx-large;text-align:center">PDBFixer</div>
<span style="background-color:LightSkyBlue;font-style:italic;font-size:large;float:right;height:100%;padding:0px 10px">
<span style="font-style:italic;font-size:large;float:right;position:relative;top:0;right:0;height:100%;padding:10px 10px">
<img src="/image?name=logo_small.png"/>
<p/>
<form method="post" action="/controls">
<input type="submit" name="newfile" value="New File" id="newfile"/>
<input type="submit" name="quit" value="Quit" style="float:right"/>
......
pdbfixer/images/logo.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="744.09448819"
height="1052.3622047"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="logo.svg"
inkscape:export-filename="/Users/peastman/logo.png"
inkscape:export-xdpi="109.29"
inkscape:export-ydpi="109.29">
<defs
id="defs4">
<linearGradient
id="linearGradient4026">
<stop
id="stop4028"
offset="0"
style="stop-color:#5a0000;stop-opacity:1;" />
<stop
style="stop-color:#ff0000;stop-opacity:1;"
offset="0.58999997"
id="stop4030" />
<stop
style="stop-color:#5a0000;stop-opacity:1;"
offset="1"
id="stop4032" />
</linearGradient>
<linearGradient
id="linearGradient4018">
<stop
id="stop4020"
offset="0"
style="stop-color:#5a0000;stop-opacity:1;" />
<stop
style="stop-color:#ff0000;stop-opacity:1;"
offset="0.55260158"
id="stop4022" />
<stop
style="stop-color:#5a0000;stop-opacity:1;"
offset="1"
id="stop4024" />
</linearGradient>
<linearGradient
id="linearGradient4010">
<stop
id="stop4012"
offset="0"
style="stop-color:#ff0000;stop-opacity:1;" />
<stop
style="stop-color:#5a0000;stop-opacity:1;"
offset="0.49692401"
id="stop4014" />
<stop
id="stop4016"
offset="1"
style="stop-color:#ff0000;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3962">
<stop
style="stop-color:#ff0000;stop-opacity:1;"
offset="0"
id="stop3964" />
<stop
id="stop3970"
offset="0.5"
style="stop-color:#5a0000;stop-opacity:1;" />
<stop
style="stop-color:#ff0000;stop-opacity:1;"
offset="1"
id="stop3966" />
</linearGradient>
<linearGradient
id="linearGradient3950">
<stop
style="stop-color:#640000;stop-opacity:1;"
offset="0"
id="stop3952" />
<stop
id="stop3960"
offset="0.57999998"
style="stop-color:#ff0000;stop-opacity:1;" />
<stop
id="stop3958"
offset="1"
style="stop-color:#640000;stop-opacity:1;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3950"
id="linearGradient3956"
x1="-34.722729"
y1="313.37689"
x2="-33.442162"
y2="544.48804"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3962"
id="linearGradient3968"
x1="-23.334583"
y1="595.64368"
x2="-22.211735"
y2="313.05106"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3962"
id="linearGradient3982"
gradientUnits="userSpaceOnUse"
x1="-23.334583"
y1="595.64368"
x2="-22.211735"
y2="313.05106" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3950"
id="linearGradient3984"
gradientUnits="userSpaceOnUse"
x1="-34.722729"
y1="313.37689"
x2="-33.442162"
y2="544.48804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3962"
id="linearGradient3988"
gradientUnits="userSpaceOnUse"
x1="-23.334583"
y1="595.64368"
x2="-22.211735"
y2="313.05106" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4026"
id="linearGradient3990"
gradientUnits="userSpaceOnUse"
x1="-34.722729"
y1="313.37689"
x2="-33.442162"
y2="544.48804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4018"
id="linearGradient4000"
x1="23.755289"
y1="576.83026"
x2="25.60638"
y2="357.68134"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4010"
id="linearGradient4008"
x1="28.608353"
y1="576.50879"
x2="30.683084"
y2="297.7854"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4010"
id="linearGradient4038"
gradientUnits="userSpaceOnUse"
x1="28.608353"
y1="576.50879"
x2="30.683084"
y2="297.7854" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4018"
id="linearGradient4040"
gradientUnits="userSpaceOnUse"
x1="23.755289"
y1="576.83026"
x2="25.60638"
y2="357.68134" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4010"
id="linearGradient4058"
gradientUnits="userSpaceOnUse"
x1="28.608353"
y1="576.50879"
x2="30.683084"
y2="297.7854" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4018"
id="linearGradient4060"
gradientUnits="userSpaceOnUse"
x1="23.755289"
y1="576.83026"
x2="25.60638"
y2="357.68134" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3962"
id="linearGradient4062"
gradientUnits="userSpaceOnUse"
x1="-23.334583"
y1="595.64368"
x2="-22.211735"
y2="313.05106" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4026"
id="linearGradient4064"
gradientUnits="userSpaceOnUse"
x1="-34.722729"
y1="313.37689"
x2="-33.442162"
y2="544.48804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3962"
id="linearGradient4080"
gradientUnits="userSpaceOnUse"
x1="-23.334583"
y1="595.64368"
x2="-22.211735"
y2="313.05106" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4026"
id="linearGradient4082"
gradientUnits="userSpaceOnUse"
x1="-34.722729"
y1="313.37689"
x2="-33.442162"
y2="544.48804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4010"
id="linearGradient4092"
gradientUnits="userSpaceOnUse"
x1="28.608353"
y1="576.50879"
x2="30.683084"
y2="297.7854" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4018"
id="linearGradient4094"
gradientUnits="userSpaceOnUse"
x1="23.755289"
y1="576.83026"
x2="25.60638"
y2="357.68134" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3962"
id="linearGradient4096"
gradientUnits="userSpaceOnUse"
x1="-23.334583"
y1="595.64368"
x2="-22.211735"
y2="313.05106" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4026"
id="linearGradient4098"
gradientUnits="userSpaceOnUse"
x1="-34.722729"
y1="313.37689"
x2="-33.442162"
y2="544.48804" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.36"
inkscape:cx="337.52197"
inkscape:cy="623.39608"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1079"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid4100" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<text
xml:space="preserve"
style="font-size:132px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Corbel;-inkscape-font-specification:Corbel Bold"
x="312.72311"
y="444.33685"
id="text3071"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3077"
x="312.72311"
y="444.33685">PDB</tspan></text>
<text
xml:space="preserve"
style="font-size:128px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Corbel;-inkscape-font-specification:Corbel Bold"
x="312.72311"
y="543.1557"
id="text3079"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3081"
x="312.72311"
y="543.1557">F</tspan></text>
<text
xml:space="preserve"
style="font-size:90px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Corbel;-inkscape-font-specification:Corbel Bold"
x="373.64224"
y="543.1557"
id="text3083"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3085"
x="373.64224"
y="543.1557">IXER</tspan></text>
<g
id="g4084"
transform="matrix(1.0485592,0,0,1.0485592,-15.223055,-26.773366)">
<g
transform="matrix(0.81849912,0,0,0.81849912,201.34662,71.34394)"
id="g4034">
<path
sodipodi:nodetypes="cccccccccccssccccccsccc"
inkscape:connector-curvature="0"
id="path3986"
d="m 30.709809,458.53208 c -3.26205,9.61339 -6.40589,21.12264 -9.36639,30.09012 -9.75528,29.17439 -15.1445143,57.1083 -19.8354043,88.24348 L -53.509661,576.2048 c -0.0958,-0.088 0.53293,-3.38159 1.39711,-7.31916 2.37225,-14.45464 8.23028,-28.66827 13.2993,-40.65921 6.54839,-15.01659 9.87488,-18.2202 18.71639,-32.35189 5.61933,-8.32727 11.7279504,-15.43134 18.1387604,-23.38396 4.39188,-5.4496 9.612658,-11.33393 15.2507276,-17.3726 5.154369,-4.83004 9.291303,-8.91406 13.79514,-13.77254 3.133974,-8.51144 7.319781,-26.92976 10.288791,-35.99915 0.95478,-3.1625 2.861961,-10.04486 3.959131,-13.61986 2.02407,-6.59518 7.72277,-28.00779 8.32959,-31.29806 l 0.33161,-1.79806 c -6.79495,-1.74207 -15.57648,-0.38021 -21.08242,-2.81912 22.07764,-20.2232 39.09657,-38.32511 59.4504,-57.33439 15.922721,22.72871 23.446181,45.53877 27.424601,65.38922 0,0 -12.26541,0.68868 -19.398701,-0.0783 -3.51888,5.12395 -6.57144,10.0097 -9.29157,14.26605 -4.35365,6.81486 -10.01863,14.8839 -13.34438,19.00735 -12.18538,15.10813 -13.56097,16.77871 -17.01622,20.66528 -6.57235,7.73171 -15.131123,15.44308 -20.959893,22.8353 -2.85461,7.50475 -3.730527,10.48709 -5.068897,17.97038 z"
style="fill:url(#linearGradient4092);fill-opacity:1" />
<path
style="fill:url(#linearGradient4094);fill-opacity:1;stroke:none"
d="m 1.7021277,576.6175 c 0,0 -0.011776,-13.91303 0.4255319,-20.85106 0.7626778,-12.10012 1.7702462,-24.22229 3.8297872,-36.17021 2.5772861,-14.9515 6.6547322,-29.61562 10.6382982,-44.25532 3.581492,-13.16207 7.969265,-26.09141 11.914893,-39.14894 2.57014,-8.50554 5.183063,-16.99865 7.659575,-25.53192 3.366934,-11.60138 6.859796,-23.17361 9.787234,-34.89361 1.442886,-5.77659 3.829787,-17.44681 3.829787,-17.44681 l 4.516163,0.76872 c 0,0 -2.143929,12.78956 -3.404255,19.14894 -1.806522,9.11539 -3.849938,18.1835 -5.957447,27.23404 -2.816593,12.09564 -5.395814,23.72239 -8.510638,35.74468 -2.174757,8.39392 -5.463683,17.21616 -7.920419,25.53192 -3.164664,10.71201 -6.451301,21.17682 -9.52639,31.91489 -3.02131,10.55027 -5.730688,21.19606 -8.085106,31.91489 -1.8263644,8.31478 -3.8330255,16.73277 -5.3672271,25.10639 -1.2986866,7.08818 -2.9787234,15.40149 -3.8297872,20.9334 z"
id="path3992"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssssssccsssssssc" />
</g>
<g
transform="matrix(0.81849912,0,0,0.81849912,254.07898,64.530513)"
id="g3972">
<path
sodipodi:nodetypes="sccccscacccccccccaaascsssssssccccs"
inkscape:connector-curvature="0"
id="path3176"
d="M 14.73022,587.12486 C 9.6427195,582.84884 4.8052195,578.7717 3.9802195,578.06454 -8.3563605,566.56961 -21.72978,555.41364 -32.47683,542.30503 l -3.31884,-4.14804 c 7.62854,-0.009 15.12485,-0.49349 22.67365,0.40116 -4.10887,-15.98403 -8.54856,-31.7873 -12.89825,-45.65679 -3.69008,-11.76627 -12.686443,-40.47921 -12.686443,-40.47921 0,0 -3.925389,-3.80313 -5.813067,-5.77825 -4.041429,-4.22864 -7.85701,-8.66751 -11.79511,-12.99254 -4.85198,-5.26156 -9.50523,-10.4023 -13.82766,-15.4205 -2.83379,-3.24686 -5.63396,-6.96468 -8.1174,-10.12241 -2.81003,-3.53636 -5.47381,-6.86778 -8.08099,-10.15352 -5.9692,-6.66071 -10.759811,-14.84715 -15.00958,-21.80357 -4.5902,-7.11846 -8.4654,-13.86005 -11.16116,-21.25 -3.73252,-10.01189 -5.94203,-20.27606 -5.93159,-30.3017 -0.0255,-3.6839 -0.0765,-11.05169 -0.0765,-11.05169 l 57.588786,0.394 c 0.12643,0.12664 0.340639,8.16327 0.865444,12.20939 1.963738,15.13992 5.02432,30.13982 8.52411,45 2.68861,11.41586 6.24708,22.61044 9.56758,33.85876 1.34702,4.56309 2.75143,9.10946 4.20031,13.64124 3.72151,11.6401 7.797828,32.14026 7.797828,32.14026 0,0 12.751132,12.03471 18.478642,18.35971 5.7275095,6.325 11.35868954,12.5125 12.5137195,13.75 1.15504,1.2375 4.60532,5.4 7.66729,9.25 3.0619805,3.85 7.6372705,9.56341 10.1673105,12.69646 7.85853,9.73154 10.27246,13.13722 14.3911,20.30354 0.47415,0.825 2.19713,3.75 3.82884,6.5 1.63172,2.75 4.041,6.8332 5.35396,9.07378 l 2.38719,4.07378 c 9.51329,1.40925 19.84519,1.87823 27.7783,3.29617 -11.470463,14.99765 -27.420637,28.74418 -34.36041,35.11559 -7.534017,6.92689 -13.45224,11.41422 -13.88957,11.56473 -0.19823,0.0682 -4.52293,-3.37451 -9.61044,-7.65052 z"
style="fill:url(#linearGradient4096);fill-opacity:1" />
<path
style="fill:url(#linearGradient4098);fill-opacity:1;stroke:none"
d="m -118.72146,313.5494 c 0,0 3.25772,18.58686 6.05239,27.28383 3.18724,9.91861 7.6852,19.49806 13.242013,28.3105 8.825196,13.99571 20.626366,25.89104 31.506848,38.35616 13.102735,15.01102 26.982939,29.32641 40.63927,43.83562 6.493014,6.89852 13.332094,13.47504 19.6347032,20.54794 7.76610238,8.71526 15.0853887,17.82263 22.3744288,26.94064 6.235109,7.79962 11.496859,15.67451 16.865238,24.0942 4.611553,7.2327 14.382859,22.11078 14.382859,22.11078 l -5.595773,-0.34319 c 0,0 -11.739075,-15.99858 -17.549467,-23.83055 C 17.349877,513.46712 11.523712,506.32927 5.4794521,499.39415 -7.962843,483.97061 -22.365859,469.409 -36.52968,454.64529 c -7.525806,-7.84455 -15.568806,-15.19851 -22.831051,-23.28767 -7.36895,-8.20802 -14.227371,-16.2226 -21.004566,-24.92562 -7.088762,-9.10312 -14.487928,-18.68101 -20.547943,-28.49904 -5.29148,-8.5729 -9.63818,-17.46276 -13.05347,-26.94064 -2.11556,-5.87095 -2.71909,-10.74085 -3.73237,-17.2971 -0.65134,-4.21439 -1.34254,-14.31647 -1.02238,-20.14582 z"
id="path3180"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssssssccssssssssc" />
</g>
</g>
</g>
</svg>
pdbfixer/ui.py
......@@ -20,6 +20,11 @@ def loadHtmlFile(name):
file = os.path.join(htmlPath, name)
return open(file).read()
def loadImageFile(name):
imagePath = os.path.join(os.path.dirname(__file__), 'images')
file = os.path.join(imagePath, name)
return open(file).read()
def controlsCallback(parameters, handler):
if 'newfile' in parameters:
displayStartPage()
......@@ -29,6 +34,16 @@ def controlsCallback(parameters, handler):
global uiIsRunning
uiIsRunning = False
def imageCallback(parameters, handler):
name = parameters['name'][0]
image = loadImageFile(name)
type = None
if name.endswith('.png'):
type = 'image/png'
elif name.endswith('.jpeg') or name.endswith('.jpg'):
type = 'image/jpeg'
handler.sendResponse(image, type=type)
def startPageCallback(parameters, handler):
global fixer
if 'type' in parameters:
......@@ -200,6 +215,7 @@ def launchUI():
header = loadHtmlFile("header.html")
uiserver.beginServing()
uiserver.setCallback(controlsCallback, "/controls")
uiserver.setCallback(imageCallback, "/image")
displayStartPage()
url = 'http://localhost:'+str(uiserver.server.server_address[1])
print("PDBFixer running: %s " % url)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment