various fixes

sourcing/model.py

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

sourcing/templates/edit.html

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

sourcing/templates/navbar.html

@@ -12,7 +12,7 @@
 
 		<div id="navbar" class="navbar-collapse collapse">
 			<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>
                 {% endfor %}
 			</ul>

sourcing/view.py

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