Skip to content

Commit

Permalink
SAK-42175 Standardardized Banners in Site-manage and Assignment (saka…
Browse files Browse the repository at this point in the history
…iproject#7157)

* SAK-42175 Site-manage: Standardized Banners
* SAK-42175 Assignment: Standardized banners
  • Loading branch information
michelle-tai authored and fostersdesign committed Oct 16, 2019
1 parent 27c5770 commit 6f72cdb
Show file tree
Hide file tree
Showing 79 changed files with 132 additions and 153 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</h3>

#if ($alertMessage)
<div class="alertMessage"> <strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>
<div class="sak-banner-error"> <strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
#else
<div class="alertMessage">
<div class="sak-banner-warn">
$confirmMessage
</div><div class="clear"></div>
</div>
#end
<form name="form1" method="post" action="#toolForm("AssignmentAction")">
<table class="listHier lines nolines" cellspacing="0" summary="$tlang.getString("gen.lisofassto")">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
</div>
#end
#if ($alertMessage)
<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
<div style="display:block;clear:both"></div>#end
<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
#end

## the form
<form name="gradeForm" id="gradeForm" action="#toolForm("AssignmentAction")" method="post" onsubmit="return true;" autocomplete="off">
Expand Down Expand Up @@ -640,7 +640,7 @@
#else
## if not allowed to grade, show the current grade instead
<input name="$name_grade" type="hidden" value="$!value_grade"/>
<div class="alertMessage">$!notAllowedToGradeWarning</div>
<div class="sak-banner-error">$!notAllowedToGradeWarning</div>
<label for="grade">$tlang.getString("gen.gra2")</label>
$!value_grade
#end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- start: chef_assignments_instructor_list_deleted_assignments.vm -->
<div class="portletBody container-fluid">
#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "Assignment.mode_list_removed_assignments" )
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end

<div class="page-header">
<h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ function printView(url) {
</h1>
</div>

#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
## reminder of submission download url
#if ($download_url_reminder)
<div class="messageInformation">
<div class="sak-banner-info">
<h4>$download_url_reminder</h4>
<p>
<a target="_blank" href="$download_url_link">$download_url_link_label</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</div>

#if ($alertMessage)
<div class="alertMessage" id="generalAlert">
<div class="sak-banner-error" id="generalAlert">
<strong>$tlang.getString("gen.alert")</strong> $alertMessage
</div>
#end
Expand Down Expand Up @@ -506,12 +506,12 @@
<div id="messages">
#if( $!range == "GROUP" && $selectedGroupsNotFound )
#if( $!groupsList.size() > 0 )
<div id="msgSelectedGroupsGoneOtherGroupsPresent" class="messageInformation indnt2" style="width: 80% !important;">$tlang.getString( "settings.access.selectedGroupsGoneOtherGroupsPresent" )</div>
<div id="msgSelectedGroupsGoneOtherGroupsPresent" class="sak-banner-warn indnt2" style="width: 80% !important;">$tlang.getString( "settings.access.selectedGroupsGoneOtherGroupsPresent" )</div>
#else
<div id="msgSelectedGroupsGoneNoGroups" class="messageInformation indnt2" style="width: 80% !important;">$tlang.getString( "settings.access.selectedGroupsGoneNoGroups" )</div>
<div id="msgSelectedGroupsGoneNoGroups" class="sak-banner-warn indnt2" style="width: 80% !important;">$tlang.getString( "settings.access.selectedGroupsGoneNoGroups" )</div>
#end
#elseif( !$!groupsList )
<div id="msgNoGroupsPresent" class="messageInformation indnt2" style="width: 80% !important;">$tlang.getString( "settings.access.noGroupsPresent" )</div>
<div id="msgNoGroupsPresent" class="sak-banner-warn indnt2" style="width: 80% !important;">$tlang.getString( "settings.access.noGroupsPresent" )</div>
#end
</div>

Expand Down Expand Up @@ -585,7 +585,7 @@

<div class="row" id="groupTable" style="display:$listDisplay">
<div class="col-sm-offset-1 col-sm-9">
<div id="msgSelectGroups" class="messageInformation" style="display: $selectGroupsDisplay">$tlang.getString( "settings.access.selectGroups" )</div>
<div id="msgSelectGroups" class="sak-banner-info" style="display: $selectGroupsDisplay">$tlang.getString( "settings.access.selectGroups" )</div>
<select id="selectedGroups" name="selectedGroups" multiple="multiple">
#foreach ($group in $!groups)
#set($description = $validator.escapeHtml($group.Description))
Expand Down Expand Up @@ -620,7 +620,7 @@
#end
</select>
</div>
<div id="review.switch.ne.2" class="information" style="display:none;">$reviewSwitchNe2</div>
<div id="review.switch.ne.2" class="sak-banner-info" style="display:none;">$reviewSwitchNe2</div>
</div>

##show it only for those assignments not of type non-electronic submission
Expand Down Expand Up @@ -733,7 +733,7 @@
<h4> $reviewServiceTitle </h4>
<div>
#if (4 == $value_SubmissionType)
<div id="review.switch.ne.1" class="information">$reviewSwitchNe1</div>
<div id="review.switch.ne.1" class="sak-banner-info">$reviewSwitchNe1</div>
<div class="checkbox indnt2">
<label id="lblReviewService" for="$name_UseReviewService" class="instruction">
<input id="$name_UseReviewService" name="$name_UseReviewService" type="checkbox" value="true" onclick="ASN.toggleReviewServiceOptions(this.checked)" disabled="disabled"/>
Expand All @@ -742,7 +742,7 @@
</label>
</div>
#else
<div id="review.switch.ne.1" class="information" style="display:none;">$reviewSwitchNe1</div>
<div id="review.switch.ne.1" class="sak-banner-info" style="display:none;">$reviewSwitchNe1</div>
<div class="checkbox">
<label id="lblReviewService" for="$name_UseReviewService">
#if($!value_UseReviewService == true)
Expand Down Expand Up @@ -1436,7 +1436,7 @@
#else
<div id="peerAssessmentOptions" style="display:none" class="col-sm-offset-1">
#end
<div class="messageInformation">
<div class="sak-banner-info">
$tlang.getString("peerassessment.note")
</div>
<div id="peerperiod-finish">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
$tlang.getString("prevassig.preass")
</h3>

#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
<div class="clear"></div>
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
<form id="previewAssignmentsForm" name="previewAssignmentsForm" action="#toolForm("AssignmentAction")" method="post" onsubmit="return true;">
<input type="hidden" name="assignmentId" value="$!value_assignment_id" />
<input type="hidden" name="assignmentContentId" value="$!value_assignmentcontent_id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
$tlang.getString("gen.closequote")
</h3>
#if ($alertMessage)
<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
<div class="clear"></div>
<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
#end
<form id="previewGradeSubmissionForm" action="#toolForm("AssignmentAction")" method="post">
<table class="itemSummary">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
## for user who cannot create assignment nor grade submission, no need to show "Assignment List" link at all since there is really no other toolbar choices
#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "reorder" )
#end
#if ($alertMessage)<div class="alertMessage" style="width:80% !important"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div style="display:block;clear:both"></div>#end
#if ($alertMessage)<div class="sak-banner-error" style="width:80% !important"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end

<div class="page-header">
<h1>
Expand Down Expand Up @@ -34,7 +34,7 @@
</li>
<li style="display:inline;color:#000">
<span id="failedValidMessage" style="display:none">$tlang.getString('reorder.fail.valid.message')</span>
<span id="messageHolder" class="messageSuccess" style="display:none">$tlang.getString("reorder.fail.valid.message")</span>
<span id="messageHolder" class="sak-banner-success" style="display:none">$tlang.getString("reorder.fail.valid.message")</span>
</li>
</ul>
<span id="lastMoveArray" style="display:none"></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="portletBody sakai-asn-grade-report">
#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )

#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end

<div class="page-header">
<h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h1>
</div>

#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
#if ($!studentMembers.size() == 0)
<p class="instruction" style="clear:both">
$tlang.getString("theisnostudent")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
$tlang.getString('uploadall.title')
#end
</h3>
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
<p class="instruction">
#if ($!download)
$tlang.getString('downloadall.instruction')
Expand Down Expand Up @@ -37,7 +37,7 @@
<div class="shorttext">
<h4><span class="reqStar">*</span><label for="file">$tlang.getString("uploadall.choose.file")</label></h4>
<input type="file" name="file" id="file" class="upload" onchange="document.getElementById('filechosenconfirm').style.display='block';" />
<p id="filechosenconfirm" class="information" style="display:none;clear:both">$tlang.getString("uploadall.choose.file.confirm")</p>
<p id="filechosenconfirm" class="sak-banner-info" style="display:none">$tlang.getString("uploadall.choose.file.confirm")</p>
<h4><span class="reqStar">*</span>$tlang.getString("uploadall.choose.file2")</h4>
</div>
#end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<h3>
$tlang.getString("viewassig.viewass1")
</h3>
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
#if ($allowAddAssignment && !$hideAssignmentFlag)
## show assignment content
<p class="discTria">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
## for user who cannot create assignment nor grade submission, no need to show "Assignment List" link at all since there is really no other toolbar choices
#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )
#end
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end

<div class="page-header">
<h1>
Expand All @@ -52,7 +52,7 @@
#else
#if ($allowAddAssignment)
#if ($!view.equals('stuvie'))
<div class="messageInformation">$tlang.getString("stulistassig.selanass1")</div>
<div class="sak-banner-info">$tlang.getString("stulistassig.selanass1")</div>
#end
#else
<div>$tlang.getString("stulistassig.selanass")</div>
Expand Down Expand Up @@ -455,7 +455,7 @@
</div>
</div>
#else
<div class="alertMessage">
<div class="sak-banner-warn">
$tlang.getString( "assignment.inaccessible" )
</div>
#end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</h1>
</div>

#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
<form action="#toolForm("$action")" method="post" name="optionsForm">
<fieldset class="indnt2">
<legend><h3>$tlang.getString("options_instruction")</h3></legend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

#progressBar($!service.getProgressBarStatus($!submission))

<div class="alertMessage"> <strong>$tlang.getString("gen.alert")</strong> $!submissionConfirmAlert</div>
<div class="sak-banner-warn"> <strong>$tlang.getString("gen.alert")</strong> $!submissionConfirmAlert</div>

#set($allowUpdateAssignment = $!service.allowUpdateAssignment($assignmentReference))
#if ($alertMessage)
<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
<div class="clear"></div>#end
<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
#end
<table class="itemSummary" summary="$tlang.getString("gen.assdet")" border="0">
<tr>
<th>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#set($allowUpdateAssignment = $!service.allowUpdateAssignment($assignmentReference))
#if ($alertMessage)
<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
<div class="clear"></div>#end
<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
#end
<table class="itemSummary" summary="$tlang.getString("gen.assdet")" border="0">
<tr>
<th>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#end
</div>
#end
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div style="display:block;clear:both"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end

## the form
<form name="gradeForm" id="gradeForm" action="#toolForm("AssignmentAction")" method="post" onsubmit="return true;" enctype="multipart/form-data">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<h3>
$tlang.getString("viewassig.viewass1")
</h3>
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
#if (!$hideAssignmentFlag)
<p class="discTria">
$tlang.getString("gen.settfor") "$validator.escapeHtml($assignment.title)"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- start: chef_assignments_student_view_assignment_honor_pledge.vm -->
<div class="portletBody container-fluid">
#if ($alertMessage)
<div class="alertMessage">
<div class="sak-banner-error">
<strong>$tlang.getString("gen.alert")</strong>
$alertMessage
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#progressBar($!service.getProgressBarStatus($!submission))
#end
#if ($alertMessage)
<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>
#end

#set($submitTime=false)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- start: chef_assignments_student_view_group_error.vm -->
<div class="portletBody">
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $validator.escapeHtml($alertMessage)</div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $validator.escapeHtml($alertMessage)</div>#end
<table class="itemSummary" summary="$tlang.getString("gen.theassinf")">
<tr>
<th>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ $(document).ready(function(){
#set($closeDate = $submission.CloseDate)
#end
#set ($submissionType = $assignment.TypeOfSubmission.ordinal())
#if ($allowSubmit && !$submission && $closeDate && $currentTime.isAfter($closeDate) && !$!nonElectronicType)
<div class="alertMessage">$tlang.getString("stuviewsubm.theclodat")</div><div class="clear"></div>
#if ($allowSubmit && !$submission && $closeDate && $currentTime.isAfter($closeDate) )
<div class="sak-banner-error">$tlang.getString("stuviewsubm.theclodat")</div>
#end

#if ($!canSubmit)
#if ($alertMessage)<div class="alertMessage"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div><div class="clear"></div>#end
#if ($alertMessage)<div class="sak-banner-error"><strong>$tlang.getString("gen.alert")</strong> $alertMessage</div>#end
#if ($!submission && $dateSubmitted)
## if there is a submitted submission
## get the properies
Expand Down Expand Up @@ -992,15 +992,15 @@ $(document).ready(function(){
#end

#if ($submitted && $!isUserSubmission && ($submissionType == 2 || $submissionType == 5) && !$!new_attachments)
<span class="messageInformation">$tlang.getString("stuviewsubm.modifytoresubmit")</span>
<span class="sak-banner-info">$tlang.getString("stuviewsubm.modifytoresubmit")</span>
#elseif ($submissionType == 5)
<span class="messageInformation">$tlang.getString("stuviewsubm.reminder")</span>
<span class="sak-banner-warn">$tlang.getString("stuviewsubm.reminder")</span>
#else
<span class="messageInformation">$tlang.getString("stuviewsubm.submitreminder")</span>
<span class="sak-banner-warn">$tlang.getString("stuviewsubm.submitreminder")</span>
#end
#end
</div>
<div id="confirmationDialogue" class="act messageInformation" style="display:none;">
<div id="confirmationDialogue" class="act sak-banner-warn" style="display:none;">
$tlang.getString("gen.can.discard")
<input class="disableme" type="button" name="yes" accesskey="y" id="yes" value="$tlang.getString("gen.yes")" onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'cancel', null, null );" />
<input class="active" type="button" name="no" accesskey="n" id="no" value="$tlang.getString("gen.no")" onclick="ASN_SVS.undoCancel();" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#if ($!email_confirmation && $!submission.Submitted)
#if (!$!user_email)
## no email could be sent due to the missing recipent email address
<p class="alertMessage">$tlang.getString('confirm.submission.email.noEmailAddress')</p>
<p class="sak-banner-error">$tlang.getString('confirm.submission.email.noEmailAddress')</p>
#end
#end
<form name="addSubmissionForm" action="#toolForm($action)" method="post" onsubmit="return true;">
Expand Down
Loading

0 comments on commit 6f72cdb

Please sign in to comment.