Remove types for setScript calls, add setCss, which is shorthand for setLink with the CSS specific params preset.

This commit is contained in:
Colin Kuskie 2010-09-24 08:02:17 -07:00
parent 17d9deb085
commit 1f42a0a24e
50 changed files with 159 additions and 173 deletions

View file

@ -517,16 +517,16 @@ sub www_view {
$var->{homeUrl} = WebGUI::Asset->getDefault( $session )->getUrl;
# All this needs to be template attachments
$style->setLink( $url->extras('yui/build/button/assets/skins/sam/button.css'), {type=>"text/css",rel=>"stylesheet"});
$style->setLink( $url->extras('yui/build/menu/assets/skins/sam/menu.css'), {type=>"text/css",rel=>"stylesheet"});
$style->setLink( $url->extras('yui/build/tabview/assets/skins/sam/tabview.css'), {type=>"text/css",rel=>"stylesheet"});
$style->setLink( $url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink( $url->extras('yui/build/container/assets/skins/sam/container.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink( $url->extras('yui/build/autocomplete/assets/skins/sam/autocomplete.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink( $url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>'stylesheet', type=>'text/css'});
#$style->setLink( $url->extras('yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
$style->setLink( $url->extras('admin/admin.css'), { type=>'text/css', rel=>'stylesheet'} );
$style->setCss( $url->extras('yui/build/button/assets/skins/sam/button.css'));
$style->setCss( $url->extras('yui/build/menu/assets/skins/sam/menu.css'));
$style->setCss( $url->extras('yui/build/tabview/assets/skins/sam/tabview.css'));
$style->setCss( $url->extras('yui/build/paginator/assets/skins/sam/paginator.css'));
$style->setCss( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setCss( $url->extras('yui/build/container/assets/skins/sam/container.css'));
$style->setCss( $url->extras('yui/build/autocomplete/assets/skins/sam/autocomplete.css'));
$style->setCss( $url->extras('yui/build/menu/assets/skins/sam/menu.css'));
#$style->setCss( $url->extras('yui-webgui/build/assetManager/assetManager.css' ));
$style->setCss( $url->extras('admin/admin.css'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));

View file

@ -1577,8 +1577,8 @@ sub getToolbar {
$toolbar .= $self->session->icon->shortcut('func=createShortcut',$self->get("url"))
if ($userUiLevel >= $uiLevels->{"shortcut"} && !$self->isa('WebGUI::Asset::Shortcut'));
$self->session->style->setLink($self->session->url->extras('assetToolbar/assetToolbar.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setLink($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setCss($self->session->url->extras('assetToolbar/assetToolbar.css'));
$self->session->style->setCss($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'));
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'));
@ -2709,7 +2709,7 @@ sub www_edit {
}
# TODO: Make this whole thing a template instead!
$style->setLink($url->extras('yui/build/button/assets/skins/sam/button.css'),{rel => 'stylesheet', type => 'text/css' });
$style->setCss($url->extras('yui/build/button/assets/skins/sam/button.css'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));

View file

@ -220,8 +220,8 @@ sub view {
if ($crop_js) {
my ($style, $url) = $session->quick(qw(style url));
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/container/assets/container.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setCss($url->extras('yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('yui/container/assets/container.css'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/container/container-min.js'));
}
@ -332,9 +332,9 @@ sub www_annotate {
my ($style, $url) = $session->quick(qw(style url));
$style->setLink($url->extras('yui/build/resize/assets/skins/sam/resize.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/imagecropper/assets/skins/sam/imagecropper.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setCss($url->extras('yui/build/resize/assets/skins/sam/resize.css'));
$style->setCss($url->extras('yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('yui/build/imagecropper/assets/skins/sam/imagecropper.css'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
@ -613,8 +613,8 @@ sub www_resize {
##YUI specific datatable CSS
my ($style, $url) = $session->quick(qw(style url));
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/resize/assets/skins/sam/resize.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setCss($url->extras('yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('yui/build/resize/assets/skins/sam/resize.css'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'));
@ -753,9 +753,9 @@ sub www_crop {
</script>
);
$style->setLink($url->extras('yui/build/resize/assets/skins/sam/resize.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/imagecropper/assets/skins/sam/imagecropper.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setCss($url->extras('yui/build/resize/assets/skins/sam/resize.css'));
$style->setCss($url->extras('yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('yui/build/imagecropper/assets/skins/sam/imagecropper.css'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));
$style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'));

View file

@ -626,8 +626,7 @@ sub view {
$self->session->style->setScript($self->session->url->extras('yui/build/datatable/datatable-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/button/button-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/json/json-min.js'));
$self->session->style->setLink($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{type =>'text/css', rel=>'stylesheet'});
$self->session->style->setCss($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
# Attributes

View file

@ -123,7 +123,7 @@ sub _drawQueryBuilder {
# html
$session->style->setScript($session->url->extras('wobject/Shortcut/querybuilder.js'));
$session->style->setLink($session->url->extras('wobject/Shortcut/querybuilder.css'), {type=>"text/css", rel=>"stylesheet"});
$session->style->setCss($session->url->extras('wobject/Shortcut/querybuilder.css'));
my $output;
$output .= qq|<table cellspacing="0" cellpadding="0" border="0"><tr><td colspan="5" align="right">$shortcutCriteriaField</td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright">$conjunctionField</td></tr>|;

View file

@ -64,7 +64,7 @@ override getEditForm => sub {
my $i18n = WebGUI::International->new($self->session, "Asset_Carousel");
$self->session->style->setScript($self->session->url->extras('yui/build/editor/editor-min.js'));
$self->session->style->setLink($self->session->url->extras('yui/build/editor/assets/skins/sam/editor.css'), {type =>'text/css', rel=>'stylesheet'});
$self->session->style->setCss($self->session->url->extras('yui/build/editor/assets/skins/sam/editor.css'));
$self->session->style->setScript($self->session->url->extras('wobject/Carousel/carousel.js'));
my $tableRowStart =

View file

@ -1289,7 +1289,7 @@ Prepare the template for the form mode of the template.
sub prepareViewForm {
my $self = shift;
$self->session->style->setLink($self->session->url->extras('tabs/tabs.css'), {"type"=>"text/css"});
$self->session->style->setCss($self->session->url->extras('tabs/tabs.css'));
$self->session->style->setScript($self->session->url->extras('tabs/tabs.js'));
my $templateId = $self->templateId;
my $template = WebGUI::Asset::Template->newById($self->session, $templateId);

View file

@ -2443,7 +2443,7 @@ sub www_manageRegistrant {
|;
# render
$session->style->setLink($session->url->extras('/yui/build/reset-fonts-grids/reset-fonts-grids.css'), {rel=>"stylesheet", type=>"text/css"});
$session->style->setCss($session->url->extras('/yui/build/reset-fonts-grids/reset-fonts-grids.css'));
$session->style->setRawHeadTags(q|
<style type="text/css">
.manageRegistrant tbody tr td { padding: 2px;}

View file

@ -243,7 +243,7 @@ sub prepareView {
$session->style->setScript($session->url->extras("yui/build/dragdrop/dragdrop.js"));
$session->style->setScript($session->url->extras("yui-webgui/build/layout/draggable.js"));
$session->style->setLink($session->url->extras("draggable.css"),{ type=>"text/css", rel=>"stylesheet", media=>"all" });
$session->style->setCss($session->url->extras("draggable.css"));
$session->style->setRawHeadTags('
<style type="text/css">
.dragging, .empty {

View file

@ -296,8 +296,8 @@ sub loadMapApiTags {
my $style = $self->session->style;
my $url = $self->session->url;
$style->setLink($url->extras('yui/build/container/assets/skins/sam/container.css'),{type=>'text/css',rel=>'stylesheet'});
$style->setLink($url->extras('yui/build/button/assets/skins/sam/button.css'),{type=>'text/css',rel=>'stylesheet'});
$style->setCss($url->extras('yui/build/container/assets/skins/sam/container.css'));
$style->setCss($url->extras('yui/build/button/assets/skins/sam/button.css'));
$style->setScript("http://www.google.com/jsapi?key=" . $self->mapApiKey);
$style->setRawHeadTags(<<'ENDHTML');
<script type="text/javascript">

View file

@ -590,8 +590,7 @@ sub view {
my $i18n = WebGUI::International->new($session, 'Asset_Matrix');
# javascript and css files for compare form datatable
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{type =>'text/css', rel=>'stylesheet'});
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
@ -848,9 +847,9 @@ sub www_compare {
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
$style->setScript($url->extras('yui/build/container/container-min.js'));
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type =>'text/css', rel=>'stylesheet'});
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setScript($url->extras('hoverhelp.js'));
$style->setLink($url->extras('hoverhelp.css'), {type =>'text/css', rel=>'stylesheet'});
$style->setCss($url->extras('hoverhelp.css'));
my $maxComparisons;
if($self->session->user->isVisitor){
@ -1363,7 +1362,7 @@ sub www_search {
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui/build/datatable/datatable-min.js'));
$style->setScript($url->extras('yui/build/button/button-min.js'));
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type =>'text/css', rel=>'stylesheet'});
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
foreach my $category (keys %{$self->getCategories}) {
my $attributes;

View file

@ -320,8 +320,8 @@ override getToolbar => sub {
$toolbar = $self->session->icon->edit('func=edit'.$returnUrl,$self->url)
if ($userUiLevel >= $uiLevels->{"edit"});
}
$self->session->style->setLink($self->session->url->extras('assetToolbar/assetToolbar.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setLink($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setCss($self->session->url->extras('assetToolbar/assetToolbar.css'));
$self->session->style->setCss($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'));
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'));

View file

@ -1720,21 +1720,9 @@ sub www_viewProject {
#Set page styles
$style->setLink($assetExtras."/subModal.css", {
rel=>"stylesheet",
type=>"text/css",
}
);
$style->setLink($assetExtras."/taskEdit.css", {
rel=>"stylesheet",
type=>"text/css",
}
);
$style->setLink($assetExtras."/cMenu.css",{
rel=>"stylesheet",
type=>"text/css",
}
);
$style->setCss($assetExtras."/subModal.css");
$style->setCss($assetExtras."/taskEdit.css");
$style->setCss($assetExtras."/cMenu.css");
#Set page scripts
$style->setScript($assetExtras."/cMenu.js");

View file

@ -1715,7 +1715,7 @@ sub www_editThing {
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$self->session->style->setScript($self->session->url->extras('yui/build/connection/connection-min.js'));
$self->session->style->setScript($self->session->url->extras('wobject/Thingy/thingy.js'));
$self->session->style->setLink($self->session->url->extras('wobject/Thingy/thingy.css'), {type =>'text/css', rel=>'stylesheet'});
$self->session->style->setCss($self->session->url->extras('wobject/Thingy/thingy.css'));
$tab = $tabForm->getTab('fields');
foreach my $fieldType ( keys %{ WebGUI::Form::FieldType->new($session)->getTypes }) {

View file

@ -569,7 +569,7 @@ sub www_manageClipboard {
$ac->addSubmenuItem($self->getUrl('func=emptyClipboard'), $i18n->get(950),
'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset");
}
$self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setCss($self->session->url->extras('assetManager/assetManager.css'));
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'));
my $output = "
<script type=\"text/javascript\">

View file

@ -67,7 +67,7 @@ sub www_editBranch {
my ($class, $asset) = @_;
my $session = $asset->session;
my ( $style, $url ) = $session->quick( qw( style url ) );
$style->setLink( $url->extras('hoverhelp.css'), { rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras('hoverhelp.css'));
$style->setScript( $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js') );
$style->setScript( $url->extras('yui/build/container/container-min.js') );
$style->setScript( $url->extras('hoverhelp.js') );

View file

@ -68,7 +68,7 @@ sub www_export {
my $session = $asset->session;
return $session->privilege->insufficient() unless ($session->user->isInGroup(13));
my ( $style, $url ) = $session->quick(qw{ style url });
$style->setLink( $url->extras('hoverhelp.css'), { rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras('hoverhelp.css'));
$style->setScript( $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js') );
$style->setScript( $url->extras('yui/build/container/container-min.js') );
$style->setScript( $url->extras('hoverhelp.js') );

View file

@ -400,7 +400,7 @@ sub www_manageTrash {
elsif ( $canAdmin ) {
$ac->addSubmenuItem($self->getUrl('func=manageTrash;systemTrash=1'), $i18n->get(964));
}
$self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setCss($self->session->url->extras('assetManager/assetManager.css'));
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'));
my $output = "
<script type=\"text/javascript\">

View file

@ -129,9 +129,9 @@ sub www_view {
showAdminBar => 1
} );
my ($style, $url) = $session->quick(qw(style url));
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setLink($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setCss($url->extras('/yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setCss($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'));

View file

@ -356,10 +356,10 @@ sub www_manage {
);
# Add script and stylesheets
$session->style->setLink( $session->url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type=>'text/css'});
$session->style->setLink( $session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
$session->style->setLink( $session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>'stylesheet', type=>'text/css'});
$session->style->setLink( $session->url->extras('yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
$session->style->setCss( $session->url->extras('yui/build/paginator/assets/skins/sam/paginator.css'));
$session->style->setCss( $session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$session->style->setCss( $session->url->extras('yui/build/menu/assets/skins/sam/menu.css'));
$session->style->setCss( $session->url->extras('yui-webgui/build/assetManager/assetManager.css' ));
$session->style->setScript( $session->url->extras( 'yui/build/utilities/utilities.js' ) );
$session->style->setScript( $session->url->extras( 'yui/build/paginator/paginator-min.js ' ) );
@ -541,7 +541,7 @@ sub www_search {
my $currentAsset = getCurrentAsset($session);
my $output = '<div id="assetSearch">' . getHeader( $session );
$session->style->setLink( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
$session->style->setCss( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.css' ));
$session->style->setScript( $session->url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ) );
$session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) );
$session->style->setScript( $session->url->extras( 'yui-webgui/build/form/form.js' ) );

View file

@ -177,7 +177,7 @@ Sets the JS for this form plugin
sub headTags {
my $self = shift;
my $session = $self->session;
$session->style->setScript($session->url->extras("yui-webgui/build/form/assetReportQuery.js"),{ type=>"text/javascript" });
$session->style->setScript($session->url->extras("yui-webgui/build/form/assetReportQuery.js"));
}
#-------------------------------------------------------------------

View file

@ -215,7 +215,7 @@ sub www_show {
}
$session->http->setCacheControl("none");
$style->setScript($url->extras("/AttachmentsControl/AttachmentsControl.js"));
$style->setLink($url->extras("/AttachmentsControl/AttachmentsControl.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setCss($url->extras("/AttachmentsControl/AttachmentsControl.css"));
my $uploadControl = '';
my $i18n = WebGUI::International->new($session);
my $maxFiles = $form->param('maxAttachments') - scalar(@assetIds) ;

View file

@ -138,8 +138,8 @@ Set the head tags for this form plugin
sub headTags {
my $self = shift;
my ($style, $url) = $self->session->quick(qw(style url));
$style->setLink($url->extras("yui/build/resize/assets/skins/sam/resize.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras("yui/build/assets/skins/sam/skin.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setCss($url->extras("yui/build/resize/assets/skins/sam/resize.css"));
$style->setCss($url->extras("yui/build/assets/skins/sam/skin.css"));
$style->setScript($url->extras("yui/build/utilities/utilities.js"));
$style->setScript($url->extras("yui/build/container/container_core-min.js"));
$style->setScript($url->extras("yui/build/menu/menu-min.js"));
@ -147,8 +147,8 @@ sub headTags {
$style->setScript($url->extras("yui/build/resize/resize-min.js"));
$style->setScript($url->extras("yui/build/editor/editor-min.js"));
$style->setScript($url->extras("yui-webgui/build/code-editor/code-editor.js"));
#$style->setLink($url->extras("yui/build/logger/assets/logger.css"), {type=>"text/css", rel=>"stylesheet"});
#$style->setLink($url->extras("yui/build/logger/assets/skins/sam/logger.css"), {type=>"text/css", rel=>"stylesheet"});
#$style->setCss($url->extras("yui/build/logger/assets/logger.css"));
#$style->setCss($url->extras("yui/build/logger/assets/skins/sam/logger.css"));
#$style->setScript($url->extras("yui/build/logger/logger.js"));
$self->SUPER::headTags();
}

View file

@ -92,18 +92,18 @@ sub headTags {
my $self = shift;
my $url = $self->session->url;
my $style = $self->session->style;
$style->setLink($url->extras('/yui/build/container/assets/skins/sam/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/yui/build/colorpicker/assets/skins/sam/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/event/event-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/dragdrop/dragdrop-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/utilities/utilities.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/container/container-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/slider/slider-min.js'),{ type=>'text/javascript' });
$style->setScript($url->extras('/yui/build/colorpicker/colorpicker-min.js'),{ type=>'text/javascript' });
$style->setLink($url->extras('/colorpicker/colorpicker.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setScript($url->extras('/colorpicker/colorpicker.js'),{ type=>'text/javascript' });
$style->setCss($url->extras('/yui/build/container/assets/skins/sam/container.css'));
$style->setCss($url->extras('/yui/build/colorpicker/assets/skins/sam/colorpicker.css'));
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('/yui/build/event/event-min.js'));
$style->setScript($url->extras('/yui/build/dom/dom-min.js'));
$style->setScript($url->extras('/yui/build/dragdrop/dragdrop-min.js'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/yui/build/slider/slider-min.js'));
$style->setScript($url->extras('/yui/build/colorpicker/colorpicker-min.js'));
$style->setCss($url->extras('/colorpicker/colorpicker.css'));
$style->setScript($url->extras('/colorpicker/colorpicker.js'));
}
#-------------------------------------------------------------------

View file

@ -371,8 +371,7 @@ sub prepare {
# Source in the scripts
my $style = $self->session->style;
my $url = $self->session->url;
$style->setLink( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{ rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setScript( $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js') );
$style->setScript( $url->extras('yui/build/element/element-min.js') );
$style->setScript( $url->extras('yui/build/dragdrop/dragdrop-min.js') );
@ -381,17 +380,9 @@ sub prepare {
# Prepare the editors
if ( $self->get('showEdit') ) {
$style->setLink(
$url->extras( 'yui/build/button/assets/skins/sam/button.css', { rel => "stylesheet", type => "text/css" } )
);
$style->setLink(
$url->extras(
'yui/build/calendar/assets/skins/sam/calendar.css',
{ rel => "stylesheet", type => "text/css" }
)
);
$style->setLink( $url->extras('yui/build/container/assets/skins/sam/container.css'),
{ rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras( 'yui/build/button/assets/skins/sam/button.css'));
$style->setCss( $url->extras( 'yui/build/calendar/assets/skins/sam/calendar.css'));
$style->setCss( $url->extras('yui/build/container/assets/skins/sam/container.css'));
$style->setScript( $url->extras('yui/build/container/container-min.js') );
$style->setScript( $url->extras('yui/build/button/button-min.js') );
$style->setScript( $url->extras('yui/build/calendar/calendar-min.js') );

View file

@ -200,15 +200,15 @@ sub headTags {
my $session = $self->session;
my $style = $session->style;
my $url = $session->url;
$style->setLink($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
$style->setScript($url->extras('yui/build/utilities/utilities.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/json/json-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/dom/dom-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/event/event-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui/build/calendar/calendar-min.js'), { type => 'text/javascript' });
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js' ), { type => 'text/javascript' });
$style->setScript($url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type => 'text/javascript' });
$style->setCss($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'));
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('yui/build/dom/dom-min.js'));
$style->setScript($url->extras('yui/build/event/event-min.js'));
$style->setScript($url->extras('yui/build/calendar/calendar-min.js'));
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js' ));
$style->setScript($url->extras('yui-webgui/build/datepicker/datepicker.js'));
}
#-------------------------------------------------------------------

View file

@ -211,7 +211,7 @@ sub headTags {
my $style = $session->style;
my $url = $session->url;
$style->setLink($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
$style->setCss($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/yahoo/yahoo-min.js'));

View file

@ -245,8 +245,8 @@ Set the head tags for this form plugin
sub headTags {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('FileUploadControl.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('fileIcons.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('FileUploadControl.js'));
$self->session->style->setScript($self->session->url->extras('fileIcons.js'));
}
#-------------------------------------------------------------------

View file

@ -134,7 +134,7 @@ Set the head tags for this form plugin
sub headTags {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
}
#-------------------------------------------------------------------

View file

@ -211,7 +211,7 @@ Asset picker for the rich editor.
sub www_pageTree {
my $session = shift;
$session->http->setCacheControl("none");
$session->style->setLink($session->url->extras('/tinymce-webgui/plugins/wgpagetree/css/pagetree.css'),{ type=>'text/css', rel=>"stylesheet" });
$session->style->setCss($session->url->extras('/tinymce-webgui/plugins/wgpagetree/css/pagetree.css'));
$session->style->setRawHeadTags(<<"JS");
<style type="text/css">body { margin: 0 }</style>
<script type="text/javascript">//<![CDATA[
@ -268,7 +268,7 @@ Each link display a thumbnail of the image via www_viewThumbnail.
sub www_imageTree {
my $session = shift;
$session->http->setCacheControl("none");
$session->style->setLink($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'),{ type=>'text/css', rel=>"stylesheet" });
$session->style->setCss($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'));
$session->style->setRawHeadTags(<<"JS");
<style type="text/css">body { margin: 0 }</style>
<script type="text/javascript">//<![CDATA[
@ -347,7 +347,7 @@ URL in the session object is used to determine which Image is used.
sub www_viewThumbnail {
my $session = shift;
$session->http->setCacheControl("none");
$session->style->setLink($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'),{ type=>'text/css', rel=>"stylesheet" });
$session->style->setCss($session->url->extras('/tinymce-webgui/plugins/wginsertimage/css/insertimage.css'));
my $image = WebGUI::Asset->newByUrl($session);
my $i18n = WebGUI::International->new($session);
my $output = '<div class="preview">';

View file

@ -118,7 +118,7 @@ A class method that returns a boolean indicating whether this control is compati
sub headTags {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
}
#-------------------------------------------------------------------

View file

@ -134,7 +134,7 @@ Set head tags for this form plugin
sub headTags {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
}
#-------------------------------------------------------------------

View file

@ -138,18 +138,9 @@ Send JS required for this plugin.
sub headTags {
my $self = shift;
my ( $url, $style ) = $self->session->quick(qw( url style ));
$style->setScript(
$url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'),
{ type => 'text/javascript' },
);
$style->setScript(
$url->extras('yui/build/json/json-min.js'),
{ type => 'text/javascript' },
);
$style->setScript(
$url->extras('yui-webgui/build/form/jsontable.js'),
{ type => 'text/javascript' },
);
$style->setScript( $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript( $url->extras('yui/build/json/json-min.js'));
$style->setScript( $url->extras('yui-webgui/build/form/jsontable.js'));
}
#-------------------------------------------------------------------

View file

@ -77,10 +77,10 @@ sub headTags {
my $style = $session->style;
my $url = $session->url;
$style->setLink($url->extras("yui/build/autocomplete/assets/skins/sam/autocomplete.css"), {rel=>"stylesheet", type=>"text/css"});
$style->setScript($url->extras("yui/build/yahoo-dom-event/yahoo-dom-event.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/datasource/datasource-min.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/autocomplete/autocomplete-min.js"), {type=>"text/javascript"});
$style->setCss($url->extras("yui/build/autocomplete/assets/skins/sam/autocomplete.css"));
$style->setScript($url->extras("yui/build/yahoo-dom-event/yahoo-dom-event.js"));
$style->setScript($url->extras("yui/build/datasource/datasource-min.js"));
$style->setScript($url->extras("yui/build/autocomplete/autocomplete-min.js"));
$style->setRawHeadTags('<style type="text/css">.yui-skin-sam.webgui-keywords-autocomplete .yui-ac-input { position: static; width: auto }</style>');
}

View file

@ -129,7 +129,7 @@ sub headTags {
my $self = shift;
my ($style, $url) = $self->session->quick(qw(style url));
if ($self->get("resizable")) {
$style->setLink($url->extras("yui/build/resize/assets/skins/sam/resize.css"), {type=>"text/css", rel=>"stylesheet"});
$style->setCss($url->extras("yui/build/resize/assets/skins/sam/resize.css"));
$style->setScript($url->extras("yui/build/utilities/utilities.js"));
$style->setScript($url->extras("yui/build/resize/resize-min.js"));
}

View file

@ -165,7 +165,7 @@ Set the head tags for this form plugin
sub headTags {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'));
}
#-------------------------------------------------------------------

View file

@ -135,7 +135,7 @@ Add JS.
sub headTags {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('addHTTP.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('addHTTP.js'));
$self->SUPER::headTags();
return;
}

View file

@ -98,12 +98,13 @@ Set the head tags for this form plugin
sub headTags {
my $self = shift;
$self->session->style->setScript($self->session->url->extras('form/fieldCheck.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/connection/connection-min.js'), {type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/json/json-min.js'), {type=>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/datasource/datasource-min.js'), {type=>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui-webgui/build/i18n/i18n.js'), {type=>'text/javascript'});
my ($style, $url) = $self->session->quick(qw/style url/);
$style->setScript($url->extras('form/fieldCheck.js'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/connection/connection-min.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/datasource/datasource-min.js'));
$style->setScript($url->extras('yui-webgui/build/i18n/i18n.js'));
}
#-------------------------------------------------------------------

View file

@ -161,7 +161,7 @@ sub toHtml {
my ( $self ) = @_;
my ( $style, $url ) = $self->session->quick(qw{ style url });
$style->setLink( $url->extras('hoverhelp.css'), { rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras('hoverhelp.css'));
$style->setScript( $url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js') );
$style->setScript( $url->extras('yui/build/container/container-min.js') );
$style->setScript( $url->extras('hoverhelp.js') );

View file

@ -64,7 +64,7 @@ sub toHtml {
my ( $self ) = @_;
my ( $style, $url ) = $self->session->quick(qw( style url ));
$style->setLink( $url->extras("yui/build/tabview/assets/skins/sam/tabview.css"), { rel => "stylesheet", type => "text/css" } );
$style->setCss( $url->extras("yui/build/tabview/assets/skins/sam/tabview.css"));
$style->setScript( $url->extras("yui/build/yahoo-dom-event/yahoo-dom-event.js") );
$style->setScript( $url->extras("yui/build/element/element-min.js") );
$style->setScript( $url->extras("yui/build/tabview/tabview-min.js") );

View file

@ -269,8 +269,8 @@ sub print {
my $self = shift;
my $style = $self->session->style;
my $url = $self->session->url;
$style->setLink($url->extras('/yui/build/container/assets/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/hoverhelp.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setCss($url->extras('/yui/build/container/assets/container.css'));
$style->setCss($url->extras('/hoverhelp.css'));
$style->setScript($url->extras('/yui/build/yahoo/yahoo-min.js'));
$style->setScript($url->extras('/yui/build/dom/dom-min.js'));
$style->setScript($url->extras('/yui/build/event/event-min.js'));

View file

@ -39,7 +39,7 @@ sub process {
my ($url, $style, $asset, $user, $config) = $session->quick(qw(url style asset user config));
$style->setScript($url->extras('yui/build/utilities/utilities.js'));
$style->setScript($url->extras('accordion/accordion.js'));
$style->setLink($url->extras('macro/AdminBar/slidePanel.css'), {type=>'text/css', rel=>'stylesheet'});
$style->setCss($url->extras('macro/AdminBar/slidePanel.css'));
my $out = q{<dl class="accordion-menu">};

View file

@ -37,11 +37,7 @@ sub process {
# add CSS and JS to the page
my $style = $session->style;
$style->setLink($extras."/yui/build/container/assets/container.css",{
rel=>"stylesheet",
type=>"text/css",
}
);
$style->setCss($extras."/yui/build/container/assets/container.css");
# and the JS
$style->setScript($extras."/wgwidget.js");

View file

@ -273,7 +273,7 @@ sub www_viewHelp {
my $session = shift;
return $session->privilege->insufficient() unless canView($session);
my $ac = WebGUI::AdminConsole->new($session,"help");
$session->style->setLink($session->url->extras("/help.css"), {rel=>"stylesheet", type=>"text/css"});
$session->style->setCss($session->url->extras("/help.css"));
my $namespace = $session->form->process("namespace","className") || "WebGUI";
my $i18n = WebGUI::International->new($session, $namespace);
my $help = _get($session,$session->form->process("hid"),$namespace);

View file

@ -348,6 +348,27 @@ sub sent {
#-------------------------------------------------------------------
=head2 setCss ( url )
Sets a <link> tag into the <head> of this rendered page for this page
view. This is a shortcut for setLink with the parameters set for the
standard CSS defaults
=head3 url
The URL to the stylesheet you are linking. Only one link can be set per url. If a link to this URL exists,
the old link will remain and this method will return undef.
=cut
sub setCss {
my $self = shift;
my $url = shift;
return $self->setLink($url, { type=>'text/css', rel=>"stylesheet" });
}
#-------------------------------------------------------------------
=head2 setLink ( url, params )
Sets a <link> tag into the <head> of this rendered page for this page

View file

@ -370,13 +370,13 @@ sub getConfigurationScreen {
# Wrap output in a YUI Tab widget.
my ($style, $url) = $session->quick( qw{ style url } );
$style->setLink($self->{_css},{rel=>"stylesheet", rel=>"stylesheet",type=>"text/css"});
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'),{type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras('/yui/build/tabview/assets/skins/sam/tabview.css'),{type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras('/yui/build/button/assets/skins/sam/button.css'),{type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras('/yui/build/container/assets/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/hoverhelp.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setCss($self->{_css});
$style->setCss($url->extras('/yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('/yui/build/tabview/assets/skins/sam/tabview.css'));
$style->setCss($url->extras('/yui/build/button/assets/skins/sam/button.css'));
$style->setCss($url->extras('/yui/build/container/assets/container.css'));
$style->setCss($url->extras('/hoverhelp.css'));
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/yui/build/tabview/tabview-min.js'));

View file

@ -543,9 +543,9 @@ sub getConfigurationScreen {
##YUI specific datatable CSS
my ($style, $url) = $session->quick(qw(style url));
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setLink($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type => 'text/CSS'});
$style->setCss($url->extras('/yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setCss($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('yui/build/json/json-min.js'));
$style->setScript($url->extras('yui/build/paginator/paginator-min.js'));

View file

@ -1089,9 +1089,9 @@ sub www_manage {
my ($style, $url) = $session->quick(qw(style url));
# set up all the files that we need
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('/yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setLink($url->extras('/yui/build/paginator/assets/skins/sam/paginator.css'), {rel=>'stylesheet', type=>'text/css'});
$style->setCss($url->extras('/yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('/yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setCss($url->extras('/yui/build/paginator/assets/skins/sam/paginator.css'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/json/json-min.js'));
$style->setScript($url->extras('/yui/build/paginator/paginator-min.js'));

View file

@ -536,9 +536,9 @@ sub www_managePayouts {
return $session->privilege->adminOnly() unless ($admin->canManage);
# Load the required YUI stuff.
$style->setLink($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'), {type=>'text/css', rel=>'stylesheet'});
$style->setLink($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type=>'text/css', rel=>'stylesheet'});
$style->setLink($url->extras('yui/build/button/assets/skins/sam/button.css'), {type=>'text/css', rel=>'stylesheet'});
$style->setCss($url->extras('yui/build/paginator/assets/skins/sam/paginator.css'));
$style->setCss($url->extras('yui/build/datatable/assets/skins/sam/datatable.css'));
$style->setCss($url->extras('yui/build/button/assets/skins/sam/button.css'));
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
$style->setScript($url->extras('yui/build/element/element-min.js'));

View file

@ -230,11 +230,11 @@ sub print {
my $self = shift;
my $style = $self->session->style;
my $url = $self->session->url;
$style->setLink($self->{_css},{rel=>"stylesheet", rel=>"stylesheet",type=>"text/css"});
$style->setLink($url->extras('/yui/build/fonts/fonts-min.css'),{type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras('/yui/build/tabview/assets/skins/sam/tabview.css'),{type=>"text/css", rel=>"stylesheet"});
$style->setLink($url->extras('/yui/build/container/assets/container.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setLink($url->extras('/hoverhelp.css'),{ type=>'text/css', rel=>"stylesheet" });
$style->setCss($self->{_css});
$style->setCss($url->extras('/yui/build/fonts/fonts-min.css'));
$style->setCss($url->extras('/yui/build/tabview/assets/skins/sam/tabview.css'));
$style->setCss($url->extras('/yui/build/container/assets/container.css'));
$style->setCss($url->extras('/hoverhelp.css'));
$style->setScript($url->extras('/yui/build/utilities/utilities.js'));
$style->setScript($url->extras('/yui/build/container/container-min.js'));
$style->setScript($url->extras('/yui/build/tabview/tabview-min.js'));