diff options
Diffstat (limited to 'design/templates')
| -rw-r--r-- | design/templates/base.html | 12 | ||||
| -rw-r--r-- | design/templates/django_registration/activation_complete.html | 5 | ||||
| -rw-r--r-- | design/templates/django_registration/registration_complete.html | 2 | ||||
| -rw-r--r-- | design/templates/notes/notebook_detail.html | 5 | ||||
| -rw-r--r-- | design/templates/notes/notes_detail.html | 2 | ||||
| -rw-r--r-- | design/templates/notes/notes_list.html | 9 | ||||
| -rw-r--r-- | design/templates/pages/page.html | 2 |
7 files changed, 27 insertions, 10 deletions
diff --git a/design/templates/base.html b/design/templates/base.html index fc369ae..adcf599 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -29,11 +29,17 @@ <div id="notebooks-menu" class="dropmenu"> <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> + <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}} {{object.note_count}}</a> {% endfor %} - <li class="menu-divider"> + <ul class="menu-divider"> + <li> + <a href="{% url 'notebooks:list' %}/trash">Trash</a> + </li> + <li> <a href="{% url 'notebooks:list' %}">Edit/Add Notebook</a> - </li></ul> + </li> + </ul> + </ul> </div> </li>{%else%} <li><a href="/" title="">Home</a></li>{%endif%} diff --git a/design/templates/django_registration/activation_complete.html b/design/templates/django_registration/activation_complete.html index 914be51..d83317a 100644 --- a/design/templates/django_registration/activation_complete.html +++ b/design/templates/django_registration/activation_complete.html @@ -1,8 +1,7 @@ - {% extends 'base.html' %} {% block content %} -<main> +<main class="single-col"> <h1>Your account is now active.</h1> -<p><a href="{% url 'login' %}">Login</a> and get started! <?p> +<p><a href="{% url 'login' %}">Login</a> and get started!</p> </main> {% endblock %} diff --git a/design/templates/django_registration/registration_complete.html b/design/templates/django_registration/registration_complete.html index e9d0610..59677ce 100644 --- a/design/templates/django_registration/registration_complete.html +++ b/design/templates/django_registration/registration_complete.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} {% block content %} -<main> +<main class="single-col"> <h1>Thanks for signing up.</h1> <p>Please check your email for a link to confirm you new account.<?p> </main> diff --git a/design/templates/notes/notebook_detail.html b/design/templates/notes/notebook_detail.html index 73c13ab..37c8f8a 100644 --- a/design/templates/notes/notebook_detail.html +++ b/design/templates/notes/notebook_detail.html @@ -8,9 +8,9 @@ <main> <article class="note-container single-col"> <div class="flex-wrapper"> + {% if object.name != 'Trash'%} <form id="nb-edit-form" action="{% url 'notebook-api-detail' object.pk %}" method="PATCH">{% csrf_token %} {{ form.non_field_errors }} - <div class="flex-wrapper flex-inner"> {% for field in form %}{% if field.name == 'color_rgb' %} <fieldset class="color-picker-fieldset" id="color-picker" {% if form.instance.color_rgb %}style="background-color: {{form.instance.color_rgb}}; border: none;"{%endif%}> @@ -28,6 +28,9 @@ <input id="btn-js-hide" type="submit" class="btn sm" value="Save" > </form> <div class="edit-btn-wrapper"><a class="hide btn btn-hollow" id="edit-toggle-btn">Edit</a></div> + {%else%} + <h1 class="notebook-title" id="nb-title">{{object.name}}</h1> + {%endif%} </div> <form id="new-note-form" action="{% url 'notebook-api-list' %}" method="post" class="hide"> diff --git a/design/templates/notes/notes_detail.html b/design/templates/notes/notes_detail.html index edf45e7..cce13b7 100644 --- a/design/templates/notes/notes_detail.html +++ b/design/templates/notes/notes_detail.html @@ -49,8 +49,8 @@ <h1 id="note-title" class="note-title">{{object.title}}</h1> <div id="q-container" class="inactive"><div id="note-body">{% if object.body_html %}{{object.body_html|safe}}{%else%}{{object.body_text}}{%endif%}</div></div> <input id="btn-js-hide" type="submit" class="btn sm" value="Save" > + <button type="submit" value="trash" class="btn-hollow trash float-right" name="trash">Move to Trash</button> </form> - <button type="submit" value="trash" class="btn btn-hollow">Move to Trash</button> </article> <!--<aside class="note-list-container"> <div class="svg-wrapper"><svg class="svg-icon-arrow"> diff --git a/design/templates/notes/notes_list.html b/design/templates/notes/notes_list.html index 5ef067a..94e82ec 100644 --- a/design/templates/notes/notes_list.html +++ b/design/templates/notes/notes_list.html @@ -5,6 +5,15 @@ <div class="note-container"> <div class="note-hed-wrapper"> <h1 class="note-hed">Notes</h1> + {% if messages %} + <ul class="messages"> + {% for message in messages %} + <li{% if message.tags %} class="{{ message.tags }}"{% endif %}> + {% if 'safe' in message.tags %}{{ message|safe }}{% else %}{{ message }}{% endif %} + </li> + {% endfor %} + </ul> + {% endif %} {% if tags|length >= 1%}<h2 class="note-subhed">Tagged with: {% for tag in tags%}<a href="{{tag.slug}}">{{tag.name}}</a>{%endfor%}</h2>{%endif%} <h6 class="bottom-margin-0 inline-block"><button id="notebook-drop-btn" class="btn btn-light btn-drop-menu">Notebooks</button></h6> diff --git a/design/templates/pages/page.html b/design/templates/pages/page.html index 92dcc85..6703d5d 100644 --- a/design/templates/pages/page.html +++ b/design/templates/pages/page.html @@ -8,7 +8,7 @@ {% block extra %} {% if login_form %} -<div class="overlay-content" id="js-overlay-content" style="display: none;"> +<div class="overlay-content hide" id="js-overlay-login"> {% include 'lib/login.html' with form=login_form %} </div> {% endif %} |