Skip to content

Commit

Permalink
Added disclaimer to doc templates and stylesheets
Browse files Browse the repository at this point in the history
  • Loading branch information
Benders authored and Benders committed Oct 9, 2018
1 parent d22bb3f commit 9dbec08
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/html_templates/ptypysphinx/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
To this end, PtyPy supports data from the following
beamlines:</p>
<ul class="simple">
<li>I13, <a href="https://www.diamond.ac.uk">Diamond</a></li>
<li>I08, I13, I14, <a href="https://www.diamond.ac.uk">Diamond</a></li>
<li>ID16, <a href="https://www.esrf.eu">ESRF</a></li>
<!--<li>NanoScopium, <a href="https://www.synchrotron-soleil.fr">Soleil</a></li>-->
</ul>
15 changes: 15 additions & 0 deletions doc/html_templates/ptypysphinx/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@

{# add a page header on top of doc #}
{% block header %}

{% if pagename == 'index' %}
<div id="disclaimer">
<div class="disclaimer">
<p> Phase Focus Limited of Sheffield, UK has an international portfolio of patents and pending applications which relate to ptychography. A current list is available <a class="reference external" href="http://www.phasefocus.com/patents/">here</a>.</p><p>
Phase Focus grants royalty free licences of its patent rights for non-commercial academic research use, for reconstruction of simulated data and for reconstruction of data obtained at synchrotrons at X-ray wavelengths. These licenses can be applied for online by clicking on this <a class="reference external" href="http://www.phasefocus.com/licence/">link</a>.</p><p>
Phase Focus asserts that the software we have made available for download may be capable of being used in circumstances which may fall within the claims of one or more of the Phase Focus patents. Phase Focus advises that you apply for a licence from it before downloading any software from this website. </p>
<button type="button"
onclick="document.getElementById('disclaimer').innerHTML = ''">
I understand.</button>
</div>
</div>
{% endif %}

<div class="pageheader">
<ul>
<li><a href="http://ptycho.github.io/ptypy">Home</a></li>
Expand All @@ -22,3 +36,4 @@
</div>
{% endblock %}


15 changes: 15 additions & 0 deletions doc/html_templates/ptypysphinx/static/header.css_t
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ body {
font-family: 'Ubuntu','PT Sans' ,'Cuprum', sans-serif;
max-width: 1140px;
}

div.disclaimer{
text-align: left;
//margin-top: -12px;
color: #f9eed0;//white;
background-color: #2c5d8a;//#CA7900;//#40fbce;//#11557C;
padding: 1em;
padding-left: 1em;
padding-right: 1em;
font-weight: bold;
}

div.disclaimer a{
color: #d8b340;//white;
}

div.pageheader {
background-image: url(ptypy_header_bg_sphinx.jpg);
Expand Down
2 changes: 1 addition & 1 deletion doc/html_templates/startpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>
<p>Currently implemented:</p>

<ul>
<li>Fully parallelized (using MPI)</li>
<li>Dully parallelized (using MPI)</li>
<li>Difference map algorithm with power bound constraint</li>
<li>Maximum Likelihood with preconditioners and regularizers.</li>
<li>Mixed-state reconstructions of probe and object</li>
Expand Down

0 comments on commit 9dbec08

Please sign in to comment.