X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=app%2Ftemplates%2Fbase.html;h=90e49a87778e766a6236154937ff0f4d37652b54;hb=5f7be4b4337358e35c9eda4b261260a08a958b4a;hp=522e3498b1d6ff36f43da93b2e03326eeebfc361;hpb=63969529adf90a49916be56869ed4a63a9667e7c;p=cheatdb.git

diff --git a/app/templates/base.html b/app/templates/base.html
index 522e349..90e49a8 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -7,7 +7,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>{% block title %}title{% endblock %} - {{ config.USER_APP_NAME }}</title>
 	<link rel="stylesheet" type="text/css" href="/static/bootstrap.css">
-	<link rel="stylesheet" type="text/css" href="/static/custom.css?v=2">
+	<link rel="stylesheet" type="text/css" href="/static/custom.css?v=12">
+	<link rel="search" type="application/opensearchdescription+xml" href="/static/opensearch.xml" title="ContentDB" />
+	<link rel="shortcut icon" href="/favicon-16.png" sizes="16x16">
+	<link rel="icon" href="/favicon-128.png" sizes="128x128">
+	<link rel="icon" href="/favicon-32.png" sizes="32x32">
 	{% block headextra %}{% endblock %}
 </head>
 
@@ -56,10 +60,17 @@
 				</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" />
+						<li class="nav-item"><a class="nav-link notification-icon" href="{{ url_for('notifications.list_all') }}">
+							{% if current_user.notifications %}
+								<i class="fas fa-bell"></i>
+								<span class="badge badge-pill badge-notify" style="font-size:10px;">{{ current_user.notifications | length }}</span>
+							{% else %}
+								<i class="fas fa-bell" ></i>
+							{% endif %}
+						</a></li>
+						<li class="nav-item"><a class="nav-link" href="{{ url_for('packages.create_edit') }}">
+							<i class="fas fa-plus"></i>
 						</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"
@@ -69,24 +80,30 @@
 
 							<ul class="dropdown-menu" role="menu">
 								<li class="nav-item">
-									<a class="nav-link" href="{{ url_for('user_profile_page', username=current_user.username) }}">Profile</a>
-								</li class="nav-item">
+									<a class="nav-link" href="{{ url_for('users.profile', username=current_user.username) }}">Profile</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link" href="{{ url_for('users.profile', username=current_user.username) }}#unadded-topics">Your unadded topics</a>
+								</li>
 								{% 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>
+									<li class="nav-item"><a class="nav-link" href="{{ url_for('todo.view') }}">{{ _("Work Queue") }}</a></li>
+									<li class="nav-item"><a  class="nav-link" href="{{ url_for('users.list_all') }}">{{ _("User list") }}</a></li>
 								{% endif %}
+								<li class="nav-item">
+									<a class="nav-link" href="{{ url_for('todo.topics') }}">{{ _("All unadded topics") }}</a>
+								</li>
 								{% if current_user.rank == current_user.rank.ADMIN %}
-									<li class="nav-item"><a class="nav-link" href="{{ url_for('admin_page') }}">Admin</a></li>
+									<li class="nav-item"><a class="nav-link" href="{{ url_for('admin.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>
+									<li class="nav-item"><a class="nav-link" href="{{ url_for('admin.tag_list') }}">{{ _("Tag Editor") }}</a></li>
+									<li class="nav-item"><a class="nav-link" href="{{ url_for('admin.license_list') }}">{{ _("License Editor") }}</a></li>
 								{% endif %}
-								<li class="nav-item"><a class="nav-link" href="{{ url_for('user.logout') }}">Sign out</a></li>
+								<li class="nav-item"><a class="nav-link" href="{{ url_for('user.logout') }}">{{ _("Sign out") }}</a></li>
 							</ul>
 						</li>
 					{% else %}
-						<li><a class="nav-link" href="{{ url_for('user.login') }}">Sign in</a></li>
+						<li><a class="nav-link" href="{{ url_for('user.login') }}">{{ _("Sign in") }}</a></li>
 					{% endif %}
 				</ul>
 			</div>
@@ -101,7 +118,7 @@
 						<li class="alert alert-{{category}} container">
 							<span class="icon_message"></span>
 
-							{{ message|safe }}
+							{{ message }}
 
 							<div style="clear: both;"></div>
 						</li>
@@ -119,10 +136,18 @@
 	{% endblock %}
 
 	<footer class="container footer-copyright my-5 page-footer font-small text-center">
-		ContentDB &copy; 2018 to <a href="https://rubenwardy.com/">rubenwardy</a> |
+		ContentDB &copy; 2018-20 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>
+		<a href="{{ url_for('flatpage', path='help') }}">{{ _("Help") }}</a> |
+		<a href="{{ url_for('flatpage', path='policy_and_guidance') }}">{{ _("Policy and Guidance") }}</a> |
+		<a href="{{ url_for('flatpage', path='help/reporting') }}">{{ _("Report / DMCA") }}</a> |
+		<a href="{{ url_for('users.list_all') }}">{{ _("User List") }}</a>
+
+		{% if debug %}
+			<p style="color: red">
+				DEBUG MODE ENABLED
+			</p>
+		{% endif %}
 	</footer>
 
 	<script src="/static/jquery.min.js"></script>
@@ -130,11 +155,9 @@
 	<script src="/static/bootstrap.min.js"></script>
 	<script src="/static/easymde.min.js"></script>
 	<link rel="stylesheet" type="text/css" href="/static/easymde.min.css">
-	<script>
-		$("textarea.markdown").each(function() {
-			new EasyMDE({ element: this, hideIcons: ["image"] });
-		})
-	</script>
+	<link href="/static/fa/css/all.css" rel="stylesheet">
+	<script src="/static/markdowntextarea.js"></script>
+
 	{% block scriptextra %}{% endblock %}
 </body>
 </html>