diff --git a/src/main/webapp/app/view/Caption.js b/src/main/webapp/app/view/Caption.js index a15e20ae75d07669f7c68c7f1d523ed7bf6e49fa..e890a3836d13f987ca62cd51931e8674fd563112 100644 --- a/src/main/webapp/app/view/Caption.js +++ b/src/main/webapp/app/view/Caption.js @@ -28,7 +28,7 @@ Ext.define('ARSnova.view.Caption', { }, badgeTranslation: { feedback: Messages.COMMENTS, - unredFeedback: Messages.UNREAD_QUESTIONS_FROM_STUDENTS, + unreadFeedback: Messages.UNREAD_QUESTIONS_FROM_STUDENTS, flashcards: Messages.FLASHCARDS, questions: Messages.QUESTIONS, answers: Messages.ANSWERS @@ -115,7 +115,7 @@ Ext.define('ARSnova.view.Caption', { questions: true, answers: true, interposed: true, - unredInterposed: true, + unreadInterposed: true, flashcards: true, unanswered: false }); @@ -131,7 +131,7 @@ Ext.define('ARSnova.view.Caption', { hasQuestions = hasQuestions || item > 0; } else { hasFeedbackQuestions = hasFeedbackQuestions || item.hasFeedbackQuestions || item.numInterposed > 0; - hasUnreadFeedbackQuestions = hasUnreadFeedbackQuestions || item.hasUnredFeedbackQuestions || item.numUnredInterposed > 0; + hasUnreadFeedbackQuestions = hasUnreadFeedbackQuestions || item.hasUnreadFeedbackQuestions || item.numUnreadInterposed > 0; hasQuestions = hasQuestions || item.hasQuestions || item.numQuestions > 0 || item.numPrepQuestions > 0; hasUnansweredQuestions = hasUnansweredQuestions || item.hasUnansweredQuestions || item.numUnanswered > 0; hasFlashcards = hasFlashcards || item.hasFlashcards || item.numFlashcards > 0; @@ -143,7 +143,7 @@ Ext.define('ARSnova.view.Caption', { badgeText: options.interposed && hasFeedbackQuestions ? this.getBadgeTranslation().feedback : "", badgeCls: "feedbackQuestionsBadgeIcon" }, { - badgeText: (options.unredInterposed && hasUnreadFeedbackQuestions) ? this.getBadgeTranslation().unredQuestions : "", + badgeText: (options.unreadInterposed && hasUnreadFeedbackQuestions) ? this.getBadgeTranslation().unreadQuestions : "", badgeCls: "unreadFeedbackQuestionsBadgeIcon" }, { badgeText: options.flashcards && hasFlashcards ? this.getBadgeTranslation().flashcards : "", diff --git a/src/main/webapp/app/view/home/HomePanel.js b/src/main/webapp/app/view/home/HomePanel.js index 2ff22cf1e31efa66fc1502c8c13ed5d0c0b11fe7..54a4f1ec11d80a2fc8dbcc5798fb2e315f7f9119 100644 --- a/src/main/webapp/app/view/home/HomePanel.js +++ b/src/main/webapp/app/view/home/HomePanel.js @@ -260,7 +260,7 @@ Ext.define('ARSnova.view.home.HomePanel', { me.caption.summarize(sessions, { questions: true, unanswered: false, - unredInterposed: false, + unreadInterposed: false, interposed: true, answers: true }); diff --git a/src/main/webapp/app/view/home/MySessionsPanel.js b/src/main/webapp/app/view/home/MySessionsPanel.js index c72ddf16710b7356ba1c92615d9fac57f22a9047..a9efbb3c737fac3546c2d586616dc55a65280b21 100644 --- a/src/main/webapp/app/view/home/MySessionsPanel.js +++ b/src/main/webapp/app/view/home/MySessionsPanel.js @@ -393,7 +393,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', { var handler = function success(sessions) { me.caption.summarize(sessions, { - unredInterposed: false + unreadInterposed: false }); me.add(me.caption); }; @@ -525,7 +525,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', { sessionButton.setBadge([ {badgeText: session.numInterposed, badgeCls: "feedbackQuestionsBadgeIcon"}, - {badgeText: session.numUnredInterposed, badgeCls: "unreadFeedbackQuestionsBadgeIcon"}, + {badgeText: session.numUnreadInterposed, badgeCls: "unreadFeedbackQuestionsBadgeIcon"}, {badgeText: session.numQuestions, badgeCls: "questionsBadgeIcon"}, {badgeText: session.numAnswers, badgeCls: "answersBadgeIcon"} ]); diff --git a/src/main/webapp/app/view/speaker/AudienceQuestionPanel.js b/src/main/webapp/app/view/speaker/AudienceQuestionPanel.js index 3c25e2fbef931d895bab5114123a21b126eb860d..b4dce177fe602558903a789d26094ce0d48ce479 100644 --- a/src/main/webapp/app/view/speaker/AudienceQuestionPanel.js +++ b/src/main/webapp/app/view/speaker/AudienceQuestionPanel.js @@ -780,7 +780,7 @@ Ext.define('ARSnova.view.speaker.AudienceQuestionPanel', { badgeTranslation = { feedback: Messages.QUESTIONS_FROM_STUDENTS, - unredFeedback: Messages.UNREAD_QUESTIONS_FROM_STUDENTS, + unreadFeedback: Messages.UNREAD_QUESTIONS_FROM_STUDENTS, questions: Messages.QUESTIONS, answers: Messages.COMMENTS }; @@ -811,7 +811,7 @@ Ext.define('ARSnova.view.speaker.AudienceQuestionPanel', { }; badgeTranslation = { - feedback: "", unredFeedback: "", questions: "", + feedback: "", unreadFeedback: "", questions: "", answers: Messages.FLASHCARD_VIEWS }; } else { diff --git a/src/main/webapp/app/view/speaker/InClass.js b/src/main/webapp/app/view/speaker/InClass.js index 7c8666d6000e5ccbc542a6550d9bfad416587210..bff74e56dffd6d1bbbd3f5fb3cf76ffd6cf142c6 100644 --- a/src/main/webapp/app/view/speaker/InClass.js +++ b/src/main/webapp/app/view/speaker/InClass.js @@ -309,7 +309,7 @@ Ext.define('ARSnova.view.speaker.InClass', { numQuestions: 0, numInterposed: 0, numFlashcards: 0, - numUnredInterposed: 0 + numUnreadInterposed: 0 }; this.add([this.toolbar, this.inClassItems]); @@ -453,7 +453,7 @@ Ext.define('ARSnova.view.speaker.InClass', { if (!features.interposed) { this.badgeOptions.numInterposed = 0; - this.badgeOptions.numUnredInterposed = 0; + this.badgeOptions.numUnreadInterposed = 0; } if (!features.flashcardFeature) { @@ -463,7 +463,7 @@ Ext.define('ARSnova.view.speaker.InClass', { hasOptions = this.badgeOptions.numAnswers || this.badgeOptions.numPrepAnswers || - this.badgeOptions.numUnredInterposed || + this.badgeOptions.numUnreadInterposed || this.badgeOptions.numInterposed || this.badgeOptions.numQuestions || this.badgeOptions.numPrepQuestions || @@ -627,8 +627,8 @@ Ext.define('ARSnova.view.speaker.InClass', { me.badgeOptions.numInterposed = !me.badgeOptions.numInterposed ? questionCount.total : me.badgeOptions.numInterposed; - me.badgeOptions.numUnredInterposed = !me.badgeOptions.numUnredInterposed ? questionCount.unread : - me.badgeOptions.numUnredInterposed; + me.badgeOptions.numUnreadInterposed = !me.badgeOptions.numUnreadInterposed ? questionCount.unread : + me.badgeOptions.numUnreadInterposed; me.updateCaption(); var feedbackQButton = ARSnova.app.mainTabPanel.tabPanel.speakerTabPanel.inClassPanel.feedbackQuestionButton; diff --git a/src/main/webapp/app/view/user/InClass.js b/src/main/webapp/app/view/user/InClass.js index 8294e59aa38cb645024fc88ff243d6dd55f854f1..9d8b17dcec0c7ef40efba586b6c30259efe39553 100644 --- a/src/main/webapp/app/view/user/InClass.js +++ b/src/main/webapp/app/view/user/InClass.js @@ -266,7 +266,7 @@ Ext.define('ARSnova.view.user.InClass', { numQuestions: 0, numInterposed: 0, numFlashcards: 0, - numUnredInterposed: 0 + numUnreadInterposed: 0 }; this.add([this.toolbar, this.inClass]); @@ -369,7 +369,7 @@ Ext.define('ARSnova.view.user.InClass', { if (!features.interposed) { this.badgeOptions.numInterposed = 0; - this.badgeOptions.numUnredInterposed = 0; + this.badgeOptions.numUnreadInterposed = 0; } if (!features.flashcardFeature) { @@ -378,7 +378,7 @@ Ext.define('ARSnova.view.user.InClass', { hasOptions = this.badgeOptions.numAnswers || this.badgeOptions.numPrepAnswers || - this.badgeOptions.numUnredInterposed || + this.badgeOptions.numUnreadInterposed || this.badgeOptions.numInterposed || this.badgeOptions.numQuestions || this.badgeOptions.numPrepQuestions || @@ -611,8 +611,8 @@ Ext.define('ARSnova.view.user.InClass', { me.badgeOptions.numInterposed = !me.badgeOptions.numInterposed ? questionCount.total : me.badgeOptions.numInterposed; - me.badgeOptions.numUnredInterposed = !me.badgeOptions.numUnredInterposed ? questionCount.unread : - me.badgeOptions.numUnredInterposed; + me.badgeOptions.numUnreadInterposed = !me.badgeOptions.numUnreadInterposed ? questionCount.unread : + me.badgeOptions.numUnreadInterposed; me.updateCaption(); if (questionCount.total === 0) {