commit/galaxy-central: 2 new changesets

20 Mar 2013

2 new commits in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/765739078002/
changeset:   765739078002
branch:      next-stable
user:        jgoecks
date:        2013-03-20 18:18:13
summary:     Simplify help text for eye icon.
affected #:  4 files

diff -r 6a80f6558febba87a6e32b9533256543597e8d30 -r 765739078002bc1ea5b1384a605b810e9a0bc640 static/scripts/mvc/dataset/hda-base.js

--- a/static/scripts/mvc/dataset/hda-base.js
+++ b/static/scripts/mvc/dataset/hda-base.js
@@ -219,7 +219,7 @@
             displayBtnData.title = _l( 'Cannot display datasets removed from disk' );
             
         } else {
-            displayBtnData.title = _l( 'Display data in browser' );
+            displayBtnData.title = _l( 'View data' );
             displayBtnData.href  = this.urls.display;
         }
 

diff -r 6a80f6558febba87a6e32b9533256543597e8d30 -r 765739078002bc1ea5b1384a605b810e9a0bc640 templates/webapps/galaxy/root/alternate_history.mako
--- a/templates/webapps/galaxy/root/alternate_history.mako
+++ b/templates/webapps/galaxy/root/alternate_history.mako
@@ -28,7 +28,7 @@
         ##    "You are over your disk ...w your allocated quota.",
         ##    "Show deleted",
         ##    "Show hidden",
-        ##    "Display data in browser",
+        ##    "View data",
         ##    "Edit Attributes",
         ##    "Download",
         ##    "View details",
@@ -60,7 +60,7 @@
             # from history_common.mako
             'Download',
             'Display Data',
-            'Display data in browser',
+            'View data',
             'Edit attributes',
             'Delete',
             'Job is waiting to run',

diff -r 6a80f6558febba87a6e32b9533256543597e8d30 -r 765739078002bc1ea5b1384a605b810e9a0bc640 templates/webapps/galaxy/root/history_common.mako
--- a/templates/webapps/galaxy/root/history_common.mako
+++ b/templates/webapps/galaxy/root/history_common.mako
@@ -98,7 +98,7 @@
                 %if data.purged:
                     <span class="icon-button display_disabled tooltip" title="Cannot display datasets removed from disk"></span>
                 %else:
-                    <a class="icon-button display tooltip" dataset_id="${dataset_id}" title='${_("Display data in browser")}' href="${display_url}"
+                    <a class="icon-button display tooltip" dataset_id="${dataset_id}" title='${_("View data")}' href="${display_url}"
                     %if for_editing:
                         target="galaxy_main"
                     %endif

diff -r 6a80f6558febba87a6e32b9533256543597e8d30 -r 765739078002bc1ea5b1384a605b810e9a0bc640 test/casperjs/modules/historypanel.js
--- a/test/casperjs/modules/historypanel.js
+++ b/test/casperjs/modules/historypanel.js
@@ -305,7 +305,7 @@
         hda : {
             ok: {
                 tooltips : {
-                    displayButton  : 'Display data in browser',
+                    displayButton  : 'View data',
                     editAttrButton : 'Edit Attributes',
                     deleteButton   : 'Delete'
                 },


https://bitbucket.org/galaxy/galaxy-central/commits/fde3df1cfee9/
changeset:   fde3df1cfee9
user:        jgoecks
date:        2013-03-20 18:22:43
summary:     Merge in next-stable.
affected #:  4 files

diff -r 3b437901dab6efd84478a74c856206dfb96a7f81 -r fde3df1cfee9e7fdf09ac4ad5e02e47623fb3eab static/scripts/mvc/dataset/hda-base.js
--- a/static/scripts/mvc/dataset/hda-base.js
+++ b/static/scripts/mvc/dataset/hda-base.js
@@ -219,7 +219,7 @@
             displayBtnData.title = _l( 'Cannot display datasets removed from disk' );
             
         } else {
-            displayBtnData.title = _l( 'Display data in browser' );
+            displayBtnData.title = _l( 'View data' );
             displayBtnData.href  = this.urls.display;
         }
 

diff -r 3b437901dab6efd84478a74c856206dfb96a7f81 -r fde3df1cfee9e7fdf09ac4ad5e02e47623fb3eab templates/webapps/galaxy/root/alternate_history.mako
--- a/templates/webapps/galaxy/root/alternate_history.mako
+++ b/templates/webapps/galaxy/root/alternate_history.mako
@@ -28,7 +28,7 @@
         ##    "You are over your disk ...w your allocated quota.",
         ##    "Show deleted",
         ##    "Show hidden",
-        ##    "Display data in browser",
+        ##    "View data",
         ##    "Edit Attributes",
         ##    "Download",
         ##    "View details",
@@ -60,7 +60,7 @@
             # from history_common.mako
             'Download',
             'Display Data',
-            'Display data in browser',
+            'View data',
             'Edit attributes',
             'Delete',
             'Job is waiting to run',

diff -r 3b437901dab6efd84478a74c856206dfb96a7f81 -r fde3df1cfee9e7fdf09ac4ad5e02e47623fb3eab templates/webapps/galaxy/root/history_common.mako
--- a/templates/webapps/galaxy/root/history_common.mako
+++ b/templates/webapps/galaxy/root/history_common.mako
@@ -98,7 +98,7 @@
                 %if data.purged:
                     <span class="icon-button display_disabled tooltip" title="Cannot display datasets removed from disk"></span>
                 %else:
-                    <a class="icon-button display tooltip" dataset_id="${dataset_id}" title='${_("Display data in browser")}' href="${display_url}"
+                    <a class="icon-button display tooltip" dataset_id="${dataset_id}" title='${_("View data")}' href="${display_url}"
                     %if for_editing:
                         target="galaxy_main"
                     %endif

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.

    

commits-noreply＠bitbucket.org

tags

participants (1)