Uploader progress bar

Fixes imports and routes
Merge branch 'master' into Develop
Finished routing

cps/templates/email_edit.html

@@ -41,16 +41,16 @@
   </form>
     {% if g.allow_registration %}
     <h2>{{_('Allowed domains for registering')}}</h2>
-    <table class="table table-no-bordered" id="domain-table" data-url="{{url_for('list_domain')}}" data-id-field="id" data-show-header="false" data-editable-mode="inline">
+    <table class="table table-no-bordered" id="domain-table" data-url="{{url_for('admin.list_domain')}}" data-id-field="id" data-show-header="false" data-editable-mode="inline">
       <thead>
         <tr>
-            <th data-field="domain" id="domain" data-editable-type="text" data-editable-url="{{ url_for('edit_domain')}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th>
+            <th data-field="domain" id="domain" data-editable-type="text" data-editable-url="{{ url_for('admin.edit_domain')}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th>
             <th data-field="id" id="id" data-visible="false"></th>
             <th data-align="right" data-formatter="TableActions"></th>
         </tr>
       </thead>
     </table>
-    <form id="domain_add" action="{{ url_for('add_domain')}}" method="POST">
+    <form id="domain_add" action="{{ url_for('admin.add_domain')}}" method="POST">
     <div class="form-group required">
       <label for="domainname">{{_('Add Domain')}}</label>
       <input type="text" class="form-control" name="domainname" id="domainname" >
@@ -71,7 +71,6 @@
       <div class="modal-body text-center">
         <p>{{_('Do you really want to delete this domain rule?')}}</p>
         <button type="button" class="btn btn-danger" id="btndeletedomain" >{{_('Delete')}}</button>
-        <!--a href="{{ url_for('delete_domain')}}" class="btn btn-danger">{{_('Delete')}}</a-->
         <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
       </div>
     </div>