diff --git a/intranet/apps/eighth/exceptions.py b/intranet/apps/eighth/exceptions.py index 0e76edab732..2eb6ac4c297 100644 --- a/intranet/apps/eighth/exceptions.py +++ b/intranet/apps/eighth/exceptions.py @@ -12,7 +12,7 @@ class SignupException(Exception): "contact an Intranet administrator."), "ScheduledActivityCancelled": m("This activity has been cancelled for this block.", "This activity has been cancelled for this block."), - "ActivityDeleted": m("This activity has been deleted.", + "ActivityDeleted": m("This activity has been deleted. Refresh this page to see an up-to-date list of activities.", "This activity has been deleted."), "ActivityFull": m("This activity is full. You may not sign up for it at this time.", "This activity is full."), @@ -22,9 +22,10 @@ class SignupException(Exception): "This activity can't be signed up for more two days in advance."), "Sticky": m("You may not switch out of a sticky activity.", "This student is already in a sticky activity."), - "OneADay": m("You may only sign up for this activity once per day.", + "OneADay": m("You may only sign up for this activity once per day. To sign up for the activity during this block, " + "change your signup on the other block where you selected this activity.", "This is a one-a-day activity."), - "Restricted": m("You may not sign up for this restricted activity.", + "Restricted": m("You may not sign up for this restricted activity. You are not on the authorized list.", "This activity is restricted for this student."), "OverrideBlockLocked": m("An override block ({}) has been locked. Signup is not allowed at this time.", "An override block ({}) has been locked."), diff --git a/intranet/static/js/eighth/signup.search.js b/intranet/static/js/eighth/signup.search.js index d3cecc5ea14..e066eb68f25 100644 --- a/intranet/static/js/eighth/signup.search.js +++ b/intranet/static/js/eighth/signup.search.js @@ -109,6 +109,10 @@ $(document).ready(function() { if(cmd[1].substring(0,1) == "r" && activity.restricted == fl) { show = true; } + // authorized + if(cmd[1].substring(0,2) == "au" && activity.restricted == fl && activity.restricted_for_user == !fl) { + show = true; + } // cancelled if(cmd[1].substring(0,1) == "c" && activity.cancelled == fl) { show = true; @@ -130,7 +134,7 @@ $(document).ready(function() { show = true; } // admin - if(cmd[1].substring(0,1) == "a" && activity.administrative == fl) { + if(cmd[1].substring(0,2) == "ad" && activity.administrative == fl) { show = true; show_adminact = true; } diff --git a/intranet/templates/eighth/signup.html b/intranet/templates/eighth/signup.html index a05f32696f1..ac00ac97ba0 100644 --- a/intranet/templates/eighth/signup.html +++ b/intranet/templates/eighth/signup.html @@ -95,35 +95,37 @@ <% } %> <% if (special) { %> - Special + Special <% } %> <% if (cancelled) { %> - CANCELLED + CANCELLED <% } %> <% if (restricted_for_user) { %> - Restricted + Restricted + <% } else if (restricted) { %> + Authorized <% } %> - <% if (sticky) { %> - Sticky + <% if (sticky && (selected || isEighthAdmin)) { %> + Sticky <% } %> <% if (both_blocks) { %> - Both Blocks + Both Blocks <% } %> <% if (one_a_day) { %> - One a Day + One a Day <% } %> <% if (administrative) { %> - Admin + Admin <% } %> <% if (presign) { %> - 48-hr + 48-hr <% } %> @@ -150,35 +152,37 @@

<% if (cancelled) { %> - CANCELLED + CANCELLED <% } %> <% if (special) { %> - Special + Special <% } %> <% if (restricted_for_user) { %> - Restricted + Restricted + <% } else if (restricted) { %> + Authorized <% } %> - <% if (sticky) { %> - Sticky + <% if (sticky && (selected || isEighthAdmin)) { %> + Sticky <% } %> <% if (both_blocks) { %> - Both Blocks + Both Blocks <% } %> <% if (one_a_day) { %> - One a Day + One a Day <% } %> <% if (administrative) { %> - Administrative + Administrative <% } %> <% if (presign) { %> - 48-hr Presign + 48-hr Presign <% } %> <% scheduled_activity_id = this.model.attributes.scheduled_activity %>