diginaut/digimarks
1
0
Fork 0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-07 00:15:10 +01:00
Code Issues Releases Wiki Activity

Fixes for themes; import models

Browse Source
This commit is contained in:
Michiel Scholten
2019-02-28 16:07:04 +01:00
parent 7092769da1
commit 89994b1307
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
digimarks/marks.py
View File

@@ -8,7 +8,10 @@ from flask import (Flask, abort, jsonify, redirect, render_template, request,
url_for) url_for)
from werkzeug.contrib.atom import AtomFeed from werkzeug.contrib.atom import AtomFeed
DIGIMARKS_USER_AGENT = 'digimarks/1.2.0-dev' from . import themes
from .models import Bookmark, PublicTag, User, urljoin, get_tags_for_user
DIGIMARKS_USER_AGENT = 'digimarks/2.0.0-dev'
try: try:
import settings import settings
@@ -58,9 +61,9 @@ def get_cached_tags(userkey):
def get_theme(userkey): def get_theme(userkey):
try: try:
usertheme = usersettings[userkey]['theme'] usertheme = usersettings[userkey]['theme']
return themes[usertheme] return themes.themes[usertheme]
except KeyError: except KeyError:
return themes[DEFAULT_THEME] # default return themes.themes[themes.DEFAULT_THEME] # default
def make_external(url): def make_external(url):
@@ -81,14 +84,14 @@ def _find_bookmarks(userkey, filter_text):
@app.errorhandler(404) @app.errorhandler(404)
def page_not_found(e): def page_not_found(e):
theme = themes[DEFAULT_THEME] theme = themes.themes[themes.DEFAULT_THEME]
return render_template('404.html', error=e, theme=theme), 404 return render_template('404.html', error=e, theme=theme), 404
@app.route('/') @app.route('/')
def index(): def index():
""" Homepage, point visitors to project page """ """ Homepage, point visitors to project page """
theme = themes[DEFAULT_THEME] theme = themes.themes[themes.DEFAULT_THEME]
return render_template('index.html', theme=theme) return render_template('index.html', theme=theme)
@@ -487,7 +490,7 @@ def publictag_page(tagkey):
#this_tag = get_object_or_404(PublicTag.select().where(PublicTag.tagkey == tagkey)) #this_tag = get_object_or_404(PublicTag.select().where(PublicTag.tagkey == tagkey))
try: try:
this_tag, bookmarks = get_publictag(tagkey) this_tag, bookmarks = get_publictag(tagkey)
theme = themes[DEFAULT_THEME] theme = themes.themes[themes.DEFAULT_THEME]
return render_template( return render_template(
'publicbookmarks.html', 'publicbookmarks.html',
bookmarks=bookmarks, bookmarks=bookmarks,

2
digimarks/models.py
View File

@@ -87,7 +87,7 @@ class User(BaseModel):
""" User account """ """ User account """
username = CharField() username = CharField()
key = CharField() key = CharField()
theme = CharField(default=DEFAULT_THEME) theme = CharField(default=themes.DEFAULT_THEME)
created_date = DateTimeField(default=datetime.datetime.now) created_date = DateTimeField(default=datetime.datetime.now)
def generate_key(self): def generate_key(self):