edward/sourcing
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

various fixes

Browse source
This commit is contained in:
Edward Betts 2017-01-30 11:42:14 +00:00
parent 8837b1e04f
commit c4bbc45372
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sourcing/model.py
View file

@ -213,8 +213,9 @@ class XanaLink(Item):
print(ident, item) print(ident, item)
ident2, start, length = parse_span(facet2[0]) ident2, start, length = parse_span(facet2[0])
title = SourceDoc.from_external(ident2).text[start:length + start] source_of_title = SourceDoc.from_external(ident2)
titles[item] = title if source_of_title:
titles[item] = source_of_title.text[start:length + start]
return titles return titles
class SourceDoc(Item): class SourceDoc(Item):

2
sourcing/templates/edit.html
View file

@ -1,6 +1,6 @@
{% from "form/controls.html" import render_field %} {% from "form/controls.html" import render_field %}
{% set title="edit " + doc.title %} {% set title="edit " + doc.title() %}
{% set action=doc.edit_url %} {% set action=doc.edit_url %}
{% set label="save" %} {% set label="save" %}

2
sourcing/templates/navbar.html
View file

@ -12,7 +12,7 @@
<div id="navbar" class="navbar-collapse collapse"> <div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% for page in ('home', 'about', 'contact') %} {% for page in ('home',) %}
<li{% if current_page == page %} class="active"{% endif %}><a href="{{ url_for('.' + page) }}">{{ page | title }}</a></li> <li{% if current_page == page %} class="active"{% endif %}><a href="{{ url_for('.' + page) }}">{{ page | title }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>

6
sourcing/view.py
View file

@ -14,7 +14,7 @@ from functools import wraps
import re import re
login_manager = LoginManager() login_manager = LoginManager()
login_manager.login_view = 'login' login_manager.login_view = '.login'
re_paragraph = re.compile(r'(?:\r\n|\r|\n){2,}') re_paragraph = re.compile(r'(?:\r\n|\r|\n){2,}')
bp = Blueprint('view', __name__) bp = Blueprint('view', __name__)
@ -189,11 +189,11 @@ def new_xanalink():
def new_xanadoc(): def new_xanadoc():
form = ItemForm() form = ItemForm()
if form.validate_on_submit(): if form.validate_on_submit():
obj = XanaLink(user=current_user) obj = XanaDoc(user=current_user)
form.populate_obj(obj) form.populate_obj(obj)
session.add(obj) session.add(obj)
session.commit() session.commit()
flash('New xanalink saved.') flash('New xanadoc saved.')
return redirect(obj.url) return redirect(obj.url)
return render_template('new.html', form=form, title='xanadoc') return render_template('new.html', form=form, title='xanadoc')