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

29 May 2013

2 new commits in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/05674ed7665c/
Changeset:   05674ed7665c
Branch:      next-stable
User:        greg
Date:        2013-05-29 22:18:27
Summary:     Fix styles for automated tool test results containers in the tool shed.
Affected #:  2 files

diff -r eb524e42fc65eb69274857bcaf85030f0edd32f0 -r 05674ed7665cbd7a1012d8b31b728cdbf52a3dbd lib/galaxy/webapps/tool_shed/api/repositories.py

--- a/lib/galaxy/webapps/tool_shed/api/repositories.py
+++ b/lib/galaxy/webapps/tool_shed/api/repositories.py
@@ -33,7 +33,7 @@
     @web.expose_api_anonymous
     def get_ordered_installable_revisions( self, trans, name, owner, **kwd ):
         """
-        GET /api/repository/get_ordered_installable_revisions
+        GET /api/repositories/get_ordered_installable_revisions
         
         :param name: the name of the Repository
         :param owner: the owner of the Repository
@@ -59,7 +59,7 @@
     @web.expose_api_anonymous
     def get_repository_revision_install_info( self, trans, name, owner, changeset_revision, **kwd ):
         """
-        GET /api/repository/get_repository_revision_install_info
+        GET /api/repositories/get_repository_revision_install_info
         
         :param name: the name of the Repository
         :param owner: the owner of the Repository

diff -r eb524e42fc65eb69274857bcaf85030f0edd32f0 -r 05674ed7665cbd7a1012d8b31b728cdbf52a3dbd templates/webapps/tool_shed/repository/common.mako
--- a/templates/webapps/tool_shed/repository/common.mako
+++ b/templates/webapps/tool_shed/repository/common.mako
@@ -395,13 +395,23 @@
 
 <%def name="render_failed_test( failed_test, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( failed_test.id ) %>
+    <style type="text/css">
+        #failed_test_table{ table-layout:fixed;
+                            width:100%;
+                            overflow-wrap:normal;
+                            overflow:hidden;
+                            border:0px; 
+                            word-break:keep-all;
+                            word-wrap:break-word;
+                            line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="readme_table">
+            <table id="failed_test_table"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${failed_test.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${failed_test.tool_id | h}</td></tr><tr><td><b>Test:</b> ${failed_test.test_id | h}</td></tr>
@@ -485,14 +495,14 @@
         encoded_id = trans.security.encode_id( invalid_tool_dependency.id )
     %><style type="text/css">
-        #readme_table{ table-layout:fixed;
-                       width:100%;
-                       overflow-wrap:normal;
-                       overflow:hidden;
-                       border:0px; 
-                       word-break:keep-all;
-                       word-wrap:break-word;
-                       line-break:strict; }
+        #invalid_td_table{ table-layout:fixed;
+                           width:100%;
+                           overflow-wrap:normal;
+                           overflow:hidden;
+                           border:0px; 
+                           word-break:keep-all;
+                           word-wrap:break-word;
+                           line-break:strict; }
     </style><tr class="datasetRow"
         %if parent is not None:
@@ -500,7 +510,9 @@
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            ${ invalid_tool_dependency.error | h }
+            <table id="invalid_td_table">
+                <tr><td>${ invalid_tool_dependency.error | h }</td></tr>
+            </table></td></tr><%
@@ -511,13 +523,23 @@
 
 <%def name="render_missing_test_component( missing_test_component, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( missing_test_component.id ) %>
+    <style type="text/css">
+        #missing_table{ table-layout:fixed;
+                        width:100%;
+                        overflow-wrap:normal;
+                        overflow:hidden;
+                        border:0px; 
+                        word-break:keep-all;
+                        word-wrap:break-word;
+                        line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="readme_table">
+            <table id="missing_table"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${missing_test_component.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${missing_test_component.tool_version | h}</td></tr><tr><td><b>Tool guid:</b> ${missing_test_component.tool_guid | h}</td></tr>
@@ -632,13 +654,23 @@
 
 <%def name="render_tool_dependency_installation_error( installation_error, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( installation_error.id ) %>
+    <style type="text/css">
+        #td_install_error_table{ table-layout:fixed;
+                                 width:100%;
+                                 overflow-wrap:normal;
+                                 overflow:hidden;
+                                 border:0px; 
+                                 word-break:keep-all;
+                                 word-wrap:break-word;
+                                 line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="td_installation_errors">
+            <table id="td_install_error_table"><tr bgcolor="#FFFFCC"><th>Type</th><th>Name</th><th>Version</th></tr>
@@ -660,13 +692,23 @@
 
 <%def name="render_repository_installation_error( installation_error, pad, parent, row_counter, row_is_header=False, is_current_repository=False )"><% encoded_id = trans.security.encode_id( installation_error.id ) %>
+    <style type="text/css">
+        #rd_install_error_table{ table-layout:fixed;
+                                 width:100%;
+                                 overflow-wrap:normal;
+                                 overflow:hidden;
+                                 border:0px; 
+                                 word-break:keep-all;
+                                 word-wrap:break-word;
+                                 line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="repository_installation_errors">
+            <table id="rd_install_error_table">
                 %if not is_current_repository:
                     <tr bgcolor="#FFFFCC"><th>Tool shed</th><th>Name</th><th>Owner</th><th>Changeset revision</th>
@@ -691,13 +733,23 @@
 
 <%def name="render_passed_test( passed_test, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( passed_test.id ) %>
+    <style type="text/css">
+        #passed_tests_table{ table-layout:fixed;
+                             width:100%;
+                             overflow-wrap:normal;
+                             overflow:hidden;
+                             border:0px; 
+                             word-break:keep-all;
+                             word-wrap:break-word;
+                             line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="readme_table">
+            <table id="passed_tests_table"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${passed_test.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${passed_test.tool_id | h}</td></tr><tr><td><b>Test:</b> ${passed_test.test_id | h}</td></tr>


https://bitbucket.org/galaxy/galaxy-central/commits/13797aac2667/
Changeset:   13797aac2667
User:        greg
Date:        2013-05-29 22:18:54
Summary:     Merged from next-stable
Affected #:  2 files

diff -r 49cc4a899f2ff5853d6c4f4c70ef9063df2f5b1b -r 13797aac2667307106edeaba3076f04abd96e60d lib/galaxy/webapps/tool_shed/api/repositories.py
--- a/lib/galaxy/webapps/tool_shed/api/repositories.py
+++ b/lib/galaxy/webapps/tool_shed/api/repositories.py
@@ -33,7 +33,7 @@
     @web.expose_api_anonymous
     def get_ordered_installable_revisions( self, trans, name, owner, **kwd ):
         """
-        GET /api/repository/get_ordered_installable_revisions
+        GET /api/repositories/get_ordered_installable_revisions
         
         :param name: the name of the Repository
         :param owner: the owner of the Repository
@@ -59,7 +59,7 @@
     @web.expose_api_anonymous
     def get_repository_revision_install_info( self, trans, name, owner, changeset_revision, **kwd ):
         """
-        GET /api/repository/get_repository_revision_install_info
+        GET /api/repositories/get_repository_revision_install_info
         
         :param name: the name of the Repository
         :param owner: the owner of the Repository

diff -r 49cc4a899f2ff5853d6c4f4c70ef9063df2f5b1b -r 13797aac2667307106edeaba3076f04abd96e60d templates/webapps/tool_shed/repository/common.mako
--- a/templates/webapps/tool_shed/repository/common.mako
+++ b/templates/webapps/tool_shed/repository/common.mako
@@ -395,13 +395,23 @@
 
 <%def name="render_failed_test( failed_test, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( failed_test.id ) %>
+    <style type="text/css">
+        #failed_test_table{ table-layout:fixed;
+                            width:100%;
+                            overflow-wrap:normal;
+                            overflow:hidden;
+                            border:0px; 
+                            word-break:keep-all;
+                            word-wrap:break-word;
+                            line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="readme_table">
+            <table id="failed_test_table"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${failed_test.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${failed_test.tool_id | h}</td></tr><tr><td><b>Test:</b> ${failed_test.test_id | h}</td></tr>
@@ -485,14 +495,14 @@
         encoded_id = trans.security.encode_id( invalid_tool_dependency.id )
     %><style type="text/css">
-        #readme_table{ table-layout:fixed;
-                       width:100%;
-                       overflow-wrap:normal;
-                       overflow:hidden;
-                       border:0px; 
-                       word-break:keep-all;
-                       word-wrap:break-word;
-                       line-break:strict; }
+        #invalid_td_table{ table-layout:fixed;
+                           width:100%;
+                           overflow-wrap:normal;
+                           overflow:hidden;
+                           border:0px; 
+                           word-break:keep-all;
+                           word-wrap:break-word;
+                           line-break:strict; }
     </style><tr class="datasetRow"
         %if parent is not None:
@@ -500,7 +510,9 @@
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            ${ invalid_tool_dependency.error | h }
+            <table id="invalid_td_table">
+                <tr><td>${ invalid_tool_dependency.error | h }</td></tr>
+            </table></td></tr><%
@@ -511,13 +523,23 @@
 
 <%def name="render_missing_test_component( missing_test_component, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( missing_test_component.id ) %>
+    <style type="text/css">
+        #missing_table{ table-layout:fixed;
+                        width:100%;
+                        overflow-wrap:normal;
+                        overflow:hidden;
+                        border:0px; 
+                        word-break:keep-all;
+                        word-wrap:break-word;
+                        line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="readme_table">
+            <table id="missing_table"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${missing_test_component.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${missing_test_component.tool_version | h}</td></tr><tr><td><b>Tool guid:</b> ${missing_test_component.tool_guid | h}</td></tr>
@@ -632,13 +654,23 @@
 
 <%def name="render_tool_dependency_installation_error( installation_error, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( installation_error.id ) %>
+    <style type="text/css">
+        #td_install_error_table{ table-layout:fixed;
+                                 width:100%;
+                                 overflow-wrap:normal;
+                                 overflow:hidden;
+                                 border:0px; 
+                                 word-break:keep-all;
+                                 word-wrap:break-word;
+                                 line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="td_installation_errors">
+            <table id="td_install_error_table"><tr bgcolor="#FFFFCC"><th>Type</th><th>Name</th><th>Version</th></tr>
@@ -660,13 +692,23 @@
 
 <%def name="render_repository_installation_error( installation_error, pad, parent, row_counter, row_is_header=False, is_current_repository=False )"><% encoded_id = trans.security.encode_id( installation_error.id ) %>
+    <style type="text/css">
+        #rd_install_error_table{ table-layout:fixed;
+                                 width:100%;
+                                 overflow-wrap:normal;
+                                 overflow:hidden;
+                                 border:0px; 
+                                 word-break:keep-all;
+                                 word-wrap:break-word;
+                                 line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="repository_installation_errors">
+            <table id="rd_install_error_table">
                 %if not is_current_repository:
                     <tr bgcolor="#FFFFCC"><th>Tool shed</th><th>Name</th><th>Owner</th><th>Changeset revision</th>
@@ -691,13 +733,23 @@
 
 <%def name="render_passed_test( passed_test, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( passed_test.id ) %>
+    <style type="text/css">
+        #passed_tests_table{ table-layout:fixed;
+                             width:100%;
+                             overflow-wrap:normal;
+                             overflow:hidden;
+                             border:0px; 
+                             word-break:keep-all;
+                             word-wrap:break-word;
+                             line-break:strict; }
+    </style><tr class="datasetRow"
         %if parent is not None:
             parent="${parent}"
         %endif
         id="libraryItem-${encoded_id}"><td style="padding-left: ${pad+20}px;">
-            <table class="grid" id="readme_table">
+            <table id="passed_tests_table"><tr><td bgcolor="#FFFFCC"><b>Tool id:</b> ${passed_test.tool_id | h}</td></tr><tr><td><b>Tool version:</b> ${passed_test.tool_id | h}</td></tr><tr><td><b>Test:</b> ${passed_test.test_id | h}</td></tr>

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: 2 new changesets

commits-noreply＠bitbucket.org