10 files changed, 77 insertions, 34 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index e5fbb4a96..82d6cb684 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -142,7 +142,7 @@ class PersonOrgaForm(forms.Form):
 
     def _media(self):
         if self.status == 'corporation':
-            return forms.Media(js=('pdl/JQueryCorporation.js',))
+            return forms.Media(js=('js/JQueryCorporation.js',))
     media = property(_media)
 
     def __init__(self, *args, **kwargs):
diff --git a/example_project/settings.py b/example_project/settings.py
index 1b0f6baea..8769c3974 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -148,7 +148,6 @@ INSTALLED_APPS = [
     'django.contrib.humanize',
     'registration',
     # 'geodjangofla',
-    'ishtar_pdl',
     'ishtar_common',
     'archaeological_files_pdl',
     'archaeological_files',
diff --git a/ishtar_pdl/static/pdl/JQueryCorporation.js b/ishtar_common/static/js/JQueryCorporation.js
index e65001506..e65001506 100644
--- a/ishtar_pdl/static/pdl/JQueryCorporation.js
+++ b/ishtar_common/static/js/JQueryCorporation.js
diff --git a/ishtar_common/static/media/styles.css b/ishtar_common/static/media/styles.css
index 9722ed9fd..23217b791 100644
--- a/ishtar_common/static/media/styles.css
+++ b/ishtar_common/static/media/styles.css
@@ -22,3 +22,21 @@
 #message span{
     padding: 0 1em;
 }
+
+div#footer{
+    position: fixed;
+    bottom: 0px;
+    width: 100%;
+    left: 0px;
+    z-index: 101;
+}
+
+div#validation-bar{
+    padding: 5px 0;
+}
+
+div#foot{
+    font-size: 0.75em;
+    text-align: center;
+    padding: 0.2em;
+}
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 5a61d72e9..56469ef34 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -40,7 +40,6 @@
     <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css?ver={{VERSION}}">
     <link rel="stylesheet" href="{{STATIC_URL}}media/styles.css?ver={{VERSION}}">
     {% for url_css in JQGRID_CSS %}<link rel="stylesheet" href="{{url_css}}?ver={{VERSION}}">{% endfor %}
-    <link rel="stylesheet" href="{{STATIC_URL}}pdl/styles.css?ver={{VERSION}}" />
     {% endcompress %}
     {% block extra_head %}
     {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/validation_bar.html b/ishtar_common/templates/ishtar/wizard/validation_bar.html
index b99b9e689..c6856aa75 100644
--- a/ishtar_common/templates/ishtar/wizard/validation_bar.html
+++ b/ishtar_common/templates/ishtar/wizard/validation_bar.html
@@ -1,8 +1,24 @@
 {% load i18n %}
-<div id='validation-bar'>
-    <input type="submit" id="submit_form" name='validate' value="{% trans 'Validate' %}"/>
+<div id='validation-bar' class="row text-center">
+    <div class="col-sm">
+        <button type="submit" id="submit_form" name='validate'
+                value="validate" class="btn btn-primary">
+            {% trans 'Validate' %}
+        </button>
+    </div>
     {% if last_step_is_available and next_steps %}
-    <input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans 'Validate and end' %}"/>
+    <div class="col-sm">
+        <button type="submit" id="submit_end_form" name='validate_and_end'
+            value="validate_and_end" class="btn btn-primary">
+            {% trans 'Validate and end' %}
+        </button>
+    </div>
     {% endif %}
-    <a href="{% url 'reset_wizards' %}" id="reset_wizards" class='button'>{% trans "Cancel" %}</a>
+    <div class="col-sm">
+        <a href="{% url 'reset_wizards' %}" id="reset_wizards">
+            <button type="button" class="btn btn-secondary">
+                {% trans "Cancel" %}
+            </button>
+        </a>
+    </div>
 </div>
diff --git a/ishtar_pdl/__init__.py b/ishtar_pdl/__init__.py
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/ishtar_pdl/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/ishtar_pdl/models.py b/ishtar_pdl/models.py
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/ishtar_pdl/models.py
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/ishtar_pdl/static/pdl/styles.css b/ishtar_pdl/static/pdl/styles.css
deleted file mode 100644
index b35d0ade2..000000000
--- a/ishtar_pdl/static/pdl/styles.css
+++ /dev/null
@@ -1,25 +0,0 @@
-div#footer{
-    position: fixed;
-    bottom: 0px;
-    background-color: #CCC;
-    width: 100%;
-    left: 0px;
-    z-index: 101;
-}
-
-div#validation-bar{
-    padding-top: 5px;
-    margin-bottom: 7px;
-}
-
-div#foot{
-    font-size: 0.75em;
-    text-align: center;
-    background-color: #bbb;
-    padding: 0.2em;
-}
-
-#reset_wizards{
-    right:50px;
-    position:absolute;
-}
diff --git a/scss/custom.scss b/scss/custom.scss
index 6269937de..761d03f4a 100644
--- a/scss/custom.scss
+++ b/scss/custom.scss
@@ -3,6 +3,18 @@
 @import "bootstrap-src/scss/bootstrap";
 
 $action-color: #ffe484;
+$action-button-color: darken($action-color, 20%);
+$ishtar-color: darken($purple, 20%);
+$ishtar-secondary-color: lighten($purple, 10%);
+
+.container{
+    margin-top: 1em;
+    margin-bottom: 5em;
+}
+
+.bg-dark{
+    background-color: $ishtar-color !important;
+}
 
 .navbar{
     padding: 0 0.5rem;
@@ -17,6 +29,32 @@ $action-color: #ffe484;
     color: $navbar-dark-color;
 }
 
+div#validation-bar{
+    background-color: $ishtar-secondary-color;
+    color: $navbar-dark-color;
+}
+
+div#validation-bar .btn-primary{
+    background-color: $action-button-color;
+    border-color: $action-button-color;
+    color: $black;
+}
+
+div#validation-bar .btn-primary:hover{
+    background-color: $action-color;
+    border-color: $action-color;
+    color: $black;
+}
+
+div#validation-bar button:hover{
+    cursor: pointer;
+}
+
+div#foot{
+    background-color: $ishtar-color;
+    color: $navbar-dark-color;
+}
+
 /*
 // required
 @import "bootstrap-src/scss/functions";