2 files changed, 113 insertions, 12 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index f469fc546..4d82cb238 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -108,6 +108,28 @@ $(document).on("click", '#progress-content', function(){
     $('#progress').hide();
 });
 
+function long_wait(){
+    $('#progress').addClass('long');
+    $('#progress').show();
+    $('.progress-1').show('slow');
+    setTimeout(function(){
+        $('.progress-1').hide('slow');
+        $('.progress-2').show('slow');
+    }, 60000);
+    setTimeout(function(){
+        $('.progress-2').hide('slow');
+        $('.progress-3').show('slow');
+    }, 120000);
+    setTimeout(function(){
+        $('.progress-3').hide('slow');
+        $('.progress-4').show('slow');
+    }, 180000);
+    setTimeout(function(){
+        $('.progress-4').hide('slow');
+        long_wait();
+    }, 240000);
+}
+
 var last_window;
 
 function load_window(url, speed, on_success){
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 69f86784b..02f4d930b 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -710,7 +710,7 @@ ul.form .help_text{
 }
 
 .autocomplete{
-    width:300px;
+    width:350px;
 }
 
 .delete td{
@@ -843,7 +843,7 @@ a.photo{
 .dashboard > div{
     background: #FFF;
     text-align:left;
-    padding-bottom:10px;
+    padding:10px;
     border:1px solid #CCC;
     border-top-left-radius: 0;
     border-top-right-radius: 0;
@@ -854,16 +854,12 @@ a.photo{
     width:762px;
     background-color:#922;
     color:#FFF;
-    padding:0;
+    padding:10px;
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
 }
 
-.dashboard h4{
-    font-weight:normal;
-    color:#D14;
-}
-.dashboard h4, .dashboard p{
+.dashboard p{
     margin:0;
     padding:0 10px;
 }
@@ -946,10 +942,6 @@ a.photo{
     border:1px solid #f1f2f6;
 }
 
-#window table td.string, .dashboard table.resume td.string{
-    text-align:left;
-}
-
 #window table td.ref, .dashboard table.resume td.ref{
     text-align:left;
     white-space:nowrap;
@@ -1037,17 +1029,24 @@ table td.item-list span{
     border-top-right-radius: 8px;
 }
 
+.dashboard label,
 #window label{
     display:inline-table;
     font-weight:bold;
     width:245px;
 }
 
+.dashboard span.value,
 #window span.value{
     display:inline-table;
     width:465px;
 }
 
+.dashboard span.value.numeric{
+    text-align: right;
+    width:80px;
+}
+
 #window ul.form-flex span.value {
     display: inline-table;
     width: 230px;
@@ -1200,6 +1199,27 @@ input.widget-oa{
     padding:10px;
 }
 
+#progress.long #progress-content{
+    background-position:center 20px;
+    width:130px;
+    height: auto;
+    padding-top: 60px;
+}
+
+#progress-content p{
+    display: none;
+    padding: 0;
+    margin: 0;
+}
+
+#progress.long #progress-content p{
+    display: block;
+}
+
+#progress.long #progress-content p.progress-detail{
+    display: none;
+}
+
 #merge-table{
     background-color:#fff;
     width:700px;
@@ -1255,3 +1275,62 @@ table.table-form td {
 table.table-form td input{
     border-color:#922;
 }
+
+.clean-table {
+  margin: 10px 0 10px 0;
+  width: 100%;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+}
+
+.clean-table h4{
+    color: #922;
+    font-size: 1.2em;
+    padding:0.3em;
+    margin:0;
+    text-align: center;
+}
+
+.clean-table-wrap{
+  overflow: auto;
+}
+
+.clean-table table{
+  width: 100%;
+  border-collapse: collapse;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.clean-table tr {
+  padding: 8px 0;
+  background: #f6f6f6;
+}
+
+.clean-table tr:nth-of-type(odd) {
+  background: #e9e9e9;
+}
+
+.clean-table tr th {
+  font-weight: 900;
+  color: #ffffff;
+  background: #DA2D2D;
+  text-align: center;
+  padding: 0.2em 0.4em;
+}
+
+.clean-table tr th.sub {
+  background: #E65C5C;
+}
+
+.clean-table td{
+  text-align: right;
+  padding: 6px 12px;
+  box-shadow: 1px 0px 0px 0px rgba(90, 90, 90, 0.2);
+}
+
+.mini-table{
+    height: 400px;
+    overflow: auto;
+    display: block;
+}
+