diff --git a/tethysext/workflows/controllers/workflows/map_workflows/spatial_condor_job_mwv.py b/tethysext/workflows/controllers/workflows/map_workflows/spatial_condor_job_mwv.py index 6f6cf0b..d0d5961 100644 --- a/tethysext/workflows/controllers/workflows/map_workflows/spatial_condor_job_mwv.py +++ b/tethysext/workflows/controllers/workflows/map_workflows/spatial_condor_job_mwv.py @@ -118,6 +118,7 @@ def render_condor_jobs_table(self, request, session, workflow, current_step, pre # Get the current app step_url_name = self.get_step_url_name(request, workflow) + context = { 'workflow': workflow, 'steps': steps, @@ -131,6 +132,7 @@ def render_condor_jobs_table(self, request, session, workflow, current_step, pre 'back_url': self.back_url, 'nav_title': workflow.name, 'nav_subtitle': workflow.DISPLAY_TYPE_SINGULAR, + 'description': workflow.description, 'jobs_table': jobs_table, 'base_template': self.base_template } diff --git a/tethysext/workflows/controllers/workflows/workflow_view.py b/tethysext/workflows/controllers/workflows/workflow_view.py index 5501e67..5e83891 100644 --- a/tethysext/workflows/controllers/workflows/workflow_view.py +++ b/tethysext/workflows/controllers/workflows/workflow_view.py @@ -88,6 +88,7 @@ def get_context(self, request, session, context, workflow_id, step_id, *args, ** # Get the current app step_url_name = self.get_step_url_name(request, workflow) + context.update({ 'workflow': workflow, 'steps': steps, @@ -95,7 +96,8 @@ def get_context(self, request, session, context, workflow_id, step_id, *args, ** 'previous_step': previous_step, 'next_step': next_step, 'step_url_name': step_url_name, - 'nav_title': 'Replacement Resource Name: replacement workflow name', + 'nav_title': workflow.name, + 'description': workflow.description, 'nav_subtitle': workflow.DISPLAY_TYPE_SINGULAR, 'previous_title': self.previous_title, 'next_title': self.next_title, @@ -426,3 +428,4 @@ def get_step_specific_context(self, request, session, context, current_step, pre dict: key-value pairs to add to context. """ return {} + diff --git a/tethysext/workflows/models/workflow.py b/tethysext/workflows/models/workflow.py index aad7b58..856e147 100644 --- a/tethysext/workflows/models/workflow.py +++ b/tethysext/workflows/models/workflow.py @@ -77,6 +77,7 @@ class TethysWorkflow(WorkflowsBase, AttributesMixin, ResultsMixin): name = Column(String) date_created = Column(DateTime, default=dt.datetime.utcnow) _attributes = Column(String) + description = Column(String, nullable=True) steps = relationship('Step', order_by='Step.order', backref='workflow', cascade='all,delete') diff --git a/tethysext/workflows/public/css/nav_header.css b/tethysext/workflows/public/css/nav_header.css index fe65bda..62a70e2 100644 --- a/tethysext/workflows/public/css/nav_header.css +++ b/tethysext/workflows/public/css/nav_header.css @@ -46,4 +46,11 @@ #nav-header #nav-title .subtitle { font-size: 12pt; +} + +#nav-header #nav-title .description { + /* Prevent text from wrapping and add ellipsis at the end of line for overlap*/ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } \ No newline at end of file diff --git a/tethysext/workflows/templates/gizmos/new_workflow_modal.html b/tethysext/workflows/templates/gizmos/new_workflow_modal.html index 08fec1a..5e1288a 100644 --- a/tethysext/workflows/templates/gizmos/new_workflow_modal.html +++ b/tethysext/workflows/templates/gizmos/new_workflow_modal.html @@ -25,6 +25,10 @@