diff --git a/journalmarks/templates/base.html b/journalmarks/templates/base.html index 11b923a..a38390d 100644 --- a/journalmarks/templates/base.html +++ b/journalmarks/templates/base.html @@ -1,7 +1,43 @@ + Journalmarks + + + {% block script %}{% endblock %} + +
+
+
{% block body %}{% endblock %} +
+
diff --git a/journalmarks/templates/index.html b/journalmarks/templates/index.html index 4270e85..6157fb2 100644 --- a/journalmarks/templates/index.html +++ b/journalmarks/templates/index.html @@ -45,13 +45,12 @@ else document.attachEvent('onreadystatechange', function(){ {% endblock %} {% block body %} -Welcome! -

-overview -logout +

Welcome!

+

You can now create a new Journalmark by simply pasting a URL into the text field. To access an existing Journalmark, enter its tag code. There's also a listing of all your Journalmarks on the overview page. Finally, you can also logout again.

- - - +
+ + +
{% endblock %} diff --git a/journalmarks/templates/login.html b/journalmarks/templates/login.html index 583c658..d31456b 100644 --- a/journalmarks/templates/login.html +++ b/journalmarks/templates/login.html @@ -11,6 +11,7 @@ function run() { .then(journalmarks_initkey(username, password)).then(function() { window.location.href = '{{ next }}'; }).catch(function(error) { + document.getElementById('login-failed').style.display = 'block'; console.log('login error', error); }); }); @@ -28,11 +29,35 @@ else document.attachEvent('onreadystatechange', function(){ if (document.readyState=='complete') run(); }); + {% endblock %} {% block body %} -

Login

+

Welcome!

+ +
+

+ Login failed. +

+ +
+ + +
+ +
+ +
- - - +

+ Create new account +

+
{% endblock %}