Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[unfold.git] / portal / templates / onelab / onelab_management-tab-about.html

diff --git a/portal/templates/onelab/onelab_management-tab-about.html b/portal/templates/onelab/onelab_management-tab-about.html
index 687b7de..bc768a6 100644 (file)
--- a/portal/templates/onelab/onelab_management-tab-about.html
+++ b/portal/templates/onelab/onelab_management-tab-about.html
@@ -4,19 +4,36 @@
                <img src="{{ STATIC_URL|add:'img/institutions/'|add:authority.authority_hrn|add:'.gif'|file_exists }}" alt="{{authority.name}}">
        </div>
        <br />
+    {% if authority.name and authority.url %}
        <h3><a href="{{authority.url}}">{{authority.name}}</a></h3>
+    {% elif authority.name %}
+       <h3>{{authority.name}}</h3>
+    {% endif %}
        <p>
+    {% if authority.address %}
                {{authority.address}} <br />
-               {{authority.postcode}} {{authority.city}} <br />
+    {% endif %}
+    {% if authority.postcode %}
+               {{authority.postcode}} 
+    {% endif %}
+    {% if authority.address %}
+        {{authority.city}} <br />
+    {% endif %}
+    {% if authority.address %}
                {{authority.country}}
+    {% endif %}
        </p>
        <br />
+
+    {% if authority.address %}
        <h4>Onelab membership</h4> 
        <p>
                {{ authority.onelab_membership }}
        </p>
+    {% endif %}
 </div>
 <div class="col-md-6">
+    {% if authority.legal %}
        <h4>Legal Contact:</h4>
        <p>
        {% for c in authority_contacts.legal %}
@@ -24,6 +41,8 @@
        {% endfor %}
        </p>
        <br />
+    {% endif %}
+    {% if authority.scientific %}
        <h4>Scientific Contact:</h4>
        <p>
        {% for c in authority_contacts.scientific %}
@@ -31,12 +50,15 @@
        {% endfor %}
        </p>
        <br />
+    {% endif %}
+    {% if authority.technical %}
        <h4>Technical Contact:</h4>
        <p>
        {% for c in authority_contacts.technical %}
                {{ c }} <br />
        {% endfor %}
        </p>
+    {% endif %}
 </div>
 <script>$(document).ready(function() {
 {% if authority.name %}