diff --git a/intranet/static/js/announcement.form.js b/intranet/static/js/announcement.form.js index 69e668caf1..98c90f7968 100644 --- a/intranet/static/js/announcement.form.js +++ b/intranet/static/js/announcement.form.js @@ -71,7 +71,8 @@ $(function() { $(".exp-header").css("display", "none"); for (var i = 0; i < dates.length; i++) { var use_date = dates[i].end ? dates[i].end.date() : dates[i].start.date(); - $(".exp-list").append(`
  • "${dates[i].text}" - ${use_date}
  • `); + var display_date = use_date.toDateString(); + $(".exp-list").append(`
  • "${dates[i].text}" - ${display_date}
  • `); } }); @@ -100,13 +101,16 @@ $(function() { $(".exp-header").css("display", "none"); for (var i = 0; i < dates.length; i++) { var use_date = dates[i].end ? dates[i].end.date() : dates[i].start.date(); - $(".exp-list").append(`
  • "${dates[i].text}" - ${use_date}
  • `); + var display_date = use_date.toDateString(); + $(".exp-list").append(`
  • "${dates[i].text}" - ${display_date}
  • `); } }); var exp = $("#id_expiration_date"); - dateReset(exp); + if (exp.val() === "" || exp.val() === "3000-01-01 00:00:00") { + dateReset(exp); + } $(".helptext", exp.parent()).before(""); $(".helptext", exp.parent()).before("" + diff --git a/intranet/templates/announcements/request.html b/intranet/templates/announcements/request.html index fb6c9dcc4b..d3c8634b39 100644 --- a/intranet/templates/announcements/request.html +++ b/intranet/templates/announcements/request.html @@ -61,7 +61,7 @@

    1. Use correct English grammar, punctuation, and spelling.
    2. Use formal language and tone; avoid slang, all caps, texting-style abbreviations, excessive use of bolding, underlining, emojis, etc.
    3. -
    4. Keep posts short and concise. Viewable dashboard space is limited on Ion; be considerate of other announcements. Avoid unecessary linebreaks or whitespace.
    5. +
    6. Keep posts short and concise. Viewable dashboard space is limited on Ion; be considerate of other announcements. Avoid unnecessary linebreaks or whitespace.
    7. Do not submit repeat announcements; if an announcement about your topic has already been posted, do not request another.
    8. See detailed guidelines here.