ESPD-115 #8 added default currency EUR for each country

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/currencies.jsp

@@ -32,9 +32,9 @@
 <tiles:importAttribute name="currencyField"/>
 <tiles:importAttribute name="style"/>
 
-<form:select path="${currencyField}" cssClass="form-control" cssStyle="${style}">
+<form:select path="${currencyField}" cssClass="form-control currency" cssStyle="${style}">
     <form:option value="${null}" label="---"/>
     <c:forEach items="<%=Currency.values()%>" var="curr">
-        <form:option value="${curr}">${curr} (${curr.description})</form:option>
+        <form:option selected="${espd.authority.country.currency == curr ? 'selected' : ''}" value="${curr}">${curr} (${curr.description})</form:option>
     </c:forEach>
 </form:select>

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp

@@ -69,7 +69,7 @@ $(function() {
 			<tiles:putAttribute name="flow" value="unknown"/>
 			<tiles:putAttribute name="start" value="true"/>
         </tiles:insertDefinition>
-		<div class="paragraph">
+		<div>
 			<h2 data-i18n="filter_header"><s:message code='filter_header'/></h2>
 		</div>
 		<div class="alert alert-espd-info">
@@ -89,7 +89,7 @@ $(function() {
 			</ul>
 		</div>
         <form:errors path="attachments" cssClass="errorContainer alert alert-danger"/>
-		<div class="paragraph">
+		<div>
 			<h3>
 				<span data-i18n="filter_who_are_you"><s:message code='filter_who_are_you'/></span>
 				<span data-i18n="tooltip_espd_used_both_ca_eo" data-toggle="tooltip" title="${i18n['tooltip_espd_used_both_ca_eo']}"></span>

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp

@@ -221,7 +221,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
     margin: -75px 0 0 -75px;
     border-radius: 50%;
     border: 3px solid transparent;
-    border-top-color: #3498db;
+    border-top-color: #04498a;
  
     -webkit-animation: spin 2s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
     animation: spin 2s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
@@ -238,7 +238,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
         bottom: 5px;
         border-radius: 50%;
         border: 3px solid transparent;
-        border-top-color: #e74c3c;
+        border-top-color: #04498a;
 
         -webkit-animation: spin 3s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
         animation: spin 3s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
@@ -253,7 +253,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
         bottom: 15px;
         border-radius: 50%;
         border: 3px solid transparent;
-        border-top-color: #f9c922;
+        border-top-color: #04498a;
 
         -webkit-animation: spin 1.5s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
           animation: spin 1.5s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
@@ -346,16 +346,6 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-	<div style="top: 170px; width: 100%; text-align: center; position: fixed; background: black;z-index:1001">
-		<h1 style="color: white">
-			${span18n["report_generating"]}
-		</h1>
-		<h1>
-			<a href="${pageContext.request.contextPath}/${flow}/${agent}/finish">
-				${span18n["back_to_final"]}
-			</a>
-		</h1>
-    </div>
 </div>
 
 <form:form id="espdform" role="form" class="form-horizontal" method="post" commandName="espd">
@@ -367,7 +357,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
 	<%-- EXCLUSION --%>
     <div class="panel-default">
 
-        <div class="paragraph">
+        <div>
             <h2>${span18n["createcaexcl_header"]}</h2>
         </div>
 
@@ -402,7 +392,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
     <div class="panel-default">
 
 
-        <div class="paragraph"><h2>${span18n['createcasel_header']}</h2></div>
+        <div><h2>${span18n['createcasel_header']}</h2></div>
         <div class="alert alert-espd-info">
             <ul class="fa-ul">
                 <li>
@@ -478,7 +468,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
 
 	<%-- FINISH --%>
 	<div class="panel-default">
-		<div class="paragraph">
+		<div>
 			<h2>
 				<span data-i18n="createcafinish_header"><s:message code="createcafinish_header"/></span>
 			</h2>

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/test.jsp

@@ -160,7 +160,7 @@
                     </ul>
                 </div>
                 <form:errors path="*" cssClass="errorContainer alert alert-danger"></form:errors>
-                <div class="paragraph"><h2>${span18n['createcasel_header']}</h2></div>
+                <div><h2>${span18n['createcasel_header']}</h2></div>
                 <div class="alert alert-espd-info">
                     <ul class="fa-ul">
                         <li>

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp

@@ -47,7 +47,7 @@
         	<tiles:putAttribute name="flow" value="${flow}"/>
             <tiles:putAttribute name="exclusion" value="true"/>
         </tiles:insertDefinition>
-        <div class="paragraph">
+        <div>
             <h2>
                 <span data-i18n="createcaexcl_header"><s:message code="createcaexcl_header"/></span>
             </h2>

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp

@@ -72,7 +72,7 @@
             </ul>
         </div>
 
-        <div class="paragraph">
+        <div>
             <h2>${span18n["createcaexcl_header"]}</h2>
         </div>
 

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp

@@ -35,7 +35,7 @@
        		<tiles:putAttribute name="flow" value="${flow}"/>
 			<tiles:putAttribute name="finish" value="true"/>
         </tiles:insertDefinition>
-		<div class="paragraph">
+		<div>
 			<h2>
 				<span data-i18n="createcafinish_header"><s:message code="createcafinish_header"/></span>
 			</h2>

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp

@@ -14,7 +14,7 @@
                 </li>
             </ul>
         </div>
-        <div class="paragraph">
+        <div>
             <h2>${span18n['createca_header']}</h2>
         </div>
         <div class="espd-panel panel panel-default">
@@ -113,7 +113,7 @@
             </div>
         </div>
         <c:if test="${agent == 'eo'}">
-            <div class="paragraph">
+            <div>
                 <h2>${span18n['createeo_header']}</h2>
             </div>
             <div class="espd-panel panel panel-default">

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp

@@ -45,7 +45,7 @@
         	<tiles:putAttribute name="flow" value="${flow}"/>
 			<tiles:putAttribute name="selection" value="true"/>
         </tiles:insertDefinition>
-        <div class="paragraph">
+        <div>
             <h2>
                 <span data-i18n="createcasel_header"><s:message code="createcasel_header"/></span>
             </h2>

espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp

@@ -71,7 +71,7 @@
             </ul>
         </div>
         <form:errors path="*" cssClass="errorContainer alert alert-danger"></form:errors>
-        <div class="paragraph"><h2>${span18n['createcasel_header']}</h2></div>
+        <div><h2>${span18n['createcasel_header']}</h2></div>
         <div class="alert alert-espd-info">
             <ul class="fa-ul">
                 <li>

espd-web/src/main/resources/i18n/messages.properties

@@ -331,7 +331,6 @@ country_ZM=Zambia
 country_ZW=Zimbabwe
 
 back_to_main=Back to main page
-back_to_final=Back to final page
 filter_header=Welcome to the ESPD service
 filter_alert=<p>European Single Procurement Document (ESPD) is a self-declaration of the businesses' financial status, abilities and suitability for a public procurement procedure. It is available in all EU languages and used as a preliminary evidence of fulfilment of the conditions required in public procurement procedures across the EU. Thanks to the ESPD, the tenderers no longer have to provide full documentary evidence and different forms previously used in the EU procurement, which means a significant simplification of access to cross-border tendering opportunities. From October 2018 onwards the ESPD shall be provided exclusively in an electronic form.</p><p>The European Commission provides a free web service for the buyers, bidders and other parties interested in filling in the ESPD electronically. The online form can be filled in, printed and then sent to the buyer together with the rest of the bid. If the procedure is run electronically, the ESPD can be exported, stored and submitted electronically. The ESPD provided in a previous public procurement procedure can be reused as long as the information remains correct. Bidders may be excluded from the procedure or be subject to prosecution if the information in the ESPD is seriously misrepresented, withheld or cannot be complemented with supporting documents.</p>
 filter_who_are_you=Who are you?
@@ -679,7 +678,6 @@ createcafinish_concl_statements_text=The undersigned formally declare that the i
 createcafinish_concl_statements_signature=Date, place and, where required or necessary, signature(s):
 place=Place
 signature=Signature
-report_generating=Generating Report
 
 #ECERTIS Link
 ecertis_404=No ECERTIS data