Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/webapp/app/directives/accordionDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
11 changes: 8 additions & 3 deletions src/main/webapp/app/resources/styles/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -646,7 +647,8 @@ togglebutton .glyphicon-info-sign {
opacity: 0.5;
}

h4 {
h4,
.h4 {
line-height: 22px;
}

Expand Down Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ span.dialog-close {
float: right;
}

h4.dialog-header {
.dialog-header {
font-weight: bold;
margin-bottom: 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/app/views/admin/settings/organization.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div id="organizationManagement" class="col-xs-12" ng-controller="OrganizationManagementController">
<div class="row" ng-show="showOrganizationManagement()">
<div class="panel-heading">
<h3 class="panel-title">
<div class="panel-title h3">
<ul class="inline-list">
<li ng-click="activateManagementPane('edit')">
<span class="management-pane-selector"
Expand All @@ -34,7 +34,7 @@ <h3 class="panel-title">
</span>
</li>
</ul>
</h3>
</div>
</div>
<div class="col-xs-12 panel-wrap" ng-class="{active: managementPaneIsActive('edit')}">
<span ng-include="'views/admin/settings/organization/manageOrganization.html'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="panel panel-default" ng-controller="EmailWorkflowRulesController">
<div class="panel-heading">
<h3 class="panel-title">
Manage {{getSelectedOrganizationName()}} Email Workflow Rules</h3>
<h2 class="panel-title">
Manage {{getSelectedOrganizationName()}} Email Workflow Rules</h2>
</div>
<div class="panel-body">

Expand All @@ -18,7 +18,7 @@ <h3 class="panel-title">
<div class="row">
<div class="col-xs-12">
<vireo-accordion single-expand="false">
<vireo-pane ng-repeat="status in submissionStatuses" query="email-workflowstep-rules-{{ status.name }}" html="views/admin/settings/organization/emailWorkflowRule.html">{{ status.name }}</vireo-pane>
<vireo-pane heading-level="3" ng-repeat="status in submissionStatuses" query="email-workflowstep-rules-{{ status.name }}" html="views/admin/settings/organization/emailWorkflowRule.html">{{ status.name }}</vireo-pane>
</vireo-accordion>
</div>
</div>
Expand All @@ -28,7 +28,7 @@ <h3 class="panel-title">
<div class="row">
<div class="col-xs-12">
<vireo-accordion single-expand="false">
<vireo-pane ng-repeat="action in submissionActions" query="email-workflowstep-rules-{{ action.name }}" html="views/admin/settings/organization/emailWorkflowRule.html">{{ action.name }}</vireo-pane>
<vireo-pane heading-level="3" ng-repeat="action in submissionActions" query="email-workflowstep-rules-{{ action.name }}" html="views/admin/settings/organization/emailWorkflowRule.html">{{ action.name }}</vireo-pane>
</vireo-accordion>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Manage {{getSelectedOrganizationName()}}</h3>
<h2 class="panel-title">Manage {{getSelectedOrganizationName()}}</h2>
</div>

<div class="panel-body">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Manage {{getSelectedOrganizationName()}} Workflow</h3>
<h2 class="panel-title">Manage {{getSelectedOrganizationName()}} Workflow</h2>
</div>
<div class="panel-body">
<div class="col-md-12">
Expand All @@ -15,7 +15,7 @@ <h3 class="panel-title">Manage {{getSelectedOrganizationName()}} Workflow</h3>
wvr-modal-backdrop="static">
</modal>
<vireo-accordion single-expand="false">
<vireo-pane ng-repeat="step in getSelectedOrganizationAggregateWorkflowSteps() track by $index" bar-view="views/admin/settings/organization/workflowsteps/workflowStep.html" query="{{step.name}}" html="views/admin/settings/organization/workflowsteps/workflowStepContent.html">{{$index+1}}. {{step.name}}</vireo-pane>
<vireo-pane heading-level="3" ng-repeat="step in getSelectedOrganizationAggregateWorkflowSteps() track by $index" bar-view="views/admin/settings/organization/workflowsteps/workflowStep.html" query="{{step.name}}" html="views/admin/settings/organization/workflowsteps/workflowStepContent.html">{{$index+1}}. {{step.name}}</vireo-pane>
</vireo-accordion>

<hr />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
</div>
<div class="panel-selection"><img ng-if="loading" class="loader" src="resources/images/ajax-loader.gif" /></div>
<span ng-transclude></span>
<span role="heading" aria-level="{{headingLevel}}" ng-transclude></span>
</div>
<div class="panel-body" ng-class="{'expanded': expanded}">
<div ng-include="html" class="panel-content-wrapper" onload="loaded()"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</div>

<div ng-if="!step.overrideable && step.originatingOrganization !== getSelectedOrganizationId()">
<h3>Read only. Workflow step is non overrideable.</h3>
<h4 class="h3">Read only. Workflow step is non overrideable.</h4>
<ul class="list-unstyled">
<li ng-repeat="fieldProfile in step.aggregateFieldProfiles">
{{fieldProfile.position}}. <span ng-if="!fieldProfile.optional">*</span>{{fieldProfile.gloss}}
Expand Down Expand Up @@ -185,7 +185,7 @@ <h3>Read only. Workflow step is non overrideable.</h3>
</div>

<div ng-if="!step.overrideable && step.originatingOrganization !== getSelectedOrganizationId()">
<h3>Read only. Workflow step is non overrideable.</h3>
<h4 class="h3">Read only. Workflow step is non overrideable.</h4>
<ul class="list-unstyled">
<li ng-repeat="note in step.aggregateNotes">
{{note.position}}. {{note.name}}
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/app/views/admin/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1>

<div class="row" ng-show="loaded">
<div class="view-section-header">
<h1>REVIEWER NOTES</h1>
<h2 class="h1">REVIEWER NOTES</h2>
</div>
<div class="form-inline reviewer-notes">
<span ng-if="!savingReviewerNotes && !editingReviewerNotes" class="glyphicon glyphicon-pencil clickable" ng-click="editReviewerNotes()"></span>
Expand All @@ -46,7 +46,7 @@ <h1>REVIEWER NOTES</h1>
<div class="row" ng-show="loaded">

<div class="view-section-header">
<h1>ACTION LOG</h1>
<h2 class="h1">ACTION LOG</h2>
<button class="btn btn-default view-action-button" ng-click="openModal('#addCommentModal')">Add Comment</button>
</div>

Expand All @@ -59,7 +59,7 @@ <h1>ACTION LOG</h1>
<div class="row" ng-show="loaded">
<a name="all-files"></a>
<div class="view-section-header">
<h1>ALL FILES</h1>
<h2 class="h1">ALL FILES</h2>
<button class="btn btn-default view-action-button" ng-click="openModal('#addFileModal')">Add File</button>
</div>
<table class="table table-bordered table-striped table-hover etd-table">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/directives/accordionPane.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="{{::query}}" class="panel panel-default">
<div ng-click="toggleExpanded()" class="panel-heading" ng-class="{'expanded': expanded}">
<div class="panel-selection"><img ng-if="loading" class="loader" src="resources/images/ajax-loader.gif" /></div>
<span ng-transclude></span>
<span role="heading" aria-level="{{headingLevel}}" ng-transclude></span>
<span class="glyphicon glyphicon-menu-down pull-right" ng-show="!expanded"></span>
<span class="glyphicon glyphicon-menu-up pull-right" ng-show="expanded"></span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/directives/lockingTextArea.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="row">
<h4>{{ label }}<div tooltip="{{hint}}"><span class="glyphicon glyphicon-info-sign opaque color-reset"></span></div></h4>
<div class="h4">{{ label }}<div tooltip="{{hint}}"><span class="glyphicon glyphicon-info-sign opaque color-reset"></span></div></div>

<div class="lock-control">
<a ng-if="locked" ng-click="toggleLock()" class="hover-pointer">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<div class="review-required-fields-directive" ng-repeat="submissionWorkflowStep in submission.submissionWorkflowSteps track by $index">
<h3>
<h2 ng-if="headingLevel === 2" class="h3">
{{submissionWorkflowStep.name}}
<span ng-if="!hideLinks" class="link-to-step" ng-click="jumpToStep(submissionWorkflowStep)">
<span class="glyphicon glyphicon-link"></span>
</span>
</h2>
<h3 ng-if="headingLevel === 3">
{{submissionWorkflowStep.name}}
<span ng-if="!hideLinks" class="link-to-step" ng-click="jumpToStep(submissionWorkflowStep)">
<span class="glyphicon glyphicon-link"></span>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div ng-show="submission" class="dialog actions">
<span class="dialog-close clickable" ng-click="show.reverse()">[{{show[0]}}]</span>
<h4 class="dialog-header">Requirements Checklist:</h4>
<h2 class="h4 dialog-header">Requirements Checklist:</h2>
<div class="dialog-content" ng-class="{'dialog-open': show[0] === '-', 'dialog-closed': show[0] === '+'}">
<ul class="dialog-actions-list">
<li ng-repeat="customAction in submission.customActionValues | orderBy:'definition.position'" ng-if="customAction.definition.isStudentVisible" class="cutom-action-label">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div ng-show="submission" class="dialog state" ng-class="{'immutable': submission.submissionStatus.name != 'Needs Correction', 'needs-correction': submission.submissionStatus.name == 'Needs Correction'}">
<span class="dialog-close clickable" ng-click="show.reverse()">[{{show[0]}}]</span>
<h4 class="dialog-header">Current Submission State:</h4>
<h2 class="h4 dialog-header">Current Submission State:</h2>
<span class="submission-state">{{submission.submissionStatus.name}}</span>
<div class="dialog-content" ng-class="{'dialog-open': show[0] === '-', 'dialog-closed': show[0] === '+'}">
<span ng-if="submission.submissionStatus.name != 'Needs Correction'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div ng-show="submission" class="dialog state" ng-class="{'immutable': submission.submissionStatus.name != 'Needs Correction', 'needs-correction': submission.submissionStatus.name == 'Needs Correction'}">
<span class="dialog-close clickable" ng-click="show.reverse()">[{{show[0]}}]</span>
<h4 class="dialog-header">Current Submission State:</h4>
<h2 class="h4 dialog-header">Current Submission State:</h2>
<span class="submission-state">{{submission.submissionStatus.name}}</span>
<div class="dialog-content" ng-class="{'dialog-open': show[0] === '-', 'dialog-closed': show[0] === '+'}">
<span ng-if="submission.submissionStatus.name != 'Needs Correction'">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/inputtype/input-radio.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
aria-labelledby="radio-label-{{profile.fieldPredicate.value}}-{{$index}}"/>
</div>
<div class="col-xs-8 well" id="radio-label-{{profile.fieldPredicate.value}}-{{$index}}">
<span><h5><b>{{word.name}}</b></h5>{{word.definition}}</span>
<div class="h5"><b>{{word.name}}</b></div>{{word.definition}}
</div>
<div class="col-xs-2">
<span ng-if="!fieldValue.updating && $index === 0" class="glyphicon glyphicon-info-sign opaque" aria-label="{{ profile.help }}" tooltip="{{ profile.help }}"> </span>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/modals/addMemberModal.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button type="button" class="close" ng-click="closeModal()" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Add Member</h3>
<h2 class="h3 modal-title">Add Member</h2>
</div>

<div class="modal-body">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/modals/loginModal.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button type="button" class="close" ng-click="reset()" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Login</h3>
<h2 class="h3 modal-title">Login</h2>
</div>

<form name="forms.login" novalidate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button type="button" class="close" ng-click="resetEmailWorkflowRule()" data-dismiss="modal" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Add Email Workflow Rule to {{ (status || action).name }}</h3>
<h2 class="h3 modal-title">Add Email Workflow Rule to {{ (status || action).name }}</h2>
</div>

<form ng-submit="addEmailWorkflowRule(newTemplate, newRecipient, status || action)" name="forms.add" novalidate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<button type="button" class="close" ng-click="cancelDeleteEmailWorkflowRule()" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Delete Email Workflow Rule</h3>
<h2 class="h3 modal-title">Delete Email Workflow Rule</h2>
</div>

<form ng-submit="deleteEmailWorkflowRule()" novalidate>

<div class="modal-body">
<h4>Really delete email workflow rule?</h4>
<p class="h4">Really delete email workflow rule?</p>
</div>

<div class="modal-footer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button type="button" class="close" ng-click="resetEditEmailWorkflowRule()" data-dismiss="modal" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Edit Email Workflow Rule</h3>
<h2 class="h3 modal-title">Edit Email Workflow Rule</h2>
</div>

<form ng-submit="editEmailWorkflowRule(rule)" name="forms.add" novalidate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<button type="button" class="close" ng-click="resetFieldProfiles()" data-dismiss="modal" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Are You Sure?</h3>
<h2 class="h3 modal-title">Are You Sure?</h2>
</div>

<form ng-submit="removeFieldProfile()" novalidate>

<validationmessage results="modalData.ValidationResults"></validationmessage>

<div class="modal-body">
<h4><b>Click confirm to remove the Field Profile: {{modalData.gloss}}</b></h4>
<h4>Organization: {{getSelectedOrganizationName()}}</h4>
<h4>Workflow Step: {{step.name}}</h4>
<h4>Predicate: {{modalData.fieldPredicate.value}}</h4>
<p class="h4"><b>Click confirm to remove the Field Profile: {{modalData.gloss}}</b></p>
<p class="h4">Organization: {{getSelectedOrganizationName()}}</p>
<p class="h4">Workflow Step: {{step.name}}</p>
<p class="h4">Predicate: {{modalData.fieldPredicate.value}}</p>
</div>

<div class="modal-footer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button type="button" class="close" ng-click="advanced = false; controlledVocabulary = false; resetFieldProfiles();" data-dismiss="modal" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Update Field</h3>
<h2 class="h3 modal-title">Update Field</h2>
</div>

<form ng-submit="advanced = false; controlledVocabulary = false; updateFieldProfile();" name="forms.update" novalidate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button type="button" class="close" ng-click="advanced = false; controlledVocabulary = false; resetFieldProfiles();" data-dismiss="modal" aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Add Field</h3>
<h2 class="h3 modal-title">Add Field</h2>
</div>

<form ng-submit="advanced = false; controlledVocabulary = false; createFieldProfile();" name="forms.create" novalidate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Are You Sure?</h3>
<h2 class="h3 modal-title">Are You Sure?</h2>
</div>

<form ng-submit="removeNote()" novalidate>

<validationmessage results="modalData.ValidationResults"></validationmessage>

<div class="modal-body">
<h4><b>Click confirm to remove the Note:</b></h4>
<h4>Workflow Step: {{step.name}}</h4>
<h4>Name: {{modalData.name}}</h4>
<h4>Text: {{modalData.text}}</h4>
<p class="h4"><b>Click confirm to remove the Note:</b></p>
<p class="h4">Workflow Step: {{step.name}}</p>
<p class="h4">Name: {{modalData.name}}</p>
<p class="h4">Text: {{modalData.text}}</p>
</div>

<div class="modal-footer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
aria-label="Close">
<span class="modal-close" aria-hidden="true">&times;</span>
</button>
<h3 class="modal-title">Edit Note</h3>
<h2 class="h3 modal-title">Edit Note</h2>
</div>

<form ng-submit="updateNote()" name="forms.update" novalidate>
Expand Down
Loading
Loading