Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
cards
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Curtis Adam
cards
Commits
e43929aa
Commit
e43929aa
authored
Jun 17, 2019
by
Curtis Adam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display a infobox entry and label for wordcloud cardsets
parent
298dd9bc
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
37 additions
and
2 deletions
+37
-2
client/themeSwitcher.scss
client/themeSwitcher.scss
+10
-0
client/themes/theme-default.scss
client/themes/theme-default.scss
+2
-0
imports/api/cardsets.js
imports/api/cardsets.js
+3
-1
imports/api/icons.js
imports/api/icons.js
+2
-0
imports/config/icons.js
imports/config/icons.js
+2
-1
imports/startup/client/registerhelper.js
imports/startup/client/registerhelper.js
+6
-0
imports/ui/cardset/info/box/cardset.html
imports/ui/cardset/info/box/cardset.html
+1
-0
imports/ui/cardset/info/box/cardset.js
imports/ui/cardset/info/box/cardset.js
+1
-0
imports/ui/cardset/info/box/item/wordcloud.html
imports/ui/cardset/info/box/item/wordcloud.html
+7
-0
imports/ui/cardset/info/box/item/wordcloud.js
imports/ui/cardset/info/box/item/wordcloud.js
+2
-0
imports/ui/cardset/labels/labels.html
imports/ui/cardset/labels/labels.html
+1
-0
No files found.
client/themeSwitcher.scss
View file @
e43929aa
...
...
@@ -82,6 +82,8 @@ $themes: (
$button_navbar_collapse_text
:
map-get
(
$map
,
"button_navbar_collapse_text"
);
$lecturer_authorized_background
:
map-get
(
$map
,
"lecturer_authorized_background"
);
$lecturer_authorized_text
:
map-get
(
$map
,
"lecturer_authorized_text"
);
$wordcloud_label_background
:
map-get
(
$map
,
"wordcloud_label_background"
);
$wordcloud_label_text
:
map-get
(
$map
,
"wordcloud_label_text"
);
$card_counter_background
:
map-get
(
$map
,
"card_counter_background"
);
$card_counter_text
:
map-get
(
$map
,
"card_counter_text"
);
$transcript_counter_background
:
map-get
(
$map
,
"transcript_counter_background"
);
...
...
@@ -2761,6 +2763,14 @@ $themes: (
}
}
.label-wordcloud
{
background-color
:
$wordcloud_label_background
!
important
;
color
:
$wordcloud_label_text
!
important
;
i
:hover
{
color
:
$wordcloud_label_text
!
important
;
}
}
.label-count-cards
{
background-color
:
$card_counter_background
!
important
;
color
:
$card_counter_text
!
important
;
...
...
client/themes/theme-default.scss
View file @
e43929aa
...
...
@@ -117,6 +117,8 @@
"button_navbar_collapse_text"
:
white
,
"lecturer_authorized_background"
:
$thm_green
,
"lecturer_authorized_text"
:
white
,
"wordcloud_label_background"
:
$thm_orange
,
"wordcloud_label_text"
:
white
,
"card_counter_background"
:
$btn_inactive
,
"card_counter_text"
:
white
,
"transcript_counter_background"
:
$thm_orange
,
...
...
imports/api/cardsets.js
View file @
e43929aa
...
...
@@ -461,7 +461,9 @@ Meteor.methods({
cardType
:
1
,
difficulty
:
1
,
learningActive
:
1
,
transcriptBonus
:
1
transcriptBonus
:
1
,
wordcloud
:
1
,
lecturerAuthorized
:
1
}
}).
fetch
();
}
...
...
imports/api/icons.js
View file @
e43929aa
...
...
@@ -53,6 +53,8 @@ export let Icons = class Icons {
switch
(
type
)
{
case
"
lecturerAuthorized
"
:
return
config
.
labels
.
lecturerAuthorized
;
case
"
wordcloud
"
:
return
config
.
labels
.
wordcloud
;
default
:
return
""
;
}
...
...
imports/config/icons.js
View file @
e43929aa
...
...
@@ -55,7 +55,8 @@ let topNavigation = {
};
let
labels
=
{
"
lecturerAuthorized
"
:
"
<i class='fa fa-graduation-cap'></i>
"
"
lecturerAuthorized
"
:
"
<i class='fa fa-graduation-cap'></i>
"
,
"
wordcloud
"
:
"
<i class='fa fa-cloud'></i>
"
};
//Only used for the active route display on mobile. Will be carried over to desktop after the main template got refactored.
...
...
imports/startup/client/registerhelper.js
View file @
e43929aa
...
...
@@ -417,6 +417,12 @@ Template.registerHelper("getLecturerAuthorizedLabel", function (cardset) {
}
});
Template
.
registerHelper
(
"
getWordcloudLabel
"
,
function
(
cardset
)
{
if
(
cardset
.
wordcloud
!==
undefined
&&
cardset
.
wordcloud
===
true
)
{
return
'
<span class="label label-wordcloud" data-id="wordcloud" title="
'
+
TAPi18n
.
__
(
'
serverStatistics.modal.table.header.wordcloud.default
'
)
+
'
">
'
+
Icons
.
labels
(
"
wordcloud
"
)
+
'
</span>
'
;
}
});
Template
.
registerHelper
(
"
getTranscriptBonusLabel
"
,
function
(
cardset
)
{
if
((
cardset
.
transcriptBonus
!==
undefined
&&
cardset
.
transcriptBonus
.
enabled
)
||
Route
.
isMyBonusTranscripts
()
||
Route
.
isTranscriptBonus
()
||
Route
.
isPresentationTranscriptBonus
()
||
Route
.
isPresentationTranscriptBonusCardset
())
{
return
'
<span class="label label-transcript-bonus" data-id="bonus-transcript" title="
'
+
TAPi18n
.
__
(
'
cardset.transcriptBonus.long
'
)
+
'
">
'
+
TAPi18n
.
__
(
'
cardset.transcriptBonus.short
'
)
+
'
</span>
'
;
...
...
imports/ui/cardset/info/box/cardset.html
View file @
e43929aa
...
...
@@ -36,4 +36,5 @@
{{> cardsetInfoBoxItemDateUpdated}}
{{> cardsetInfoBoxItemActiveLearners}}
{{> cardsetInfoBoxItemRatings}}
{{> cardsetInfoBoxItemWordcloud}}
</template>
imports/ui/cardset/info/box/cardset.js
View file @
e43929aa
...
...
@@ -15,6 +15,7 @@ import "./item/price.js";
import
"
./item/purchased.js
"
;
import
"
./item/ratings.js
"
;
import
"
./item/reviewer.js
"
;
import
"
./item/wordcloud.js
"
;
import
"
./cardset.html
"
;
import
{
CardsetVisuals
}
from
"
../../../../api/cardsetVisuals
"
;
...
...
imports/ui/cardset/info/box/item/wordcloud.html
0 → 100644
View file @
e43929aa
<template
name=
"cardsetInfoBoxItemWordcloud"
>
{{#if this.wordcloud}}
<tr>
<td
colspan=
"2"
>
{{_ "serverStatistics.modal.table.header.wordcloud.default"}}
</td>
</tr>
{{/if}}
</template>
imports/ui/cardset/info/box/item/wordcloud.js
0 → 100644
View file @
e43929aa
//------------------------ IMPORTS
import
"
./wordcloud.html
"
;
imports/ui/cardset/labels/labels.html
View file @
e43929aa
...
...
@@ -15,6 +15,7 @@
{{/unless}}
{{/if}}
{{{getLecturerAuthorizedLabel this}}}
{{{getWordcloudLabel this}}}
{{#unless isTranscriptRoute}}
{{#unless isBonusTranscriptsRoute}}
{{{getKind this.kind 0}}}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment