From 44bc4abcdb2d6b0cc8a1ccecde6bd782595ad43d Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 25 Jun 2009 03:26:31 +0000 Subject: [PATCH] use getWebguiProperty to find the extrasURL. --- lib/WebGUI/Content/AssetManager.pm | 18 +++--------------- .../build/assetManager/assetManager.js | 4 +--- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index 71e577433..99e58f9cb 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -334,16 +334,6 @@ sub www_manage { ### Do Action my @assetIds = $session->form->get( 'assetId' ); -# if ( $session->form->get( 'action_update' ) ) { -# for my $assetId ( @assetIds ) { -# my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); -# next unless $asset; -# my $rank = $session->form->get( $assetId . '_rank' ); -# next unless $rank; # There's no such thing as zero -# -# $asset->setRank( $rank ); -# } -# } if ( $session->form->get( 'action_delete' ) ) { for my $assetId ( @assetIds ) { my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); @@ -407,13 +397,11 @@ sub www_manage { $session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) ); $session->style->setScript( $session->url->extras( 'yui-webgui/build/form/form.js' ) ); - my $extras = $session->url->extras; $session->style->setRawHeadTags( < - ENDHTML @@ -442,8 +430,8 @@ ENDHTML ### The page of assets $output .= q{
} . q{
} - . q{} - . q{} + . q{} + . q{} . q{
} . q{
} . q{

} . $i18n->get( 'with selected' ) diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js index eb26339c2..2cbfac8dd 100644 --- a/www/extras/yui-webgui/build/assetManager/assetManager.js +++ b/www/extras/yui-webgui/build/assetManager/assetManager.js @@ -11,8 +11,6 @@ if ( typeof WebGUI.AssetManager == "undefined" ) { WebGUI.AssetManager = {}; } -// The extras folder -WebGUI.AssetManager.extrasUrl = '/extras/'; // Keep track of the open more menus WebGUI.AssetManager.MoreMenusDisplayed = {}; // Append something to a url: @@ -150,7 +148,7 @@ WebGUI.AssetManager.formatClassName = function ( elCell, oRecord, oColumn, order Format the asset class name */ WebGUI.AssetManager.formatLockedBy = function ( elCell, oRecord, oColumn, orderNumber ) { - var extras = WebGUI.AssetManager.extrasUrl; + var extras = getWebguiProperty('extrasURL'); elCell.innerHTML = oRecord.getData( 'lockedBy' ) ? ''