Commit 73be1b62 authored by Tim Häuser's avatar Tim Häuser

merged with upstream master

parents 535be084 d199d92f
......@@ -25,7 +25,7 @@ Minor features and changes:
Project management: Klaus Quibeldey-Cirkel
Lead programming: Andreas Gärtner, Daniel Gerhardt, Christoph Thelen
Contributions: Felix Schmidt, Artjom Siebert, Daniel Vogel
Sponsoring: [AG QLS](https://www.thm.de/zqe/qmnetzwerk/agqls),
Sponsoring: [AG QLS](https://www.thm.de/site/en/hochschule/service/ag-qls.html),
[HMWK](https://wissenschaft.hessen.de/wissenschaft/it-neue-medien/kompetenznetz-e-learning-hessen)
......@@ -61,7 +61,7 @@ Contributions: Colin Appel, Sören Gutzeit, Julian Hochstetter, Jan Kammer,
Daniel Knapp, Alexander Nadler, Julian Rossback, Karolina Rozanka, Jannik
Schaaf, Felix Schmidt, Artjom Siebert, Daniel Vogel
Testing & Feedback: Kevin Atkins, Kathrin Jäger
Sponsoring: [AG QLS](https://www.thm.de/zqe/qmnetzwerk/agqls),
Sponsoring: [AG QLS](https://www.thm.de/site/en/hochschule/service/ag-qls.html),
[HMWK](https://wissenschaft.hessen.de/wissenschaft/it-neue-medien/kompetenznetz-e-learning-hessen),
[@LLZ](http://llz.uni-halle.de/)
......
......@@ -227,6 +227,9 @@ Ext.application({
/* show diagnosis tab panel */
mainTabPanel.diagnosisPanel.tab.show();
/* check existing login in stored session */
ARSnova.app.getController('Sessions').checkExistingSessionLogin();
mainTabPanel.animateActiveItem(mainTabPanel.homeTabPanel, 'slide');
var hTP = mainTabPanel.homeTabPanel;
switch (ARSnova.app.userRole) {
......@@ -240,12 +243,6 @@ Ext.application({
default:
break;
}
if (sessionStorage.getItem("keyword") !== null && sessionStorage.getItem("keyword") !== "") {
return ARSnova.app.getController('Sessions').login({
keyword: sessionStorage.getItem("keyword")
});
}
},
/**
......@@ -302,23 +299,48 @@ Ext.application({
}
},
showMask: function (mask, duration) {
var minimumDuration = 800;
Ext.Viewport.setMasked(mask);
this.maskedMessage = mask.message;
var hideLoadMask = Ext.Function.createDelayed(function (message) {
if (this.maskedMessage === message) {
Ext.Viewport.setMasked(false);
}
}, minimumDuration, this, [mask.message]);
Ext.defer(hideLoadMask, (duration || 5000) - minimumDuration);
return hideLoadMask;
},
/**
* Wrapper for an invidivudal LoadMask
* Wrapper for an individual loading mask
*/
showLoadMask: function (message, duration) {
var minimumDuration = 800;
Ext.Viewport.setMasked({
return this.showMask({
xtype: 'loadmask',
message: message || ""
});
}, duration);
},
var hideLoadMask = Ext.Function.createDelayed(function () {
Ext.Viewport.setMasked(false);
}, minimumDuration);
Ext.defer(hideLoadMask, (duration || 5000) - minimumDuration);
/**
* Wrapper for an individual load indicator
*/
showLoadIndicator: function (message, duration) {
var screenWidth = (window.innerWidth > 0) ? window.innerWidth : screen.width;
var indicatorCls = 'x-loading-mask customLoadingIndicator ' +
(screenWidth < 720 ? 'overlayLoadingIndicator' : 'toolbarLoadingIndicator');
return hideLoadMask;
return this.showMask({
xtype: 'loadmask',
baseCls: '',
top: 'initial',
right: 'initial',
cls: indicatorCls,
message: message || '',
bottom: screenWidth < 720 ? '60px' : '4px'
}, duration);
},
/**
......
......@@ -87,14 +87,23 @@ Ext.define("ARSnova.controller.Application", {
cachedY = 0;
var preventClick = function (e) {
var prevent = false;
e = e || window.event;
var element = e.target || e.srcElement;
if (element.tagName === 'IMG' && element.className === 'resizeableImage' ||
element.tagName === 'SPAN' && element.className === 'videoImageContainer' ||
element.tagName === 'A' && element.className !== "session-export") {
return true;
element.tagName === 'A' && element.className !== 'session-export') {
prevent = true;
if (element.tagName === 'A' &&
!ARSnova.app.getController('Application').checkHrefProtocol(element.href)) {
element.target = '_blank'; // open link in new tab
prevent = false;
}
}
return false;
return prevent;
};
document.onclick = function (e) {
......@@ -156,10 +165,6 @@ Ext.define("ARSnova.controller.Application", {
controller.toggleHrefPanelActive();
controller.handleInternEmbeddedPageLoading(controller, title, url);
}
return false; // prevent default action and stop event propagation
} else {
element.target = '_blank'; // open link in new tab
}
}
},
......
......@@ -160,7 +160,11 @@ Ext.define("ARSnova.controller.Auth", {
var animation = {
type: 'flip',
<<<<<<< HEAD
direction: role ? 'right' : left,
=======
direction: role ? 'right' : 'left',
>>>>>>> d199d92ff38ee74b2f549bbfa47038b0aaaf3694
listeners: !callback ? {} : {
animationend: callback
}
......
......@@ -105,16 +105,5 @@ Ext.define("ARSnova.controller.Feedback", {
fP.activeItem = 1;
}
tP.setActiveItem(fP);
},
statistic: function () {
ARSnova.app.showLoadMask("Erzeuge die Grafik...");
var fP = ARSnova.app.mainTabPanel.tabPanel.feedbackTabPanel;
fP.statisticPanel.backButton.show();
ARSnova.app.mainTabPanel.tabPanel.setActiveItem(fP);
ARSnova.app.mainTabPanel.tabPanel.feedbackTabPanel.addListener('deactivate', function (panel) {
panel.statisticPanel.backButton.hide();
}, this, {single: true});
}
});
......@@ -285,9 +285,16 @@ Ext.define("ARSnova.controller.Questions", {
return;
}
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SAVE);
question.saveSkillQuestion({
success: options.successFunc,
failure: options.failureFunc
success: function () {
options.successFunc();
hideLoadMask();
},
failure: function () {
options.failureFunc();
hideLoadMask();
}
});
},
......
......@@ -50,6 +50,7 @@ Ext.define("ARSnova.controller.Sessions", {
return;
}
/* do login stuff */
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_LOGIN);
var res = ARSnova.app.sessionModel.checkSessionLogin(options.keyword, {
success: function (obj) {
// check if user is creator of this session
......@@ -95,12 +96,15 @@ Ext.define("ARSnova.controller.Sessions", {
},
notFound: function () {
Ext.Msg.alert(Messages.NOTIFICATION, Messages.SESSION_NOT_FOUND);
hideLoadMask();
},
forbidden: function () {
Ext.Msg.alert(Messages.NOTIFICATION, Messages.SESSION_LOCKED);
hideLoadMask();
},
failure: function () {
Ext.Msg.alert(Messages.NOTIFICATION, Messages.CONNECTION_PROBLEM);
hideLoadMask();
}
});
},
......@@ -172,10 +176,15 @@ Ext.define("ARSnova.controller.Sessions", {
tabPanel.feedbackTabPanel.tab.hide();
},
reloadData: function () {
reloadData: function (animation) {
var tabPanel = ARSnova.app.mainTabPanel.tabPanel;
var hideLoadMask = Ext.emptyFn;
animation = !!animation ? animation : {
type: 'slide',
duration: 700
};
if (ARSnova.app.isSessionOwner && ARSnova.app.userRole === ARSnova.app.USER_ROLE_SPEAKER) {
ARSnova.app.sessionModel.fireEvent(ARSnova.app.sessionModel.events.sessionJoinAsSpeaker);
/* add speaker in class panel */
......@@ -183,14 +192,10 @@ Ext.define("ARSnova.controller.Sessions", {
tabPanel.speakerTabPanel = Ext.create('ARSnova.view.speaker.TabPanel');
tabPanel.insert(1, tabPanel.speakerTabPanel);
} else {
hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_LOGIN, 3000);
tabPanel.speakerTabPanel.tab.show();
tabPanel.speakerTabPanel.renew();
}
tabPanel.animateActiveItem(tabPanel.speakerTabPanel, {
type: 'slide',
duration: 700
});
tabPanel.animateActiveItem(tabPanel.speakerTabPanel, animation);
tabPanel.speakerTabPanel.inClassPanel.registerListeners();
/* add feedback statistic panel*/
......@@ -231,21 +236,22 @@ Ext.define("ARSnova.controller.Sessions", {
tabPanel.feedbackTabPanel.renew();
}
tabPanel.animateActiveItem(tabPanel.userTabPanel, {
type: 'slide',
duration: 700
});
tabPanel.animateActiveItem(tabPanel.userTabPanel, animation);
}
/* add feedback questions panel*/
if (!tabPanel.feedbackQuestionsPanel) {
tabPanel.feedbackQuestionsPanel = Ext.create('ARSnova.view.feedbackQuestions.TabPanel');
if (ARSnova.app.userRole === ARSnova.app.USER_ROLE_SPEAKER) {
tabPanel.insert(2, tabPanel.feedbackQuestionsPanel);
} else {
tabPanel.insert(4, tabPanel.feedbackQuestionsPanel);
}
}
if (!tabPanel.userTabPanel) {
tabPanel.insert(2, tabPanel.feedbackQuestionsPanel);
if (ARSnova.app.userRole === ARSnova.app.USER_ROLE_SPEAKER) {
tabPanel.feedbackQuestionsPanel.tab.show();
} else {
tabPanel.insert(4, tabPanel.feedbackQuestionsPanel);
tabPanel.feedbackQuestionsPanel.tab.hide();
}
......@@ -257,8 +263,8 @@ Ext.define("ARSnova.controller.Sessions", {
create: function (options) {
var session = Ext.create('ARSnova.model.Session', {
type: 'session',
name: options.name,
shortName: options.shortName,
name: options.name.trim(),
shortName: options.shortName.trim(),
creator: localStorage.getItem('login'),
courseId: options.courseId,
courseType: options.courseType,
......@@ -377,6 +383,70 @@ Ext.define("ARSnova.controller.Sessions", {
});
},
changeRole: function () {
var tabPanel = ARSnova.app.mainTabPanel.tabPanel;
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.CHANGE_ROLE + '...', 2000);
var reloadSession = function (animationDirection, onAnimationEnd) {
tabPanel.updateHomeBadge();
ARSnova.app.socket.setSession(null);
ARSnova.app.socket.setSession(sessionStorage.getItem('keyword'));
onAnimationEnd = (typeof onAnimationEnd === 'function') ?
onAnimationEnd : hideLoadMask;
ARSnova.app.getController('Sessions').reloadData({
listeners: {animationend: onAnimationEnd},
direction: animationDirection,
type: 'flip'
});
};
if (ARSnova.app.userRole === ARSnova.app.USER_ROLE_SPEAKER) {
localStorage.setItem('lastVisitedRole', ARSnova.app.USER_ROLE_SPEAKER);
localStorage.setItem('role', ARSnova.app.USER_ROLE_STUDENT);
ARSnova.app.userRole = ARSnova.app.USER_ROLE_STUDENT;
/* hide speaker tab panel and destroy listeners */
tabPanel.speakerTabPanel.tab.hide();
tabPanel.speakerTabPanel.inClassPanel.destroyListeners();
reloadSession('right');
} else {
if (localStorage.getItem('lastVisitedRole') === ARSnova.app.USER_ROLE_SPEAKER) {
localStorage.setItem('role', ARSnova.app.USER_ROLE_SPEAKER);
ARSnova.app.userRole = ARSnova.app.USER_ROLE_SPEAKER;
localStorage.removeItem('lastVisitedRole');
/* hide user tab panels and destroy listeners */
tabPanel.userTabPanel.tab.hide();
tabPanel.userQuestionsPanel.tab.hide();
tabPanel.userTabPanel.inClassPanel.destroyListeners();
reloadSession('left', function () {
/* remove user tab panel and user questions panel*/
tabPanel.remove(tabPanel.userQuestionsPanel);
tabPanel.remove(tabPanel.userTabPanel);
delete tabPanel.userQuestionsPanel;
delete tabPanel.userTabPanel;
hideLoadMask();
});
}
}
},
checkExistingSessionLogin: function () {
if (localStorage.getItem('lastVisitedRole') === ARSnova.app.USER_ROLE_SPEAKER) {
localStorage.setItem('role', ARSnova.app.USER_ROLE_SPEAKER);
ARSnova.app.userRole = ARSnova.app.USER_ROLE_SPEAKER;
localStorage.removeItem('lastVisitedRole');
} else {
if (sessionStorage.getItem("keyword") !== null && sessionStorage.getItem("keyword") !== "") {
ARSnova.app.getController('Sessions').login({
keyword: sessionStorage.getItem("keyword")
});
}
}
},
setActive: function (options) {
ARSnova.app.sessionModel.lock(sessionStorage.getItem("keyword"), options.active, {
success: function () {
......
......@@ -105,6 +105,7 @@
/* LOAD MASK */
LOAD_MASK: "Lade Daten...",
LOAD_MASK_LOGIN: "Login...",
LOAD_MASK_SAVE: 'Speichern...',
LOAD_MASK_SEARCH: "Suche Sessions...",
LOAD_MASK_SEARCH_QUESTIONS: "Suche Fragen...",
LOAD_MASK_SEARCH_COURSES: "Suche Kurse...",
......@@ -682,6 +683,7 @@
/* LOAD MASK */
LOAD_MASK: "Loading...",
LOAD_MASK_LOGIN: "Login...",
LOAD_MASK_SAVE: 'Saving...',
LOAD_MASK_SEARCH: "Looking for sessions...",
LOAD_MASK_SEARCH_QUESTIONS: "Looking for questions...",
LOAD_MASK_SEARCH_COURSES: "Looking for courses...",
......
......@@ -46,6 +46,15 @@ Ext.define('ARSnova.proxy.RestProxy', {
}, this, {single: true});
},
/**
* @param start index
* @param end index
* @return formatted range header string
*/
constructRangeRequestString: function (offset, limit) {
return 'items=' + offset + '-' + limit;
},
/**
* Search for a session with specified keyword
* @param keyword of session
......@@ -134,7 +143,7 @@ Ext.define('ARSnova.proxy.RestProxy', {
* @return session-objects, if found
* @return false, if nothing found
*/
getMySessions: function (callbacks, sortby) {
getMySessions: function (callbacks, sortby, offset, limit) {
this.arsjax.request({
url: "session/",
method: "GET",
......@@ -142,7 +151,6 @@ Ext.define('ARSnova.proxy.RestProxy', {
statusonly: true,
sortby: sortby
},
success: callbacks.success,
204: callbacks.empty,
......
......@@ -34,6 +34,8 @@ Ext.define('ARSnova.view.Caption', {
this.listButton = Ext.create('ARSnova.view.MultiBadgeButton', {
ui: 'small',
text: "",
disabled: true,
disabledCls: '',
cls: 'forwardListButton caption',
style: this.getStyle()
});
......
......@@ -71,12 +71,12 @@ Ext.define('ARSnova.view.Question', {
answerStore.each(function (item) {
if (ARSnova.app.globalConfig.parseAnswerOptionFormatting) {
var md = Ext.create('ARSnova.view.MathJaxMarkDownPanel');
md.setContent(item.get('text'), true, true, function (html) {
item.set('formattedText', html.getHtml());
md.setContent(item.get('text'), true, false, function (html) {
item.set('formattedText', '<p>' + html.getHtml() + '</p>');
md.destroy();
});
} else {
item.set('formattedText', Ext.util.Format.htmlEncode(item.get('text')));
item.set('formattedText', '<p>' + Ext.util.Format.htmlEncode(item.get('text')) + '</p>');
}
});
......@@ -524,6 +524,11 @@ Ext.define('ARSnova.view.Question', {
0.9 : 0.75
});
/* update disabled state on initialize */
if (this.questionObj.votingDisabled) {
this.disableQuestion();
}
this.add([
this.formPanel, this.countdownTimer,
this.editButtons ? this.editButtons : {}
......@@ -692,24 +697,17 @@ Ext.define('ARSnova.view.Question', {
setZoomLevel: function (size) {
this.formPanel.setStyle('font-size: ' + size + '%;');
this.answerList.fireEvent('resizeList', this.answerList.element);
ARSnova.app.getController('Application').setGlobalZoomLevel(size);
this.updateListHeight();
},
updateListHeight: function () {
var me = this;
if (!me.resizeListFlag && this.questionObj.questionType !== 'grid') {
me.resizeListFlag = true;
Ext.create('Ext.util.DelayedTask', function () {
if (me.answerList.element.dom.style.display !== 'none') {
me.answerList.element.dom.style.display = 'none';
me.answerList.fireEvent('resizeList', me.answerList.element);
me.answerList.element.dom.style.display = '';
me.resizeListFlag = false;
}
}).delay(2000);
if (this.questionObj.questionType !== 'grid') {
var listItemsDom = this.answerList.element.select(".x-list .x-inner .x-inner").elements[0];
listItemsDom.style.display = 'none';
this.answerList.fireEvent('resizeList', this.answerList.element);
listItemsDom.style.display = '';
this.answerList.fireEvent('resizeList', this.answerList.element);
}
},
......
......@@ -34,7 +34,7 @@ Ext.define('ARSnova.view.SessionStatusButton', {
this.sessionIsClosed = Ext.create('ARSnova.view.MatrixButton', {
buttonConfig: 'icon',
cls: 'actionButton',
cls: 'smallerActionButton',
text: Messages.START_SESSION,
imageCls: 'icon-lock thm-orange',
imageStyle: {
......@@ -48,7 +48,7 @@ Ext.define('ARSnova.view.SessionStatusButton', {
this.sessionIsOpen = Ext.create('ARSnova.view.MatrixButton', {
buttonConfig: 'icon',
cls: 'actionButton',
cls: 'smallerActionButton',
text: Messages.STOP_SESSION,
imageCls: 'icon-unlock',
imageStyle: {
......@@ -104,6 +104,11 @@ Ext.define('ARSnova.view.SessionStatusButton', {
this.isRendered = true;
},
setActionButtonCls: function (buttonCls) {
this.sessionIsClosed.setCls(buttonCls);
this.sessionIsOpen.setCls(buttonCls);
},
sessionClosedSuccessfully: function () {
this.isOpen = false;
this.sessionIsClosed.show();
......
......@@ -61,7 +61,7 @@ Ext.define('ARSnova.view.components.QuestionToolbar', {
this.statisticsButton = Ext.create('Ext.Button', {
iconCls: 'icon-chart',
style: 'padding: 0 0.4em',
style: 'padding: 0; width: 44px',
handler: this.getStatisticsButtonHandler(),
align: 'right'
});
......
......@@ -199,7 +199,7 @@ Ext.define('ARSnova.view.diagnosis.StatisticsPanel', {
},
updateData: function () {
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK);
this.statisticsStore.clearData();
this.getStatistics().then(hideLoadMask, hideLoadMask); // hide mask on success and on error
},
......
......@@ -381,7 +381,7 @@ Ext.define('ARSnova.view.feedbackQuestions.QuestionsPanel', {
},
getFeedbackQuestions: function () {
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOADING_NEW_QUESTIONS);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOADING_NEW_QUESTIONS);
ARSnova.app.questionModel.getInterposedQuestions(sessionStorage.getItem('keyword'), {
success: function (response) {
var questions = Ext.decode(response.responseText);
......
......@@ -83,9 +83,7 @@ Ext.define('ARSnova.view.home.HomePanel', {
docked: 'top',
ui: 'light',
items: [
this.logoutButton,
this.roleIcon,
this.changeRoleButton
this.logoutButton
]
});
......@@ -235,7 +233,7 @@ Ext.define('ARSnova.view.home.HomePanel', {
this.add(this.matrixButtonPanel);
}
this.on('activate', this.onActivate);
this.on('painted', this.onActivate);
this.on('resize', function () {
this.resizeSessionButtons();
......@@ -259,7 +257,6 @@ Ext.define('ARSnova.view.home.HomePanel', {
var p1 = this.loadVisitedSessions();
var p2 = this.loadMySessions();
console.log("p2-session: ", p2);
// get the summary of all session lists
RSVP.all([p1, p2]).then(handler, function error() {
// errors swallow results, retest each promise seperately to figure out if one succeeded
......@@ -280,7 +277,7 @@ Ext.define('ARSnova.view.home.HomePanel', {
},
onSubmit: function () {
ARSnova.app.showLoadMask(Messages.LOGIN_LOAD_MASK);
ARSnova.app.showLoadIndicator(Messages.LOGIN_LOAD_MASK);
// delete the textfield-focus, to hide the numeric keypad on phones
this.down('textfield').blur();
......@@ -327,7 +324,7 @@ Ext.define('ARSnova.view.home.HomePanel', {
var me = this;
var promise = new RSVP.Promise();
var hideLoadingMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SEARCH);
var hideLoadingMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SEARCH);
ARSnova.app.restProxy.getMyVisitedSessions({
success: function (sessions) {
......@@ -363,7 +360,7 @@ Ext.define('ARSnova.view.home.HomePanel', {
var me = this;
var promise = new RSVP.Promise();
var hideLoadingMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SEARCH);
var hideLoadingMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SEARCH);
ARSnova.app.sessionModel.getMySessions({
success: function (response) {
......@@ -405,7 +402,7 @@ Ext.define('ARSnova.view.home.HomePanel', {
form.show();
var buttonHandler = function (options) {
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_LOGIN);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_LOGIN);
ARSnova.app.getController('Sessions').login({
keyword: options.config.sessionObj.keyword
});
......
......@@ -118,7 +118,6 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
this.roleIcon,
this.motdButton,
this.changeRoleButton
]
});
......@@ -234,7 +233,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
scope: this,
loadsuccess: function (data) {
if (!Ext.os.is.iOS) {
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SESSION_IMPORT, 240000);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SESSION_IMPORT, 240000);
try {
var n = data.indexOf("base64,");
data = decodeURIComponent(window.escape(atob(data.substring(n + 7)))); // remove disturbing prefix
......@@ -371,7 +370,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
this.lastVisitedSessionsForm
]);
this.on('activate', this.onActivate);
this.on('painted', this.onActivate);
this.on('resize', function () {
this.resizeMySessionsButtons();
......@@ -440,7 +439,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
var me = this;
var promise = new RSVP.Promise();
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SEARCH);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SEARCH);
ARSnova.app.sessionModel.getMySessions({
success: function (response) {
var sessions = Ext.decode(response.responseText);
......@@ -455,7 +454,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
}
var sessionButtonHandler = function (options) {
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_LOGIN);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_LOGIN);
localStorage.setItem('role', ARSnova.app.USER_ROLE_SPEAKER);
ARSnova.app.userRole = ARSnova.app.USER_ROLE_SPEAKER;
ARSnova.app.setWindowTitle();
......@@ -537,7 +536,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
return promise;
}
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SEARCH);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SEARCH);
ARSnova.app.sessionModel.getMyPublicPoolSessions({
success: function (response) {
var sessions = Ext.decode(response.responseText);
......@@ -552,7 +551,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
}
var sessionButtonHandler = function (options) {
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_LOGIN);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_LOGIN);
localStorage.setItem('role', ARSnova.app.USER_ROLE_SPEAKER);
ARSnova.app.setWindowTitle();
......@@ -616,7 +615,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
loadVisitedSessions: function () {
var me = this;
var hideLoadingMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SEARCH);
var hideLoadingMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SEARCH);
var promise = new RSVP.Promise();
ARSnova.app.restProxy.getMyVisitedSessions({
......@@ -629,7 +628,7 @@ Ext.define('ARSnova.view.home.MySessionsPanel', {
panel.lastVisitedSessionsForm.show();
var sessionButtonHandler = function (options) {
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_LOGIN);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_LOGIN);
localStorage.setItem('lastVisitedRole', ARSnova.app.USER_ROLE_SPEAKER);
localStorage.setItem('role', ARSnova.app.USER_ROLE_STUDENT);
ARSnova.app.userRole = ARSnova.app.USER_ROLE_STUDENT;
......
......@@ -303,7 +303,7 @@ Ext.define('ARSnova.view.home.PublicPoolSingleItemPanel', {
duration: 700
});
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_LOGIN);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_LOGIN);
ARSnova.app.getController('Auth').roleSelect({
mode: ARSnova.app.USER_ROLE_STUDENT
});
......
......@@ -135,7 +135,7 @@ Ext.define('ARSnova.view.home.SessionExportListPanel', {
var me = this;
var promise = new RSVP.Promise();
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SEARCH);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SEARCH);
ARSnova.app.sessionModel.getMySessions({
success: function (response) {
......@@ -168,7 +168,7 @@ Ext.define('ARSnova.view.home.SessionExportListPanel', {
var me = this;
var promise = new RSVP.Promise();
var hideLoadMask = ARSnova.app.showLoadMask(Messages.LOAD_MASK_SEARCH);
var hideLoadMask = ARSnova.app.showLoadIndicator(Messages.LOAD_MASK_SEARCH);
<