Skip to content

Commit 5f7dbd5

Browse files
nondeterministicnondeterministic
committed
v0.13.0 (see NEWS)
1 parent 761593a commit 5f7dbd5

File tree

23 files changed

+455
-207
lines changed

23 files changed

+455
-207
lines changed

‎NEWS

+21
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@
44
| |_| | |_| | _ <| |___| __/ | |\ | |___ \ V V / ___) |
55
\___/ \___/|_| \_\_____|_| |_| \_|_____| \_/\_/ |____/
66

7+
v0.13.0 Thu May 26 12:13:11 PM CEST 2022
8+
--------------------------------------------------------
9+
- Main features:
10+
- Not really a user-visible one: but now would require
11+
third-party-v3.tar.gz support file
12+
13+
- Minor improvements and changes:
14+
- Move from OpenJDK 11.0.14 to 11.0.15
15+
- Move bootstrap and bootswatch from 4.2.1 to 4.3.1
16+
- Move jquery from 3.3.1 to 3.5.1
17+
- Load main JS application asynchronously
18+
- Improvements to reactive/mobile layout
19+
- Link to OOREP tutorial videos on landing page
20+
21+
- Bug fixes:
22+
- Fix display of unsuccessful repertory searches for
23+
small repertories (e.g., boger)
24+
- Fix materia medica and repertory info dialogs for
25+
logged in users
26+
- This time, hopefully really fix pagination display
27+
728
v0.12.1 Tue 03 May 2022 07:00:51 PM CEST [tag: v0.12.1]
829
--------------------------------------------------------
930
- Minor improvements and changes:

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ It is strongly recommended to also download the following external JavaScript
8080
libraries and fonts:
8181

8282
* [aos](https://github.com/michalsnik/aos) (tested with v2.3.4)
83-
* [bootstrap](https://getbootstrap.com/) (tested with v4.2.1)
84-
* [bootswatch](https://bootswatch.com/) (tested with v4.2.1)
85-
* [jquery](https://jquery.com/) (tested with v3.3.1)
83+
* [bootstrap](https://getbootstrap.com/) (tested with v4.3.1)
84+
* [bootswatch](https://bootswatch.com/) (tested with v4.3.1)
85+
* [jquery](https://jquery.com/) (tested with v3.5.1)
8686
* [Open Iconic font](https://useiconic.com/open)
8787
* [Open Sans font](https://fonts.google.com/specimen/Open+Sans)
8888
* [Linux Libertine Display font](https://en.wikipedia.org/wiki/Linux_Libertine)
8989

9090
For your convenience, an archived package with the respective versions
91-
is available [here](http://pspace.org/a/third-party-v2.tar.gz). It should
91+
is available [here](http://pspace.org/a/third-party-v3.tar.gz). It should
9292
be unpacked and then placed inside `backend/public/html` within the main
9393
OOREP directory. (For OOREP versions < 0.11, you should use
9494
[this file](http://pspace.org/a/third-party.tar.gz)

‎backend/app/views/index_landing.scala.html

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
</head>
1414

1515
<body>
16-
<script>AOS.init();</script>
1716

1817
@if(org.multics.baueran.frep.backend.controllers.getAuthenticatedUser(request) == None) {
1918
@partial.cookiepopup(org.multics.baueran.frep.backend.controllers.Get.staticServerUrl)
@@ -26,7 +25,7 @@
2625
<div id="temporary_content">
2726

2827
<div style="width:100%;">
29-
<div style="width:100%; margin-top:100px; margin-bottom:100px;" class="text-center">
28+
<div style="width:100%; height: 80vh; margin-top:100px; margin-bottom:100px;" class="text-center">
3029
<h1 style="font-size:20pt;">
3130
<a href="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}/"><img src="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/logo_small.png" width="180" height="65" alt="OOREP"></a>
3231
&nbsp; &middot; &nbsp; open online homeopathic repertory
@@ -39,17 +38,19 @@ <h1 style="font-size:20pt;">
3938

4039
<div style="width:100%;" id="content"></div>
4140

41+
<script>AOS.init();</script>
42+
4243
@if(org.multics.baueran.frep.backend.controllers.getAuthenticatedUser(request) == None) {
4344

44-
<script src="/assets/frontend-opt.js"></script>
45+
<script async src="/assets/frontend-opt.js"></script>
4546

4647
@partial.about()
4748

4849
@partial.features()
4950

5051
} else {
5152

52-
<script src="/assets/sec_frontend-opt.js"></script>
53+
<script async src="/assets/sec_frontend-opt.js"></script>
5354

5455
}
5556

‎backend/app/views/index_lookup.scala.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
@import org.multics.baueran.frep.shared.Defs._
55

66
@header = {
7-
<link id="normaltheme" rel="stylesheet" href="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/third-party/bootstrap-4.2.1/css/bootstrap.min.css" @if(getFromRequestCookie(request, CookieFields.theme.toString).getOrElse("normal") == "dark") { disabled }>
8-
<link id="darktheme" rel="stylesheet" href="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/third-party/bootstrap-4.2.1/css/bootstrap-darkly.min.css" @if(getFromRequestCookie(request, CookieFields.theme.toString).getOrElse("normal") == "normal") { disabled }>
9-
<script src="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/third-party/jquery-3.3.1.min.js"></script>
7+
<link id="normaltheme" rel="stylesheet" href="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/third-party/bootstrap-4.3.1/css/bootstrap.min.css" @if(getFromRequestCookie(request, CookieFields.theme.toString).getOrElse("normal") == "dark") { disabled }>
8+
<link id="darktheme" rel="stylesheet" href="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/third-party/bootstrap-4.3.1/css/bootstrap-darkly.min.css" @if(getFromRequestCookie(request, CookieFields.theme.toString).getOrElse("normal") == "normal") { disabled }>
9+
<script src="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/third-party/jquery-3.5.1.min.js"></script>
1010
<link rel="stylesheet" href="@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/mystyle.css">
1111

1212
<meta charset="utf-8">
@@ -62,11 +62,11 @@ <h1 style="font-size:20pt;">
6262

6363
@if(org.multics.baueran.frep.backend.controllers.getAuthenticatedUser(request) == None) {
6464

65-
<script src="/assets/frontend-opt.js"></script>
65+
<script async src="/assets/frontend-opt.js"></script>
6666

6767
} else {
6868

69-
<script src="/assets/sec_frontend-opt.js"></script>
69+
<script async src="/assets/sec_frontend-opt.js"></script>
7070

7171
}
7272

‎backend/app/views/index_static_content.scala.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
@if(org.multics.baueran.frep.backend.controllers.getAuthenticatedUser(request) == None) {
2828

29-
<script src="/assets/frontend-opt.js"></script>
29+
<script async src="/assets/frontend-opt.js"></script>
3030

3131
} else {
3232

33-
<script src="/assets/sec_frontend-opt.js"></script>
33+
<script async src="/assets/sec_frontend-opt.js"></script>
3434

3535
}
3636

‎backend/app/views/partial/about.scala.html

+50-24
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,29 @@
55
<div class="row">
66
<div class="col align-self-center">
77
<div data-aos="fade-right" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
8-
<h3 style="text-align:center; margin-bottom: 10px">
9-
<span class="blue-dot"></span>
10-
<span class="blue-dot"></span>
11-
<span class="blue-dot"></span>
12-
<span>About</span>
13-
<span class="blue-dot"></span>
14-
<span class="blue-dot"></span>
15-
<span class="blue-dot"></span>
16-
</h3>
8+
<div style="text-align: center; margin-bottom: 10px">
9+
10+
<div class="d-sm-none">
11+
<h3>
12+
<span>About</span>
13+
</h3>
14+
</div>
15+
16+
<div class="d-none d-sm-block">
17+
<h3>
18+
<span class="blue-dot"></span>
19+
<span class="blue-dot"></span>
20+
<span class="blue-dot"></span>
21+
<span>About</span>
22+
<span class="blue-dot"></span>
23+
<span class="blue-dot"></span>
24+
<span class="blue-dot"></span>
25+
</h3>
26+
</div>
27+
28+
</div>
1729
</div>
18-
<div style="text-align:justify;max-width:700px;">
30+
<div style="text-align: justify; max-width:700px;">
1931
<p>
2032
OOREP is an open online repertory for homeopathy. It is open, because its source code is freely available,
2133
it is online, because a running instance of it is served right here on this very server for your convenience.
@@ -35,37 +47,51 @@ <h3 style="text-align:center; margin-bottom: 10px">
3547
</p>
3648
</div>
3749
</div>
38-
<div class="col">
39-
<img height="500" width="383" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/hahnemann_statue_2.webp" alt="">
50+
<div class="col d-none d-sm-block">
51+
<img height="500" width="383"
52+
src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/hahnemann_statue_2.webp"
53+
loading="lazy"
54+
alt="">
4055
</div>
4156
</div>
4257
</div>
4358
</div>
4459

4560
<div class="jumbotron jumbo-light" style="position: relative;">
4661
<div class="container">
47-
<div class="row h-100">
48-
<div class="col">
62+
<div class="row h-100 text-center">
63+
<div class="col d-none d-sm-block">
4964
<img src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/laptop-min.webp"
5065
srcset="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/laptop-min.webp 383w,
51-
@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/laptop-med.webp 500w,
52-
@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/laptop.webp 830w"
66+
@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/laptop-med.webp 500w,
67+
@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/laptop.webp 830w"
5368
sizes="(max-width: 1024px) 383px,
54-
(max-width: 1300px) 500px,
55-
830px"
69+
(max-width: 1300px) 500px,
70+
830px"
5671
style="position: relative; left:-15px;"
72+
loading="lazy"
5773
alt="OOREP screenshot">
5874
</div>
5975
<div class="col my-auto" style="font-size: 120%;">
60-
<div style="width: 80%;" data-aos="fade-left" data-aos-delay="300" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
61-
<h2 style="margin-bottom: 10px">
62-
<i>At a glance...</i>
63-
</h2>
76+
<div class="text-center" style="width: 100%;" data-aos="fade-left" data-aos-delay="300" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
77+
<div style="margin-bottom: 10px;">
78+
<span class="oi oi-video" style="font-size: 47px;"></span>
79+
</div>
80+
<p>
81+
Short video tutorials to learn all about OOREP's features on
82+
</p>
6483
<p>
65-
A homeopathic repertorisation software that runs in your browser.
84+
<a href="https://vimeo.com/oorep">
85+
<img src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/third-party/img/vimeo_logo_blue.webp"
86+
loading="lazy"
87+
height="47" width="165"
88+
alt="Vimeo logo">
89+
</a>
6690
</p>
6791
<p>
68-
All classic repertories just a click away!
92+
<small>
93+
(Also available on <a href="https://www.youtube.com/channel/UCcHQXsPwIK53ciSjR9_P2xw">YouTube</a>)
94+
</small>
6995
</p>
7096
</div>
7197
</div>

‎backend/app/views/partial/features.scala.html

+56-16
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,94 @@
1-
21
<div class="jumbotron jumbo-dark horizontal-center background-image" id="features" style="position: relative;">
32
<div class="container">
4-
<h3 style="text-align:center;margin-bottom: 10px">
5-
<span class="white-dot"></span>
6-
<span class="white-dot"></span>
7-
<span class="white-dot"></span>
8-
<span>Why use OOREP?</span>
9-
<span class="white-dot"></span>
10-
<span class="white-dot"></span>
11-
<span class="white-dot"></span>
12-
</h3>
3+
<div style="margin-bottom: 10px">
4+
<div class="row justify-content-center" style="text-align: center;">
5+
6+
<div class="d-sm-none">
7+
<h3>
8+
<span>Why use OOREP?</span>
9+
</h3>
10+
<!-- hide on screens wider than sm-->
11+
</div>
12+
13+
<div class="d-none d-sm-block">
14+
<h3>
15+
<span class="white-dot"></span>
16+
<span class="white-dot"></span>
17+
<span class="white-dot"></span>
18+
<span>Why use OOREP?</span>
19+
<span class="white-dot"></span>
20+
<span class="white-dot"></span>
21+
<span class="white-dot"></span>
22+
</h3>
23+
<!-- hide on screens smaller than md-->
24+
</div>
25+
26+
<!-- <div class="d-none d-sm-block">-->
27+
<!-- <span class="white-dot"></span>-->
28+
<!-- <span class="white-dot"></span>-->
29+
<!-- <span class="white-dot"></span>-->
30+
<!-- </div>-->
31+
<!-- <h3 style="display: inline;">-->
32+
<!-- <span>Why use OOREP?</span>-->
33+
<!-- </h3>-->
34+
<!-- <div class="d-none d-sm-block">-->
35+
<!-- <span class="white-dot"></span>-->
36+
<!-- <span class="white-dot"></span>-->
37+
<!-- <span class="white-dot"></span>-->
38+
<!-- </div>-->
39+
</div>
40+
</div>
1341
<div class="row">
1442
<div class="col-lg-4 col-sm-6">
1543
<div class="icon" data-aos-delay="400" data-aos="fade" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
16-
<img style="height:65px; width:55px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-penguin.png" alt="penguin">
44+
<img style="height:65px; width:55px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-penguin.png"
45+
loading="lazy"
46+
alt="penguin">
1747
</div>
1848
<h4>Powered by open-source</h4>
1949
<p>Built using proven open-source technologies and products. You can also download all the source code and run your own version of the software.</p>
2050
</div>
2151
<div class="col-lg-4 col-sm-6">
2252
<div class="icon" data-aos-delay="400" data-aos="fade" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
23-
<img style="height:55px; width:55px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-browser.png" alt="browser">
53+
<img style="height:55px; width:55px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-browser.png"
54+
loading="lazy"
55+
alt="browser">
2456
</div>
2557
<h4>Platform-independent</h4>
2658
<p>Works with any computer and OS. All you need is a web-browser - no installations, serial numbers or dongles.</p>
2759
</div>
2860
<div class="col-lg-4 col-sm-6">
2961
<div class="icon" data-aos-delay="400" data-aos="fade" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
30-
<img style="height:40px; width:50px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-book.png" alt="book">
62+
<img style="height:40px; width:50px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-book.png"
63+
loading="lazy"
64+
alt="book">
3165
</div>
3266
<h4>Various sources</h4>
3367
<p>Search in well-known repertories and materia medicas like Kent, Boger, Hering, etc.</p>
3468
</div>
3569
<div class="col-lg-4 col-sm-6">
3670
<div class="icon" data-aos-delay="400" data-aos="fade" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
37-
<img style="height:40px; width:40px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-results.png" alt="results">
71+
<img style="height:40px; width:40px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-results.png"
72+
loading="lazy"
73+
alt="results">
3874
</div>
3975
<h4>Get results fast</h4>
4076
<p>Very easy to use: only the essential features - no distractions, no non-sense.</p>
4177
</div>
4278
<div class="col-lg-4 col-sm-6">
4379
<div class="icon" data-aos-delay="400" data-aos="fade" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
44-
<img style="height:60px; width:60px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-search.png" alt="search">
80+
<img style="height:60px; width:60px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-search.png"
81+
loading="lazy"
82+
alt="search">
4583
</div>
4684
<h4>Advanced search</h4>
4785
<p>Widen your search using wildcards, like <b>'cough*, dry*'</b>, or narrow it down using <b>'-'</b> (minus).</p>
4886
</div>
4987
<div class="col-lg-4 col-sm-6">
5088
<div class="icon" data-aos-delay="400" data-aos="fade" data-aos-offset="200" data-aos-easing="ease-in-sine" data-aos-duration="600" data-aos-once="true">
51-
<img style="height:55px; width:28px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-mobile.png" alt="mobile">
89+
<img style="height:55px; width:28px;" src="@{org.multics.baueran.frep.backend.controllers.Get.staticServerUrl}@{org.multics.baueran.frep.backend.controllers.Get.staticAssetsPath}/img/icon-mobile.png"
90+
loading="lazy"
91+
alt="mobile">
5292
</div>
5393
<h4>Mobile friendly</h4>
5494
<p>Although repertorisation requires screen real estate, OOREP's responsive design supports mobile devices.</p>

0 commit comments

Comments
 (0)