Index: main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/datacenteruploadpage.pt
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/datacenteruploadpage.pt	(revision 13803)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/datacenteruploadpage.pt	(revision 13804)
@@ -1,11 +1,38 @@
-<p i18n:translate="">
-    Before uploading a file check that your file header corresponds
-    with header format of the selected processor. All available headers
-    are listed below.
-    After file upload click the 'Process data' button and proceed up to
-    import step 3. Verify that the data format
-    meets all the import criteria and requirements of the processor.
-</p>
-
+<span i18n:translate="">
+    Before uploading a file, check that your file header corresponds
+    with the header format of the selected processor:
+</span>
+<!-- Processors Modal -->
+<button i18n:translate="" class="btn btn-info btn-xs"
+   data-toggle="modal" data-target="#ProcessorsModal"
+   href="../processorsoverview">
+   View available processors (importers)
+</button>
+<div class="modal fade" id="ProcessorsModal" tabindex="-1"
+     role="dialog" aria-labelledby="ProcessorsModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+    </div>
+  </div>
+</div>
+<br /><br />
+<span i18n:translate="">
+    Many importer fields are of type 'Choice' which means only definied keywords
+    are allowed:
+</span>
+<!-- Sources Modal -->
+<button i18n:translate="" class="btn btn-info btn-xs"
+   data-toggle="modal" data-target="#SourcesModal"
+   href="../sourcesoverview">
+   View choices
+</button>
+<div class="modal fade" id="SourcesModal" tabindex="-1"
+     role="dialog" aria-labelledby="SourcesModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+    </div>
+  </div>
+</div>
+<br />
 <form method="post" enctype="multipart/form-data">
 <br />
@@ -16,12 +43,12 @@
       </td>
       <td>
-    		<div class="input-group half">
-    			<div class="input-group-btn">
-    				<div class="btn btn-default btn-file">
+        <div class="input-group half">
+          <div class="input-group-btn">
+            <div class="btn btn-default btn-file">
               Select&hellip;
               <input type="file" name="uploadfile:file" />
             </div>
-    			</div>
-    			<input type="text" class="form-control" readonly>
+          </div>
+          <input type="text" class="form-control" readonly>
         </div>
       </td>
@@ -59,63 +86,15 @@
       tal:attributes="value view/cancel_button"/>
 </form>
-<br />
-<p i18n:translate="">
-    Import managers will be automatically informed by email after file upload.
-    There is no need for assigning tickets or sending emails anymore.
-    The data will be imported according to the information given.
-</p>
+
 
 <br /><br />
 
-<h2 i18n:translate="">Available Processors (Importers)</h2>
-
-<table i18n:domain="waeup.ikoba" class="table table-condensed">
-  <thead>
-    <tr>
-      <th i18n:translate="">Processor</th>
-      <th i18n:translate="">Required Schema Fields</th>
-      <th i18n:translate="">Optional Schema Fields</th>
-      <th i18n:translate="">Non-Schema Fields</th>
-    </tr>
-  </thead>
-  <tr tal:repeat="importer view/getImporters">
-    <td>
-      <span tal:content="importer/title">TITLE</span><br /><br />
-      <a i18n:translate="" class="btn btn-primary btn-xs"
-         tal:attributes="href python: 'skeleton?name=' + importer['name']">
-         Download CSV Skeleton File
-      </a>
-    </td>
-    <td nowrap>
-      <span tal:repeat="field importer/fields">
-          <tal:schemafield condition="field/f_type">
-            <tal:required condition="field/f_required">
-              <span tal:replace="field/f_name"></span>
-              (<span tal:replace="field/f_type"></span>)
-              <br />
-            </tal:required>
-          </tal:schemafield>
-      </span>
-    </td>
-    <td nowrap>
-      <span tal:repeat="field importer/fields">
-          <tal:schemafield condition="field/f_type">
-            <tal:notrequired condition="not:field/f_required">
-              <span tal:replace="field/f_name"></span>
-              (<span tal:replace="field/f_type"></span>)
-              <br />
-            </tal:notrequired>
-          </tal:schemafield>
-      </span>
-    </td>
-    <td>
-      <span tal:repeat="field importer/fields">
-          <tal:extrafield condition="not:field/f_type">
-            <span tal:replace="field/f_name"></span>
-            <br />
-          </tal:extrafield>
-      </span>
-    </td>
-
-  </tr>
-</table>
+<div i18n:translate="">
+    After file upload click the 'Process data' button and proceed up to
+    import step 3. Verify that the data format
+    meets all the import criteria and requirements of the processor.
+</div>
+<br />
+<div i18n:translate="">
+    Import managers will be automatically informed by email after file upload.
+</div>
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/processorsoverview.pt
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/processorsoverview.pt	(revision 13804)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/processorsoverview.pt	(revision 13804)
@@ -0,0 +1,89 @@
+<div class="modal-body">
+  <div class="panel-group"
+       id="accordion"
+       role="tablist"
+       aria-multiselectable="true"
+       i18n:domain="waeup.kofa"
+       >
+    <div class="panel panel-default"  tal:repeat="importer view/getImporters">
+      <div class="panel-heading" role="tab"
+           tal:attributes="id python: 'heading' + importer['name']">
+        <h4 class="panel-title">
+          <a class="collapsed" data-toggle="collapse"
+             data-parent="#accordion"
+             tal:attributes="href python: '#collapse' + importer['name'];
+                             aria-controls python: 'collapse' + importer['name']"
+             aria-expanded="false">
+            <span tal:replace="importer/title">TITLE</span>
+          </a>
+        </h4>
+      </div>
+      <div tal:attributes="id python: 'collapse' + importer['name'];
+                           aria-labelledby python: 'heading' + importer['name']"
+           class="panel-collapse collapse"
+           role="tabpanel">
+        <div class="panel-body">
+          <table class="table table-condensed">
+            <thead>
+              <tr>
+                <th i18n:translate="">Processor</th>
+                <th i18n:translate="">Required Schema Fields</th>
+                <th i18n:translate="">Optional Schema Fields</th>
+                <th i18n:translate="">Non-Schema Fields</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>
+                  <span tal:content="importer/title">TITLE</span><br /><br />
+                  <a i18n:translate="" class="btn btn-primary btn-xs"
+                     tal:attributes="href python: view.url(context)
+                                          + '/skeleton?name='
+                                          + importer['name']">
+                     Download CSV File Template
+                  </a>
+                </td>
+                <td nowrap>
+                  <span tal:repeat="field importer/fields">
+                      <tal:schemafield condition="field/f_type">
+                        <tal:required condition="field/f_required">
+                          <span tal:replace="field/f_name"></span>
+                          (<span tal:replace="field/f_type"></span>)
+                          <br />
+                        </tal:required>
+                      </tal:schemafield>
+                  </span>
+                </td>
+                <td nowrap>
+                  <span tal:repeat="field importer/fields">
+                      <tal:schemafield condition="field/f_type">
+                        <tal:notrequired condition="not:field/f_required">
+                          <span tal:replace="field/f_name"></span>
+                          (<span tal:replace="field/f_type"></span>)
+                          <br />
+                        </tal:notrequired>
+                      </tal:schemafield>
+                  </span>
+                </td>
+                <td>
+                  <span tal:repeat="field importer/fields">
+                      <tal:extrafield condition="not:field/f_type">
+                        <span tal:replace="field/f_name"></span>
+                        <br />
+                      </tal:extrafield>
+                  </span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+  <br />
+  <button type="button" class="btn btn-default" style="float: right"
+          i18n:translate="" data-dismiss="modal"
+          tal:condition="python: view.__name__ == 'processorsoverview'">
+      Close
+  </button>
+</div>
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/source.pt
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/source.pt	(revision 13804)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/source.pt	(revision 13804)
@@ -0,0 +1,35 @@
+<div class="panel panel-default">
+  <div class="panel-heading" role="tab"
+       tal:attributes="id viewlet/heading">
+    <h4 class="panel-title">
+      <a class="collapsed" data-toggle="collapse"
+         tal:attributes="data-parent viewlet/accordion;
+                         href viewlet/hash_collapse;
+                         aria-controls viewlet/collapse"
+         aria-expanded="false">
+        <span tal:replace="viewlet/title">TITLE</span>
+      </a>
+    </h4>
+  </div>
+  <div tal:attributes="id viewlet/collapse;
+                       aria-labelledby viewlet/heading"
+       class="panel-collapse collapse"
+       role="tabpanel">
+    <div class="panel-body">
+      <table class="table">
+        <thead>
+          <tr>
+            <th i18n:translate="">Value</th>
+            <th i18n:translate="">Title</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="item viewlet/source">
+            <td tal:content="python: item[0]">NAME</td>
+            <td tal:content="python: item[1]">TITLE</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/sourcesoverview.pt
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/sourcesoverview.pt	(revision 13804)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/sourcesoverview.pt	(revision 13804)
@@ -0,0 +1,24 @@
+<div class="modal-body" i18n:domain="waeup.ikoba">
+  <table width="100%">
+    <tr>
+      <td valign="top">
+        <div class="panel-group" id="accordion-left" role="tablist"
+             aria-multiselectable="true">
+          <tal:sourcesleft tal:content="structure provider:sources_left" />
+        </div>
+      </td>
+      <td valign="top">
+        <div class="panel-group" id="accordion-right" role="tablist"
+             aria-multiselectable="true">
+          <tal:sourcesright tal:content="structure provider:sources_right" />
+        </div>
+      </td>
+    </tr>
+  </table>
+
+  <button type="button" class="btn btn-default" style="float: right"
+          i18n:translate="" data-dismiss="modal"
+          tal:condition="python: view.__name__ == 'sourcesoverview'">
+      Close
+  </button>
+</div>
