diff --git a/src/digimarks/main.py b/src/digimarks/main.py index 91f827a..33357eb 100644 --- a/src/digimarks/main.py +++ b/src/digimarks/main.py @@ -482,5 +482,7 @@ def page_user_landing( raise HTTPException(status_code=404, detail='User not found') language = 'en' return templates.TemplateResponse( - request=request, name='user_index.html', context={'language': language, 'version': DIGIMARKS_VERSION} + request=request, + name='user_index.html', + context={'language': language, 'version': DIGIMARKS_VERSION, 'user_key': user_key}, ) diff --git a/src/digimarks/static/css/digimarks.css b/src/digimarks/static/css/digimarks.css index 18722b0..83dc082 100644 --- a/src/digimarks/static/css/digimarks.css +++ b/src/digimarks/static/css/digimarks.css @@ -4,64 +4,3 @@ /** Navigation **/ -nav .sidenav-trigger -{ - /* Fix for misalignment of hamburger icon */ - margin: 0; -} - -nav .sidenav-trigger i -{ - /* Make the hamburger icon great again */ - font-size: 2.7rem; -} - -/** Cards and tags **/ - -.card .card-content, -.card .card-reveal -{ - padding: 12px; -} - -.card.tiny -{ - height: 140px; - overflow: hidden; -} - -.card.tiny .card-title -{ - font-size: 18px; -} - -.card .card-reveal .digimark-card-header, -.card .digimark-card-header.activator, -.chip.clickable -{ - cursor: pointer; - /*display: block;*/ -} - -.card .digimark-card-header-tags -{ - padding-top: 10px; -} - -.card-image -{ - min-width: 60px; -} - -.card-image i, -.list-image i -{ - padding: 5px 0 0 15px; -} - -.card.horizontal .card-image img.favicon, -.list-image img.favicon -{ - height: 60px; - width: 60px; -} diff --git a/src/digimarks/static/css/digui.css b/src/digimarks/static/css/digui.css new file mode 100644 index 0000000..31f34b9 --- /dev/null +++ b/src/digimarks/static/css/digui.css @@ -0,0 +1,3 @@ +/** + * digui structure + */ diff --git a/src/digimarks/static/js/init.js b/src/digimarks/static/js/init.js deleted file mode 100644 index 343f899..0000000 --- a/src/digimarks/static/js/init.js +++ /dev/null @@ -1,11 +0,0 @@ -/* global M */ - -var options = {}; -var elem = document.querySelector(".sidenav"); -var instance = M.Sidenav.init(elem, options); - -elem = document.querySelector(".collapsible"); -instance = M.Collapsible.init(elem, { - // inDuration: 1000, - // outDuration: 1000 -}); diff --git a/src/digimarks/templates/base.html b/src/digimarks/templates/base.html index 0f63499..80b5cfb 100644 --- a/src/digimarks/templates/base.html +++ b/src/digimarks/templates/base.html @@ -1,126 +1,35 @@ - - - {% block title %}{% endblock %} - digimarks + + + {% block title %}{% endblock %} - digimarks + + + + + + + + + + + + + + - - - +
- - - - - - - + {% block pagecontent %} - - + {% endblock %} - - - - - -{% if not sortmethod %} - {% set sortmethod = None %} -{% endif %} -{% if not show_as %} - {% set show_as = None %} -{% endif %} - - - -
-
-
-

{% block pageheader %}Bookmarks{% endblock %}

-
-
-
-
-
- {% block pagecontent %} - {% endblock %} -
-
+ {% block extrajs %}{% endblock %} - - - +
- {% block extrajs %}{% endblock %} - + diff --git a/src/digimarks/templates/index.html b/src/digimarks/templates/index.html index b9bd526..1e05790 100644 --- a/src/digimarks/templates/index.html +++ b/src/digimarks/templates/index.html @@ -8,7 +8,7 @@
- If you forgot/lost your personal url, contact your digimarks administrator. On startup, the personal codes are printed to the standard output (so should be findable in a log). Of course, bookmarks.db contains the user information too. + If you forgot/lost your personal url, contact your digimarks administrator.{# On startup, the personal codes are printed to the standard output (so should be findable in a log). Of course, bookmarks.db contains the user information too.#}
diff --git a/src/digimarks/templates/user_index.html b/src/digimarks/templates/user_index.html new file mode 100644 index 0000000..b5b66a1 --- /dev/null +++ b/src/digimarks/templates/user_index.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block title %}Bookmarks{% endblock %} +{% block pageheader %}Bookmarks{% endblock %} +{% block pagecontent %} + + Welcome user! + +
+ +{% endblock %}