Merge branch 'master' into v0.9

1 files changed, 6 insertions, 2 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 59cfe6321..d508444a4 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -24,6 +24,7 @@ import cStringIO as StringIO
 import datetime
 import ho.pisa as pisa
 import json
+from markdown import markdown
 import optparse
 import re
 from tempfile import NamedTemporaryFile
@@ -61,7 +62,8 @@ from archaeological_files.forms import DashboardForm as DashboardFormFile
 from ishtar_common.forms import FinalForm, FinalDeleteForm
 from ishtar_common import forms_common as forms
 from ishtar_common import wizards
-from ishtar_common.models import HistoryError
+from ishtar_common.models import HistoryError, PRIVATE_FIELDS, \
+    get_current_profile
 
 import models
 
@@ -74,6 +76,9 @@ def index(request):
     Main page
     """
     dct = {}
+    profile = get_current_profile()
+    if hasattr(profile, 'homepage') and profile.homepage:
+        dct['homepage'] = markdown(profile.homepage)
     try:
         return render_to_response('index.html', dct,
                                   context_instance=RequestContext(request))
@@ -325,7 +330,6 @@ def format_val(val):
 HIERARCHIC_LEVELS = 5
 HIERARCHIC_FIELDS = ['periods', 'period', 'unit', 'material_types',
                      'material_type', 'conservatory_state']
-PRIVATE_FIELDS = ('id', 'history_modifier', 'order')
 
 
 def get_item(model, func_name, default_name, extra_request_keys=[],