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

export cleanups and mobile style

Browse source
This commit is contained in:
Graham Knop 2009-05-15 09:30:20 +00:00
parent 93819cda0c
commit 1f3ab6a419
20 changed files with 518 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Event.pm
View file

@ -2469,7 +2469,7 @@ ENDJS
### Show the processed template
$session->http->sendHeader;
my $style = $session->style->process($self->getSeparator,$self->getParent->get("styleTemplateId"));
my $style = $self->getParent->processStyle($self->getSeparator);
my ($head, $foot) = split($self->getSeparator,$style);
$self->session->output->print($head, 1);
$self->session->output->print($self->processTemplate($var, undef, $template));

16
lib/WebGUI/Asset/Wobject.pm
View file

@ -99,7 +99,16 @@ sub definition {
hoverHelp=>$i18n->get('1079 description'),
filter=>'fixId',
namespace=>'style'
}
},
mobileStyleTemplateId => {
fieldType => ( $session->setting->get('useMobileStyle') ? 'template' : 'hidden' ),
defaultValue => 'PBtmpl0000000000000060',
tab => 'display',
label => $i18n->get('mobileStyleTemplateId label'),
hoverHelp => $i18n->get('mobileStyleTemplateId description'),
filter => 'fixId',
namespace => 'style',
},
);
push(@{$definition}, {
tableName=>'wobject',
@ -390,7 +399,10 @@ sub processStyle {
content => $self->get('synopsis'),
});
}
return $style->process($output,$self->get("styleTemplateId"));
if ($style->useMobileStyle) {
return $style->process($output,$self->get("mobileStyleTemplateId"));
}
return $style->process($output,$self->get("styleTemplateId"));
}

54
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -72,6 +72,11 @@ sub definition {
namespace => "Layout",
defaultValue =>'PBtmpl0000000000000054',
},
mobileTemplateId => {
fieldType => ( $session->style->useMobileStyle ? 'template' : 'hidden' ),
namespace => 'Layout',
defaultValue => 'PBtmpl0000000000000054',
},
contentPositions => {
noFormPost =>1,
defaultValue =>undef,
@ -117,6 +122,22 @@ sub getEditForm {
-namespace=>"Layout"
);
if ( $self->session->setting->get('useMobileStyle') ) {
$tabform->getTab("display")->template(
name => 'mobileTemplateId',
value => $self->getValue('mobileTemplateId'),
label => $i18n->get('mobileTemplateId label'),
hoverHelp => $i18n->get('mobileTemplateId description'),
namespace => 'Layout',
);
}
else {
$tabform->getTab("display")->hidden(
name => 'mobileTemplateId',
value => $self->getValue('mobileTemplateId'),
);
}
tie my %assetOrder, "Tie::IxHash";
%assetOrder = (
"asc" =>$i18n->get("asset order asc"),
@ -163,7 +184,16 @@ sub prepareView {
my $self = shift;
$self->SUPER::prepareView;
my $session = $self->session;
my $template = WebGUI::Asset->new($session,$self->get("templateId"),"WebGUI::Asset::Template");
my $templateId;
if ($session->style->useMobileStyle) {
$templateId = $self->get('templateId');
}
else {
$templateId = $self->get('mobileTemplateId');
}
my $template = WebGUI::Asset->new($session,$templateId,"WebGUI::Asset::Template");
$template->prepare( $self->getMetaDataAsTemplateVariables );
$self->{_viewTemplate} = $template;
@ -325,30 +355,34 @@ sub getContentLastModified {
#-------------------------------------------------------------------
sub www_view {
my $self = shift;
my $session = $self->session;
# slashdot / burst protection hack
if ($self->session->var->get("userId") eq "1" && $self->session->form->param() == 0) {
if ($session->var->get("userId") eq "1"
&& $session->form->param() == 0
&& !$session->scratch->get('isExporting')
) {
my $check = $self->checkView;
return $check if (defined $check);
my $cache = WebGUI::Cache->new($self->session, "view_".$self->getId);
my $cache = WebGUI::Cache->new($session, "view_".$self->getId);
my $out = $cache->get if defined $cache;
unless ($out) {
$self->prepareView;
$self->session->stow->set("cacheFixOverride", 1);
$session->stow->set("cacheFixOverride", 1);
$out = $self->processStyle($self->view);
$cache->set($out, 60);
$self->session->stow->delete("cacheFixOverride");
$session->stow->delete("cacheFixOverride");
}
# keep those ads rotating
while ($out =~ /(\[AD\:([^\]]+)\])/gs) {
my $code = $1;
my $adSpace = WebGUI::AdSpace->newByName($self->session, $2);
my $adSpace = WebGUI::AdSpace->newByName($session, $2);
my $ad = $adSpace->displayImpression if (defined $adSpace);
$out =~ s/\Q$code/$ad/ges;
}
$self->session->http->setLastModified($self->getContentLastModified);
$self->session->http->sendHeader;
$self->session->output->print($out, 1);
return "chunked";
$session->http->setLastModified($self->getContentLastModified);
$session->http->sendHeader;
$session->output->print($out, 1);
return "chunked";
}
$self->{_viewPrintOverride} = 1; # we do this to make it output each asset as it goes, rather than waiting until the end
return $self->SUPER::www_view;

2
lib/WebGUI/Asset/Wobject/ProjectManager.pm
View file

@ -2011,7 +2011,7 @@ sub www_viewProject {
$var->{'task.back.label'} = $i18n->get("task back label");
$var->{'task.back.url'} = $self->getUrl;
return $style->process($self->processTemplate($var,$self->getValue("projectDisplayTemplateId")),$self->getValue("styleTemplateId"));
return $style->processStyle($self->processTemplate($var,$self->getValue("projectDisplayTemplateId")));
}

6
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -1408,7 +1408,7 @@ sub www_takeSurvey {
my $self = shift;
my $out = $self->processTemplate( {}, $self->get('surveyTakeTemplateId') );
return $self->session->style->process( $out, $self->get('styleTemplateId') );
return $self->processStyle($out);
}
#-------------------------------------------------------------------
@ -2071,7 +2071,7 @@ sub www_viewGradeBook {
$paginator->appendTemplateVars($var);
my $out = $self->processTemplate( $var, $self->get('gradebookTemplateId') );
return $self->session->style->process( $out, $self->get('styleTemplateId') );
return $self->processStyle($out);
}
#-------------------------------------------------------------------
@ -2161,7 +2161,7 @@ sub www_viewStatisticalOverview {
$paginator->appendTemplateVars($var);
my $out = $self->processTemplate( $var, $self->get('overviewTemplateId') );
return $self->session->style->process( $out, $self->get('styleTemplateId') );
return $self->processStyle($out);
}
#-------------------------------------------------------------------

5
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -3468,8 +3468,9 @@ sub www_viewThingData {
$self->getViewThingVars($thingId,$thingDataId,$var);
$self->appendThingsVars($var, $thingId);
return $self->session->style->process($self->processTemplate($var,$thingProperties->{viewTemplateId}),$self->get("styleTemplateId"));
return $self->processStyle(
$self->processTemplate($var,$thingProperties->{viewTemplateId})
);
}
#-------------------------------------------------------------------