From commits-noreply@bitbucket.org Fri Jul 29 14:33:47 2011
From: Bitbucket <commits-noreply@bitbucket.org>
To: galaxy-commits@lists.galaxyproject.org
Subject: [galaxy-commits] commit/galaxy-central: greg: Tool shed template
 fixes: replace 1/2 template somehow removed in change set 5830, fix pop-up
 menu code for tools.
Date: Fri, 29 Jul 2011 18:33:43 +0000
Message-ID: <20110729183343.7877.72439@bitbucket02.managed.contegix.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2095670818731473044=="

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

1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/dc8f4f649a43/
changeset:   dc8f4f649a43
user:        greg
date:        2011-07-29 20:33:34
summary:     Tool shed template fixes: replace 1/2 template somehow removed i=
n change set 5830, fix pop-up menu code for tools.
affected #:  4 files (1.5 KB)

--- a/templates/webapps/community/repository/common.mako	Fri Jul 29 11:26:09 =
2011 -0400
+++ b/templates/webapps/community/repository/common.mako	Fri Jul 29 14:33:34 =
2011 -0400
@@ -50,4 +50,39 @@
                 onActivate: function(dtnode) {
                     var cell =3D $("#file_contents");
                     var selected_value;
-=20
\ No newline at end of file
+                     if (dtnode.data.key =3D=3D 'root') {
+                        selected_value =3D "${repository.repo_path}/";
+                    } else {
+                        selected_value =3D dtnode.data.key;
+                    };
+                    if (selected_value.charAt(selected_value.length-1) !=3D =
'/') {
+                        // Make ajax call
+                        $.ajax( {
+                            type: "POST",
+                            url: "${h.url_for( controller=3D'repository', ac=
tion=3D'get_file_contents' )}",
+                            dataType: "json",
+                            data: { file_path: selected_value },
+                            success : function ( data ) {
+                                cell.html( '<label>'+data+'</label>' )
+                            }
+                        });
+                    } else {
+                        cell.html( '' );
+                    };
+                },
+            });
+        });
+    </script>
+</%def>
+
+<%def name=3D"render_clone_str( repository )">
+    <%
+        protocol, base =3D trans.request.base.split( '://' )
+        if trans.user:
+            username =3D '%s@' % trans.user.username
+        else:
+            username =3D ''
+        clone_str =3D '%s://%s%s/repos/%s/%s' % ( protocol, username, base, =
repository.user.username, repository.name )
+    %>
+    hg clone <a href=3D"${clone_str}">${clone_str}</a>
+</%def>


--- a/templates/webapps/community/repository/manage_repository.mako	Fri Jul 2=
9 11:26:09 2011 -0400
+++ b/templates/webapps/community/repository/manage_repository.mako	Fri Jul 2=
9 14:33:34 2011 -0400
@@ -177,12 +177,12 @@
                             %for tool_dict in tool_dicts:
                                 <tr><td>
-                                        <div style=3D"float: left; margin-le=
ft: 1px;" class=3D"menubutton split popup" id=3D"tool-${tool_dict[ 'id' ]}-po=
pup">
+                                        <div style=3D"float: left; margin-le=
ft: 1px;" class=3D"menubutton split popup" id=3D"tool-${tool_dict[ 'id' ].rep=
lace( ' ', '_' )}-popup"><a class=3D"view-info" href=3D"${h.url_for( controll=
er=3D'repository', action=3D'display_tool', repository_id=3Dtrans.security.en=
code_id( repository.id ), tool_config=3Dtool_dict[ 'tool_config' ] )}">
                                                 ${tool_dict[ 'name' ]}
                                             </a></div>
-                                        <div popupmenu=3D"tool-${tool_dict[ =
'id' ]}-popup">
+                                        <div popupmenu=3D"tool-${tool_dict[ =
'id' ].replace( ' ', '_' )}-popup"><a class=3D"action-button" href=3D"${h.url=
_for( controller=3D'repository', action=3D'view_tool_metadata', repository_id=
=3Dtrans.security.encode_id( repository.id ), changeset_revision=3Drepository=
.tip, tool_id=3Dtool_dict[ 'id' ] )}">View all metadata for this tool</a></di=
v></td>


--- a/templates/webapps/community/repository/view_repository.mako	Fri Jul 29 =
11:26:09 2011 -0400
+++ b/templates/webapps/community/repository/view_repository.mako	Fri Jul 29 =
14:33:34 2011 -0400
@@ -170,12 +170,12 @@
                         %for tool_dict in tool_dicts:
                             <tr><td>
-                                    <div style=3D"float: left; margin-left: =
1px;" class=3D"menubutton split popup" id=3D"tool-${repository.id}-popup">
+                                    <div style=3D"float: left; margin-left: =
1px;" class=3D"menubutton split popup" id=3D"tool-${tool_dict[ 'id' ].replace=
( ' ', '_' )}-popup"><a class=3D"view-info" href=3D"${h.url_for( controller=
=3D'repository', action=3D'display_tool', repository_id=3Dtrans.security.enco=
de_id( repository.id ), tool_config=3Dtool_dict[ 'tool_config' ] )}">
                                             ${tool_dict[ 'name' ]}
                                         </a></div>
-                                    <div popupmenu=3D"tool-${repository.id}-=
popup">
+                                    <div popupmenu=3D"tool-${tool_dict[ 'id'=
 ].replace( ' ', '_' )}-popup"><a class=3D"action-button" href=3D"${h.url_for=
( controller=3D'repository', action=3D'view_tool_metadata', repository_id=3Dt=
rans.security.encode_id( repository.id ), changeset_revision=3Drepository.tip=
, tool_id=3Dtool_dict[ 'id' ] )}">View all metadata for this tool</a></div></=
td>


--- a/templates/webapps/community/repository/view_tool_metadata.mako	Fri Jul =
29 11:26:09 2011 -0400
+++ b/templates/webapps/community/repository/view_tool_metadata.mako	Fri Jul =
29 14:33:34 2011 -0400
@@ -111,7 +111,7 @@
             </div><div class=3D"form-row"><label>Command:</label>
-                ${tool.command}
+                <pre>${tool.command}</pre><div style=3D"clear: both"></div><=
/div><div class=3D"form-row">

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.

--===============2095670818731473044==--