Merge 45d4f98 into 4f88207

atramhasis/static/js/concept.js

@@ -0,0 +1,12 @@
+$(document).ready(function () {
+  var searchUrl = window.location.search.substr(1);
+  var params = searchUrl.split();
+
+  if (params.indexOf('view_tree') > -1) {
+    openTreeTab();
+  }
+});
+
+function openTreeTab() {
+  document.getElementById('tree-link').click();
+}

atramhasis/templates/concept.jinja2

@@ -92,7 +92,7 @@
         </div>
         <ul class="tabs tabnav" data-tab role="tablist" style="width:100%">
           <li class="tab-title active" role="presentation" style="width:50%;"><a href="#panel2-1" role="tab" tabindex="0" aria-selected="true" aria-controls="panel2-1">{% trans %}view_relations{% endtrans %}</a></li>
-          <li class="tab-title" role="presentation" style="width:50%;"><a href="#panel2-2" role="tab" tabindex="0" aria-selected="false" aria-controls="panel2-2" style="border-left: 0;">{% trans %}view_tree{% endtrans %}</a></li>
+          <li class="tab-title" role="presentation" style="width:50%;"><a id="tree-link" href="#panel2-2" role="tab" tabindex="0" aria-selected="false" aria-controls="panel2-2" style="border-left: 0;">{% trans %}view_tree{% endtrans %}</a></li>
         </ul>
         <div class="tabs-content">
           <section role="tabpanel" aria-hidden="false" class="content active" id="panel2-1">
@@ -180,4 +180,5 @@
       {% endif %}
     </div>
   </div>
+  <script type="text/javascript" src="{{ request.static_path(app_package + ':static/js/concept.js') }}"></script>
 {% endblock %}

atramhasis/templates/tree.jinja2

@@ -212,7 +212,7 @@
         d3.event.preventDefault();
         if (d.concept_id) {
           var basepath = '{{ request.route_path('concept', scheme_id= scheme_id, c_id = '') }}';
-          window.location.href = basepath + d.concept_id;
+          window.location.href = basepath + d.concept_id +'?view_tree';
         }
         else {
           if (d.scheme_id) {