Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

2 files changed, 24 insertions, 1 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 8abf23289..b5f4f1a79 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -102,6 +102,18 @@ function init_shortcut_fields(){
                load_shortcut_menu
         );
     });
+    $("#current_treatment").change(function(){
+        $.post('/' + url_path + 'update-current-item/',
+               {item:'treatment', value:$("#current_treatment").val()},
+               load_shortcut_menu
+        );
+    });
+    $("#current_treatmentfile").change(function(){
+        $.post('/' + url_path + 'update-current-item/',
+               {item:'treatmentfile', value:$("#current_treatmentfile").val()},
+               load_shortcut_menu
+        );
+    });
 }
 
 function init_advanced_shortcut_fields(){
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 00fed380d..b1939eaf0 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -60,6 +60,10 @@ a.add-button,
     color:#000;
 }
 
+#context_menu .blue {
+    color:#00a8ff;
+}
+
 .chosen-container,
 #context_menu .green,
 #context_menu .red,
@@ -272,7 +276,9 @@ button.ui-widget-header:hover {
 .chosen-container-single .chosen-single{
     background: none;
     background-color: #fff;
-    border-radius:4px;
+    border-radius: 0;
+    box-shadow: none;
+    border: 1px solid #fff;
 }
 
 textarea,
@@ -847,6 +853,11 @@ ul.form .help_text{
 
 .autocomplete{
     width:350px;
+    font-size: 13px;
+}
+
+#current_items .autocomplete{
+    width:400px;
 }
 
 .delete td{