aboutsummaryrefslogtreecommitdiff
path: root/app/templates
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2018-12-21 14:45:54 +0000
committerrubenwardy <rw@rubenwardy.com>2018-12-21 14:45:54 +0000
commit9da6b45cc371fe99712e273eab5af692b669b833 (patch)
tree03f4d6ec8103d95a3d4f7643c9a0ad8f763d77df /app/templates
parentc9bf7a32451069c0697c8a18dddad7aa1a2bd8af (diff)
downloadcheatdb-9da6b45cc371fe99712e273eab5af692b669b833.tar.xz
Add bootstrap, change base template
Diffstat (limited to 'app/templates')
-rw-r--r--app/templates/admin/list.html2
-rw-r--r--app/templates/base.html132
-rw-r--r--app/templates/flask_user/login.html4
-rw-r--r--app/templates/index.html22
-rw-r--r--app/templates/packages/create_edit.html4
-rw-r--r--app/templates/packages/delete.html2
-rw-r--r--app/templates/packages/list.html27
-rw-r--r--app/templates/packages/view.html4
-rw-r--r--app/templates/users/claim.html4
9 files changed, 101 insertions, 100 deletions
diff --git a/app/templates/admin/list.html b/app/templates/admin/list.html
index a2ac6d5..1b7063d 100644
--- a/app/templates/admin/list.html
+++ b/app/templates/admin/list.html
@@ -20,7 +20,7 @@
<select name="action">
<option value="importmodlist" selected>Import forum topics</option>
<option value="recalcscores">Recalculate package scores</option>
- <!-- <option value="importscreenshots">Import screenshots from VCS</option> -->
+ <option value="importscreenshots">Import screenshots from VCS</option>
<!-- <option value="importdepends">Import dependencies from downloads</option> -->
<!-- <option value="modprovides">Set provides to mod name</option> -->
<!-- <option value="vcsrelease">Create VCS releases</option> -->
diff --git a/app/templates/base.html b/app/templates/base.html
index 35a2ac6..1020b14 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -11,70 +11,81 @@
</head>
<body>
- <nav>
+ <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<div class="container">
- <ul class="nav navbar-nav navbar-left">
- <li><a href="/">{{ config.USER_APP_NAME }}</a></li>
- {% for item in current_menu.children recursive %}
- {% if item.visible %}
- <li{% if item.children %} class="dropdown"{% endif %}>
- <a href="{{ item.url }}"
+ <a class="navbar-brand" href="/">{{ config.USER_APP_NAME }}</a>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+
+ <div class="collapse navbar-collapse" id="navbarColor01">
+ <ul class="navbar-nav mr-auto">
+ {% for item in current_menu.children recursive %}
+ {% if item.visible %}
+ <li class="nav-item {% if item.children %} dropdown{% endif %}">
+ <a class="nav-link" href="{{ item.url }}"
+ {% if item.children %}
+ class="dropdown-toggle"
+ data-toggle="dropdown"
+ role="button"
+ aria-expanded="false"
+ {% endif %}>
+ {{ item.text }}
{% if item.children %}
- class="dropdown-toggle"
- data-toggle="dropdown"
- role="button"
- aria-expanded="false"
- {% endif %}>
- {{ item.text }}
+ <span class="caret"></span>
+ {% endif %}
+ </a>
{% if item.children %}
- <span class="caret"></span>
+ <ul class="dropdown-menu" role="menu">
+ {{ loop(item.children) }}
+ </ul>
{% endif %}
- </a>
- {% if item.children %}
+ </li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+ <form class="form-inline my-2 my-lg-0" method="GET" action="/packages/">
+ {% if type %}<input type="hidden" name="type" value="{{ type }}" />{% endif %}
+ <input class="form-control mr-sm-2" name="q" type="text" placeholder="Search {{ title | lower or 'all packages' }}" value="{{ query or ''}}">
+ <input class="btn btn-secondary my-2 my-sm-0 mr-sm-2" type="submit" value="Search" />
+ <input class="btn btn-primary my-2 my-sm-0" type="submit" name="lucky" value="Lucky" />
+ </form>
+ <ul class="navbar-nav ml-auto">
+ {% if current_user.is_authenticated %}
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('notifications_page') }}">
+ <img src="/static/notification{% if current_user.notifications %}_alert{% endif %}.svg" />
+ </a></li>
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('create_edit_package_page') }}">+</a></li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle"
+ data-toggle="dropdown"
+ role="button"
+ aria-expanded="false">{{ current_user.display_name }}
+ <span class="caret"></span></a>
+
<ul class="dropdown-menu" role="menu">
- {{ loop(item.children) }}
+ <li class="nav-item">
+ <a class="nav-link" href="{{ url_for('user_profile_page', username=current_user.username) }}">Profile</a>
+ </li class="nav-item">
+ {% if current_user.canAccessTodoList() %}
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('todo_page') }}">Work Queue</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('user_list_page') }}">User list</a></li>
+ {% endif %}
+ {% if current_user.rank == current_user.rank.ADMIN %}
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('admin_page') }}">Admin</a></li>
+ {% endif %}
+ {% if current_user.rank == current_user.rank.MODERATOR %}
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('tag_list_page') }}">Tag Editor</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('license_list_page') }}">License Editor</a></li>
+ {% endif %}
+ <li class="nav-item"><a class="nav-link" href="{{ url_for('user.logout') }}">Sign out</a></li>
</ul>
- {% endif %}
</li>
+ {% else %}
+ <li><a class="nav-link" href="{{ url_for('user.login') }}">Sign in</a></li>
{% endif %}
- {% endfor %}
- </ul>
- <ul class="nav navbar-nav navbar-right">
- {% if current_user.is_authenticated %}
- <li><a href="{{ url_for('notifications_page') }}">
- <img src="/static/notification{% if current_user.notifications %}_alert{% endif %}.svg" />
- </a></li>
- <li><a href="{{ url_for('create_edit_package_page') }}">+</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle"
- data-toggle="dropdown"
- role="button"
- aria-expanded="false">{{ current_user.display_name }}
- <span class="caret"></span></a>
-
- <ul class="dropdown-menu" role="menu">
- <li>
- <a href="{{ url_for('user_profile_page', username=current_user.username) }}">Profile</a>
- </li>
- {% if current_user.canAccessTodoList() %}
- <li><a href="{{ url_for('todo_page') }}">Work Queue</a></li>
- <li><a href="{{ url_for('user_list_page') }}">User list</a></li>
- {% endif %}
- {% if current_user.rank == current_user.rank.ADMIN %}
- <li><a href="{{ url_for('admin_page') }}">Admin</a></li>
- {% endif %}
- {% if current_user.rank == current_user.rank.MODERATOR %}
- <li><a href="{{ url_for('tag_list_page') }}">Tag Editor</a></li>
- <li><a href="{{ url_for('license_list_page') }}">License Editor</a></li>
- {% endif %}
- <li><a href="{{ url_for('user.logout') }}">Sign out</a></li>
- </ul>
- </li>
- {% else %}
- <li><a href="{{ url_for('user.login') }}">Sign in</a></li>
- {% endif %}
- </ul>
- <div class="clearboth"></div>
+ </ul>
+ </div>
</div>
</nav>
@@ -97,16 +108,21 @@
{% endblock %}
{% block container %}
- <main>
+ <main class="container mt-4">
{% block content %}
{% endblock %}
</main>
{% endblock %}
- <footer>
+ <footer class="container">
ContentDB &copy; 2018 to <a href="https://rubenwardy.com/">rubenwardy</a> |
<a href="https://github.com/minetest/contentdb">GitHub</a> |
<a href="{{ url_for('flatpage', path='help') }}">Help</a> |
<a href="{{ url_for('flatpage', path='help/reporting') }}">Report / DMCA</a>
</footer>
+
+ <script src="static/jquery.min.js"></script>
+ <script src="static/popper.min.js"></script>
+ <script src="static/bootstrap.min.js"></script>
+</body>
</html>
diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html
index a758011..73d83c3 100644
--- a/app/templates/flask_user/login.html
+++ b/app/templates/flask_user/login.html
@@ -61,7 +61,7 @@ Sign in
</p>
<h3>Sign in with Github</h3>
- <p><a class="button" href="{{ url_for('github_signin_page') }}">GitHub</a></p>
+ <p><a class="btn" href="{{ url_for('github_signin_page') }}">GitHub</a></p>
</form>
</div>
@@ -72,7 +72,7 @@ Sign in
<div class="box-body">
<p>Create an account using your forum account or email.</p>
- <a href="{{ url_for('user_claim_page') }}" class="button">{%trans%}Claim your account{%endtrans%}</a>
+ <a href="{{ url_for('user_claim_page') }}" class="btn">{%trans%}Claim your account{%endtrans%}</a>
</div>
</aside>
</div>
diff --git a/app/templates/index.html b/app/templates/index.html
index 47efd3d..4af91e0 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -5,9 +5,19 @@ Welcome
{% endblock %}
{% block container %}
-<header>
+<!-- <div class="jumbotron">
+ <h1 class="display-3">Hello, world!</h1>
+ <p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
+ <hr class="my-4">
+ <p>It uses utility classes for typography and spacing to space content out within the larger container.</p>
+ <p class="lead">
+ <a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a>
+ </p>
+</div> -->
+
+<header class="jumbotron">
<div class="container">
- <h1>Content DB</h1>
+ <h1 class="display-3">Content DB</h1>
<p>
Minetest's official content repository.
@@ -16,20 +26,20 @@ Welcome
and open source license.
</p>
- <form method="get" action="/packages/">
+ <!-- <form method="get" action="/packages/">
<input type="text" name="q" value="{{ query or ''}}" />
<input type="submit" value="Search" />
- </form>
+ </form> -->
</div>
</header>
-<main>
+<main class="container">
{% from "macros/packagegridtile.html" import render_pkggrid %}
<h2>Popular</h2>
{{ render_pkggrid(popular) }}
- <a href="{{ url_for('packages_page') }}" class="button">Show More</a>
+ <a href="{{ url_for('packages_page') }}" class="btn">Show More</a>
<h2 style="margin-top:2em;">Newly Added</h2>
{{ render_pkggrid(new) }}
diff --git a/app/templates/packages/create_edit.html b/app/templates/packages/create_edit.html
index fee73bd..7e9392e 100644
--- a/app/templates/packages/create_edit.html
+++ b/app/templates/packages/create_edit.html
@@ -57,8 +57,8 @@
{{ render_field(form.repo, class_="pkg_repo") }}
<div class="pkg_wiz_1">
- <a id="pkg_wiz_1_next" class="button button-primary">Next (Autoimport)</a>
- <a id="pkg_wiz_1_skip" class="button button-default">Skip Autoimport</a>
+ <a id="pkg_wiz_1_next" class="btn btn-primary">Next (Autoimport)</a>
+ <a id="pkg_wiz_1_skip" class="btn btn-default">Skip Autoimport</a>
</div>
<div class="pkg_wiz_2">
diff --git a/app/templates/packages/delete.html b/app/templates/packages/delete.html
index 95709c3..96f37f3 100644
--- a/app/templates/packages/delete.html
+++ b/app/templates/packages/delete.html
@@ -12,7 +12,7 @@
<p>This action can be undone by the admin, but he'll be very annoyed!</p>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
- <input type="submit" value="Delete" class="button-danger" />
+ <input type="submit" value="Delete" class="btn-danger" />
</div>
</form>
{% endblock %}
diff --git a/app/templates/packages/list.html b/app/templates/packages/list.html
index 5a9e58c..fd27373 100644
--- a/app/templates/packages/list.html
+++ b/app/templates/packages/list.html
@@ -5,35 +5,10 @@
{% endblock %}
{% block content %}
- <form method="get" action="" class="plsearchform">
- {% if type %}<input type="hidden" name="type" value="{{ type }}" />{% endif %}
- <input type="text" name="q" value="{{ query or ''}}" />
- <input type="submit" value="Search" />
- <input type="submit" name="lucky" value="I'm feeling lucky" />
-
- <p>
- Found {{ packages_count }} packages.
- </p>
- </form>
-
- <!--<aside class="box box_grey outsidecontainer">
- <h3>Tags</h3>
-
- <ul class="flatlist">
- {% for t in tags %}
- <li><a href="{{ url_for('packages_page', q=(query or '')+' tag:'+t.name, type=type) }}">
- {{ t.title }}
- </a></li>
- {% else %}
- <li><i>No tags available</i></ul>
- {% endfor %}
- </ul>
- </aside> -->
-
{% from "macros/packagegridtile.html" import render_pkggrid %}
{{ render_pkggrid(packages) }}
- <ul class="buttonset linedbuttonset">
+ <ul class="btnset linedbuttonset">
{% if prev_url %}<li><a href="{{ prev_url }}">Previous</a></li>{% endif %}
<li>{{ page }} / {{ page_max }}</li>
{% if next_url %}<li><a href="{{ next_url }}">Next</a></li> {% endif %}
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index f5ff628..a2ced03 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -16,7 +16,7 @@
You need to create releases even if you use a rolling release development cycle,
as Minetest needs them to check for updates.
</p>
- <a class="button" href="{{ package.getCreateReleaseURL() }}">Create Release</a>
+ <a class="btn" href="{{ package.getCreateReleaseURL() }}">Create Release</a>
{% else %}
A release is required before this package can be approved.
{% endif %}
@@ -158,7 +158,7 @@
</tr>
</table>
- <ul class="buttonset linedbuttonset">
+ <ul class="btnset linedbuttonset">
{% if package.getDownloadRelease() %}<li><a href="{{ package.getDownloadURL() }}" class="btn_green">Download</a></li>{% endif %}
{% if package.repo %}<li><a href="{{ package.repo }}">View Source</a></li>{% endif %}
{% if package.forums %}<li><a href="https://forum.minetest.net/viewtopic.php?t={{ package.forums }}">Forums</a></li>{% endif %}
diff --git a/app/templates/users/claim.html b/app/templates/users/claim.html
index ae8e9c9..5a6b53a 100644
--- a/app/templates/users/claim.html
+++ b/app/templates/users/claim.html
@@ -19,7 +19,7 @@ Creating an Account
Please log out to continue.
</p>
<p>
- <a href="{{ url_for('user.logout', next=url_for('user_claim_page')) }}" class="button">Logout</a>
+ <a href="{{ url_for('user.logout', next=url_for('user_claim_page')) }}" class="btn">Logout</a>
</p>
{% else %}
<p>
@@ -108,7 +108,7 @@ Creating an Account
options.
</p>
- <a class="button" href="{{ url_for('user.register') }}">Register</a>
+ <a class="btn" href="{{ url_for('user.register') }}">Register</a>
</div>
</div>
{% endif %}
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-24 20:47:53 +0000