Skip to content

Commit 171f6f6

Browse files
committed
Merge branch 'master' into staging
2 parents 708812b + 78499f7 commit 171f6f6

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

app/views/layouts/embed_inlineav.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<link href="/OpenDSA/RST/_themes/haiku/static/haiku.css_t" rel="stylesheet" type="text/css"/>
66
<link href="/OpenDSA/lib/normalize.css" rel="stylesheet" type="text/css"/>
77
<link href="/OpenDSA/lib/JSAV.css" rel="stylesheet" type="text/css"/>
8-
<link href="/OpenDSA/lib/odsaMOD-min.css" rel="stylesheet" type="text/css"/>
8+
<link href="/OpenDSA/lib/odsaMOD.css" rel="stylesheet" type="text/css"/>
99
<link href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" type="text/css"/>
10-
<link href="/OpenDSA/lib/odsaStyle-min.css" rel="stylesheet" type="text/css"/>
10+
<link href="/OpenDSA/lib/odsaStyle.css" rel="stylesheet" type="text/css"/>
1111
<script type="text/x-mathjax-config">
1212
MathJax.Hub.Config({
1313
tex2jax: {
@@ -27,7 +27,7 @@
2727
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script>
2828
<script src="/OpenDSA/lib/jquery.transit.js" type="text/javascript"></script>
2929
<script src="/OpenDSA/lib/raphael.js" type="text/javascript"></script>
30-
<script src="/OpenDSA/lib/JSAV-min.js" type="text/javascript"></script>
30+
<script src="/OpenDSA/lib/JSAV.js" type="text/javascript"></script>
3131
<script src="/OpenDSA/lib/odsaUtils.js" type="text/javascript"></script>
3232
<script src="/OpenDSA/lib/odsaMOD.js" type="text/javascript"></script>
3333
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.min.js" type="text/javascript"></script>

app/views/layouts/lti_launch.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<link href="/OpenDSA/RST/_themes/haiku/static/haiku.css_t" rel="stylesheet" type="text/css"/>
66
<link href="/OpenDSA/lib/normalize.css" rel="stylesheet" type="text/css"/>
77
<link href="/OpenDSA/lib/JSAV.css" rel="stylesheet" type="text/css"/>
8-
<link href="/OpenDSA/lib/odsaMOD-min.css" rel="stylesheet" type="text/css"/>
8+
<link href="/OpenDSA/lib/odsaMOD.css" rel="stylesheet" type="text/css"/>
99
<link href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" type="text/css"/>
10-
<link href="/OpenDSA/lib/odsaStyle-min.css" rel="stylesheet" type="text/css"/>
10+
<link href="/OpenDSA/lib/odsaStyle.css" rel="stylesheet" type="text/css"/>
1111
<script>
1212
(function() {
1313
var TP = {};
@@ -57,7 +57,7 @@
5757
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script>
5858
<script src="/OpenDSA/lib/jquery.transit.js" type="text/javascript"></script>
5959
<script src="/OpenDSA/lib/raphael.js" type="text/javascript"></script>
60-
<script src="/OpenDSA/lib/JSAV-min.js" type="text/javascript"></script>
60+
<script src="/OpenDSA/lib/JSAV.js" type="text/javascript"></script>
6161
<script src="/OpenDSA/lib/odsaUtils.js" type="text/javascript"></script>
6262
<script src="/OpenDSA/lib/odsaMOD.js" type="text/javascript"></script>
6363
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.min.js" type="text/javascript"></script>

app/views/lti13/launches/launch.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<!-- CSS Imports -->
99
<link href="/OpenDSA/RST/_themes/haiku/static/haiku.css_t" rel="stylesheet" type="text/css"/>
1010
<link href="/OpenDSA/lib/normalize.css" rel="stylesheet" type="text/css"/>
11-
<link href="/OpenDSA/lib/odsaMOD-min.css" rel="stylesheet" type="text/css"/>
11+
<link href="/OpenDSA/lib/odsaMOD.css" rel="stylesheet" type="text/css"/>
1212
<link href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" type="text/css"/>
13-
<link href="/OpenDSA/lib/odsaStyle-min.css" rel="stylesheet" type="text/css"/>
13+
<link href="/OpenDSA/lib/odsaStyle.css" rel="stylesheet" type="text/css"/>
1414

1515
<!-- JS Imports -->
1616
<script src="https://code.jquery.com/jquery-2.1.4.min.js" type="text/javascript"></script>

config/initializers/constants.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ module OpenDSA
5757
# languages that OpenDSA has content for
5858
BOOK_LANGUAGES = {
5959
"en" => "English",
60-
"fr" => "Français",
6160
"pt" => "Português",
6261
"fi" => "Suomi",
63-
"sv" => "Svenska",
6462
}
6563

6664
BOOK_THEMES = {

0 commit comments

Comments
 (0)