From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 16 Apr 2015 13:46:13 +0000 (+0200)
Subject: merged conflict
X-Git-Tag: myslice-1.3~37^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fb1ea43f186744db9556901259836b0d69e91336;hp=7bc456148732fab9970fa1bda20d4906f0b0cb07;p=unfold.git

merged conflict
---

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 6fe0fb3b..5d05b480 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -44,8 +44,7 @@
              
                 <div id="home-project-tree"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
             </div>
-            
-            
+                        
             <div class="experiment-tools">
                 <h4 title="Some tools do their own slice creation and management.">Experiment now</h4>
                 
@@ -164,7 +163,6 @@
 		
     });
 </script>
-<link rel='stylesheet' href='https://authority.ilabt.iminds.be/js/jquery/jquery-ui.css' />
 <script src='https://authority.ilabt.iminds.be/js/jquery/jquery-ui.min.js'></script>
 <script src="//java.com/js/dtjava.js"></script>
 <script src='https://authority.ilabt.iminds.be/js/jfed_webstart_f4fportal.js'></script>
diff --git a/portal/templates/fed4fire/fed4fire_slicerequest_view.html b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
index 15fad97c..7e9ee0b4 100644
--- a/portal/templates/fed4fire/fed4fire_slicerequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
@@ -65,7 +65,7 @@ jQuery(document).ready(function(){
                     $("#authority_hrn").val("");
                 }
         }
-    });
+    }).bind('focus', function(){ $(this).autocomplete("search"); } );
 });
 
 /*function draw_projects(authority_hrn){