diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docs/admin_handbook.html | 3 | ||||
| -rw-r--r-- | main.go | 6 | ||||
| -rwxr-xr-x | scripts/latexify-source.sh | 4 | ||||
| -rw-r--r-- | templates/login.html (renamed from tmpl/login.html) | 0 | ||||
| -rw-r--r-- | templates/staff.html (renamed from tmpl/staff.html) | 0 | ||||
| -rw-r--r-- | templates/student.html (renamed from tmpl/student.html) | 0 | ||||
| -rw-r--r-- | templates/student_disabled.html (renamed from tmpl/student_disabled.html) | 0 |
8 files changed, 7 insertions, 10 deletions
@@ -11,7 +11,7 @@ docs: dist/docs/admin_handbook.html dist/docs/handbook.css dist/docs/cca.scfg.ex iadocs: dist/iadocs/index.html dist/iadocs/cover_page.htm dist/iadocs/appendix.pdf dist/iadocs/crita_planning.pdf dist/iadocs/critb_design.pdf dist/iadocs/critb_recordoftasks.htm dist/iadocs/critc_development.pdf dist/iadocs/critd_functionality.pdf dist/iadocs/crite_evaluation.pdf # Final binary which tries to embed stuff -dist/cca: go.* *.go build/static/style.css build/static/student.js tmpl/* build/docs/admin_handbook.html build/docs/handbook.css build/docs/cca.scfg.example build/iadocs/index.html build/iadocs/cover_page.htm build/iadocs/appendix.pdf build/iadocs/crita_planning.pdf build/iadocs/critb_design.pdf build/iadocs/critb_recordoftasks.htm build/iadocs/critc_development.pdf build/iadocs/critd_functionality.pdf build/iadocs/crite_evaluation.pdf .editorconfig .gitignore scripts/* sql/* docs/* iadocs/* README.md LICENSE Makefile +dist/cca: go.* *.go build/static/style.css build/static/student.js templates/* build/docs/admin_handbook.html build/docs/handbook.css build/docs/cca.scfg.example build/iadocs/index.html build/iadocs/cover_page.htm build/iadocs/appendix.pdf build/iadocs/crita_planning.pdf build/iadocs/critb_design.pdf build/iadocs/critb_recordoftasks.htm build/iadocs/critc_development.pdf build/iadocs/critd_functionality.pdf build/iadocs/crite_evaluation.pdf .editorconfig .gitignore scripts/* sql/* docs/* iadocs/* README.md LICENSE Makefile mkdir -p dist go build -o $@ @@ -52,7 +52,7 @@ build/iadocs/appendix.pdf: iadocs/appendix.tex build/iadocs/header.inc build/iad mkdir -p build/iadocs lualatex -interaction batchmode -shell-escape -output-directory=build/iadocs $< lualatex -interaction batchmode -shell-escape -output-directory=build/iadocs $< -build/iadocs/source.gen: go.* *.go frontend/*.css frontend/*.js tmpl/* scripts/latexify-source.sh docs/* sql/* scripts/* +build/iadocs/source.gen: go.* *.go frontend/*.css frontend/*.js templates/* scripts/latexify-source.sh docs/* sql/* scripts/* mkdir -p build/iadocs scripts/latexify-source.sh build/iadocs/%.inc: iadocs/%.inc diff --git a/docs/admin_handbook.html b/docs/admin_handbook.html index 338d22e..765d4bb 100644 --- a/docs/admin_handbook.html +++ b/docs/admin_handbook.html @@ -39,9 +39,6 @@ </p> <h2>Configuration</h2> <p> - The <code>static</code> and <code>tmpl</code> directories must be available to the running program, in addition to a configuration file <code>cca.scfg</code>. - </p> - <p> Copy <a href="./cca.scfg.example">the example configuration file</a> to <code>cca.scfg</code> in the working directory where you intend to run CCASS. Then edit it according to the comments, though you may wish to pay attention to the following: </p> <ul> @@ -35,14 +35,14 @@ import ( var tmpl *template.Template -//go:embed build/static/* tmpl/* +//go:embed build/static/* templates/* //go:embed build/iadocs/*.pdf build/iadocs/*.htm build/iadocs/*.html //go:embed build/docs/* var runFS embed.FS //go:embed go.* *.go //go:embed docs/* iadocs/* -//go:embed frontend/* tmpl/* +//go:embed frontend/* templates/* //go:embed README.md LICENSE Makefile .editorconfig .gitignore //go:embed scripts/* sql/* var srcFS embed.FS @@ -65,7 +65,7 @@ func main() { } log.Println("Setting up templates") - tmpl, err = template.ParseFS(runFS, "tmpl/*") + tmpl, err = template.ParseFS(runFS, "templates/*") if err != nil { log.Fatal(err) } diff --git a/scripts/latexify-source.sh b/scripts/latexify-source.sh index 26597c0..29825f2 100755 --- a/scripts/latexify-source.sh +++ b/scripts/latexify-source.sh @@ -28,8 +28,8 @@ printfile javascript 4 ./frontend *.js printfile javascript 8 ./frontend *.css printf '\\section{HTML templates}\n' >> "$targetfile" -cd ../tmpl -printfile html 2 ./tmpl *.html +cd ../templates +printfile html 2 ./templates *.html printf '\\section{Build system and auxiliary scripts}\n' >> "$targetfile" cd .. diff --git a/tmpl/login.html b/templates/login.html index 371d970..371d970 100644 --- a/tmpl/login.html +++ b/templates/login.html diff --git a/tmpl/staff.html b/templates/staff.html index a8bab1a..a8bab1a 100644 --- a/tmpl/staff.html +++ b/templates/staff.html diff --git a/tmpl/student.html b/templates/student.html index 6f48867..6f48867 100644 --- a/tmpl/student.html +++ b/templates/student.html diff --git a/tmpl/student_disabled.html b/templates/student_disabled.html index fbd8844..fbd8844 100644 --- a/tmpl/student_disabled.html +++ b/templates/student_disabled.html |