return-to-ritherdon
/
ritherdon-archive
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity
Browse Source

clean up old and unused code in HTML templates. 

It was getting out of hand and difficult to navigate around the pages
when viewing them in the browser.
stable
Craig Oates 2 years ago
parent
e9792a6fa0
commit
2bb7d053e6
9 changed files with 35 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      templates/index.html
  2. 9
      templates/layouts/default.html
  3. 31
      templates/page.html
  4. 27
      templates/pages.html
  5. 22
      templates/user/dashboard.html
  6. 10
      templates/user/edit.html
  7. 2
      templates/user/index.html
  8. 32
      templates/user/pages.html
  9. 11
      templates/user/site-settings.html

6
templates/index.html
Unescape View File

@ -1,12 +1,6 @@
{% extends "layouts/default.html" %} {% extends "layouts/default.html" %}
{% block title %}Nicola Ellis & Ritherdon Archive{% endblock %} {% block title %}Nicola Ellis & Ritherdon Archive{% endblock %}
{% block content %} {% block content %}
<h1>Index</h1>
<a href="/setup">Create Account</a>
<a href="/dashboard">Dashboard</a>
<a href="/login">Log In</a>
<a href="/sign-up">Sign Up</a>
<a href="/pages">Pages</a>
<main> <main>
{{content | safe }} {{content | safe }}
</main> </main>

9
templates/layouts/default.html
Unescape View File

@ -16,8 +16,11 @@
<!-- <script defer src="/js/ritherdon-archive.js"></script> --> <!-- <script defer src="/js/ritherdon-archive.js"></script> -->
</head> </head>
<body> <body>
<h2>{% if alert %}{{alert}}{% endif %}</h2> <div>
<p>{% if alert %}{{alert}}{% endif %}</p>
{% block content %}{% endblock %} </div>
{% include "/layouts/header.html" %}
{% block content %}{% endblock %}
{% include "/layouts/footer.html" %}
</body> </body>
</html> </html>

31
templates/page.html
Unescape View File

@ -1,32 +1,7 @@
{% extends "layouts/default.html" %} {% extends "layouts/default.html" %}
{% block title %}View page.{% endblock %} {% block title %}View page.{% endblock %}
{% block content %} {% block content %}
<div> <main>
{% if roles.logged-in %} {{data | safe}}
<a href="/dashboard">Dashboard</a> </main>
<a href="/user/edit">Edit Account</a>
<form action="/logout" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="logout">
</form>
<form action="/user/delete" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="Delete Account">
</form>
<a href="/create/page">Create Page</a>
<a href="/user/pages">View Pages</a>
{% if roles.administrator %}
<a href="/site-settings">Site Settings</a>
<a href="/users">Users</a>
{% endif %}
{% else %}
<a href="/">Home</a>
<a href="/login">Log-in</a>
{% endif %}
<main>
{{data | safe}}
</main>
</div>
{% endblock %} {% endblock %}

27
templates/pages.html
Unescape View File

@ -2,33 +2,12 @@
{% block title %}A list of the site's pages.{% endblock %} {% block title %}A list of the site's pages.{% endblock %}
{% block content %} {% block content %}
<h1>Pages</h1> <h1>Pages</h1>
<div>
{% if roles.logged-in %}
<a href="/dashboard">Dashboard</a>
<a href="/user/edit">Edit Account</a>
<form action="/logout" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="logout">
</form>
<form action="/user/delete" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="Delete Account">
</form>
<a href="/create/page">Create Page</a>
<a href="/pages">View Pages</a>
{% if roles.administrator %}
<a href="/site-settings">Site Settings</a>
<a href="/users">Users</a>
{% endif %}
{% else %}
<a href="/">Home</a>
<a href="/login">Log-in</a>
{% endif %}
</div>
{% for page in pages %} {% for page in pages %}
<div> <div>
<a href="/view/page/{{page}}">{{page}}</a> {% if page.can-delete == 1 %}
<a href="/view/page/{{page.slug}}">{{page.title}}</a>
{% endif %}
</div> </div>
{% endfor %} {% endfor %}

22
templates/user/dashboard.html
Unescape View File

@ -3,26 +3,12 @@
{% block content %} {% block content %}
<h1>Dashboard</h1> <h1>Dashboard</h1>
<div> <div>
{% if roles.logged-in %}
<a href="/dashboard">Dashboard</a>
<a href="/user/edit">Edit Account</a>
<form action="/logout" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="logout">
</form>
<form action="/user/delete" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="Delete Account">
</form>
<a href="/create/page">Create Page</a> <a href="/create/page">Create Page</a>
<a href="/user/pages">View Pages</a> <a href="/user/pages">Manage Pages</a>
<a href="/storage/upload">Upload File</a>
<a href="/storage/files">Manage Files</a>
{% if roles.administrator %} {% if roles.administrator %}
<a href="/site-settings">Site Settings</a> <a href="/users">Manage Users</a>
<a href="/users">Users</a>
{% endif %}
{% else %}
<a href="/">Home</a>
<a href="/login">Log-in</a>
{% endif %} {% endif %}
</div> </div>

10
templates/user/edit.html
Unescape View File

@ -6,8 +6,8 @@
<div> <div>
<p>Note: Username cannot be changed.</p> <p>Note: Username cannot be changed.</p>
<form action="/user/edit" method="post"> <form action="/user/edit" method="post">
<input type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}"> <input type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<label>Display Name</label> <label>Display Name</label>
<input type="text" name="DISPLAY-NAME" value="{{user.display-name}}"> <input type="text" name="DISPLAY-NAME" value="{{user.display-name}}">
<label>New Password</label> <label>New Password</label>
@ -15,6 +15,10 @@
<label>New Password Check</label> <label>New Password Check</label>
<input type="password" name="PASSWORD-CHECK"> <input type="password" name="PASSWORD-CHECK">
<input type="submit" value="Update Account"> <input type="submit" value="Update Account">
</form> </form>
<form action="/user/delete" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="Delete Account">
</form>
</div> </div>
{% endblock %} {% endblock %}

2
templates/user/index.html
Unescape View File

@ -2,8 +2,6 @@
{% block title %}Users{% endblock %} {% block title %}Users{% endblock %}
{% block content %} {% block content %}
<h1>Users</h1> <h1>Users</h1>
<a href="/dashboard">Dashboard</a>
<form action="/user/admin/create" method="post"> <form action="/user/admin/create" method="post">
<fieldset> <fieldset>
<legend>Create New Account</legend> <legend>Create New Account</legend>

32
templates/user/pages.html
Unescape View File

@ -2,44 +2,20 @@
{% block title %}A list of the site's pages.{% endblock %} {% block title %}A list of the site's pages.{% endblock %}
{% block content %} {% block content %}
<h1>Pages</h1> <h1>Pages</h1>
<div>
{% if roles.logged-in %}
<a href="/dashboard">Dashboard</a>
<a href="/user/edit">Edit Account</a>
<form action="/logout" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="logout">
</form>
<form action="/user/delete" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input type="submit" value="Delete Account">
</form>
<a href="/create/page">Create Page</a>
<a href="/user/pages">View Pages</a>
{% if roles.administrator %}
<a href="/site-settings">Site Settings</a>
<a href="/users">Users</a>
{% endif %}
{% else %}
<a href="/">Home</a>
<a href="/login">Log-in</a>
{% endif %}
</div>
{% for page in pages %} {% for page in pages %}
{% if page.can-delete == 1 %}
<div> <div>
<a href="/view/page/{{page}}">{{page}}</a> <a href="/view/page/{{page.slug}}">{{page.title}}</a>
<a href="/edit/page/{{page.slug}}">Edit</a>
{% if roles.administrator %} {% if roles.administrator %}
<a href="/edit/page/{{page}}">Edit</a>
{% ifequal page.can-delete 1 %}
<form action="/page/delete" method="post"> <form action="/page/delete" method="post">
<input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}"> <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
<input required type="hidden" name="slug" value="{{page}}"> <input required type="hidden" name="slug" value="{{page}}">
<input type="submit" value="Delete"> <input type="submit" value="Delete">
</form> </form>
{% endif %} {% endif %}
{% endif %}
</div> </div>
{% endif %}
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}

11
templates/user/site-settings.html
Unescape View File

@ -2,7 +2,6 @@
{% block title %}Nicola Ellis & Ritherdon Archive{% endblock %} {% block title %}Nicola Ellis & Ritherdon Archive{% endblock %}
{% block content %} {% block content %}
<h1>Site Settings</h1> <h1>Site Settings</h1>
<a href="/dashboard">Dashboard</a>
<h2>Sign-Up</h2> <h2>Sign-Up</h2>
<form action="/site-settings/update-sign-up" method="post"> <form action="/site-settings/update-sign-up" method="post">
@ -22,8 +21,14 @@
<p>Currently set to: {{settings.home-page}}</p> <p>Currently set to: {{settings.home-page}}</p>
<select required name="SET-HOME-PAGE"> <select required name="SET-HOME-PAGE">
<option>Select Page</option> <option>Select Page</option>
{% for page in pages %} {% for page in system-data.last.first%}
<option value="{{page}}">{{page}}</option> {% if page.slug == "login" %}
{% elif page.slug == "archive" %}
{% elif page.slug == "sign-up" %}
{% elif page.slug == "pages" %}
{% else %}
<option value="{{page.slug}}">{{page.title}}</option>
{% endif %}
{% endfor %} {% endfor %}
</select> </select>
<input type="submit" value="Set Home Page"> <input type="submit" value="Set Home Page">

Write Preview
Loading…
Cancel
Save