3 files changed, 33 insertions, 3 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index c50d050ef..9af5cf2b0 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -41,6 +41,16 @@ $(document).ready(function(){
                {item:'operation', value:$("#current_operation").val()}
         );
     });
+    $("#current_contextrecord").change(function(){
+        $.post('/' + url_path + 'update-current-item/',
+               {item:'contextrecord', value:$("#current_contextrecord").val()}
+        );
+    });
+    $("#current_find").change(function(){
+        $.post('/' + url_path + 'update-current-item/',
+               {item:'find', value:$("#current_find").val()}
+        );
+    });
     if ($(document).height() < 1.5*$(window).height()){
         $('#to_bottom_arrow').hide();
         $('#to_top_arrow').hide();
@@ -177,3 +187,11 @@ function closeAllWindows(){
     jQuery("#window > div").hide("slow");
     jQuery("#window").html("");
 }
+
+function show_hide_flex(id){
+    if ($(id).is(':hidden')){
+        $(id).css('display', 'flex');
+    } else {
+        $(id).hide();
+    }
+}
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 2a0079706..4467a0639 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -167,7 +167,7 @@ button, input[type=submit], button.submit{
     border:1px solid #FFF;
     margin:6px;
     font-size:0.9em;
-    padding:4px 3px;
+    padding:4px 8px;
     border-radius:4px;
     -moz-border-radius:4px;
     -webkit-border-radius:4px;
@@ -179,6 +179,18 @@ button:hover, input[type=submit]:hover{
     border:1px solid #922;
 }
 
+button.ui-widget-header {
+    font-weight: normal;
+    border:1px solid #f8b950;
+    background: #f8b950;
+}
+
+button.ui-widget-header:hover {
+    color:#fff;
+    border:1px solid #f8b950;
+    background: #f8b950;
+}
+
 textarea,
 input[type=text],
 input[type=password],
@@ -204,7 +216,7 @@ input[role=textbox]:focus{
     border:1px solid #D14;
 }
 
-.hidden{
+ul.form-flex.hidden, .hidden{
     display:none;
 }
 
@@ -266,7 +278,7 @@ div#validation-bar.big{
 }
 
 a.button{
-    padding:0.5em;
+    padding: 8px;
 }
 
 #reset_wizards{
diff --git a/ishtar_common/static/template.odt b/ishtar_common/static/template.odt
index d1d0515bf..87b578800 100644
--- a/ishtar_common/static/template.odt
+++ b/ishtar_common/static/template.odt