oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Wobject/Carousel.pm
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 =

2
lib/WebGUI/Asset/Wobject/DataForm.pm
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);

2
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
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;}

2
lib/WebGUI/Asset/Wobject/Layout.pm
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 {

4
lib/WebGUI/Asset/Wobject/Map.pm
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">

9
lib/WebGUI/Asset/Wobject/Matrix.pm
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;

4
lib/WebGUI/Asset/Wobject/Navigation.pm
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'));

18
lib/WebGUI/Asset/Wobject/ProjectManager.pm
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");

2
lib/WebGUI/Asset/Wobject/Thingy.pm
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 }) {