Commit ed71b0a2 authored by Curtis Adam's avatar Curtis Adam

Highlight the transcript deadlines in red

parent 734620ec
......@@ -548,6 +548,7 @@ $themes: (
$markdeep_image_border: map-get($map, "markdeep_image_border");
//transcript bonus colors
$transcript_bonus_info_text: map-get($map, "transcript_bonus_info_text");
$transcript_bonus_info_background: map-get($map, "transcript_bonus_info_background");
//markdeep editor colors
$markdeep_help_text: map-get($map, "markdeep_help_text");
$markdeep_help_background: map-get($map, "markdeep_help_background");
......@@ -3028,6 +3029,7 @@ $themes: (
//transcript bonus colors
.transcript-info-text {
color: $transcript_bonus_info_text !important;
background-color: $transcript_bonus_info_background !important;
}
//presentation colors
.clock {
......
......@@ -589,7 +589,8 @@
"markdeep_blockquote_quotes": $thm_orange,
"markdeep_image_border": $thm_gray,
//transcript bonus colors
"transcript_bonus_info_text": $thm_orange,
"transcript_bonus_info_text": white,
"transcript_bonus_info_background": $thm_red,
//markdeep editor colors
"markdeep_help_text": $white,
"markdeep_help_background": $thm_orange,
......
......@@ -53,9 +53,10 @@
data-cardset_id="{{this.cardset_id}}"
data-date_id="{{this.date_id}}" data-name="{{this.name}}">
<a href="#">
{{this.name}}<br>
<div class="transcript-info-text">{{this.info}}
<br>{{this.deadline}}<br>{{this.deadlineEditing}}</div>
{{this.name}}
<div class="transcript-info-text">
{{this.deadline}}<br>{{this.deadlineEditing}}
</div>
<div class="cardset-details">
{{> cardsetLabels}}
</div>
......
......@@ -24,10 +24,10 @@ Template.selectLearningUnit.helpers({
for (let d = 0; d < cardsets[c].transcriptBonus.dates.length; d++) {
let transcriptBonus = cardsets[c].transcriptBonus;
transcriptBonus.cardset_id = cardsets[c]._id;
transcriptBonus.name = cardsets[c].name;
if (TranscriptBonusList.canBeSubmittedToLecture(transcriptBonus, d)) {
let lecture = {};
lecture.name = cardsets[c].name;
lecture.info = TranscriptBonusList.getLectureEnd(transcriptBonus, cardsets[c].transcriptBonus.dates[d]);
lecture.name = TranscriptBonusList.getLectureName(transcriptBonus);
lecture.deadline = TranscriptBonusList.getDeadline(transcriptBonus, cardsets[c].transcriptBonus.dates[d]);
lecture.deadlineEditing = TranscriptBonusList.getDeadlineEditing(transcriptBonus, cardsets[c].transcriptBonus.dates[d]);
lecture.cardset_id = cardsets[c]._id;
......@@ -37,6 +37,7 @@ Template.selectLearningUnit.helpers({
lecture.cardType = cardsets[c].cardType;
lecture.difficulty = cardsets[c].difficulty;
lecture.kind = cardsets[c].kind;
lecture.transcriptBonus = cardsets[c].transcriptBonus;
lectures.push(lecture);
}
}
......
......@@ -21,7 +21,7 @@
{{/if}}
<div class="resultItem col-xs-12">
<div class="resultItemHeaderWrapper">
<div class="resultItemHeader resultItemHeaderLeftArea resultItemHeaderAuthor resultItemHeaderCardType resultName {{#if isBonusTranscriptsRoute}}resultNameBonusTranscript{{/if}} {{#if isCardsetTranscriptBonusRoute}}col-xs-10 col-sm-4{{else}}col-xs-12 col-sm-6{{/if}} {{getCardsetBackground
<div class="resultItemHeader resultItemHeaderLeftArea resultItemHeaderAuthor resultItemHeaderCardType resultName {{#if isBonusTranscriptsRoute}}{{#unless isMyBonusTranscriptsRouteAndDeadlineExpired}}resultNameBonusTranscript{{/unless}}{{/if}} {{#if isCardsetTranscriptBonusRoute}}col-xs-10 col-sm-4{{else}}col-xs-12 col-sm-6{{/if}} {{getCardsetBackground
this.difficulty this.cardType}}"
data-type="{{this.subject}}">
<a href="/presentation/transcripts/{{#if isBonusTranscriptsRoute}}bonus/{{/if}}{{#if isCardsetTranscriptBonusRoute}}{{getCardsetID}}/{{/if}}{{this._id}}">
......@@ -31,11 +31,13 @@
{{this.subject}}
{{/if}}
</a>
<span class="hidden-xs">
{{#if isBonusTranscriptsRoute}}
{{#if isBonusTranscriptsRoute}}
{{#unless isMyBonusTranscriptsRouteAndDeadlineExpired}}
<span class="hidden-xs transcript-info-text">
<br>{{getBonusLectureDeadline}}
{{/if}}
</span>
</span>
{{/unless}}
{{/if}}
</div>
{{#if isCardsetTranscriptBonusRoute}}
<div class="resultItemHeader resultItemHeaderLeftArea resultItemHeaderAuthor resultItemHeaderCardType resultName col-xs-2 col-sm-2 {{getCardsetBackground
......
......@@ -74,6 +74,7 @@ $margin-top_infinite_scroll_text: 3px;
$font_size_infinite_scroll_text: 16px;
$font_weight_infinite_scroll_text: normal;
$margin_bottom_item: 10px;
$transcript_info_padding: 3px;
//markdeep
$padding_inline_code: 5px;
......@@ -845,3 +846,9 @@ blockquote {
.lightbox {
z-index: 20010;
}
.transcript-info-text {
padding: $transcript_info_padding !important;
margin-left: -$transcript_info_padding !important;
font-weight: bold;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment