commit/galaxy-central: 4 new changesets

11 Oct 2012

4 new commits in galaxy-central:


https://bitbucket.org/galaxy/galaxy-central/changeset/d2258c1bcbc9/
changeset:   d2258c1bcbc9
user:        dan
date:        2012-10-11 22:36:45
summary:     Unicode fixes for copying datasets.
affected #:  1 file

diff -r 7549962ac83381ab92ac806b168d45b0b4b9a107 -r d2258c1bcbc9344dc376c11fceeec039b1b23709 templates/dataset/copy_view.mako

--- a/templates/dataset/copy_view.mako
+++ b/templates/dataset/copy_view.mako
@@ -57,7 +57,7 @@
                             
                         %><option value="${trans.security.encode_id(hist.id)}" ${selected}>
-                            ${i + 1}: ${h.truncate(hist.name, 30)}${current_history_text}
+                            ${i + 1}: ${h.truncate(util.unicodify( hist.name ), 30)}${current_history_text}
                         </option>
                     %endfor
                 </select>
@@ -98,7 +98,7 @@
                                 if encoded_id == target_history_id:
                                     selected = " selected='selected'"
                             %>
-                            <option value="${encoded_id}"${selected}>${i + 1}: ${h.truncate(hist.name, 30)}${source_history_text}</option>
+                            <option value="${encoded_id}"${selected}>${i + 1}: ${h.truncate( util.unicodify( hist.name ), 30)}${source_history_text}</option>
                         %endfor
                     </select><br /><br /><a style="margin-left: 10px;" href="javascript:void(0);" id="select-multiple">Choose multiple histories</a>
@@ -113,7 +113,7 @@
                         %><div class="form-row"><input type="checkbox" name="target_history_ids" id="hist_${encoded_id}" value="${encoded_id}"/>
-                            <label for="hist_${encoded_id}" style="display: inline; font-weight:normal;">${i + 1}: ${hist.name}${cur_history_text}</label>
+                            <label for="hist_${encoded_id}" style="display: inline; font-weight:normal;">${i + 1}: ${ util.unicodify( hist.name ) }${cur_history_text}</label></div>
                     %endfor
                 </div>



https://bitbucket.org/galaxy/galaxy-central/changeset/6ef979d7cab5/
changeset:   6ef979d7cab5
user:        dan
date:        2012-10-11 22:36:45
summary:     Unicode fixes for Galaxy Forms.
affected #:  1 file

diff -r d2258c1bcbc9344dc376c11fceeec039b1b23709 -r 6ef979d7cab519ceef3727a069a55ec7c5a8c21f templates/form.mako
--- a/templates/form.mako
+++ b/templates/form.mako
@@ -53,7 +53,7 @@
     %endif
     
     <div class="form" style="margin: 1em">
-        <div class="form-title">${form.title}</div>
+        <div class="form-title">${util.unicodify( form.title )}</div><div class="form-body"><%
             has_file_input = False



https://bitbucket.org/galaxy/galaxy-central/changeset/5f67671bafdf/
changeset:   5f67671bafdf
user:        dan
date:        2012-10-11 22:36:45
summary:     Unicode fixes for sharing histories.
affected #:  1 file

diff -r 6ef979d7cab519ceef3727a069a55ec7c5a8c21f -r 5f67671bafdfb3fa4986f1059035bbf177f586f8 templates/history/share.mako
--- a/templates/history/share.mako
+++ b/templates/history/share.mako
@@ -20,7 +20,7 @@
                                 <tr><td><input type="hidden" name="id" value="${trans.security.encode_id( history.id )}">
-                                        ${history.name}
+                                        ${ util.unicodify( history.name )}
                                     </td><td>
                                         %if len( history.datasets ) < 1:
@@ -81,7 +81,7 @@
                         %for history, hdas in no_change_needed.items():
                             <div class="form-row"><label>History</label>
-                                ${history.name}
+                                ${util.unicodify( history.name )}
                             </div><div style="clear: both"></div><div class="form-row">
@@ -89,7 +89,7 @@
                             </div>
                             %for hda in hdas:
                                 <div class="form-row">
-                                    ${hda.name}
+                                    ${util.unicodify( hda.name )}
                                     %if hda.deleted:
                                         (deleted)
                                     %endif
@@ -108,7 +108,7 @@
                         %for history, hdas in can_change.items():
                             <div class="form-row"><label>History</label>
-                                ${history.name}
+                                ${util.unicodify( history.name )}
                             </div><div style="clear: both"></div><div class="form-row">
@@ -116,7 +116,7 @@
                             </div>
                             %for hda in hdas:
                                 <div class="form-row">
-                                    ${hda.name}
+                                    ${util.unicodify( hda.name )}
                                     %if hda.deleted:
                                         (deleted)
                                     %endif
@@ -136,7 +136,7 @@
                         %for history, hdas in cannot_change.items():
                             <div class="form-row"><label>History</label>
-                                ${history.name}
+                                ${util.unicodify( history.name )}
                             </div><div style="clear: both"></div><div class="form-row">
@@ -144,7 +144,7 @@
                             </div>
                             %for hda in hdas:
                                 <div class="form-row">
-                                    ${hda.name}
+                                    ${util.unicodify( hda.name )}
                                     %if hda.deleted:
                                         (deleted)
                                     %endif



https://bitbucket.org/galaxy/galaxy-central/changeset/26a72076eb75/
changeset:   26a72076eb75
user:        dan
date:        2012-10-11 22:36:46
summary:     Unicode fixes for workflow configuration menu.
affected #:  1 file

diff -r 5f67671bafdfb3fa4986f1059035bbf177f586f8 -r 26a72076eb75683e1fe1dca95e1a356f501d9393 templates/workflow/configure_menu.mako
--- a/templates/workflow/configure_menu.mako
+++ b/templates/workflow/configure_menu.mako
@@ -31,7 +31,7 @@
         %for i, workflow in enumerate( workflows ):
             <tr><td>
-                    ${workflow.name}
+                    ${util.unicodify( workflow.name )}
                 </td><td>You</td><td>${len(workflow.latest_workflow.steps)}</td>
@@ -53,7 +53,7 @@
             <% workflow = association.stored_workflow %><tr><td>
-                    ${workflow.name}
+                    ${util.unicodify( workflow.name )}
                 </td><td>${workflow.user.email}</td><td>${len(workflow.latest_workflow.steps)}</td>

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.

    

Bitbucket

tags

participants (1)