Jason Guiditta
2008-Jul-23 22:37 UTC
[Ovirt-devel] [PATCH] Sprint 4 (part deux) - Found bug in partial.
This might be because of my changes for the tabs, but somehow it didn't pop up until now. Also, forgot to switch the paths for the ui js files. I'll clean this up and combine into one commit after ack and before pushing to next. Sorry for the spam. -j Signed-off-by: Jason Guiditta <jguiditt at redhat.com> --- wui/src/app/views/layouts/_side_toolbar.rhtml | 2 +- wui/src/app/views/layouts/redux.rhtml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wui/src/app/views/layouts/_side_toolbar.rhtml b/wui/src/app/views/layouts/_side_toolbar.rhtml index 42cbae6..763f4a2 100644 --- a/wui/src/app/views/layouts/_side_toolbar.rhtml +++ b/wui/src/app/views/layouts/_side_toolbar.rhtml @@ -17,8 +17,8 @@ <%= image_tag "icon_delete.gif", :title=>"Delete Selected Pool" %> </a> </div> -<% end -%> <div class="toolbar" style="display:none;"> <%= confirmation_dialog("conf_nav_delete_pool", "Are you sure?", "delete_#{pool[:type]=='HardwarePool' ? 'hw' : 'vm'}_pool(#{pool.id})") %> </div> +<% end -%> <div class="toolbar"></div> diff --git a/wui/src/app/views/layouts/redux.rhtml b/wui/src/app/views/layouts/redux.rhtml index ddbcc14..924f300 100644 --- a/wui/src/app/views/layouts/redux.rhtml +++ b/wui/src/app/views/layouts/redux.rhtml @@ -33,8 +33,8 @@ <%= javascript_include_tag "jquery.form.js" -%> <%= javascript_include_tag "jquery.jgrowl.js" -%> - <%= javascript_include_tag "jquery.ui-1.5.2/ui/ui.core.packed.js" -%> - <%= javascript_include_tag "jquery.ui-1.5.2/ui/ui.tabs.packed.js" -%> + <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.core.packed.js" -%> + <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.tabs.packed.js" -%> <!-- ovirt-specific functions defined here --> <%= javascript_include_tag "ovirt.js" -%> -- 1.5.5.1