From greg@bx.psu.edu Fri Dec 11 13:08:41 2009
From: Greg Von Kuster <greg@bx.psu.edu>
To: galaxy-dev@lists.galaxyproject.org
Subject: [galaxy-dev] [hg] galaxy 3172: Replace dbkey select boxes in	library
 interfac...
Date: Fri, 11 Dec 2009 13:08:13 -0500
Message-ID: <hg.ab7877640903.1260554893.-331200333@basie.bx.psu.edu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0637165336186333790=="

--===============0637165336186333790==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

details:   http://www.bx.psu.edu/hg/galaxy/rev/ab7877640903
changeset: 3172:ab7877640903
user:      jeremy goecks <jeremy.goecks(a)emory.edu>
date:      Thu Dec 10 15:37:00 2009 -0500
description:
Replace dbkey select boxes in library interface with search+select boxes.

diffstat:

 templates/admin/library/ldda_edit_info.mako   |  17 +++++++++++++++++
 templates/admin/library/upload.mako           |  10 ++++++++++
 templates/library/ldda_edit_info.mako         |  17 +++++++++++++++++
 templates/library/library_dataset_common.mako |   7 +++++++
 templates/library/upload.mako                 |  10 ++++++++++
 templates/tool_form.mako                      |   7 ++-----
 6 files changed, 63 insertions(+), 5 deletions(-)

diffs (128 lines):

diff -r 97226da136bf -r ab7877640903 templates/admin/library/ldda_edit_info.m=
ako
--- a/templates/admin/library/ldda_edit_info.mako	Thu Dec 10 14:44:05 2009 -0=
500
+++ b/templates/admin/library/ldda_edit_info.mako	Thu Dec 10 15:37:00 2009 -0=
500
@@ -3,6 +3,23 @@
 <%namespace file=3D"/admin/library/common.mako" import=3D"render_template_in=
fo" />
 <% from galaxy import util %>
=20
+<%def name=3D"javascripts()">
+   ${parent.javascripts()}
+   ${h.js("jquery.autocomplete", "autocomplete_tagging" )}
+    ## Script to replace dbkey select with select+search.
+   <script type=3D"text/javascript">
+       // Replace dbkey select with search+select.
+       jQuery(document).ready( function() {
+           replace_dbkey_select();
+       });
+   </script>
+</%def>
+
+<%def name=3D"stylesheets()">
+    ${parent.stylesheets()}
+    ${h.css( "autocomplete_tagging" )}
+</%def>
+
 %if ldda =3D=3D ldda.library_dataset.library_dataset_dataset_association:
     <b><i>This is the latest version of this library dataset</i></b>
 %else:
diff -r 97226da136bf -r ab7877640903 templates/admin/library/upload.mako
--- a/templates/admin/library/upload.mako	Thu Dec 10 14:44:05 2009 -0500
+++ b/templates/admin/library/upload.mako	Thu Dec 10 15:37:00 2009 -0500
@@ -11,6 +11,16 @@
         replace_id =3D 'None'
 %>
=20
+<%def name=3D"javascripts()">
+   ${parent.javascripts()}
+   ${h.js("jquery.autocomplete", "autocomplete_tagging" )}
+</%def>
+
+<%def name=3D"stylesheets()">
+    ${parent.stylesheets()}
+    ${h.css( "autocomplete_tagging" )}
+</%def>
+
 <b>Create new data library datasets</b>
 %if replace_dataset in [ None, 'None' ]:
     ## Don't allow multiple datasets to be uploaded when replacing a dataset=
 with a new version
diff -r 97226da136bf -r ab7877640903 templates/library/ldda_edit_info.mako
--- a/templates/library/ldda_edit_info.mako	Thu Dec 10 14:44:05 2009 -0500
+++ b/templates/library/ldda_edit_info.mako	Thu Dec 10 15:37:00 2009 -0500
@@ -3,6 +3,23 @@
 <%namespace file=3D"/library/common.mako" import=3D"render_template_info" />
 <% from galaxy import util %>
=20
+<%def name=3D"javascripts()">
+   ${parent.javascripts()}
+   ${h.js("jquery.autocomplete", "autocomplete_tagging" )}
+    ## Script to replace dbkey select with select+search.
+   <script type=3D"text/javascript">
+       // Replace dbkey select with search+select.
+       jQuery(document).ready( function() {
+           replace_dbkey_select();
+       });
+   </script>
+</%def>
+
+<%def name=3D"stylesheets()">
+    ${parent.stylesheets()}
+    ${h.css( "autocomplete_tagging" )}
+</%def>
+
 <% user, roles =3D trans.get_user_and_roles() %>
=20
 %if ldda =3D=3D ldda.library_dataset.library_dataset_dataset_association:
diff -r 97226da136bf -r ab7877640903 templates/library/library_dataset_common=
.mako
--- a/templates/library/library_dataset_common.mako	Thu Dec 10 14:44:05 2009 =
-0500
+++ b/templates/library/library_dataset_common.mako	Thu Dec 10 15:37:00 2009 =
-0500
@@ -223,6 +223,13 @@
                 </form>
             </div>
         </div>
+        ## Script to replace dbkey select with select+search.
+        <script type=3D"text/javascript">
+            // Replace dbkey select with search+select.
+            jQuery(document).ready( function() {
+                replace_dbkey_select();
+            });
+        </script>
     %elif upload_option =3D=3D 'import_from_history':
         <div class=3D"toolForm">
             <div class=3D"toolFormTitle">Active datasets in your current his=
tory (${history.name})</div>
diff -r 97226da136bf -r ab7877640903 templates/library/upload.mako
--- a/templates/library/upload.mako	Thu Dec 10 14:44:05 2009 -0500
+++ b/templates/library/upload.mako	Thu Dec 10 15:37:00 2009 -0500
@@ -11,6 +11,16 @@
         replace_id =3D 'None'
 %>
=20
+<%def name=3D"javascripts()">
+   ${parent.javascripts()}
+   ${h.js("jquery.autocomplete", "autocomplete_tagging" )}
+</%def>
+
+<%def name=3D"stylesheets()">
+    ${parent.stylesheets()}
+    ${h.css( "autocomplete_tagging" )}
+</%def>
+
 <b>Create new data library datasets</b>
 %if replace_dataset in [ None, 'None' ]:
     ## Don't allow multiple datasets to be uploaded when replacing a dataset=
 with a new version
diff -r 97226da136bf -r ab7877640903 templates/tool_form.mako
--- a/templates/tool_form.mako	Thu Dec 10 14:44:05 2009 -0500
+++ b/templates/tool_form.mako	Thu Dec 10 15:37:00 2009 -0500
@@ -50,11 +50,8 @@
         }
     });
    =20
-    var cur_value =3D null;
-    var select_elt =3D $('select[name=3Ddbkey]');
-    if (select_elt.length !=3D 0)
-        cur_value =3D select_elt.attr('last_selected_value');
-    replace_dbkey_select(cur_value);
+    // Replace dbkey select with search+select.
+    replace_dbkey_select();
 });
 %if not add_frame.debug:
     if( window.name !=3D "galaxy_main" ) {

--===============0637165336186333790==--