diff --git a/src/styles/_app_base.sass b/src/styles/_app_base.sass index aba2f12..a19d6e3 100644 --- a/src/styles/_app_base.sass +++ b/src/styles/_app_base.sass @@ -16,6 +16,11 @@ body nav.sidebar .navbar-item.shots +sidebar-button-active + &[data-context="asset"] + overflow: hidden // columns scroll independently + nav.sidebar .navbar-item.assets + +sidebar-button-active + &[data-context="dashboard"] nav.sidebar .navbar-item.attract +sidebar-button-active diff --git a/src/templates/attract/index.jade b/src/templates/attract/index.jade index eb376c9..9950a07 100644 --- a/src/templates/attract/index.jade +++ b/src/templates/attract/index.jade @@ -27,9 +27,11 @@ a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") {{ proj.name }} span.pull-right - a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") Shots  - | | - a(href="{{ url_for('attract.tasks.perproject.index', project_url=proj.url) }}") Tasks + a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") Shots + |  |  + a(href="{{ url_for('attract.assets.perproject.index', project_url=proj.url) }}") Assets + |  |  + a(href="{{ url_for('attract.tasks.perproject.index', project_url=proj.url) }}") Tasks .progress | {% for status, percentage in summary.percentages() %} .progress-bar.bg-status( diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.jade index c137aa5..641d875 100644 --- a/src/templates/attract/layout.jade +++ b/src/templates/attract/layout.jade @@ -35,15 +35,15 @@ html(lang="en") title='Attract') i.pi-attract | {% if project %} - li - a.navbar-item.tasks(href="{{ url_for('attract.tasks.perproject.index', project_url=project.url) }}", - title='Tasks for project {{ project.name }}') T li a.navbar-item.shots(href="{{ url_for('attract.shots.perproject.index', project_url=project.url) }}", title='Shots for project {{ project.name }}') S li - a.navbar-item.shots(href="{{ url_for('attract.assets.perproject.index', project_url=project.url) }}", + a.navbar-item.assets(href="{{ url_for('attract.assets.perproject.index', project_url=project.url) }}", title='Assets for project {{ project.name }}') A + li + a.navbar-item.tasks(href="{{ url_for('attract.tasks.perproject.index', project_url=project.url) }}", + title='Tasks for project {{ project.name }}') T | {% else %} | {% if current_user.is_authenticated %} li