From b1940c761d55511b6d93897297c1d6971da863e9 Mon Sep 17 00:00:00 2001
From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 23 Jul 2014 13:46:39 -0300
Subject: [PATCH] Institution page: wip to fix

---
 portal/templates/fibre/fibre_institution.html | 47 +------------------
 .../fibre/fibre_management-tab-about.html     | 10 ++--
 2 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/portal/templates/fibre/fibre_institution.html b/portal/templates/fibre/fibre_institution.html
index 09b90719..c8a668f1 100644
--- a/portal/templates/fibre/fibre_institution.html
+++ b/portal/templates/fibre/fibre_institution.html
@@ -28,50 +28,6 @@
 </div>
 <div class="container tab-content">
 	<div class="tab-pane active row" id="about">
-        <div class="col-md-6">
-        	<div>
-        		<img src="{{ STATIC_URL|add:'img/institutions/'|add:authority.authority_hrn|add:'.gif'|file_exists }}" alt="{{authority.name}}">
-        	</div>
-        	<br />
-        	<h3><a href="{{authority.url}}">{{authority.name}}</a></h3>
-        	<p>
-        		{{authority.address}} <br />
-        		{{authority.postcode}} {{authority.city}} <br />
-        		{{authority.country}}
-        	</p>
-        	<br />
-        	<h4>Onelab membership</h4> 
-        	<p>
-        		{{ authority.onelab_membership }}
-        	</p>
-        </div>
-        <div class="col-md-6">
-        	<h4>Legal Contact:</h4>
-        	<p>
-        	{% for c in authority_contacts.legal %}
-        		 {{ c }} <br />
-        	{% endfor %}
-        	</p>
-        	<br />
-        	<h4>Scientific Contact:</h4>
-        	<p>
-        	{% for c in authority_contacts.scientific %}
-        		{{ c }} <br />
-        	{% endfor %}
-        	</p>
-        	<br />
-        	<h4>Technical Contact:</h4>
-        	<p>
-        	{% for c in authority_contacts.technical %}
-        		{{ c }} <br />
-        	{% endfor %}
-        	</p>
-        </div>
-        <script>
-        $(document).ready(function() {
-            $('#authority_name').text("{{ authority.name|default:authority.authority_hrn }}");
-        });
-        </script>
 	</div>
 	
 	<div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
@@ -205,7 +161,7 @@ $(document).ready(function() {
     {% endif %}
 
 }); // End document.ready
-/*
+
 $(document).ready(function() {
 	$('.nav-tabs a').click(function (e) {
   		e.preventDefault();
@@ -221,6 +177,5 @@ $(document).ready(function() {
 		$('.nav-tabs a[href=#about]').click();
 	}
 });
-*/
 </script>
 {% endblock %}
diff --git a/portal/templates/fibre/fibre_management-tab-about.html b/portal/templates/fibre/fibre_management-tab-about.html
index 30fd067c..687b7de3 100644
--- a/portal/templates/fibre/fibre_management-tab-about.html
+++ b/portal/templates/fibre/fibre_management-tab-about.html
@@ -38,8 +38,12 @@
 	{% endfor %}
 	</p>
 </div>
-<script>
-$(document).ready(function() {
-    $('#authority_name').text("{{ authority.name|default:authority.authority_hrn }}");
+<script>$(document).ready(function() {
+{% if authority.name %}
+    auth_name = "{{authority.name}}";
+{% else %}
+    auth_name = "{{authority.authority_hrn}}";
+{% endif %}
+    $('#authority_name').text(auth_name);
 });
 </script>
-- 
2.43.0