From d1918fa4c95628a52a9ab5cfbc053721dbadfaf7 Mon Sep 17 00:00:00 2001
From: James Taylor <james@jamestaylor.org>
Date: Wed, 22 Apr 2009 12:36:17 -0400
Subject: [PATCH] Clean up (unify) workflow sharing UI a bit

---
 lib/galaxy/web/controllers/workflow.py |  2 +-
 templates/workflow/list.mako           |  3 +--
 templates/workflow/sharing.mako        | 19 ++++++++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/galaxy/web/controllers/workflow.py b/lib/galaxy/web/controllers/workflow.py
index 8451287ca8c..988ae9dbf82 100644
--- a/lib/galaxy/web/controllers/workflow.py
+++ b/lib/galaxy/web/controllers/workflow.py
@@ -91,7 +91,7 @@ class WorkflowController( BaseController ):
                 session.save_or_update( share )
                 session.flush()
                 trans.set_message( "Workflow '%s' shared with user '%s'" % ( stored.name, other.email ) )
-                return self.list( trans )
+                return trans.response.send_redirect( url_for( controller='workflow', action='sharing', id=id ) )
         return trans.fill_template( "workflow/share.mako",
                                     message = msg,
                                     messagetype = mtype,
diff --git a/templates/workflow/list.mako b/templates/workflow/list.mako
index f45aa50a346..989e9a67b2a 100644
--- a/templates/workflow/list.mako
+++ b/templates/workflow/list.mako
@@ -47,8 +47,7 @@
                     <a class="action-button" href="${h.url_for( action='editor', id=trans.security.encode_id(workflow.id) )}" target="_parent">Edit</a>
                     <a class="action-button" href="${h.url_for( controller='root', action='index', workflow_id=trans.security.encode_id(workflow.id) )}" target="_parent">Run</a>
                     <a class="action-button" href="${h.url_for( action='rename', id=trans.security.encode_id(workflow.id) )}">Rename</a>
-                    <a class="action-button" href="${h.url_for( action='share', id=trans.security.encode_id(workflow.id) )}">Share</a>
-                    <a class="action-button" href="${h.url_for( action='sharing', id=trans.security.encode_id(workflow.id) )}">Manage sharing</a>
+                    <a class="action-button" href="${h.url_for( action='sharing', id=trans.security.encode_id(workflow.id) )}">Sharing</a>
                     <a class="action-button" confirm="Are you sure you want to delete workflow '${workflow.name}'?" href="${h.url_for( action='delete', id=trans.security.encode_id(workflow.id) )}">Delete</a>
                     </div>
                 </td>
diff --git a/templates/workflow/sharing.mako b/templates/workflow/sharing.mako
index 45526f46c2d..c4343ff9676 100644
--- a/templates/workflow/sharing.mako
+++ b/templates/workflow/sharing.mako
@@ -39,7 +39,15 @@
         The following users will see this workflow in thier workflow list, and be
         able to run it or create their own copy of it:
     </p>
-
+    
+        <ul class="manage-table-actions">
+        <li>
+            <a class="action-button" href="${h.url_for( action='share', id=trans.security.encode_id(stored.id) )}">
+                <span>Share with another user</span>
+            </a>
+        </li>
+    </ul>
+        
     <table class="colored" border="0" cellspacing="0" cellpadding="0" width="100%">
         <tr class="header">
             <th>Email</th>
@@ -60,8 +68,13 @@
             </tr>    
         %endfor
     </table>
+
 %else:
 
-    You have not shared this workflow with any users.
-
+    <p>You have not shared this workflow with any users.</p>
+    
+    <a class="action-button" href="${h.url_for( action='share', id=trans.security.encode_id(stored.id) )}">
+        <span>Share with another user</span>
+    </a>
+    
 %endif
\ No newline at end of file