From cb29744bce761d21060803a009e407aa3a006ddb Mon Sep 17 00:00:00 2001 From: JT Smith Date: Thu, 27 Apr 2006 04:32:36 +0000 Subject: [PATCH] fixed some more bugs --- docs/upgrades/7fixup.pl | 13 +- docs/upgrades/7fixup/style1/css01.snippet | 446 +++++++++++----------- docs/upgrades/7fixup/style1/style01.tmpl | 92 ++--- lib/WebGUI/Asset/Wobject/Navigation.pm | 2 +- 4 files changed, 277 insertions(+), 276 deletions(-) diff --git a/docs/upgrades/7fixup.pl b/docs/upgrades/7fixup.pl index a5ce1cbb0..62a64346f 100644 --- a/docs/upgrades/7fixup.pl +++ b/docs/upgrades/7fixup.pl @@ -39,7 +39,7 @@ sub addNewContent { ownerUserId=>'3', groupIdView=>'7', groupIdEdit=>'4', - description=>q|

The WebGUI Content Engine is a powerful and easy to use system for managing web sites, and building web applications. It provides thousands of features out of the box, and lots of plug-in points so you can extend it to match your needs. It's easy enough for the average business user, but powerful enough for any large enterprise.

+ description=>q|

The WebGUI Content Engine® is a powerful and easy to use system for managing web sites, and building web applications. It provides thousands of features out of the box, and lots of plug-in points so you can extend it to match your needs. It's easy enough for the average business user, but powerful enough for any large enterprise.

There are thousands of small and large businesses, schools, universities, governments, associations, clubs, churches, projects, and communities using WebGUI all over the world today. A brief list of some of them can be found here. Your site should be on that list.

|, templateId=>'PBtmpl0000000000000002' @@ -88,13 +88,13 @@ sub addNewContent { groupIdEdit=>'4', description=>q|

-If you're reading this message that means you've successfully installed and configured WebGUI. Great job! +If you're reading this message that means you've successfully installed and configured the WebGUI Content Engine®. Great job!

Now you should log in and go into admin mode. The default username is "admin" and the default password is "123qwe", but you probably customized both of those when you visited this site for the very first time.

-Now that you're logged in, we recommend creating a secondary account for yourself with admin privileges just in case you forget the login information for your primary admin account. Don't worry if you lock yourself out, you can always contact Plain Black support to get instructions to get back in. +Now that you're logged in, we recommend creating a secondary account for yourself with admin privileges just in case you forget the login information for your primary admin account. Don't worry if you lock yourself out, you can always contact Plain Black® support to get instructions to get back in.

No doubt after you enabled admin mode you saw a menu along the left side of the screen, that's called the Admin Bar. Use that to add content and access administrative functions. To get started with managing content, watch the short instructional video below. @@ -123,7 +123,7 @@ Enjoy your new WebGUI site! ownerUserId=>'3', groupIdView=>'7', groupIdEdit=>'4', - description=>q|

Plain Black created WebGUI and is here to answer your questions and provide you with services to make sure your WebGUI implementation is entirely successful. We bend over backwards to make sure you're a success. Contact us today to see how we can help you.

|, + description=>q|

Plain Black® created the WebGUI Content Engine® and is here to answer your questions and provide you with services to make sure your WebGUI implementation is entirely successful. We bend over backwards to make sure you're a success. Contact us today to see how we can help you.

|, templateId=>'PBtmpl0000000000000002' }); $yns->addChild({ @@ -335,12 +335,13 @@ sub addNewStyles { $folder->addChild(\%properties, "7.0-style".sprintf("%013d",$assetCounter)); } elsif ($file =~ m/\.snippet$/) { open(FILE,"<7fixup/".$style."/".$file); - my $head = 0; + my $head = 1; my %properties = (className=>"WebGUI::Asset::Snippet"); while (my $line = ) { - if ($line =~ m/^\#(.*):(.*)$/) { + if ($head && $line =~ m/^\#(\w+):(.*)$/) { $properties{$1} = $2; } else { + $head = 0; $properties{snippet} .= $line; } } diff --git a/docs/upgrades/7fixup/style1/css01.snippet b/docs/upgrades/7fixup/style1/css01.snippet index ba909203f..f5b6bf66e 100644 --- a/docs/upgrades/7fixup/style1/css01.snippet +++ b/docs/upgrades/7fixup/style1/css01.snippet @@ -3,226 +3,226 @@ #url:style1/css01.css #processAsTemplate:1 #mimeType:text/css -body, html -{ - text-align:center; - margin:0px; - height:100%; - background-color:#494949; -} - -#main -{ - width:800px; - background: url('^FileUrl(style1/main_bg.jpg);') repeat-y; - height:100%; - margin-left:auto; - margin-right:auto; - margin-top:0px; - margin-bottom:0px; - position:relative; -} -body > #main -{ - height:auto; - min-height:100%; -} - -#main #mainHeader -{ - width:800px; - height:133px; - background: url('^FileUrl(style1/header.jpg);') top left no-repeat; - margin-bottom:0px; - position:relative; -} -#main #mainHeader #title -{ - position:absolute; - top:23px; - left:145px; - font-size:32pt; - font-family:arial; - color:white; - font-weight:bold; -} -#main #mainHeader #title a { - color:white; - text-decoration:none; -} - -#main #mainContent -{ - background: url('^FileUrl(style1/orange_left01.jpg);') left top no-repeat; - width:100%; - height:100%; - margin-top:0px; - text-align:left; - border:solid red 0px; -} -#main > #mainContent -{ - margin-top:0px; - min-height:500px; -} -#main > #mainContent > p { - margin-top:0px; -} -#main #mainContent #mainText a:link { - color:#FF7F23; -} -#main #mainContent #mainText a:visited { - color:#D25900; -} - -/* LEVEL 1 AND 2 NAVIGATION */ -#main .mainNav_1, #main .mainNav_2 { - border-bottom:dashed #DADADA 1px; - width:621px; - height:25px; - text-align:left; - position:relative; - margin-left:137px; - clear:both; -} -#main .mainNav_1 a:link, #main .mainNav_1 a:visited, #main .mainNav_2 a:link, #main .mainNav_2 a:visited { - color:white; - text-decoration:none; - top:5px; - position:relative; - -moz-box-sizing:border-box; -} -#main .mainNav_1 a:hover,#main .mainNav_2 a:hover { - color:black; -} -#main .mainNav_1 div .left, #main .mainNav_2 div .left { - width:12px; - height:25px; - display:block; - float:left; - background: url('^FileUrl(style1/nav1_off_left.jpg);') no-repeat top left; -} -#main .mainNav_2 div .left { - background: url('^FileUrl(style1/nav2_off_left.jpg);') no-repeat top left; -} -#main .mainNav_1 div .center, #main .mainNav_2 div .center { - height:25px; - display:block; - float:left; - background: url('^FileUrl(style1/nav1_off_center.jpg);') repeat-x top left; - color:white; - font-family:arial, verdana; - font-size:8pt; -} -#main .mainNav_2 div .center { - background: url('^FileUrl(style1/nav2_off_center.jpg);') repeat-x top left; -} -#main .mainNav_1 div .right, #main .mainNav_2 div .right { - width:10px; - height:25px; - display:block; - float:left; - background: url('^FileUrl(style1/nav1_off_right.jpg);') no-repeat top left; -} -#main .mainNav_2 div .right { - background: url('^FileUrl(style1/nav2_off_right.jpg);') no-repeat top left; -} -#main .mainNav_1 div.navOn .left { - background: url('^FileUrl(style1/nav1_on_left.jpg);') no-repeat top left; -} -#main .mainNav_1 div.navOn .center { - background: url('^FileUrl(style1/nav1_center_on.jpg);') repeat-x top left; -} -#main .mainNav_1 div.navOn .right { - background: url('^FileUrl(style1/nav1_on_right.jpg);') no-repeat top left; -} -#main .mainNav_2 div.navOn .left { - background: url('^FileUrl(style1/nav2_on_left.jpg);') no-repeat top left; -} -#main .mainNav_2 div.navOn .center { - background: url('^FileUrl(style1/nav2_center_on.jpg);') repeat-x top left; -} -#main .mainNav_2 div.navOn .right { - background: url('^FileUrl(style1/nav2_on_right.jpg);') no-repeat top left; -} -#main .mainNav_1 div.navOn a:link, #main .mainNav_1 div.navOn a:visited, #main .mainNav_2 div.navOn a:link, #main .mainNav_2 div.navOn a:visited { - color:black; -} -/* ENDOF LEVEL 1 AND 2 NAVIGATION */ - -#main #crumbTrail { - margin-left:177px; - margin-bottom:0px; - color:gray; - font-size:8pt; - font-weight:bold; -} -#main #crumbTrail a.crumbTrail:visited, #main #crumbTrail a.crumbTrail:link { - color:silver; - font-size:8pt; - font-family:arial; - text-decoration:none; - font-weight:normal; -} -#main #crumbTrail a.crumbTrail:hover { - color:gray; -} - -#main #mainText -{ - padding-left:150px; - font-family:verdana; - font-size:9pt; - width:600px; - margin-top:0px; -} - -#main #gui -{ - bottom:0px; - left:0px; - position:absolute; - width:135px; - font-size:8pt; - color:black; - font-family:arial; - text-align:right; -} -#main #gui .loginBox { - padding-right:12px; - -moz-box-sizing:border-box; - width:100px; - float:right; - margin-bottom:10px; -} -#main #gui .loginBox .loginBoxField { - width:75px; -} -#main #gui .loginBox .loginBoxButton { - background-color:#D65501; - color:white; - border:solid white 2px; - margin-top:4px; - font-variant:small-caps; -} -#main #gui a -{ - color:white; -} -#copyright { - color:#fff; - position:absolute; - top:110px; - right:40px; - font-family:verdana; - font-size:8pt; - font-weight:bold; - background-color:#2D2D2D; - opacity:0.4; - -moz-opacity:0.4; - -khtml-opacity:0.4; - padding:2px; -} -* html #copyright { - background: transparent; -} \ No newline at end of file +body, html +{ + text-align:center; + margin:0px; + height:100%; + background-color:#494949; +} + +#main +{ + width:800px; + background: url('^FileUrl(style1/main_bg.jpg);') repeat-y; + height:100%; + margin-left:auto; + margin-right:auto; + margin-top:0px; + margin-bottom:0px; + position:relative; +} +body > #main +{ + height:auto; + min-height:100%; +} + +#main #mainHeader +{ + width:800px; + height:133px; + background: url('^FileUrl(style1/header.jpg);') top left no-repeat; + margin-bottom:0px; + position:relative; +} +#main #mainHeader #title +{ + position:absolute; + top:23px; + left:145px; + font-size:32pt; + font-family:arial; + color:white; + font-weight:bold; +} +#main #mainHeader #title a { + color:white; + text-decoration:none; +} + +#main #mainContent +{ + background: url('^FileUrl(style1/orange_left01.jpg);') left top no-repeat; + width:100%; + height:100%; + margin-top:0px; + text-align:left; + border:solid red 0px; +} +#main > #mainContent +{ + margin-top:0px; + min-height:500px; +} +#main > #mainContent > p { + margin-top:0px; +} +#main #mainContent #mainText a:link { + color:#FF7F23; +} +#main #mainContent #mainText a:visited { + color:#D25900; +} + +/* LEVEL 1 AND 2 NAVIGATION */ +#main .mainNav_1, #main .mainNav_2 { + border-bottom:dashed #DADADA 1px; + width:621px; + height:25px; + text-align:left; + position:relative; + margin-left:137px; + clear:both; +} +#main .mainNav_1 a:link, #main .mainNav_1 a:visited, #main .mainNav_2 a:link, #main .mainNav_2 a:visited { + color:white; + text-decoration:none; + top:5px; + position:relative; + -moz-box-sizing:border-box; +} +#main .mainNav_1 a:hover,#main .mainNav_2 a:hover { + color:black; +} +#main .mainNav_1 div .left, #main .mainNav_2 div .left { + width:12px; + height:25px; + display:block; + float:left; + background: url('^FileUrl(style1/nav1_off_left.jpg);') no-repeat top left; +} +#main .mainNav_2 div .left { + background: url('^FileUrl(style1/nav2_off_left.jpg);') no-repeat top left; +} +#main .mainNav_1 div .center, #main .mainNav_2 div .center { + height:25px; + display:block; + float:left; + background: url('^FileUrl(style1/nav1_off_center.jpg);') repeat-x top left; + color:white; + font-family:arial, verdana; + font-size:8pt; +} +#main .mainNav_2 div .center { + background: url('^FileUrl(style1/nav2_off_center.jpg);') repeat-x top left; +} +#main .mainNav_1 div .right, #main .mainNav_2 div .right { + width:10px; + height:25px; + display:block; + float:left; + background: url('^FileUrl(style1/nav1_off_right.jpg);') no-repeat top left; +} +#main .mainNav_2 div .right { + background: url('^FileUrl(style1/nav2_off_right.jpg);') no-repeat top left; +} +#main .mainNav_1 div.navOn .left { + background: url('^FileUrl(style1/nav1_on_left.jpg);') no-repeat top left; +} +#main .mainNav_1 div.navOn .center { + background: url('^FileUrl(style1/nav1_center_on.jpg);') repeat-x top left; +} +#main .mainNav_1 div.navOn .right { + background: url('^FileUrl(style1/nav1_on_right.jpg);') no-repeat top left; +} +#main .mainNav_2 div.navOn .left { + background: url('^FileUrl(style1/nav2_on_left.jpg);') no-repeat top left; +} +#main .mainNav_2 div.navOn .center { + background: url('^FileUrl(style1/nav2_center_on.jpg);') repeat-x top left; +} +#main .mainNav_2 div.navOn .right { + background: url('^FileUrl(style1/nav2_on_right.jpg);') no-repeat top left; +} +#main .mainNav_1 div.navOn a:link, #main .mainNav_1 div.navOn a:visited, #main .mainNav_2 div.navOn a:link, #main .mainNav_2 div.navOn a:visited { + color:black; +} +/* ENDOF LEVEL 1 AND 2 NAVIGATION */ + +#main #crumbTrail { + margin-left:177px; + margin-bottom:0px; + color:gray; + font-size:8pt; + font-weight:bold; +} +#main #crumbTrail a.crumbTrail:visited, #main #crumbTrail a.crumbTrail:link { + color:silver; + font-size:8pt; + font-family:arial; + text-decoration:none; + font-weight:normal; +} +#main #crumbTrail a.crumbTrail:hover { + color:gray; +} + +#main #mainText +{ + padding-left:150px; + font-family:verdana; + font-size:9pt; + width:600px; + margin-top:0px; +} + +#main #gui +{ + bottom:0px; + left:0px; + position:absolute; + width:135px; + font-size:8pt; + color:black; + font-family:arial; + text-align:right; +} +#main #gui .loginBox { + padding-right:12px; + -moz-box-sizing:border-box; + width:100px; + float:right; + margin-bottom:10px; +} +#main #gui .loginBox .loginBoxField { + width:75px; +} +#main #gui .loginBox .loginBoxButton { + background-color:#D65501; + color:white; + border:solid white 2px; + margin-top:4px; + font-variant:small-caps; +} +#main #gui a +{ + color:white; +} +#copyright { + color:#fff; + position:absolute; + top:110px; + right:40px; + font-family:verdana; + font-size:8pt; + font-weight:bold; + background-color:#2D2D2D; + opacity:0.4; + -moz-opacity:0.4; + -khtml-opacity:0.4; + padding:2px; +} +* html #copyright { + background: transparent; +} diff --git a/docs/upgrades/7fixup/style1/style01.tmpl b/docs/upgrades/7fixup/style1/style01.tmpl index c193992c3..8b0617d3f 100644 --- a/docs/upgrades/7fixup/style1/style01.tmpl +++ b/docs/upgrades/7fixup/style1/style01.tmpl @@ -3,50 +3,50 @@ #menuTitle:Style 01 #url:style_01 #namespace:style - - - - ^Page(title); - - - - - ^AdminBar(); -
-
-
- ^H(^c();); -
- - -
- -
-
- ^AssetProxy(roottab_level0); -
-
-
- ^AssetProxy(roottab_level1); -
-
- ^AssetProxy(crumbtrail); -
-
 
-
- -
-
 
-
- -
- ^L("","","PBtmpl0000000000000044"); -
^AdminToggle;
- ^AssetProxy(style1/gui_bottom.jpg);
- WebGUI Button -
-
- + + + + ^Page(title); + + + + + ^AdminBar(); +
+
+
+ ^H(^c();); +
+ + +
+ +
+
+ ^AssetProxy(roottab_level0); +
+
+
+ ^AssetProxy(roottab_level1); +
+
+ ^AssetProxy(crumbtrail); +
+
 
+
+ +
+
 
+
+ +
+ ^L("","","PBtmpl0000000000000044"); +
^AdminToggle;
+ ^AssetProxy(style1/gui_bottom.jpg);
+ WebGUI Button +
+
+ diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm index 2052c359d..3b3869845 100644 --- a/lib/WebGUI/Asset/Wobject/Navigation.pm +++ b/lib/WebGUI/Asset/Wobject/Navigation.pm @@ -528,7 +528,7 @@ sub www_view { my $self = shift; my $mimeType = $self->getValue('mimeType') || 'text/html'; if ($mimeType eq 'text/html') { - return $self->SUPER->www_view(); + return $self->SUPER::www_view(); } else { $self->prepareView();