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
34 changes: 34 additions & 0 deletions src/main/webapp/app/directives/keyboardActivateDirective.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
vireo.directive('keyboardActivate', function() {
return {
restrict: 'A',
link: function($scope, element) {

// Anything exposed as role="button" must also respond to Enter and
// Space. Native buttons and links already do, so leave those alone
// rather than activating them twice.
var nativelyActivated = ['A', 'BUTTON', 'INPUT', 'SELECT', 'TEXTAREA'];

if (nativelyActivated.indexOf(element[0].nodeName) > -1) {
return;
}

// Bound natively instead of with ng-keydown. ng-keydown would run
// inside a digest, and the click dispatched below starts its own,
// which would throw "$apply already in progress".
element.on('keydown', function(event) {

if (event.which !== 13 && event.which !== 32) {
return;
}

// Space would otherwise scroll the page.
event.preventDefault();

// A real click rather than the scope expression, so it bubbles
// to whichever element owns the ng-click. For some of the edit
// icons that is an ancestor, not the icon itself.
element[0].click();
});
}
};
});
27 changes: 24 additions & 3 deletions src/main/webapp/app/resources/styles/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,20 @@ h4 {
cursor: pointer;
}

// Revealed on row hover, but kept in the layout rather than removed, so that it
// stays focusable for keyboard users. Focus reveals it the same way hover does.
.edit-setting-icon.edit-setting-icon-hidden {
opacity: 0;
pointer-events: none;
}

.edit-setting-icon:focus,
.edit-setting-icon.edit-setting-icon-hidden:focus {
opacity: 1;
outline: 1px dotted;
pointer-events: auto;
}

.td-center-middle {
text-align: center;
vertical-align: middle;
Expand Down Expand Up @@ -1649,12 +1663,19 @@ input[type=color]:focus {
cursor: pointer;
}

// Hidden with opacity rather than visibility so the icon stays focusable; a
// visibility: hidden element is dropped from the tab order entirely.
.email-workflow-rule-row span.glyphicon-pencil {
visibility: hidden;
opacity: 0;
}

.email-workflow-rule-row:hover span.glyphicon-pencil {
visibility: visible;
.email-workflow-rule-row:hover span.glyphicon-pencil,
.email-workflow-rule-row span.glyphicon-pencil:focus {
opacity: 1;
}

.email-workflow-rule-row span.glyphicon-pencil:focus {
outline: 1px dotted;
}

.submission-review-item {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
ng-repeat="rule in getSelectedOrganizationEmailWorkflowRules()"
class="email-workflow-rule-row">
<td ng-click="openEditEmailWorkflowRule(rule)">
<span class="glyphicon glyphicon-pencil"></span>
<span class="glyphicon glyphicon-pencil" role="button" tabindex="0" keyboard-activate aria-label="Edit email workflow rule {{ rule.emailTemplate.name }}"></span>
</td>
<td ng-click="openEditEmailWorkflowRule(rule)">
{{rule.emailTemplate.name}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
</td>
<td >
<span ng-hide="editMode(vocabularyWord)">
<button class="btn btn-sm btn-default" title="Edit" ng-click="startEditVWMode(vocabularyWord, 'name')"><span class="glyphicon glyphicon-pencil"></span></button>
<button class="btn btn-sm btn-default" title="Edit" aria-label="Edit {{ vocabularyWord.name }}" ng-click="startEditVWMode(vocabularyWord, 'name')"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></button>
<button class="btn btn-sm btn-danger" title="Delete" ng-hide="deleting" ng-click="deleting=true"><span class="glyphicon glyphicon-trash"></span></button>
<div class="btn-group" role="group" ng-show="deleting">
<button class="btn btn-sm btn-danger disabled" disabled><span class="glyphicon glyphicon-trash"></span></button>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/app/views/admin/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h1>
<h1>REVIEWER NOTES</h1>
</div>
<div class="form-inline reviewer-notes">
<span ng-if="!savingReviewerNotes && !editingReviewerNotes" class="glyphicon glyphicon-pencil clickable" ng-click="editReviewerNotes()"></span>
<span ng-if="!savingReviewerNotes && !editingReviewerNotes" class="glyphicon glyphicon-pencil clickable" role="button" tabindex="0" keyboard-activate aria-label="Edit reviewer notes" ng-click="editReviewerNotes()"></span>
<span ng-if="savingReviewerNotes" class="glyphicon glyphicon-refresh spinning"></span>
<span ng-if="!editingReviewerNotes" ng-class="{'info-empty': !submission.reviewerNotes}">{{submission.reviewerNotes || 'none'}}</span>
<div class="input-group" ng-if="editingReviewerNotes">
Expand Down Expand Up @@ -82,7 +82,7 @@ <h1>ALL FILES</h1>
<td>{{documentFieldValue.fileInfo.time | date : 'MM/dd/yyyy h:mm:ss a' }}</td>
<td class="all-files-action">
<modal modal-id="{{'editFileModal-' + documentFieldValue.id}}" modal-view="views/modals/view/editFileModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<span ng-if="!documentFieldValue.updating" class="glyphicon glyphicon-pencil clickable" ng-click="openModal('#editFileModal-' + documentFieldValue.id)"></span>
<span ng-if="!documentFieldValue.updating" class="glyphicon glyphicon-pencil clickable" role="button" tabindex="0" keyboard-activate aria-label="Edit file {{ documentFieldValue.fileInfo.name }}" ng-click="openModal('#editFileModal-' + documentFieldValue.id)"></span>
<span ng-if="documentFieldValue.updating" class="glyphicon glyphicon-refresh spinning"></span>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<span ng-repeat="property in properties" class="repeated-span">
<span ng-show="!item.isEntityProperty" class="glyphicon glyphicon-user"></span>
<span ng-show="item.isEntityProperty" class="glyphicon glyphicon-globe"></span> {{ item[property] }}</span>
<span ng-if="!item.isEntityProperty" ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-if="!item.isEntityProperty" ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item.position})"></span>
</div>
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<div class="custom-action">
<span>{{ item.position }}.</span>
<span class="mouse-hover-pointer"
role="button"
tabindex="0"
keyboard-activate
aria-label="Edit {{ item.label }}"
ng-click="edit({index:item.position})"
ng-mouseenter="isMouseHover=true"
ng-mouseleave="isMouseHover=false">
ng-mouseleave="isMouseHover=false"
ng-focus="isMouseHover=true"
ng-blur="isMouseHover=false">
<span ng-show="!item.isStudentVisible" class="glyphicon glyphicon glyphicon-user"></span>
<span ng-show="item.isStudentVisible" class="glyphicon glyphicon glyphicon-globe"></span>
{{item.label}}
</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon"></span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" aria-hidden="true"></span>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="degree" ng-mouseenter="isMouseHover=true" ng-mouseleave="isMouseHover=false">
<span>{{ item.position }}.</span>
<span>{{item[properties[0]]}} ({{item[properties[1]].name}})</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item.position})"></span>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="deposit-location" ng-mouseenter="isMouseHover=true" ng-mouseleave="isMouseHover=false">
<span>{{ item.position }}.</span>
<span ng-repeat="property in properties" class="repeated-span">{{item[property]}}</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item.position})"></span>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<span ng-repeat="property in properties" class="repeated-span">
<span>{{item[property]}}</span>
</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item.position})"></span>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<span ng-repeat="property in properties" class="repeated-span">{{item[property]}}</span>
<span ng-show="!item.systemRequired" class="glyphicon glyphicon glyphicon-user"></span>
<span ng-show="item.systemRequired" class="glyphicon glyphicon glyphicon-globe"></span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item.position})"></span>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<span ng-repeat="property in properties" class="repeated-span">
<span>{{item[property]}}</span>
</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item})"></span>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<span ng-repeat="property in properties" class="repeated-span">
<span>{{item[property]}}</span>
</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item})"></span>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<span ng-repeat="property in properties" class="repeated-span" ng-class="{'text-warning': !isEditable({fieldProfile: item}), 'disable-strike-through': !item.enabled}">
<span ng-if="property === 'gloss'">{{ item[property] }}<span ng-if="!item.optional">*</span></span>
</span>
<span ng-if="isEditable({fieldProfile: item})" ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-if="isEditable({fieldProfile: item})" ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item.gloss }}" ng-click="edit({index:item.position})"></span>
<span ng-if="!isEditable({fieldProfile: item})" class="glyphicon glyphicon-info-sign text-warning" tooltip="This field profile is not overrideable."></span>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="graduation-month" ng-mouseenter="isMouseHover=true" ng-mouseleave="isMouseHover=false">
<span>{{ item.position }}.</span>
<span ng-repeat="property in properties" class="repeated-span">{{toString({month:item[property]})}}</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ toString({month:item[properties[0]]}) }}" ng-click="edit({index:item.position})"></span>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<span ng-repeat="property in properties" class="repeated-span">
{{ item[property] }}
</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item.position})"></span>
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/directives/dragAndDropNote.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="notes" ng-mouseenter="isMouseHover=true" ng-mouseleave="isMouseHover=false">
<span>{{ item.position }}. </span>
<span ng-repeat="property in properties" class="repeated-span" ng-class="{'text-warning': !isEditable({note: item})}">{{ item[property] }}</span>
<span ng-if="isEditable({note: item})" ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item.position})"></span>
<span ng-if="isEditable({note: item})" ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item.position})"></span>
<span ng-if="!isEditable({note: item})" class="glyphicon glyphicon-info-sign text-warning" tooltip="This note is not overrideable."></span>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="organization-category" ng-mouseenter="isMouseHover=true" ng-mouseleave="isMouseHover=false">
<span ng-repeat="property in properties" class="repeated-span">{{item[property]}}</span>
<span ng-show="isMouseHover" class="glyphicon glyphicon-pencil edit-setting-icon" ng-click="edit({index:item})"></span>
<span ng-class="{'edit-setting-icon-hidden': !isMouseHover}" class="glyphicon glyphicon-pencil edit-setting-icon" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ item[properties[0]] }}" ng-click="edit({index:item})"></span>
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/directives/lockingTextArea.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h4>{{ label }}<div tooltip="{{hint}}"><span class="glyphicon glyphicon-info-sig
</a>

<p ng-if="!locked" ng-click="toggleLock()" class="hover-pointer">
<span class="glyphicon glyphicon-pencil"></span> This field is unlocked and may be edited. Leaving the editable area will save and re-lock the field.
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> This field is unlocked and may be edited. Leaving the editable area will save and re-lock the field.
</p>

<div ng-show="!locked">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/directives/submissionInfo.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<span ng-if="type=='view' && !field.isValid()" class="glyphicon glyphicon-refresh text-primary clickable" ng-click="refreshFieldValue(field)"></span>

<!-- conditionally show the edit clicker or the progress spinner -->
<span id="{{$index}}" ng-if="type=='view' && !field.updating" class="glyphicon glyphicon-pencil clickable" ng-click="editFieldValue($event, field)"></span>
<span id="{{$index}}" ng-if="type=='view' && !field.updating" class="glyphicon glyphicon-pencil clickable" role="button" tabindex="0" keyboard-activate aria-label="Edit {{ fieldProfile.gloss }}" ng-click="editFieldValue($event, field)"></span>
<span ng-if="type=='view' && !field.updating && fieldProfile.repeatable && $index > 0" class="glyphicon glyphicon-minus clickable" ng-click="removeFieldValue(field)"></span>

<span ng-if="type=='view' && field.updating" class="glyphicon glyphicon-refresh spinning"></span>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/app/views/myprofile.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2>Personal Information</h2>
</div>
<div class="col-sm-6">
<span ng-if="(isAdmin() || isManager())" ng-hide="editdisplayName">
<span class="edit-handle glyphicon glyphicon-pencil" ng-click="editMode('displayName')"></span>
<span class="edit-handle glyphicon glyphicon-pencil" role="button" tabindex="0" keyboard-activate aria-label="Edit display name" ng-click="editMode('displayName')"></span>
<span class="profile-value" ng-Dblclick="editMode('displayName')">{{settings.user.displayName}}</span>
</span>
<input id="displayName" type="text" name="displayName" class="form-control" ng-show="editdisplayName" ng-if="(isAdmin() || isManager())" ng-model="settings.user.displayName" ng-change="updateUserSetting('displayName', 500)" ng-blur="viewMode('displayName')" ng-keyup="confirmEdit($event, 'displayName')" tamu-force-focus="editdisplayName" required shadow/>
Expand Down Expand Up @@ -122,7 +122,7 @@ <h2>Phone &amp; Address</h2>
</div>
<div class="col-sm-6">
<span ng-if="(isAdmin() || isManager())" ng-hide="editpreferedEmail">
<span class="edit-handle glyphicon glyphicon-pencil" ng-click="editMode('preferedEmail')"></span>
<span class="edit-handle glyphicon glyphicon-pencil" role="button" tabindex="0" keyboard-activate aria-label="Edit preferred email" ng-click="editMode('preferedEmail')"></span>
<span class="profile-value" ng-Dblclick="editMode('preferedEmail')">{{settings.user.preferedEmail}}</span>
</span>
<input id="preferedEmail" type="email" name="preferedEmail" class="form-control" ng-show="editpreferedEmail" ng-if="(isAdmin() || isManager())" ng-model="settings.user.preferedEmail" ng-change="updateUserSetting('preferedEmail', 500)" ng-blur="viewMode('preferedEmail')" ng-keyup="confirmEdit($event, 'preferedEmail')" tamu-force-focus="editpreferedEmail" required shadow/>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/app/views/sideboxes/submissionStatus.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<li><button class="btn btn-info" ng-click="openModal('#submissionStatus')">{{box.submission.submissionStatus.name}}</button></li>

<li>Assignee:</li>
<li ng-click="openModal('#submissionAssign')" class="sidebar-btn font-weight-bold"> <span class="glyphicon glyphicon-pencil"></span> {{box.submission.assignee.settings.displayName || "none"}}</li>
<li ng-click="openModal('#submissionAssign')" class="sidebar-btn font-weight-bold"> <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> {{box.submission.assignee.settings.displayName || "none"}}</li>

<li>Last Action:</li>
<li class="font-weight-bold">{{box.getLastActionDate() | date : 'short'}}</li>
Expand All @@ -20,7 +20,7 @@
is-open="date"
close-text="Close"
stringtodate>
<span ng-if="!box.savingDate" class="glyphicon glyphicon-pencil"></span> <span ng-if="box.savingDate" class="glyphicon glyphicon-refresh spinning"></span> {{box.submission.submissionDate || "not submitted" | date: 'M/d/yyyy' : 'UTC'}}
<span ng-if="!box.savingDate" class="glyphicon glyphicon-pencil" aria-hidden="true"></span> <span ng-if="box.savingDate" class="glyphicon glyphicon-refresh spinning"></span> {{box.submission.submissionDate || "not submitted" | date: 'M/d/yyyy' : 'UTC'}}
</li>

<li><button ng-click="openModal('#advisorEmail')" class="btn btn-default">Generate Advisor Email</button></li>
Expand Down
Loading
Loading