Cleanup projec_detail and layout scripts

ffdnispdb/static/js/site.js

@@ -15,6 +15,7 @@ $(function () {
         });
     });
     $('.selectpicker').selectpicker();
+    $("[rel=tooltip]").tooltip();
     init_map();
 });
 

ffdnispdb/templates/layout.html

@@ -60,19 +60,14 @@
 {% block body %}{% endblock %}
 </div>
 
-{% endblock container%}
-</div> <!-- container -->   
+{% endblock container %}
+</div>
 
-  <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
-  <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
-  <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap-select.min.js') }}"></script>
-  <script type="text/javascript" src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
-  <script type="text/javascript" src="{{ url_for('static', filename='js/site.js') }}"></script>
-  <script type="text/javascript">
-    $(document).ready(function () {
-      $("[rel=tooltip]").tooltip();
-    });
-  </script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap-select.min.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/site.js') }}"></script>
 </body>
 
 </html>

ffdnispdb/templates/project_detail.html

@@ -7,9 +7,11 @@
 {% block body %}
   <div class="pull-right">
     <div class="text-right">
-      <a class="btn btn-success btn-small" href="{{ url_for('edit_project', projectid=project.id) }}"><i class="icon-edit icon-white"></i> {{ _("Edit") }}</a>
+      <a class="btn btn-success btn-small" href="{{ url_for('edit_project', projectid=project_row.id) }}"><i class="icon-edit icon-white"></i> {{ _("Edit") }}</a>
     </div>
+{%- if project.logoURL %}
     <a href="{{ project.website }}"><img alt="{{ project.name }}" src="{{ project.logoURL }}" style="max-width: 300px;" /></a>
+{%- endif %}
   </div>
   <dl class="dl-horizontal">
     <dt>{{ _("name")|capitalize }}</dt>
@@ -23,11 +25,11 @@
     <dt>{{ _("website")|capitalize }}</dt>
       <dd>{% if project.website %}<a href="{{ project.website }}">{{ project.website }}</a>{% else %}<em>None</em>{% endif %}</dd>
     <dt>{{ _("email")|capitalize }}</dt>
-      <dd>{{ project.email|default(_("<em>None given</em>"), True) }}</dd>
+      <dd>{% if project.email %}<a href="mailto:{{ project.email }}">{{ project.email }}</a>{% else %}<em>None given</em>{% endif %}</dd>
     <dt>{{ _("main mailing list")|capitalize }}</dt>
-      <dd>{{ project.email|default(_("<em>None given</em>"), True) }}</dd>
+      <dd>{% if project.mainMailingList %}<a href="mailto:{{ project.mainMailingList }}">{{ project.mainMailingList }}</a>{% else %}<em>None given</em>{% endif %}</dd>
     <dt>{{ _("chatrooms")|capitalize }}</dt>
-      {%- for c in project.chatrooms -%}
+      {% for c in project.chatrooms -%}
       <dd><code>{{ c }}</code></dd>
       {%- else -%}
       <dd><em>None</em></dd>