diff --git a/src/main/webapp/app/directives/accordionDirective.js b/src/main/webapp/app/directives/accordionDirective.js index b20ad86497..740e416c4d 100644 --- a/src/main/webapp/app/directives/accordionDirective.js +++ b/src/main/webapp/app/directives/accordionDirective.js @@ -80,6 +80,10 @@ vireo.directive("vireoPane", function ($location, $timeout, $routeParams, Accord $scope.query = attr.query !== undefined ? attr.query : "pane-" + count; + // A pane bar is the heading for the content it expands. Accordions nest, so + // the level is set by the caller to keep the page outline from skipping one. + $scope.headingLevel = attr.headingLevel !== undefined ? parseInt(attr.headingLevel, 10) : 2; + $scope.expanded = false; $scope.toggleExpanded = function () { diff --git a/src/main/webapp/app/directives/reviewSubmissionFieldsDirective.js b/src/main/webapp/app/directives/reviewSubmissionFieldsDirective.js index 89bfcbd191..c54175ee4d 100644 --- a/src/main/webapp/app/directives/reviewSubmissionFieldsDirective.js +++ b/src/main/webapp/app/directives/reviewSubmissionFieldsDirective.js @@ -10,9 +10,16 @@ vireo.directive('reviewsubmissionsfields', function ($location, InputTypes, Fiel showVocabularyWord: "&?", sortEmbargos: "&?", isEmbargo: "&?", - validate: "=?" + validate: "=?", + headingLevel: "=?" }, controller: function ($scope) { + // The workflow step names are section headings. Their level depends on how + // deeply this directive is embedded in the page that uses it, so callers may + // override it to avoid skipping a level. Only 2 and 3 are supported. + if ($scope.headingLevel !== 3) { + $scope.headingLevel = 2; + } if ($scope.validate) { $scope.submission.ready().then(function () { $scope.submission.validate(); diff --git a/src/main/webapp/app/resources/styles/sass/app.scss b/src/main/webapp/app/resources/styles/sass/app.scss index 1ba8ab43ed..2a3f435f22 100644 --- a/src/main/webapp/app/resources/styles/sass/app.scss +++ b/src/main/webapp/app/resources/styles/sass/app.scss @@ -132,7 +132,8 @@ main footer { margin: 25px 0; } -.settings-view h2 { +/* Panel and modal titles size themselves; this is for section headings only. */ +.settings-view h2:not(.panel-title):not(.modal-title) { font-weight: bold; text-rendering: optimizelegibility; } @@ -646,7 +647,8 @@ togglebutton .glyphicon-info-sign { opacity: 0.5; } -h4 { +h4, +.h4 { line-height: 22px; } @@ -853,14 +855,17 @@ footer p { } .admin-page h1, +.admin-page .h1, .my-profile h1 { font-weight: bold; text-rendering: optimizelegibility; } .admin-page h1 + hr, +.admin-page .h1 + hr, .my-profile h1 + hr, -.review-page h3 + hr { +.review-page h3 + hr, +.review-page .h3 + hr { border: 0; height: 1px; background-image: linear-gradient(to right, rgba(112, 112, 111, 0.4), rgba(50, 50, 50, 0)); diff --git a/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss b/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss index 24589b3d8b..8852b457c4 100644 --- a/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss +++ b/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss @@ -80,7 +80,7 @@ span.dialog-close { float: right; } -h4.dialog-header { +.dialog-header { font-weight: bold; margin-bottom: 0; } diff --git a/src/main/webapp/app/resources/styles/sass/views/submission/_submissionHistory.scss b/src/main/webapp/app/resources/styles/sass/views/submission/_submissionHistory.scss index 2e2378eaf0..1269acf68c 100644 --- a/src/main/webapp/app/resources/styles/sass/views/submission/_submissionHistory.scss +++ b/src/main/webapp/app/resources/styles/sass/views/submission/_submissionHistory.scss @@ -4,7 +4,7 @@ border-bottom: 1px solid #cccccc; } -.submission-history .page-head h3 { +.submission-history .page-head h1 { font-size: 2.2em; font-weight: normal; margin: 0; diff --git a/src/main/webapp/app/views/admin/settings/organization.html b/src/main/webapp/app/views/admin/settings/organization.html index ee281dd87b..ecd0b6e8c9 100644 --- a/src/main/webapp/app/views/admin/settings/organization.html +++ b/src/main/webapp/app/views/admin/settings/organization.html @@ -10,7 +10,7 @@
-

+
-

+
diff --git a/src/main/webapp/app/views/admin/settings/organization/emailWorkflowRules.html b/src/main/webapp/app/views/admin/settings/organization/emailWorkflowRules.html index c79dd59e77..e5f03f19ec 100644 --- a/src/main/webapp/app/views/admin/settings/organization/emailWorkflowRules.html +++ b/src/main/webapp/app/views/admin/settings/organization/emailWorkflowRules.html @@ -1,7 +1,7 @@
-

- Manage {{getSelectedOrganizationName()}} Email Workflow Rules

+

+ Manage {{getSelectedOrganizationName()}} Email Workflow Rules

@@ -18,7 +18,7 @@

- {{ status.name }} + {{ status.name }}
@@ -28,7 +28,7 @@

- {{ action.name }} + {{ action.name }}
diff --git a/src/main/webapp/app/views/admin/settings/organization/manageOrganization.html b/src/main/webapp/app/views/admin/settings/organization/manageOrganization.html index 2d3cccaf2b..ae8fb8226e 100644 --- a/src/main/webapp/app/views/admin/settings/organization/manageOrganization.html +++ b/src/main/webapp/app/views/admin/settings/organization/manageOrganization.html @@ -1,6 +1,6 @@
-

Manage {{getSelectedOrganizationName()}}

+

Manage {{getSelectedOrganizationName()}}

diff --git a/src/main/webapp/app/views/admin/settings/organization/manageWorkflow.html b/src/main/webapp/app/views/admin/settings/organization/manageWorkflow.html index 6ebe1e38c2..e495322abc 100644 --- a/src/main/webapp/app/views/admin/settings/organization/manageWorkflow.html +++ b/src/main/webapp/app/views/admin/settings/organization/manageWorkflow.html @@ -1,6 +1,6 @@
-

Manage {{getSelectedOrganizationName()}} Workflow

+

Manage {{getSelectedOrganizationName()}} Workflow

@@ -15,7 +15,7 @@

Manage {{getSelectedOrganizationName()}} Workflow

wvr-modal-backdrop="static"> - {{$index+1}}. {{step.name}} + {{$index+1}}. {{step.name}}
diff --git a/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStep.html b/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStep.html index c4923373d5..c794630a32 100644 --- a/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStep.html +++ b/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStep.html @@ -9,7 +9,7 @@
- +
diff --git a/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStepContent.html b/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStepContent.html index cc3601ff72..1617fd8e68 100644 --- a/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStepContent.html +++ b/src/main/webapp/app/views/admin/settings/organization/workflowsteps/workflowStepContent.html @@ -112,7 +112,7 @@
-

Read only. Workflow step is non overrideable.

+

Read only. Workflow step is non overrideable.

  • {{fieldProfile.position}}. *{{fieldProfile.gloss}} @@ -185,7 +185,7 @@

    Read only. Workflow step is non overrideable.

-

Read only. Workflow step is non overrideable.

+

Read only. Workflow step is non overrideable.