diff --git a/lib/galaxy/web/controllers/root.py b/lib/galaxy/web/controllers/root.py index b3ec3801344..4c37ad1d2c0 100644 --- a/lib/galaxy/web/controllers/root.py +++ b/lib/galaxy/web/controllers/root.py @@ -27,7 +27,7 @@ class RootController( BaseController ): @web.expose def tool_menu( self, trans ): - return trans.fill_template('tool_menu.tmpl', toolbox=self.get_toolbox() ) + return trans.fill_template('/root/tool_menu.mako', toolbox=self.get_toolbox() ) @web.expose def tool_help( self, trans, id ): @@ -265,7 +265,7 @@ class RootController( BaseController ): ldatatypes = [x for x in trans.app.datatypes_registry.datatypes_by_extension.iterkeys()] ldatatypes.sort() trans.log_event( "Opened edit view on dataset %s" % str(id) ) - return trans.fill_template( "edit_data.tmpl", data=data, metadata=metadata, + return trans.fill_template( "/dataset/edit_attributes.mako", data=data, metadata=metadata, datatypes=ldatatypes, err=None ) @web.expose diff --git a/templates/dataset/edit_attributes.mako b/templates/dataset/edit_attributes.mako new file mode 100644 index 00000000000..faf11771489 --- /dev/null +++ b/templates/dataset/edit_attributes.mako @@ -0,0 +1,132 @@ +<%inherit file="/base.mako"/> +<%def name="title()">Your saved histories + + +<%def name="datatype( dataset, datatypes )"> + + + +
+
Edit Attributes
+
+
+ +
+ +
+ +
+
+
+
+ +
+ +
+
+
+ %for element in metadata: +
+ +
+ ${element.get_html()} +
+
+
+ %endfor +
+ +
+
+
+ +
+ +
+
+ This will inspect the dataset and attempt to correct the above column values + if they are not accurate. +
+
+
+
+ +

+ + <% converters = data.get_converter_types() %> + %if len( converters ) > 0: +

+
Convert to new format
+
+
+ +
+ +
+ +
+ +
+ This will create a new dataset with the contents of this + dataset converted to a new format. +
+
+
+
+ +
+
+
+
+ +

+ %endif + + +

+
Change data type
+
+
+ +
+ +
+ ${datatype( data, datatypes )} +
+ +
+ This will change the datatype of the existing dataset + but not modify its contents. Use this if Galaxy + has incorrectly guessed the type of your dataset. +
+
+
+
+ +
+
+
+
diff --git a/templates/edit_data.tmpl b/templates/edit_data.tmpl deleted file mode 100644 index 11a33ed2627..00000000000 --- a/templates/edit_data.tmpl +++ /dev/null @@ -1,148 +0,0 @@ - - -#from galaxy.util.expressions import ExpressionContext - - - - Galaxy - - - - - - #if $getVar( 'error_message', None ) -
$error_message
-

- #end if - - #def datatype( $dataset, $datatypes ) - - #end def - -
-
Edit Attributes
-
-
- -
- -
- -
-
-
-
- -
- -
-
-
- #for $element in $metadata -
- -
- $element.get_html() -
-
-
- #end for -
- -
-
-
- -
- -
-
- This will inspect the dataset and attempt to correct the above column values - if they are not accurate. -
-
-
-
- -

- - #set $converters = $data.get_converter_types() - #if len( $converters ) > 0: -

-
Convert to new format
-
-
- -
- -
- -
- -
- This will create a new dataset with the contents of this - dataset converted to a new format. -
-
-
-
- -
-
-
-
- -

- #end if - - -

-
Change data type
-
-
- -
- -
- $datatype( $data, $datatypes ) -
- -
- This will change the datatype of the existing dataset - but not modify its contents. Use this if Galaxy - has incorrectly guessed the type of your dataset. -
-
-
-
- -
-
-
-
- - - diff --git a/templates/root/tool_menu.mako b/templates/root/tool_menu.mako new file mode 100644 index 00000000000..4a80d1ff5bf --- /dev/null +++ b/templates/root/tool_menu.mako @@ -0,0 +1,107 @@ + + + + +Galaxy Tools + + + + + + + + + + + + +
+ +
+%for i, section in enumerate( toolbox.sections ): + %if i > 0: +
+ %endif +
+ ${section.name} +
+
+
+ %for tool in section.tools: + %if not tool.hidden: +
+ <% + if tool.input_required: + link = h.url_for( 'tool_runner', tool_id=tool.id ) + else: + link = h.url_for( tool.action, ** tool.get_static_param_values( t ) ) + %> + ## FIXME: This doesn't look right + ## %if "[[" in tool.description and "]]" in tool.description: + ## ${tool.description.replace( '[[', '' % $tool.id ).replace( "]]", "" ) + %if tool.name: + ${tool.name} ${tool.description} + %else: + ${tool.description} + %endif +
+ %endif + %endfor +
+
+%endfor + +## Link to workflow management. The location of this may change, but eventually +## at least some workflows will appear here (the user should be able to +## configure which of their stored workflows appear in the tools menu). + +%if app.config.enable_beta_features: +
+
+
+ Workflow (beta) +
+
+
+
+ Manage workflows +
+
+
+%endif + +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/templates/share.tmpl b/templates/share.tmpl deleted file mode 100644 index 793564970ae..00000000000 --- a/templates/share.tmpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - -Share History - - - - - - -

Share history

-

-The link below can be used to the current history. -

-

- $url -

-

-Send this link to others (right-click + copy link location) or bookmark it for further reference. -

- -

-You may also create a new history by clicking here -

- - - - \ No newline at end of file diff --git a/templates/tool_menu.tmpl b/templates/tool_menu.tmpl deleted file mode 100644 index 98760e85e54..00000000000 --- a/templates/tool_menu.tmpl +++ /dev/null @@ -1,134 +0,0 @@ - - - - -Galaxy Tools - - - - - - - - - - - - - - - - -
- -
-#for $i, $section in enumerate( $toolbox.sections ) - #if $i > 0 -
- #end if -
- $section.name -
-
-
- #for $tool in $section.tools - #if not $tool.hidden: -
- #if $tool.input_required - #set $link = $h.url_for( 'tool_runner', tool_id=$tool.id ) - #else - #set $link = $h.url_for( $tool.action, ** $tool.get_static_param_values( $t ) ) - #end if - #if "[[" in $tool.description and "]]" in $tool.description - $tool.description.replace( '[[', '' % $tool.id ).replace( "]]", "" ) - #elif $tool.name - $tool.name $tool.description - #else - $tool.description - #end if -
- #end if - #end for -
-
-#end for - -## Link to workflow management. The location of this may change, but eventually -## at least some workflows will appear here (the user should be able to -## configure which of their stored workflows appear in the tools menu). - -#if $app.config.enable_beta_features -
-
-
- Workflow (beta) -
-
-
-
- Manage workflows -
-
-
-#end if - -
- -
- -
- - - - - \ No newline at end of file