Commit cbe818df authored by Curtis Adam's avatar Curtis Adam

Add an arsnova.click and arsnova.voting modal

parent bde30e56
......@@ -2606,5 +2606,21 @@ $themes: (
color: $wordcloud_tooltip_divider !important;
}
}
.showArsnovaApp.pressed {
background-color: #80BA24 !important;
}
.showArsnovaClick.pressed {
background-color: #637B89 !important;
}
.showArsnovaApp {
background-color: $white !important;
}
.showArsnovaClick {
background-color: $white !important;
}
}
}
......@@ -1189,6 +1189,8 @@
"zoomTextReset": "Zurücksetzen",
"pomodoro": "Wechsel zwischen Minutensprunguhr | Pomodoro-Timer",
"showHelp": "Hilfe",
"arsnovaApp": "arsnova.app",
"arsnovaClick": "arsnova.click",
"markdeepEditor": {
"help": "Zeige alle Formatierungsoptionen von Markdeep",
"center": "Zentriere den Karteninhalt vertikal",
......
......@@ -1188,6 +1188,8 @@
"zoomTextReset": "Zurücksetzen",
"pomodoro": "",
"showHelp": "Help",
"arsnovaApp": "arsnova.app",
"arsnovaClick": "arsnova.click",
"markdeepEditor": {
"help": "",
"center": " ",
......
......@@ -233,7 +233,7 @@ img.cardside {
margin-left: 0;
}
.card-button {
.card-button, .showArsnovaApp, .showArsnovaClick {
cursor: pointer;
font-size: $font_size_card_header_button !important;
}
......
<template name="cardSidebarItemArsnovaApp">
<img class="hidden-xs showArsnovaApp card-button cardHeaderItem"
data-type="cardNavigation"
src="/img/button/arsnova_app.png" title="{{_ "card.tooltip.arsnovaApp"}}">
</template>
<template name="arsnovaAppModal">
<div class="modal fade" id="arsnovaAppModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
{{#if isArsnovaAppModalActive}}
<iframe src="https://arsnova.app">
</iframe>
{{/if}}
</div>
</div>
</template>
import "./arsnovaApp.html";
import {Session} from "meteor/session";
import {Template} from "meteor/templating";
Session.setDefault('arsnovaAppModalActive', false);
/*
* ############################################################################
* cardSidebarItemArsnovaApp
* ############################################################################
*/
Template.cardSidebarItemArsnovaApp.events({
"click .showArsnovaApp": function () {
Session.set('arsnovaAppModalActive', true);
$('#arsnovaAppModal').modal('show');
}
});
Template.cardSidebarItemArsnovaApp.onCreated(function () {
if ($(window).width() >= 768) {
Session.set('arsnovaAppModalActive', true);
}
});
Template.cardSidebarItemArsnovaApp.onDestroyed(function () {
Session.set('arsnovaAppModalActive', false);
});
/*
* ############################################################################
* arsnovaAppModal
* ############################################################################
*/
Template.arsnovaAppModal.onRendered(function () {
$('#arsnovaAppModal').on('hidden.bs.modal', function () {
$('.showArsnovaApp').attr('src', '/img/button/arsnova_app.png');
$('.showArsnovaApp').removeClass('pressed');
});
$('#arsnovaAppModal').on('shown.bs.modal', function () {
$('.showArsnovaApp').attr('src', '/img/button/arsnova_app_pressed.png');
$('.showArsnovaApp').addClass('pressed');
});
});
Template.arsnovaAppModal.helpers({
isArsnovaAppModalActive: function () {
return Session.get('arsnovaAppModalActive');
}
});
<template name="cardSidebarItemArsnovaClick">
<img class="hidden-xs showArsnovaClick card-button cardHeaderItem"
data-type="cardNavigation"
src="/img/button/arsnova_click.png"
title="{{_ "card.tooltip.arsnovaClick"}}">
</template>
<template name="arsnovaClickModal">
<div class="modal fade" id="arsnovaClickModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
{{#if isArsnovaClickActive}}
<iframe src="https://arsnova.click">
</iframe>
{{/if}}
</div>
</div>
</template>
import "./arsnovaClick.html";
import {Session} from "meteor/session";
import {Template} from "meteor/templating";
Session.setDefault('arsnovaClickModalActive', false);
/*
* ############################################################################
* cardSidebarItemArsnovaClick
* ############################################################################
*/
Template.cardSidebarItemArsnovaClick.events({
"click .showArsnovaClick": function () {
Session.set('arsnovaClickModalActive', true);
$('#arsnovaClickModal').modal('show');
}
});
Template.cardSidebarItemArsnovaClick.onCreated(function () {
if ($(window).width() >= 768) {
Session.set('arsnovaClickModalActive', true);
}
});
Template.cardSidebarItemArsnovaClick.onDestroyed(function () {
Session.set('arsnovaClickModalActive', false);
});
/*
* ############################################################################
* arsnovaClickModal
* ############################################################################
*/
Template.arsnovaClickModal.onRendered(function () {
$('#arsnovaClickModal').on('hidden.bs.modal', function () {
$('.showArsnovaClick').attr('src', '/img/button/arsnova_click.png');
$('.showArsnovaClick').removeClass('pressed');
});
$('#arsnovaClickModal').on('shown.bs.modal', function () {
$('.showArsnovaClick').attr('src', '/img/button/arsnova_click_pressed.png');
$('.showArsnovaClick').addClass('pressed');
});
});
Template.arsnovaClickModal.helpers({
isArsnovaClickActive: function () {
return Session.get('arsnovaClickModalActive');
}
});
......@@ -86,6 +86,8 @@
{{> cardSidebarItemCardList}}
{{> cardSidebarItemPomodoroButton}}
{{> flashcardSidebarDictionary}}
{{> cardSidebarItemArsnovaApp}}
{{> cardSidebarItemArsnovaClick}}
</template>
<template name="flashcardSidebarPresentationRight">
......
......@@ -4,6 +4,8 @@ import {Template} from "meteor/templating";
import {Session} from "meteor/session";
import {Route} from "../../../api/route";
import "./sidebar.html";
import "./item/arsnovaClick.js";
import "./item/arsnovaApp.js";
import "./item/cardList.js";
import "./item/backToCardset.js";
import "./item/dictionary.js";
......
......@@ -62,3 +62,7 @@
.flashcardSidebarPreviewRight {
position: absolute !important;
}
.showArsnovaApp, .showArsnovaClick {
padding: 0 4px !important;
}
......@@ -4,6 +4,8 @@
{{> connectionStatusModal}}
{{> underDevelopmentModal}}
{{> zoomTextOverlay}}
{{> arsnovaClickModal}}
{{> arsnovaAppModal}}
{{#unless fullscreenActive}}
{{#if currentUser}}
{{#if isInRole 'firstLogin'}}
......
......@@ -35,6 +35,7 @@ $default_font:
'Segoe UI Emoji',
'Segoe UI Symbol';
$default_text_shadow: 1px 1px 1px #4A5C66;
$default_box_shadow: 10px 10px 15px #4A5C66;
//navbar
$size_navbar_alldecks_border: 3px;
......@@ -953,3 +954,10 @@ th {
margin-left: 5px;
}
}
#arsnovaAppModal iframe, #arsnovaClickModal iframe {
width: 600px;
height: 800px;
border: 0;
box-shadow: $default_box_shadow !important;
}
......@@ -7569,31 +7569,6 @@
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.0",
"util-deprecate": "~1.0.1"
},
"dependencies": {
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"process-nextick-args": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
},
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
}
}
},
"rimraf": {
......
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