Skip to content

Commit cd6db12

Browse files
bertfreesbertfrees
committed
git subrepo pull webui
subrepo: subdir: "webui" merged: "b0b9ea8934" upstream: origin: "git@github.com:daisy/pipeline-webui.git" branch: "master" commit: "b0b9ea8934" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
1 parent dc26fba commit cd6db12

31 files changed

Lines changed: 117 additions & 96 deletions

‎webui/.github/workflows/debian.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: debian
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
jobs:
8+
build:
9+
name: Build Debian package
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-java@v2
14+
with:
15+
distribution: 'adopt'
16+
java-version: '8'
17+
- name: Cache downloaded dependencies
18+
uses: actions/cache@v2
19+
with:
20+
path: ~/.ivy2/cache
21+
key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}
22+
restore-keys: |
23+
${{ runner.os }}-ivy-
24+
- name: Build
25+
run: |
26+
./activator clean debian:packageBin
27+
- name: Store the deb file
28+
if: ${{ always() }}
29+
uses: actions/upload-artifact@v2
30+
with:
31+
path: target/*.deb

‎webui/.gitrepo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
[subrepo]
77
remote = git@github.com:daisy/pipeline-webui.git
88
branch = master
9-
commit = da26286e59190919450b5409c20fe0a139f75b2b
10-
parent = 9054572ac20191f8e7ef341ef6e19a7bd37f05e6
9+
commit = b0b9ea8934bbb783438992097cb16b717daf3667
10+
parent = 01ff39d1e26045d73ea0647f53c5b81dd7f9469e
1111
cmdver = 0.3.1

‎webui/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the webui
2-
FROM java as builder
2+
FROM eclipse-temurin:8-jdk AS builder
33

44
# Uncomment the following during development to reduce build time
55
#RUN apt install git && \
@@ -17,7 +17,7 @@ RUN mkdir data && mv db-empty data/db
1717

1818

1919
# then use the build artifacts to create an image where the pipeline is installed
20-
FROM openjdk:8-jre
20+
FROM eclipse-temurin:8-jre
2121
LABEL maintainer="DAISY Consortium (http://www.daisy.org/)"
2222
COPY --from=builder /usr/src/webui/target/docker/stage/opt/docker /opt/daisy-pipeline2-webui/.
2323
RUN mkdir /run/daisy-pipeline2-webui

‎webui/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DAISY Pipeline 2 Web UI
1+
DAISY Pipeline Web UI
22
_______________________
33

44
Copyright 2010-2016, The DAISY Consortium

‎webui/Makefile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.PHONY : help
2+
help :
3+
@echo "make help:" >&2 && \
4+
echo "\tPrint list of commands" >&2 && \
5+
echo "make docker-image:" >&2 && \
6+
echo "\tBuild, tag and push the Docker image" >&2
7+
8+
.PHONY : docker-image
9+
docker-image :
10+
docker buildx create --use --name=mybuilder \
11+
--driver docker-container \
12+
--driver-opt image=moby/buildkit:buildx-stable-1
13+
docker buildx build --platform linux/amd64,linux/arm64 -t daisyorg/pipeline-webui:latest-snapshot --push .
14+
docker buildx rm mybuilder

‎webui/NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DAISY Pipeline 2 Web UI
1+
DAISY Pipeline Web UI
22
________________
33

44
Copyright © 2010-2011, The DAISY Consortium
@@ -17,10 +17,10 @@ You should have received a copy of the GNU Lesser General Public License along
1717
with this library; if not, see <http://www.gnu.org/licenses/lgpl.html>
1818

1919

20-
DAISY Pipeline 2
20+
DAISY Pipeline
2121
____________________
2222

23-
The DAISY Pipeline 2 Web UI depends on the DAISY Pipeline 2 core framework.
23+
The DAISY Pipeline Web UI depends on the DAISY Pipeline core framework.
2424
The core framework is bundled with the standalone version of this Web UI,
2525
in which case you should also read the NOTICE.txt included inside the
2626
"daisy-pipeline" directory.
@@ -92,7 +92,7 @@ This product includes the following third-party software:
9292
Respective licenses are available in the LICENSES directory.
9393

9494

95-
Pipeline 2 Web UI Dependencies:
95+
Pipeline Web UI Dependencies:
9696
- Play! 2.0 Framework - http://www.playframework.org/ - Apache License v2.0
9797
- Twitter Bootstrap - http://twitter.github.com/bootstrap/ - Apache License v2.0
9898
- Glyphicons Free - http://glyphicons.com/ - CC BY 3.0

‎webui/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- [![Build Status](https://travis-ci.org/daisy/pipeline-webui.png?branch=master)](https://travis-ci.org/daisy/pipeline-webui) -->
22

3-
# Pipeline 2 Web UI
3+
# Pipeline Web UI
44

5-
This project provides a Web User Interface for the DAISY Pipeline 2, developed with the Play! framework.
5+
This project provides a Web User Interface for the DAISY Pipeline, developed with the Play! framework.
66

77
## Publishing builds
88

@@ -71,7 +71,7 @@ Then:
7171
- Upload the `target/rpm/RPMS/noarch/*.rpm.asc` file, then click "Add Artifact"
7272
- Upload the `target/windows/*.msi` file, then click "Add Artifact"
7373
- Upload the `target/windows/*.msi.asc` file, then click "Add Artifact"
74-
- In the "Description" field, enter "A web-based user interface for the DAISY Pipeline 2."
74+
- In the "Description" field, enter "A web-based user interface for the DAISY Pipeline."
7575
- Click "Upload Artifact(s)"
7676
- Click "Staging Repositories"
7777
- Scroll to the bottom and click the "orgdaisy" repository that was created

‎webui/app/Global.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public synchronized void onStart(play.Application app) {
3939
public void run() {
4040

4141
if (Setting.get("appearance.title") == null)
42-
Setting.set("appearance.title", "DAISY Pipeline 2");
42+
Setting.set("appearance.title", "DAISY Pipeline");
4343

4444
if (Setting.get("appearance.titleLink") == null)
4545
Setting.set("appearance.titleLink", "scripts");

‎webui/app/controllers/Account.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public static boolean sendEmail(String subject, String html, String text, String
218218
email.setHostName(host);
219219
email.setDebug(Application.debug);
220220
email.setFrom(from, fromName);
221-
email.setSubject("[DAISY Pipeline 2] "+subject);
221+
email.setSubject("[DAISY Pipeline] "+subject);
222222
email.setHtmlMsg(html);
223223
email.setTextMsg(text);
224224
email.addTo(recipientEmail.toLowerCase(), recipientName);

‎webui/app/controllers/Administrator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public static void save(Form<ConfigureEmailForm> filledForm) {
284284
Setting.set("mail.smtp.host", filledForm.field("smtp").valueOr(""));
285285
Setting.set("mail.smtp.port", filledForm.field("port").valueOr(""));
286286
Setting.set("mail.smtp.ssl", filledForm.field("ssl").valueOr(""));
287-
Setting.set("mail.from.name", "Pipeline 2");
287+
Setting.set("mail.from.name", "Pipeline");
288288
Setting.set("mail.from.email", session("email"));
289289
}
290290

@@ -851,7 +851,7 @@ public static Result postSettings() {
851851

852852
} else {
853853
Administrator.SetWSForm.save(filledForm);
854-
flash("success", "Pipeline 2 Web API endpoint changed successfully!");
854+
flash("success", "Pipeline Web API endpoint changed successfully!");
855855
return redirect(routes.Administrator.getSettings());
856856
}
857857
}

0 commit comments

Comments
 (0)