aboutsummaryrefslogtreecommitdiff
path: root/design/templates
diff options
context:
space:
mode:
Diffstat (limited to 'design/templates')
-rw-r--r--design/templates/accounts/profile.html2
-rw-r--r--design/templates/base.html45
2 files changed, 26 insertions, 21 deletions
diff --git a/design/templates/accounts/profile.html b/design/templates/accounts/profile.html
index c47e6c6..e8ab65e 100644
--- a/design/templates/accounts/profile.html
+++ b/design/templates/accounts/profile.html
@@ -1,6 +1,6 @@
{% extends 'base.html' %}
{% block content %}
-<main>
+<main class="single-col">
<h1>Account Settings</h1>
<table>
<tbody>
diff --git a/design/templates/base.html b/design/templates/base.html
index bb54717..50749cb 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -4,49 +4,55 @@
<!--[if IE 9]> <html class="ie9"> <![endif]-->
<!--[if !IE]><!--> <html lang="en"><!--<![endif]-->
<head>
-<title>Note</title>
-<meta name="viewport" content="width=device-width">
-<meta name="description" content="Note taking for writers">
-<meta property="og:description" content="Note taking for writers">
-<meta property="og:site_name" content="Notes">
-<meta property="og:image" content="">
-<link rel="stylesheet" href="/media/screenv1.css?{%now "u"%}" type="text/css">
-{% block extrastyles %}{%endblock%}
-<link rel="icon" type="image/png" href="">
-<!--<link rel="manifest" href="/webmanifest.json">-->
-<link rel="apple-touch-icon" sizes="256x256" href="">
+ <title>{% block pagetitle %}{% endblock %}TKNotes</title>
+ <meta name="viewport" content="width=device-width">
+ <meta name="description" content="TKNote taking for writers">
+ <meta property="og:description" content="TkNote taking for writers">
+ <meta property="og:site_name" content="TKNotes">
+ <meta property="og:image" content="">
+ <link rel="stylesheet" href="/media/screenv1.css?{%now "u"%}" type="text/css">
+ {% block extrastyles %}{%endblock%}
+ <link rel="icon" type="image/png" href="">
+ <!--<link rel="manifest" href="/webmanifest.json">-->
+ <link rel="apple-touch-icon" sizes="256x256" href="">
+ <script async src="/media/js/main.min.js?{%now "u"%}"></script>
</head>
<body class="{% block bodyclass %}{% endblock %}">
<div class="head-wrapper">
<header>
<nav class="left">
<ul>{% if not request.user.is_anonymous %}
- <li><a href="{%url 'notes:note-list' user.username %}">Notes</a></li>
- <li><a id="notebook-menu-link" href="{%url 'notes:notebook-list' user.username %}" title="view notebooks">Notebooks</a>
+ <li><a class="circle plus" href="{%url 'notes:create' %}" title="Add a new note">New</a></li>
+ <li><a href="{%url 'notes:list' %}" title="View all your notes">Notes</a></li>
+ <li><a id="notebook-menu-link" href="{%url 'notebooks:list' %}" title="view your notebooks">Notebooks</a>
<div id="notebooks-menu" class="dropmenu">
- <ul id="notebooks-menu-list" class="list-style-none vertical">{% for obj in user.profile.get_notebook_list %}
- <li><a href="{{obj.get_absolute_url}}">{{obj}}</a></li>
- {% endfor %}</ul>
+ <ul id="notebooks-menu-list" class="list-style-none vertical">
+ {% for object in user.profile.get_notebook_list %}
+ <li><a href="{{object.get_absolute_url}}" title="view all notes in the notebook {{object.name}}"><span class="color-box" style="background-color: {{object.color_rgb}}"></span>{{object}}</a>
+ {% endfor %}
+ <li class="menu-divider">
+ <a href="{% url 'notebooks:list' %}">Edit/Add Notebook</a>
+ </li></ul>
</div>
</li>{%else%}
<li><a href="/" title="">Home</a></li>{%endif%}
</ul>
</nav>
<div class="logo"></div>
- <nav class="right">
+ <nav class="right {% if request.user.is_anonymous %}nologin{% endif %}">
<ul>
+ <li><a href="{% url 'forum:topic-list' %}" title="View the TKNote Forum">Forum</a></li>
<li><a href="{% url 'pages' slug='tour' %}" title="">Tour</a></li>
<li><a href="{% url 'pages' slug='howto' %}" title="">How to</a></li>{% if not request.user.is_anonymous %}
<li><a id="account-menu" href="{% url 'settings' %}" title="">Account</a>
<div id="user-menu" class="dropmenu" tabindex="-1">
<ul id="user-menu-list" class="list-style-none vertical">
- <li><a href="/users/luxagraf/" class="">Your Notes</a></li>
<li><a href="/settings/" class="">Account settings</a></li>
<li><a href="/plans/" class="">Subscription plans</a></li>
</ul>
<ul class="menu-divider list-style-none">
<li>
- <form action="/logout/" method="post">
+ <form action="/logout/" method="post">{% csrf_token %}
<input type="hidden" name="a" value="3">
<button type="submit" value="Log out" class="btn-link">Log out</button>
</form>
@@ -85,7 +91,6 @@
</footer>
{% block extra %}
{%endblock%}
-<script async src="/media/js/package.min.js"></script>
{% block jsinclude %}{%endblock%}
<script>