Merge branch 'git-mv-files' into 'master'

Move HTML pages to a specific directory

See merge request rc/self-reg-form!27

app/__init__.py

@@ -51,13 +51,13 @@ def create_app(config_name):
         session['return_url'] = request.args.get('redir', vars.default_referrer)
 
         if (not any(item in session['user'].get('eppa') for item in valid_eppa)):
-            return render_template('errors/shibboleth.html')
+            return render_template('account/unauthorized.html')
 
         if rc_util.check_state(session['user'].get('username')) == "blocked":
-            return render_template('errors/blocked.html')
+            return render_template('account/blocked.html')
 
         elif rc_util.check_state(session['user'].get('username')) == "certification":
-              return render_template('errors/certify.html', room_id=session['uid'],
+              return render_template('account/certify.html', room_id=session['uid'],
                                username=session['user'].get('username'),
                                fullname=session['user'].get('fullname'), email=session['user'].get('email'),
                                referrer=session['return_url'], cancel_url=vars.default_referrer,
@@ -73,14 +73,6 @@ def create_app(config_name):
                                cancel_msg=messages.cancel_message,
                                error_msg=messages.error_message)
 
-    @app.route('/blocked_account')
-    def account_block():    
-        return render_template('errors/blocked.html')
-
-    @app.route('/certify_account')
-    def error_certify():
-        return render_template('errors/certify.html')
-
     # misc page error catching
     @app.errorhandler(403)
     def forbidden(error):