diff --git a/src/scripts/tutti/1_project-navigation.js b/src/scripts/tutti/1_project-navigation.js index 61ebea63..8f9b38b9 100644 --- a/src/scripts/tutti/1_project-navigation.js +++ b/src/scripts/tutti/1_project-navigation.js @@ -157,16 +157,16 @@ function containerResizeY(window_height){ var container_offset = $('#project-container').offset(); var container_height = window_height - container_offset.top; var container_height_wheader = window_height - container_offset.top - $('#project_nav-header').height(); - var window_height_minus_nav = $('#project_nav').height() - $('#project_nav-header').height(); + var window_height_minus_nav = window_height - $('#project_nav-header').height(); $('#project_context-header').width($('#project_context-container').width()); - $('#project_nav-container, .project_split').css( - {'max-height': window_height_minus_nav + 'px', - 'height': window_height_minus_nav + 'px'} - ); - if ($(window).width() > 768) { + $('#project_nav-container, #project_tree, .project_split').css( + {'max-height': window_height_minus_nav + 'px', + 'height': window_height_minus_nav + 'px'} + ); + if (container_height > parseInt($('#project-container').css("min-height"))) { if (projectTree){ $(projectTree).css( @@ -174,7 +174,8 @@ function containerResizeY(window_height){ 'height': container_height_wheader + 'px'} ); } - }; + } + }; if (projectTree){ Ps.update(projectTree) } diff --git a/src/templates/projects/edit.jade b/src/templates/projects/edit.jade index 91a6cf54..9efc4536 100644 --- a/src/templates/projects/edit.jade +++ b/src/templates/projects/edit.jade @@ -51,7 +51,7 @@ | {{ project.name }} // TODO - make list a macro - #project_tree + #project_tree.edit ul.project_nav-edit-list li(class="{% if title == 'edit' %}active{% endif %}") a(href="{{ url_for('projects.edit', project_url=project.url) }}") @@ -174,11 +174,6 @@ script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets script(type="text/javascript"). - /* UI Stuff */ - $(window).on("load resize",function(){ - containerResizeY($(window).height()); - }); - /* Initialize scrollbars */ if ((typeof Ps !== 'undefined') && window.innerWidth > 768){ Ps.initialize(document.getElementById('project_tree'), {suppressScrollX: true}); diff --git a/src/templates/projects/edit_node_types.jade b/src/templates/projects/edit_node_types.jade index dac4183a..52d11ea5 100644 --- a/src/templates/projects/edit_node_types.jade +++ b/src/templates/projects/edit_node_types.jade @@ -51,7 +51,7 @@ | {{ project.name }} // TODO - make list a macro - #project_tree + #project_tree.edit ul.project_nav-edit-list li(class="{% if title == 'edit' %}active{% endif %}") a(href="{{ url_for('projects.edit', project_url=project.url) }}") @@ -99,10 +99,6 @@ | {% endblock %} | {% block footer_scripts %} -script(type="text/javascript"). - $(window).on("load resize",function(){ - containerResizeY($(window).height()); - }); | {% endblock %} | {% block footer_navigation %} | {% endblock %} diff --git a/src/templates/projects/sharing.jade b/src/templates/projects/sharing.jade index 9e0bd175..9c1112fc 100644 --- a/src/templates/projects/sharing.jade +++ b/src/templates/projects/sharing.jade @@ -51,7 +51,7 @@ | {{ project.name }} // TODO - make list a macro - #project_tree + #project_tree.edit ul.project_nav-edit-list li(class="{% if title == 'edit' %}active{% endif %}") a(href="{{ url_for('projects.edit', project_url=project.url) }}") @@ -140,10 +140,6 @@ | {% endblock %} | {% block footer_scripts %} -script(type="text/javascript"). - $(window).on("load resize",function(){ - containerResizeY($(window).height()); - }); | {% if (project.user == current_user.objectid or current_user.has_role('admin')) %} script(src='//cdn.jsdelivr.net/autocomplete.js/0/autocomplete.jquery.min.js') script.