[galaxy-commits] commit/galaxy-central: 7 new changesets

29 Aug 2012

7 new commits in galaxy-central:


https://bitbucket.org/galaxy/galaxy-central/changeset/a76cfda22bcd/
changeset:   a76cfda22bcd
user:        dan
date:        2012-08-29 16:49:37
summary:     Unicode fixes for template selection.
affected #:  2 files

diff -r 36591da93d40a924a6276aefa49edcf8a675437c -r a76cfda22bcd50350fb4ebba00ce37b85a89bba3 templates/common/select_template.mako

--- a/templates/common/select_template.mako
+++ b/templates/common/select_template.mako
@@ -25,7 +25,7 @@
 %endif
 
 <div class="toolForm">
-    <div class="toolFormTitle">Select a template for the ${item_desc} '${item_name}'</div>
+    <div class="toolFormTitle">Select a template for the ${item_desc} '${util.unicodify( item_name )}'</div><div class="toolFormBody">
         %if form_type == trans.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE:
             <form id="select_template" name="select_template" action="${h.url_for( controller='library_common', action='add_template', cntrller=cntrller, item_type=item_type, form_type=trans.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE, library_id=library_id, folder_id=folder_id, ldda_id=ldda_id, use_panels=use_panels, show_deleted=show_deleted )}" method="post" >


diff -r 36591da93d40a924a6276aefa49edcf8a675437c -r a76cfda22bcd50350fb4ebba00ce37b85a89bba3 templates/common/template_common.mako
--- a/templates/common/template_common.mako
+++ b/templates/common/template_common.mako
@@ -63,7 +63,7 @@
                 if history_user:
                     for history in history_user.histories:
                         if not history.deleted and str( widget.value ) == str( history.id ):
-                            value = history.name
+                            value = util.unicodify( history.name )
                             break
                 else:
                     # If we didn't find the selected workflow option above, we'll just print the value
@@ -188,7 +188,7 @@
     %elif widget_fields_have_contents:
         <p/><div class="toolForm">
-            <div class="toolFormTitle">Other information about ${item.name}</div>
+            <div class="toolFormTitle">Other information about ${ util.unicodify( item.name )}</div><div class="toolFormBody">
                 %for i, field in enumerate( widgets ):
                     ${render_template_field( field )}



https://bitbucket.org/galaxy/galaxy-central/changeset/0e0f1d52e011/
changeset:   0e0f1d52e011
user:        dan
date:        2012-08-29 16:49:37
summary:     Unicode fixes for browsing libraries.
affected #:  2 files

diff -r a76cfda22bcd50350fb4ebba00ce37b85a89bba3 -r 0e0f1d52e011207f4c1a9b1b67e8359cd30b2acb templates/library/common/browse_library.mako
--- a/templates/library/common/browse_library.mako
+++ b/templates/library/common/browse_library.mako
@@ -247,14 +247,14 @@
                 %endif
                 />
                 %if simple:
-                    <label for="${trans.security.encode_id( ldda.id )}">${ldda.name}</label>
+                    <label for="${trans.security.encode_id( ldda.id )}">${ util.unicodify( ldda.name )}</label>
                 %else:
                     <div style="float: left; margin-left: 1px;" class="menubutton split popup" id="dataset-${ldda.id}-popup"><a class="view-info" href="${h.url_for( controller='library_common', action='ldda_info', cntrller=cntrller, library_id=trans.security.encode_id( library.id ), folder_id=trans.security.encode_id( folder.id ), id=trans.security.encode_id( ldda.id ), use_panels=use_panels, show_deleted=show_deleted )}">
                             %if ldda.library_dataset.deleted:
-                                <div class="libraryItem-error">${ldda.name}</div>
+                                <div class="libraryItem-error">${util.unicodify( ldda.name )}</div>
                             %else:
-                                ${ldda.name}
+                                ${util.unicodify( ldda.name )}
                             %endif     
                         </a></div>
@@ -288,7 +288,7 @@
                             %endif
                             %if can_modify:
                                 %if not library.deleted and not branch_deleted( folder ) and not ldda.library_dataset.deleted:
-                                    <a class="action-button" confirm="Click OK to delete dataset '${ldda.name}'." href="${h.url_for( controller='library_common', action='delete_library_item', cntrller=cntrller, library_id=trans.security.encode_id( library.id ), item_id=trans.security.encode_id( library_dataset.id ), item_type='library_dataset', show_deleted=show_deleted )}">Delete this dataset</a>
+                                    <a class="action-button" confirm="Click OK to delete dataset '${util.unicodify( ldda.name )}'." href="${h.url_for( controller='library_common', action='delete_library_item', cntrller=cntrller, library_id=trans.security.encode_id( library.id ), item_id=trans.security.encode_id( library_dataset.id ), item_type='library_dataset', show_deleted=show_deleted )}">Delete this dataset</a>
                                 %elif not library.deleted and not branch_deleted( folder ) and not ldda.library_dataset.purged and ldda.library_dataset.deleted:
                                     <a class="action-button" href="${h.url_for( controller='library_common', action='undelete_library_item', cntrller=cntrller, library_id=trans.security.encode_id( library.id ), item_id=trans.security.encode_id( library_dataset.id ), item_type='library_dataset', show_deleted=show_deleted )}">Undelete this dataset</a>
                                 %endif


diff -r a76cfda22bcd50350fb4ebba00ce37b85a89bba3 -r 0e0f1d52e011207f4c1a9b1b67e8359cd30b2acb templates/library/common/common.mako
--- a/templates/library/common/common.mako
+++ b/templates/library/common/common.mako
@@ -100,7 +100,7 @@
                     %if replace_dataset not in [ None, 'None' ]:
                         <input type="hidden" name="replace_id" value="${trans.security.encode_id( replace_dataset.id )}"/><div class="form-row">
-                            You are currently selecting a new file to replace '<a href="${h.url_for( controller='library_common', action='ldda_info', cntrller=cntrller, library_id=library_id, folder_id=folder_id, id=trans.security.encode_id( replace_dataset.library_dataset_dataset_association.id ) )}">${replace_dataset.name}</a>'.
+                            You are currently selecting a new file to replace '<a href="${h.url_for( controller='library_common', action='ldda_info', cntrller=cntrller, library_id=library_id, folder_id=folder_id, id=trans.security.encode_id( replace_dataset.library_dataset_dataset_association.id ) )}">${util.unicodify( replace_dataset.name )}</a>'.
                             <div style="clear: both"></div></div>
                     %endif
@@ -340,7 +340,7 @@
         </script>
     %elif upload_option == 'import_from_history':
         <div class="toolForm">
-            <div class="toolFormTitle">Active datasets in your current history (${history.name})</div>
+            <div class="toolFormTitle">Active datasets in your current history (${ util.unicodify( history.name )})</div><div class="toolFormBody">
                 %if history and history.active_datasets:
                     <form name="add_history_datasets_to_library" action="${h.url_for( controller='library_common', action='add_history_datasets_to_library', cntrller=cntrller, library_id=library_id )}" enctype="multipart/form-data" method="post">
@@ -359,7 +359,7 @@
                         %if replace_dataset not in [ None, 'None' ]:
                             <input type="hidden" name="replace_id" value="${trans.security.encode_id( replace_dataset.id )}"/><div class="form-row">
-                                You are currently selecting a new file to replace '<a href="${h.url_for( controller='library_common', action='ldda_info', cntrller=cntrller, library_id=library_id, folder_id=folder_id, id=trans.security.encode_id( replace_dataset.library_dataset_dataset_association.id ) )}">${replace_dataset.name}</a>'.
+                                You are currently selecting a new file to replace '<a href="${h.url_for( controller='library_common', action='ldda_info', cntrller=cntrller, library_id=library_id, folder_id=folder_id, id=trans.security.encode_id( replace_dataset.library_dataset_dataset_association.id ) )}">${ util.unicodify( replace_dataset.name )}</a>'.
                                 <div style="clear: both"></div></div>
                         %endif
@@ -367,7 +367,7 @@
                             <% encoded_id = trans.security.encode_id( hda.id ) %><div class="form-row"><input name="hda_ids" id="hist_${encoded_id}" value="${encoded_id}" type="checkbox"/>
-                                <label for="hist_${encoded_id}" style="display: inline;font-weight:normal;">${hda.hid}: ${hda.name}</label>
+                                <label for="hist_${encoded_id}" style="display: inline;font-weight:normal;">${hda.hid}: ${ util.unicodify( hda.name )}</label></div>
                         %endfor
                         %if widgets:



https://bitbucket.org/galaxy/galaxy-central/changeset/35cbec7cebd2/
changeset:   35cbec7cebd2
user:        dan
date:        2012-08-29 16:49:37
summary:     Unicode fixes for importing library datasets.
affected #:  1 file

diff -r 0e0f1d52e011207f4c1a9b1b67e8359cd30b2acb -r 35cbec7cebd2a4a24164b124a33a91202bbe3915 templates/library/common/import_datasets_to_histories.mako
--- a/templates/library/common/import_datasets_to_histories.mako
+++ b/templates/library/common/import_datasets_to_histories.mako
@@ -18,7 +18,7 @@
 </%def>
 
 %if message:
-    ${render_msg( message, status )}
+    ${render_msg( util.unicodify( message ), status )}
 %endif
 
 <b>Import library datasets into histories</b>
@@ -36,7 +36,7 @@
                     %><div class="form-row"><input type="checkbox" name="ldda_ids" id="dataset_${encoded_id}" value="${encoded_id}" ${checked}/>
-                        <label for="dataset_${encoded_id}" style="display: inline;font-weight:normal;">${source_ldda.name}</label>
+                        <label for="dataset_${encoded_id}" style="display: inline;font-weight:normal;">${util.unicodify( source_ldda.name )}</label></div>
                 %endfor
             %else:
@@ -62,7 +62,7 @@
                             else:
                                 current_history_text = ""
                         %>
-                        <option value="${encoded_id}"${selected_text}>${i + 1}: ${h.truncate( target_history.name, 30 )}${current_history_text}</option>
+                        <option value="${encoded_id}"${selected_text}>${i + 1}: ${h.truncate( util.unicodify( target_history.name ), 30 )}${current_history_text}</option>
                     %endfor
                 </select><br/><br/>
@@ -79,7 +79,7 @@
                     %><div class="form-row"><input type="checkbox" name="target_history_ids" id="target_history_${encoded_id}" value="${encoded_id}"/>
-                        <label for="target_history_${encoded_id}" style="display: inline; font-weight:normal;">${i + 1}: ${target_history.name}${current_history_text}</label>
+                        <label for="target_history_${encoded_id}" style="display: inline; font-weight:normal;">${i + 1}: ${util.unicodify( target_history.name )}${current_history_text}</label></div>
                 %endfor
             </div>



https://bitbucket.org/galaxy/galaxy-central/changeset/6e16daab2c88/
changeset:   6e16daab2c88
user:        dan
date:        2012-08-29 16:49:37
summary:     Unicode fixes for editing library datasets.
affected #:  1 file

diff -r 35cbec7cebd2a4a24164b124a33a91202bbe3915 -r 6e16daab2c882515633a41d1a48ce1ebbfed5b6b templates/library/common/ldda_edit_info.mako
--- a/templates/library/common/ldda_edit_info.mako
+++ b/templates/library/common/ldda_edit_info.mako
@@ -44,18 +44,18 @@
 
 %if ( trans.user_is_admin() and cntrller=='library_admin' ) or trans.app.security_agent.can_modify_library_item( current_user_roles, ldda.library_dataset ):
     <div class="toolForm">
-        <div class="toolFormTitle">Edit attributes of ${ldda.name}</div>
+        <div class="toolFormTitle">Edit attributes of ${util.unicodify( ldda.name )}</div><div class="toolFormBody"><form name="edit_attributes" action="${h.url_for( controller='library_common', action='ldda_edit_info', cntrller=cntrller, library_id=library_id, folder_id=trans.security.encode_id( ldda.library_dataset.folder.id ), use_panels=use_panels, show_deleted=show_deleted, )}" method="post"><input type="hidden" name="id" value="${trans.security.encode_id( ldda.id )}"/><div class="form-row"><label>Name:</label>
-                    <input type="text" name="name" value="${ldda.name}" size="40"/>
+                    <input type="text" name="name" value="${util.unicodify( ldda.name )}" size="40"/><div style="clear: both"></div></div><div class="form-row"><label>Info:</label>
-                    <input type="text" name="info" value="${ldda.info}" size="40"/>
+                    <input type="text" name="info" value="${util.unicodify( ldda.info )}" size="40"/><div style="clear: both"></div></div><div class="form-row">
@@ -125,16 +125,16 @@
     <p/>
 %else:
     <div class="toolForm">
-        <div class="toolFormTitle">View information about ${ldda.name}</div>
+        <div class="toolFormTitle">View information about ${util.unicodify( ldda.name )}</div><div class="toolFormBody"><div class="form-row"><label>Name:</label>
-                ${ldda.name}
+                ${util.unicodify( ldda.name )}
                 <div style="clear: both"></div></div><div class="form-row"><label>Info:</label>
-                ${ldda.info}
+                ${util.unicodify( ldda.info )}
                 <div style="clear: both"></div></div><div class="form-row">



https://bitbucket.org/galaxy/galaxy-central/changeset/2b713397767f/
changeset:   2b713397767f
user:        dan
date:        2012-08-29 16:49:38
summary:     Unicode fixes for viewing library datasets.
affected #:  2 files

diff -r 6e16daab2c882515633a41d1a48ce1ebbfed5b6b -r 2b713397767fd6552a755234ad4d8cf8aae7b439 templates/library/common/ldda_info.mako
--- a/templates/library/common/ldda_info.mako
+++ b/templates/library/common/ldda_info.mako
@@ -47,7 +47,7 @@
 
 <div class="toolForm"><div class="toolFormTitle">
-        Information about <div class="menubutton popup" id="dataset-${ldda.id}-popup">${ldda.name}</div>
+        Information about <div class="menubutton popup" id="dataset-${ldda.id}-popup">${util.unicodify( ldda.name )}</div>
         %if not library.deleted and not branch_deleted( ldda.library_dataset.folder ) and not ldda.library_dataset.deleted:
             <div popupmenu="dataset-${ldda.id}-popup">
                 %if can_modify:
@@ -119,7 +119,7 @@
         </div><div class="form-row"><label>Miscellaneous information:</label>
-            ${ldda.info}
+            ${util.unicodify( ldda.info )}
             <div style="clear: both"></div></div>
         %if ldda.creating_job_associations:
@@ -163,7 +163,7 @@
             <div class="form-row"><div id="info${ldda.id}" class="historyItemBody"><label>Peek:</label>
-                    <div><pre id="peek${ldda.id}" class="peek">${ldda.display_peek()}</pre></div>
+                    <div><pre id="peek${ldda.id}" class="peek">${util.unicodify( ldda.display_peek() )}</pre></div></div></div>
         %endif
@@ -278,10 +278,10 @@
     <% expired_lddas = [ e_ldda for e_ldda in ldda.library_dataset.expired_datasets ] %>
     %if expired_lddas:
         <br/>
-        <div class="toolFormTitle">Expired versions of ${ldda.name}</div>
+        <div class="toolFormTitle">Expired versions of ${util.unicodify( ldda.name )}</div>
         %for expired_ldda in expired_lddas:
             <div class="form-row">
-                <a href="${h.url_for( controller='library_common', action='ldda_info', cntrller=cntrller, library_id=trans.security.encode_id( library.id ), folder_id=trans.security.encode_id( expired_ldda.library_dataset.folder.id ), id=trans.security.encode_id( expired_ldda.id ), use_panels=use_panels, show_deleted=show_deleted )}">${expired_ldda.name}</a>
+                <a href="${h.url_for( controller='library_common', action='ldda_info', cntrller=cntrller, library_id=trans.security.encode_id( library.id ), folder_id=trans.security.encode_id( expired_ldda.library_dataset.folder.id ), id=trans.security.encode_id( expired_ldda.id ), use_panels=use_panels, show_deleted=show_deleted )}">${util.unicodify( expired_ldda.name )}</a></div>
         %endfor
     %endif


diff -r 6e16daab2c882515633a41d1a48ce1ebbfed5b6b -r 2b713397767fd6552a755234ad4d8cf8aae7b439 templates/library/common/library_dataset_info.mako
--- a/templates/library/common/library_dataset_info.mako
+++ b/templates/library/common/library_dataset_info.mako
@@ -25,20 +25,20 @@
 
 %if ( trans.user_is_admin() and cntrller=='library_admin' ) or trans.app.security_agent.can_modify_library_item( current_user_roles, library_dataset ):
     <div class="toolForm">
-        <div class="toolFormTitle">Edit attributes of ${library_dataset.name}</div>
+        <div class="toolFormTitle">Edit attributes of ${util.unicodify( library_dataset.name )}</div><div class="toolFormBody"><form name="edit_attributes" action="${h.url_for( controller='library_common', action='library_dataset_info', id=trans.security.encode_id( library_dataset.id ), library_id=library_id, show_deleted=show_deleted )}" method="post"><div class="form-row"><label>Name:</label><div style="float: left; width: 250px; margin-right: 10px;">
-                        <input type="text" name="name" value="${library_dataset.name}" size="40"/>
+                        <input type="text" name="name" value="${util.unicodify( library_dataset.name )}" size="40"/></div><div style="clear: both"></div></div><div class="form-row"><label>Info:</label><div style="float: left; width: 250px; margin-right: 10px;">
-                        <input type="text" name="info" value="${library_dataset.info}" size="40"/>
+                        <input type="text" name="info" value="${util.unicodify( library_dataset.info )}" size="40"/></div><div style="clear: both"></div></div> 
@@ -50,12 +50,12 @@
     </div>
 %else:
     <div class="toolForm">
-        <div class="toolFormTitle">View information about ${library_dataset.name}</div>
+        <div class="toolFormTitle">View information about ${util.unicodify( library_dataset.name )}</div><div class="toolFormBody"><div class="form-row">
-                <b>Name:</b> ${library_dataset.name}
+                <b>Name:</b> ${util.unicodify( library_dataset.name )}
                 <div style="clear: both"></div>
-                <b>Info:</b> ${library_dataset.info}
+                <b>Info:</b> ${util.unicodify( library_dataset.info )}
                 <div style="clear: both"></div><b>Dataset Versions:</b><div style="clear: both"></div>



https://bitbucket.org/galaxy/galaxy-central/changeset/e2902ab09446/
changeset:   e2902ab09446
user:        dan
date:        2012-08-29 16:49:38
summary:     Unicode fixes for editing library permissions.
affected #:  1 file

diff -r 2b713397767fd6552a755234ad4d8cf8aae7b439 -r e2902ab094466c3591bacde61233d9da186c74a3 templates/library/common/ldda_permissions.mako
--- a/templates/library/common/ldda_permissions.mako
+++ b/templates/library/common/ldda_permissions.mako
@@ -7,7 +7,7 @@
         name_str = '%d selected datasets' % len( lddas )
     else:
         ldda = lddas[0]
-        name_str = ldda.name
+        name_str = util.unicodify( ldda.name )
 %><br/><br/>



https://bitbucket.org/galaxy/galaxy-central/changeset/cc1c82662d88/
changeset:   cc1c82662d88
user:        dan
date:        2012-08-29 16:49:38
summary:     Unicode fixes for moving library datasets.
affected #:  1 file

diff -r e2902ab094466c3591bacde61233d9da186c74a3 -r cc1c82662d88e0953d8df588d6449020eb25d0bf templates/library/common/move_library_item.mako
--- a/templates/library/common/move_library_item.mako
+++ b/templates/library/common/move_library_item.mako
@@ -45,7 +45,7 @@
                     %><div class="form-row"><input type="checkbox" name="item_id" id="dataset_${encoded_id}" value="${encoded_id}" ${checked}/>
-                        <label for="dataset_${encoded_id}" style="display: inline;font-weight:normal;">${move_ldda.name}</label>
+                        <label for="dataset_${encoded_id}" style="display: inline;font-weight:normal;">${util.unicodify( move_ldda.name )}</label></div>
                 %endfor
             %elif item_type == 'folder':

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

    

[galaxy-commits] commit/galaxy-central: 7 new changesets

Bitbucket