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

[ 1475220 ] some 6.99 templates have double slashes

Browse source
This commit is contained in:
JT Smith 2006-04-28 17:12:58 +00:00
parent f91b1b9d13
commit 1b7488e4b1
12 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Form/Float.pm
View file

@ -116,7 +116,7 @@ Renders a floating point field.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789-.\')"'); $self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789-.\')"');
return $self->SUPER::toHtml; return $self->SUPER::toHtml;
} }

2
lib/WebGUI/Form/HTMLArea.pm
View file

@ -123,7 +123,7 @@ Renders an HTML area field.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/textFix.js',{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('textFix.js'),{ type=>'text/javascript' });
$self->set("extras", $self->get('extras') . ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" '); $self->set("extras", $self->get('extras') . ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" ');
$self->set("resizeable", 0); $self->set("resizeable", 0);
return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->session,$self->get("richEditId"))->getRichEditor($self->get('id')); return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->session,$self->get("richEditId"))->getRichEditor($self->get('id'));

4
lib/WebGUI/Form/Image.pm
View file

@ -163,7 +163,7 @@ sub toHtml {
my @files = $storage->getFiles if (defined $storage); my @files = $storage->getFiles if (defined $storage);
my $maxFiles = $self->get('maxAttachments') - scalar(@files); my $maxFiles = $self->get('maxAttachments') - scalar(@files);
if ($maxFiles > 0) { if ($maxFiles > 0) {
$self->session->style->setScript($self->session->config->get("extrasURL").'/FileUploadControl.js',{type=>"text/javascript"}); $self->session->style->setScript($self->session->url->extras('/FileUploadControl.js'),{type=>"text/javascript"});
$uploadControl = '<script type="text/javascript"> $uploadControl = '<script type="text/javascript">
var fileIcons = new Array(); var fileIcons = new Array();
'; ';
@ -174,7 +174,7 @@ sub toHtml {
unless ($file eq "." || $file eq "..") { unless ($file eq "." || $file eq "..") {
my $ext = $file; my $ext = $file;
$ext =~ s/(.*?)\.gif/$1/; $ext =~ s/(.*?)\.gif/$1/;
$uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->config->get("extrasURL").'/fileIcons/'.$file.'";'."\n"; $uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->url->extras('fileIcons/'.$file).'";'."\n";
} }
} }
$uploadControl .= sprintf q!var uploader = new FileUploadControl("%s", fileIcons, "%s","%d"); $uploadControl .= sprintf q!var uploader = new FileUploadControl("%s", fileIcons, "%s","%d");

2
lib/WebGUI/HTMLForm.pm
View file

@ -206,7 +206,7 @@ Returns the HTML for this form object.
sub print { sub print {
my $self = shift; my $self = shift;
return $self->{_header}.$self->{_data}.$self->{_footer}.'<script type="text/javascript" src="'.$self->session->config->get("extrasURL").'/wz_tooltip.js"></script>'; return $self->{_header}.$self->{_data}.$self->{_footer}.'<script type="text/javascript" src="'.$self->session->url->extras('wz_tooltip.js').'"></script>';
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

2
lib/WebGUI/Operation/Commerce.pm
View file

@ -698,7 +698,7 @@ sub www_editCommerceSettings {
$tabform->submit; $tabform->submit;
$session->style->setScript($session->config->get("extrasURL").'/swapLayers.js',{type=>"text/javascript"}); $session->style->setScript($session->url->extras('swapLayers.js'),{type=>"text/javascript"});
return _submenu($session,$tabform->print, 'edit commerce settings title', 'commerce manage'); return _submenu($session,$tabform->print, 'edit commerce settings title', 'commerce manage');
} }

4
lib/WebGUI/Operation/FormHelpers.pm
View file

@ -93,7 +93,7 @@ sub www_richEditPageTree {
-value=>$i18n->get('done'), -value=>$i18n->get('done'),
-extras=>'onclick="createLink()"' -extras=>'onclick="createLink()"'
); );
$session->style->setScript($session->config->get("extrasURL")."/tinymce2/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"}); $session->style->setScript($session->url->extras('tinymce2/jscripts/tiny_mce/tiny_mce_popup.js'),{type=>"text/javascript"});
my $output = '<fieldset><legend>'.$i18n->get('insert a link').'</legend> my $output = '<fieldset><legend>'.$i18n->get('insert a link').'</legend>
<fieldset><legend>'.$i18n->get('insert a link').'</legend>'.$f->print.'</fieldset> <fieldset><legend>'.$i18n->get('insert a link').'</legend>'.$f->print.'</fieldset>
<script type="text/javascript"> <script type="text/javascript">
@ -213,7 +213,7 @@ sub www_richEditViewThumbnail {
</script>\n"; </script>\n";
return $output; return $output;
} }
return '<div align="center"><img src="'.$session->config->get("extrasURL").'/tinymce2/images/icon.gif" style="border-style:none;" alt="'.$i18n->get('image manager').'" /></div>'; return '<div align="center"><img src="'.$session->url->extras('tinymce2/images/icon.gif').'" style="border-style:none;" alt="'.$i18n->get('image manager').'" /></div>';
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

2
lib/WebGUI/Operation/Settings.pm
View file

@ -262,8 +262,6 @@ sub www_editSettings {
-extras=>'onchange="alert(\''.$i18n->get("Illegal Warning").'\')" ' -extras=>'onchange="alert(\''.$i18n->get("Illegal Warning").'\')" '
); );
# auth settings # auth settings
$session->style->setScript($session->config->get("extrasURL")."/swapLayers.js",{type=>"text/javascript"});
$session->style->setRawHeadTags('<script type="text/javascript" >var active="'.$session->setting->get("authMethod").'";</script>');
my $options; my $options;
foreach (@{$session->config->get("authMethods")}) { foreach (@{$session->config->get("authMethods")}) {
$options->{$_} = $_; $options->{$_} = $_;

2
lib/WebGUI/Operation/User.pm
View file

@ -313,8 +313,6 @@ sub www_editUser {
my $u = WebGUI::User->new($session,($uid eq 'new') ? '' : $uid); #Setting uid to '' when uid is 'new' so visitor defaults prefill field for new user my $u = WebGUI::User->new($session,($uid eq 'new') ? '' : $uid); #Setting uid to '' when uid is 'new' so visitor defaults prefill field for new user
my $username = $u->userId eq '1' ? '' : $u->username; my $username = $u->userId eq '1' ? '' : $u->username;
$session->stow->set("editUser_UID", $uid); $session->stow->set("editUser_UID", $uid);
$session->style->setScript($session->config->get("extrasURL")."/swapLayers.js", {type=>"text/javascript"});
$session->style->setRawHeadTags('<script type="text/javascript">var active="'.$u->authMethod.'";</script>');
$tabform->hidden({name=>"op",value=>"editUserSave"}); $tabform->hidden({name=>"op",value=>"editUserSave"});
$tabform->hidden({name=>"uid",value=>$uid}); $tabform->hidden({name=>"uid",value=>$uid});
$tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>'); $tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>');

2
lib/WebGUI/Operation/WebGUI.pm
View file

@ -145,7 +145,7 @@ sub www_setup {
$output .= $f->print; $output .= $f->print;
} }
$output .= '</fieldset></div> $output .= '</fieldset></div>
<img src="'.$session->config->get("extrasURL").'/background.jpg" style="border-style:none;position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 5;" /> <img src="'.$session->url->extras('background.jpg').'" style="border-style:none;position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 5;" />
</body> </body>
</html>'; </html>';
return $output; return $output;

2
lib/WebGUI/Session/Style.pm
View file

@ -173,7 +173,7 @@ $var{'head.tags'} = '
<script type="text/javascript"> <script type="text/javascript">
function getWebguiProperty (propName) { function getWebguiProperty (propName) {
var props = new Array(); var props = new Array();
props["extrasURL"] = "'.$self->session->config->get("extrasURL").'"; props["extrasURL"] = "'.$self->session->url->extras().'";
props["pageURL"] = "'.$self->session->url->page(undef, undef, 1).'"; props["pageURL"] = "'.$self->session->url->page(undef, undef, 1).'";
return props[propName]; return props[propName];
} }

4
lib/WebGUI/Storage.pm
View file

@ -505,9 +505,9 @@ sub getFileIconUrl {
my $extension = $self->getFileExtension($filename); my $extension = $self->getFileExtension($filename);
my $path = $self->session->config->get("extrasPath").'/fileIcons/'.$extension.".gif"; my $path = $self->session->config->get("extrasPath").'/fileIcons/'.$extension.".gif";
if (-e $path) { if (-e $path) {
return $self->session->config->get("extrasURL")."/fileIcons/".$extension.".gif"; return $self->session->url->extras("fileIcons/".$extension.".gif");
} }
return $self->session->config->get("extrasURL")."/fileIcons/unknown.gif"; return $self->session->url->extras("fileIcons/unknown.gif");
} }

6
lib/WebGUI/TabForm.pm
View file

@ -194,7 +194,7 @@ sub new {
my $class = shift; my $class = shift;
my $session = shift; my $session = shift;
my $startingTabs = shift; my $startingTabs = shift;
my $css = shift || $session->config->get("extrasURL").'/tabs/tabs.css'; my $css = shift || $session->url->extras('tabs/tabs.css');
my $cancelUrl = shift || $session->url->page(); my $cancelUrl = shift || $session->url->page();
my $uiLevelOverride = shift; my $uiLevelOverride = shift;
my %tabs; my %tabs;
@ -223,7 +223,7 @@ Returns an HTML string with all the necessary components to draw the tab form.
sub print { sub print {
my $self = shift; my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/tabs/tabs.js',{type=>"text/javascript"}); $self->session->style->setScript($self->session->url->extras('tabs/tabs.js'),{type=>"text/javascript"});
$self->session->style->setLink($self->{_css},{rel=>"stylesheet", rev=>"stylesheet",type=>"text/css"}); $self->session->style->setLink($self->{_css},{rel=>"stylesheet", rev=>"stylesheet",type=>"text/css"});
my $output = $self->{_form}; my $output = $self->{_form};
$output .= $self->{_hidden}; $output .= $self->{_hidden};
@ -245,7 +245,7 @@ sub print {
$output .= $form; $output .= $form;
$output .= WebGUI::Form::formFooter($self->session,); $output .= WebGUI::Form::formFooter($self->session,);
$output .= '<script type="text/javascript">var numberOfTabs = '.($i-1).'; initTabs();</script>'; $output .= '<script type="text/javascript">var numberOfTabs = '.($i-1).'; initTabs();</script>';
$output .= '<script type="text/javascript" src="'.$self->session->config->get("extrasURL").'/wz_tooltip.js"></script>'; $output .= '<script type="text/javascript" src="'.$self->session->url->extras('wz_tooltip.js').'"></script>';
return $output; return $output;
} }