diff options
| author | LMBishop <13875753+LMBishop@users.noreply.github.com> | 2021-11-22 14:17:44 +0000 |
|---|---|---|
| committer | LMBishop <13875753+LMBishop@users.noreply.github.com> | 2021-11-22 14:17:44 +0000 |
| commit | a84425a42e9246243dffd23dba33b4d4a5b626ac (patch) | |
| tree | 5e0a356407e50b172afeb8662a6a6f2fb6e334fe /app/views | |
| parent | 7d1aa7d48e5f16d639713804d6a86290fac7ffab (diff) | |
Update styles & add page rebuilding
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/error.ejs | 9 | ||||
| -rw-r--r-- | app/views/index.ejs | 7 | ||||
| -rw-r--r-- | app/views/page.ejs | 11 | ||||
| -rw-r--r-- | app/views/partials/header.ejs | 5 | ||||
| -rw-r--r-- | app/views/partials/navbar.ejs | 3 | ||||
| -rw-r--r-- | app/views/purge.ejs | 15 | ||||
| -rw-r--r-- | app/views/rebuild.ejs | 14 |
7 files changed, 41 insertions, 23 deletions
diff --git a/app/views/error.ejs b/app/views/error.ejs index 87296bc..88e1a27 100644 --- a/app/views/error.ejs +++ b/app/views/error.ejs @@ -7,9 +7,12 @@ <body> <div id="main-container"> <%- include('partials/header') %> - <div id="content"> - <h1>An error occurred (<%= code %>)</h1> - <p>Go <a href="/">home</a>?</p> + <div id="content-container"> + <%- include('partials/navbar') %> + <div id="content"> + <h1>An error occurred (<%= code %>)</h1> + <p>Go <a href="/">home</a>?</p> + </div> </div> </div> </body> diff --git a/app/views/index.ejs b/app/views/index.ejs index ae21964..ca674f0 100644 --- a/app/views/index.ejs +++ b/app/views/index.ejs @@ -7,8 +7,11 @@ <body> <div id="main-container"> <%- include('partials/header') %> - <div id="content"> - <%- page %> + <div id="content-container"> + <%- include('partials/navbar') %> + <div id="content"> + <%- page %> + </div> </div> </div> </body> diff --git a/app/views/page.ejs b/app/views/page.ejs index bca4828..4422157 100644 --- a/app/views/page.ejs +++ b/app/views/page.ejs @@ -7,10 +7,13 @@ <body> <div id="main-container"> <%- include('partials/header') %> - <div id="content"> - <%- content %> - <hr> - <span class=footer><a href="https://github.com/LMBishop/website">GitHub</a> | <a href="/<%= path %>.wiki">View raw</a> | Page built: <%= buildTime %> | <a href="/special/purge/<%= path %>">Purge this page</a></span> + <div id="content-container"> + <%- include('partials/navbar') %> + <div id="content"> + <%- content %> + <hr> + <span class=footer><a href="https://github.com/LMBishop/website">GitHub</a> | <a href="/<%= path %>.wiki">View raw</a> | Page built: <%= buildTime %> | <a href="/special/purge/<%= path %>">Purge this page</a></span> + </div> </div> </div> </body> diff --git a/app/views/partials/header.ejs b/app/views/partials/header.ejs index 67a23d4..6582e36 100644 --- a/app/views/partials/header.ejs +++ b/app/views/partials/header.ejs @@ -8,7 +8,4 @@ ███████ ███████ ██████ ██ ████ ██ ██ ██ ██ ██████ ██████ ██████ ██ ███████ ██ ██ ██████ ██ -</pre> -<div id="navbar"> - <%- navbar %> -</div>
\ No newline at end of file +</pre>
\ No newline at end of file diff --git a/app/views/partials/navbar.ejs b/app/views/partials/navbar.ejs new file mode 100644 index 0000000..2664d48 --- /dev/null +++ b/app/views/partials/navbar.ejs @@ -0,0 +1,3 @@ +<div id="navbar"> + <%- navbar %> +</div>
\ No newline at end of file diff --git a/app/views/purge.ejs b/app/views/purge.ejs index f36e482..54fc49b 100644 --- a/app/views/purge.ejs +++ b/app/views/purge.ejs @@ -9,12 +9,15 @@ <body> <div id="main-container"> <%- include('partials/header') %> - <div id="content"> - <h1>Purge page</h1> - <span id="response"></span> - <p>Are you sure you wish to purge the page <span class="highlight"><%= page %></span>?</p> - <p>The last build time for this page was <span class="highlight"><%= buildTime %></span> (<span class="highlight"><%= buildTimeRelative %></span> minutes ago).</p> - <button id="confirm" data-page="<%= page %>">Confirm</button> + <div id="content-container"> + <%- include('partials/navbar') %> + <div id="content"> + <h1>Purge page</h1> + <span id="response"></span> + <p>Are you sure you wish to purge the page <span class="highlight"><%= page %></span>?</p> + <p>The last build time for this page was <span class="highlight"><%= buildTime %></span> (<span class="highlight"><%= buildTimeRelative %></span> minutes ago).</p> + <button id="confirm" data-page="<%= page %>">Confirm</button> + </div> </div> </div> </body> diff --git a/app/views/rebuild.ejs b/app/views/rebuild.ejs index e2943f1..62076cf 100644 --- a/app/views/rebuild.ejs +++ b/app/views/rebuild.ejs @@ -3,14 +3,20 @@ <head> <title>Rebuild</title> <link rel="stylesheet" href="/css/globalstyles.css"> + <script src="https://code.jquery.com/jquery-3.6.0.min.js" ntegrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> + <script src="/scripts/rebuild.js"></script> </head> <body> <div id="main-container"> <%- include('partials/header') %> - <div id="content"> - <h1>Rebuild</h1> - <p>Are you sure you wish to rebuild the page directory?</p> - <button>Confirm</button> + <div id="content-container"> + <%- include('partials/navbar') %> + <div id="content"> + <h1>Rebuild</h1> + <span id="response"></span> + <p>Are you sure you wish to rebuild the page directory?</p> + <button id="confirm">Confirm</button> + </div> </div> </div> </body> |