From c28cbf2673a74aa92a79248661d4520f2d02603b Mon Sep 17 00:00:00 2001 From: Wouter van Oijen Date: Fri, 14 Oct 2005 07:58:50 +0000 Subject: [PATCH] - fix [ 1323057 ] Anchors break XHTML 1.1 - fixed "Fail Safe" template (admin bar doesn't overlap content anymore) - fixed lots of XHTML bugs in templates --- docs/changelog/6.x.x.txt | 3 + docs/upgrades/upgrade_6.7.6-6.7.7.pl | 5159 +++++++++++++++++++++++++- 2 files changed, 5069 insertions(+), 93 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 4d74feafe..f8408f7bf 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -14,6 +14,9 @@ - fix [ 1312107 ] Forum Issue in "Thread" View - fix [ 1318963 ] 6.7.5 None of the profile fields can be updated - fix [ 1306722 ] 6.7.5 Add an event only on TODAY + - fix [ 1323057 ] Anchors break XHTML 1.1 + - fixed "Fail Safe" template (admin bar doesn't overlap content anymore) + - fixed lots of XHTML bugs in templates and code 6.7.6 - Fixed invalid i18n keys that were causing missing labels. diff --git a/docs/upgrades/upgrade_6.7.6-6.7.7.pl b/docs/upgrades/upgrade_6.7.6-6.7.7.pl index 39641c12f..9af9a0308 100644 --- a/docs/upgrades/upgrade_6.7.6-6.7.7.pl +++ b/docs/upgrades/upgrade_6.7.6-6.7.7.pl @@ -9,22 +9,740 @@ use WebGUI::Setting; my $toVersion = "6.7.7"; my $configFile; my $quiet; +my %fixedTemplates; start(); removingThreadedView(); +fixTemplates(); finish(); - #------------------------------------------------- sub removingThreadedView { print "\tRemoving threaded views from CS in favor of nested views.\n" unless ($quiet); - my $asset = WebGUI::Asset->new("PBtmpl0000000000000032","WebGUI::Asset::Template"); - my $template = < - + # + # (template fixes moved into fixTemplates function) + # + WebGUI::SQL->write("update userSessionScratch set value='nested' where value='threaded' and name='discussionLayout'"); + WebGUI::SQL->write("update userProfileData set fieldData='nested' where fieldData='threaded' and fieldName='discussionLayout'"); + WebGUI::SQL->write("update userProfileField set dataValues='{ + flat=>WebGUI::International::get(510), + nested=>WebGUI::International::get(1045) +}', dataDefault=".quote("['nested']")." where fieldName='discussionLayout'"); +} + +#------------------------------------------------- +sub fixTemplates { + print "\tFixing templates.\n" unless ($quiet); + loadFixedTemplates(); + foreach my $assetId (keys %fixedTemplates) { + my $asset = WebGUI::Asset->new($assetId, "WebGUI::Asset::Template"); + $asset->addRevision({template=>$fixedTemplates{$assetId}})->commit if (defined $asset); + } +} + +#------------------------------------------------- +sub start { + $|=1; #disable output buffering + GetOptions( + 'configFile=s'=>\$configFile, + 'quiet'=>\$quiet + ); + WebGUI::Session::open("../..",$configFile); + WebGUI::Session::refreshUserInfo(3); + WebGUI::SQL->write("insert into webguiVersion values (".quote($toVersion).",'upgrade',".time().")"); +} + +#------------------------------------------------- +sub finish { + WebGUI::Session::close(); +} + +#------------------------------------------------- +# No interesting code below this line, only templates +sub loadFixedTemplates { +$fixedTemplates{DPUROtmpl0000000000001} = << 'END'; + + +

+

+RSS 0.90 +RSS 0.91 +RSS 1.0 +RSS 2.0 +

+ + +

+ + + + +

+ + +

+ + + + + +

+ + +

+ + + + + + +

+ + +
  • + + + + + + + - + + +
    + + +END + +$fixedTemplates{GNvjCFQWjY2AF2uf0aCM8Q} = << 'END'; + + + +

    +     + + +

    +     + + +

    + + +

    + + + + + +

    + + +

    + + + + + +
    + +     + +
    + Read More... +     +
    +
    +     +END + +$fixedTemplates{PBtmpl0000000000000001} = << 'END'; +^StyleSheet(^Extras;adminConsole/adminConsole.css); +^JavaScript(^Extras;adminConsole/adminConsole.js); + +

    + +
    +
    + +
    +
    +
    +   +
    + + +
    + <tmpl_var title>
    + +
    +     +     +
    +   +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + >
    +     +
    +
    +
    + ^AdminToggle;
    + ^LoginToggle;
    +
    +
    +
    + +
    +
    + + ? + +
    +
    + <tmpl_var application.title> +
    +
    +* +
    +
    + <tmpl_var console.title> +
    + +END + +$fixedTemplates{PBtmpl0000000000000002} = << 'END'; + + + +

    +     + + +

    +     + + + +
    + <tmpl_var image.url> + + + + + + + + + + +

    + + + + + + + + +· + +· + + + + + +

    +     +     + + + +

    + + + + + +
    ()
    + + +END + +$fixedTemplates{PBtmpl0000000000000003} = << 'END'; + + + + + +
    + <tmpl_var attachment.name> + + <tmpl_var attachment.name> +
    +END + +$fixedTemplates{PBtmpl0000000000000004} = << 'END'; +

    + +

    + + + +

    + + + + + +
    + + + +
    +     + +
    +
      + +
      • +       +
    +
    +END + +$fixedTemplates{PBtmpl0000000000000010} = << 'END'; +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + +
    +
      + +
      • +       +
    +
    +END + +$fixedTemplates{PBtmpl0000000000000020} = << 'END'; + + +

    +     + + +

    +     + + +
      + +
    • + +
    +     + + + +

    + + + + + · + + · + + + · + · + +

    + + + + + + + + + + +
    + + + + + + + + + * +
    +
    + + +END + +$fixedTemplates{PBtmpl0000000000000022} = << 'END'; + + + +

    +     + + +

    +     + + + +

    + + + + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

     

    + + + ·
    +     +     +
     
    +     + + +

    +     +END + +$fixedTemplates{PBtmpl0000000000000026} = << 'END'; + + + +

    +     + + + + +

    +     + + + + + +

    + + + • + + + + + + + + • + + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @ + + by + + + + + + on @ +
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000029} = << 'END'; + + + +

    +     + + +

    +     + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +

    + +     +END + +$fixedTemplates{PBtmpl0000000000000031} = << 'END'; + + + +

    +     + + + + +
    +

    +     		+ + + + + + +
    +     		+ +
    + + + + + + + + + + + + + + + + + + + +
    @
    +     + + + + +END + +$fixedTemplates{PBtmpl0000000000000032} = << 'END'; + + + +

    +     + + +

    +     + + + + + + +
    +

    + Price:
    + Product Number:
    +
    + <tmpl_var brochure.icon>
     + <tmpl_var manual.icon>
     + <tmpl_var warranty.icon>
     +

    		+ <tmpl_var thumbnail1>

    + <tmpl_var thumbnail2>

    + <tmpl_var thumbnail3>

    +

    + + + + + + + + + + + + + +
    +
    Features
    +

    + + +
    +     +

    +

    		+ + +
    Benefits
    +

    + + +
    +     +

    +

    		+ + +
    Specifications
    +

    + + + :
    +     +

    +

    		+ + +
    Accessories
    +

    + + +
    +     +

    +

    		+ + +
    Related Products
    +

    + + +
    +     +

    +END + +$fixedTemplates{PBtmpl0000000000000059} = << 'END'; + + + +

    +     + + +

    +     + + + +

    + + + +

      + +
      • +       +
    +     + + + + + + + + + + + + + + + + + + + + +
    + + + + + +
      + + + + + + + + + + + + + + + + + + + +
    + + + + + +
      + + + + + + + + + + + + + + + + + + + +
    + + + + + +
      + + + + + + + + + + + + + + + + + + + +
    + + + + + +
      + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000060} = << 'END'; + + + + ^Page("title"); - WebGUI + + + + + + ^AdminBar; + +
    + +
    + ^AssetProxy(flexmenu); +
    + +
    + +
    +
    +
    + ^LoginToggle;   ^a(^@;);   ^H;   ^AdminToggle; +
    + +
    + + + +END + +$fixedTemplates{PBtmpl0000000000000061} = << 'END'; + + + +

    +     + + +

    +     + + + +

    + + + + + + + + +

    + : / +
    + :% +
    +     + +

    +     + + + + + + + + +
    + +

    +
    +
    +
    + +
    +
    +     +     +     		+ : /
    + + : /
    + :% / 100%
    +     +
    +
    + + + +     +     + + + + + + +     +
    +
    + + + • + + • + +
    + + • + + • + + • + +     + + +

    +

    + + +

    + +    + +
    +     +     +     +END + +$fixedTemplates{PBtmpl0000000000000063} = << 'END'; +

    + + + + • + + • + +
    + + • + + • + + • + +     + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +

    +     +
    + +
    + +
    +
    + +

    + +
    +     +     +
    +     +


    +     + + + + +END + +$fixedTemplates{PBtmpl0000000000000065} = << 'END'; + + + +

    +     + + +

    +     + + + +

    + + +

    + + + + + +

    + + + +

    + + + +

  • + + + + + + + - + +
    + +END + +$fixedTemplates{PBtmpl0000000000000066} = << 'END'; + + + + + + + + + +

    +     + + + + + +

    + + + • + + + + + + + + • + + +

    + + + + + + + + + + + + + + + + + + + + + + + + +
    ()
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000067} = << 'END'; + + + +

    +

    @@ -274,7 +1934,7 @@ STOP
    - :     [ | ]
    + :     [ | ]
    :
    @@ -282,8 +1942,6 @@ STOP     - - @@ -317,8 +1975,6 @@ STOP

    - -

    @@ -331,7 +1987,6 @@ STOP

    - + + +

    +     + + + + + +

    + + + • + + + + + + + + • + + +

    + + + + + + + + + + + + + + + + + + + + + + + +
    ()
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000078} = << 'END'; + + + +

    +     + + +

    +     + + + + + + + + + + + + + + + + + + + + + + + +
    + <tmpl_var title> + + +
    + + + + + + <tmpl_var title> + + + + ^D("%z %Z",); + + +
    +END + +$fixedTemplates{PBtmpl0000000000000079} = << 'END'; + + + + + + + +

    +     + + + + + +

    + + [] + + + + [] + + [] + + + + [] + +

    + + + + +
    []
    +     +     + +
    + + + + + + [] + + + + () +
    +     +

    + +

    + + + +

    +     +END + +$fixedTemplates{PBtmpl0000000000000080} = << 'END'; + + + + + + + +

    +     + + + + + +

    + + [] + + + + [] + + [] + + + + [] + +

    + +
      + +
    • + +
    + + + + +
    []
    +     +     + +
    + + + + + + [] + + + + () +
    +     +
    + +

    [top]

    +     + + + + +END + +$fixedTemplates{PBtmpl0000000000000081} = << 'END'; + + + + + + + +

    +     + + + + + +

    + + [] + + + + [] + + [] + + + + [] + +

    + + + + +
    []
    +     +     + +
    + + + + + + [] + + + + () +
    +     + Q:
    + A: +

    + + + +

    +     +END + +$fixedTemplates{PBtmpl0000000000000082} = << 'END'; + + + + + + + +

    +     + + + + + +

    + + [] + + + + [] + + [] + + + + [] + +

    + +
      + +
    • + + + [] + + + + + + + + + [] + + + + () + + target="_blank"> + + - + +
      • +       +
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000083} = << 'END'; + + + + + + + +

    +     + + + + + +

    + + [] + + + + [] + + [] + + + + [] + +

    + + + + +
    []
    +     +     + +
    + + + + + + [] + + + + () +
    +     +

    + target="_blank"> + + - + +

    +     + + + + +END + +$fixedTemplates{PBtmpl0000000000000084} = << 'END'; + + + +

    +     + + +

    +     + + + +
    <tmpl_var image.url>
    +     +     + + + +

    + + + + + +

    + + + + +

    + + + + +· + +· + + + + + + + + + + +
    ()
    +     +     +END + +$fixedTemplates{PBtmpl0000000000000086} = << 'END'; + + + +

    +     + + +

    +     + + + +

    + + + + +

    + + + + + + + + + , - + - - , + + +

    + + + + + + + + + - + +
    +     + + + + + + + +END + +$fixedTemplates{PBtmpl0000000000000094} = << 'END'; + + + +

    +     + +^RawHeadTags(); + + +

    +     + + +

    +     + + +
    + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
     
    + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + +
     
    + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + +     +END + +$fixedTemplates{PBtmpl0000000000000095} = << 'END'; + + + +

    +     + + + + +

    +     + + + <tmpl_var image1> +

    + + + + + + + +
    + + +

    + + Benefits
    + + +

    + + + ·
    +     +

    		+ + <tmpl_var thumbnail2> +

    + + Specifications
    + + +

    + + + ·:
    +     + Options
    + + +

    + + + ·
    +     + Other Products
    + + +

    + + + + + ·
    +     +

    +END + +$fixedTemplates{PBtmpl0000000000000097} = << 'END'; + + + + + + + + + +

    +     + + + + + +

    + + + • + + + + + + + + • + + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    () + + <tmpl_var title> + +   + +
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000098} = << 'END'; + +

    -
    - :     [ | ]
    + :     [ | ]
     - Job Description

    @@ -585,20 +3242,20 @@ STOP - - + + - - + + - - + + - - + +
    Date PostedDate Posted
    LocationLocation
    CompensationCompensation
    ViewsViews
    @@ -625,7 +3282,6 @@ STOP

    - + +

    + + +

    +     + +
    + + + + +
    + + + + +

    You searched for . We found around matching records.

    +     + + + + + + + + +
    + +
    +     +
    + + Description:
    +     + + + - + +

    +     +     + + Could not retrieve results from Google. +     +END + +$fixedTemplates{PBtmpl0000000000000101} = << 'END'; + + + + + + + +

    +     + + + + + +

    + + [] + + + + [] + + [] + + + + [] + +

    + +
      + +
    1. + + + [] + + + + + + + + + [] + + + + () + + target="_blank"> + + - + +
      2. +       +
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000103} = << 'END'; + + + +

    +     + + +

    +     + + + +
    + <tmpl_var image.url> + + + + + +

    + + + + + +

    + + + + +

    + + + + +

    +     +     + + + +· + +· + + + + + +

    + + + +
    ()
    + + +END + +$fixedTemplates{PBtmpl0000000000000104} = << 'END'; + + + +

    +     + + +

    + + + + + + + +
    +

    + +END + +$fixedTemplates{PBtmpl0000000000000105} = << 'END'; + + + +

    +     + + +

    +     + + + +

    + + + + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

     

    + + + + + +

     
    +     + + +

    +     +END + +$fixedTemplates{PBtmpl0000000000000107} = << 'END'; +<tmpl_var file.icon>() +END + +$fixedTemplates{PBtmpl0000000000000109} = << 'END'; + + + +

    +     + +^RawHeadTags(); + + +

    +     + + +

    +     + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + +
     
    + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + +
     
    + + +
    + +     + +END + +$fixedTemplates{PBtmpl0000000000000110} = << 'END'; + + + +

    +     + + + + +

    +     + + + +

    + + + + + + + + +
    + + <tmpl_var thumbnail1> + + + + <tmpl_var thumbnail2> + + + + <tmpl_var thumbnail3> + +
    + + + + + + + +
    + Features
    + +

    + + + ·
    +     +

    + Benefits
    + + +

    + + + ·
    +     +

    +

    		+ Specifications
    + +

    + + + ·:
    +     +

    + Accessories
    + + +

    + + + ·
    +     +

    + Related Products
    + + +

    + + + ·
    +     +

    +

    		+ + Price:
    +     + + Product Number:
    +     +
    + + <tmpl_var brochure.icon>
    +     + + <tmpl_var manual.icon>
    +     + + <tmpl_var warranty.icon>
    +     +
    +END + +$fixedTemplates{PBtmpl0000000000000111} = << 'END'; + + + + ^Page(title); - <tmpl_var session.setting.companyName> + + + + + + + + ^AdminBar(""); + +

    plainblack
    + + + +
    © 2001-2005 Plain Black Corporation
    + + + +END + +$fixedTemplates{PBtmpl0000000000000112} = << 'END'; + + + +

    +     + + +

    +     + + + + + +

    + + + • + + + + + + + + • + + +

    + + + +

    + + +

    + +
    +
    + + + - + + + - + + + - + + + - + + + + + <tmpl_var title> + + +
    + +
    +
    +

    + + + +

    +     + +END + +$fixedTemplates{PBtmpl0000000000000113} = << 'END'; + +

    @@ -861,11 +4350,10 @@ STOP
    - :     [ | ]
    + :     [ | ]
     - Link Description

    @@ -897,9 +4385,7 @@ STOP

    - - ); + + +

    +     + + +

    +     + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + +
     
    + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + +     +END + +$fixedTemplates{PBtmpl0000000000000119} = << 'END'; + + + +

    +     + + + + +

    +     + + + +
    +
    + + <tmpl_var brochure.icon>
    +     + + <tmpl_var manual.icon>
    +     + + <tmpl_var warranty.icon>
    +     +
    +
    + + <tmpl_var thumbnail1>

    + + + <tmpl_var thumbnail2>

    + + + <tmpl_var thumbnail3>

    + +

    +    		 + +

    + + +Specs:
    + +

    + + + ·:
    +     +

    + +Features:
    + +

    + + + ·
    +     +

    + +Options:
    + +

    + + + ·
    +     + +

    +END + +$fixedTemplates{PBtmpl0000000000000121} = << 'END'; + + + +

    +     + + +

    +     + + + + + +

    + + + • + + + + + + + + • + + +

    + + + +
    + + +
    +
    +
    ()
     +
    <tmpl_var title>
    +
    +
    +
    +     + +
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000122} = << 'END'; + + +

     +

     +

     +

     +

     + + +

    + +

    +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +

    + +

    +

    +

    +     +END + +$fixedTemplates{PBtmpl0000000000000123} = << 'END'; + + + +

    +     + + + + + + + + + +     + + + - + <tmpl_var attachment.name> + + + + - + +END + +$fixedTemplates{PBtmpl0000000000000125} = << 'END'; + + + +

    +     + +^RawHeadTags(); + + +

    +     + + +

    +     + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + +
     
    + + +
    + +     + +END + +$fixedTemplates{PBtmpl0000000000000128} = << 'END'; + + + +

    +     + + +

    +     + + + + + +

    + + + • + + + + + + + + • + + +

    + + + +
    + + +
    +
    +
    + () + +
    + <tmpl_var thumbnail> +
    +     +
    + +
    +     + +
    + + + + +END + +$fixedTemplates{PBtmpl0000000000000129} = << 'END'; + + + +

    +     + + + + + + + + + +     + + + - + <tmpl_var attachment.name> + + + + - + +END + +$fixedTemplates{PBtmpl0000000000000130} = << 'END'; + +

    +     + + +

    +     + +^StyleSheet("/Navigation/dtree/dtree.css"); +^JavaScript("/Navigation/dtree/dtree.js"); + + + + + +
    + +
    +END + +$fixedTemplates{PBtmpl0000000000000131} = << 'END'; + + + +

    +     + +^RawHeadTags(); + + +

    +     + + +

    +     + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + +
     
    + + +
    + +     + +END + +$fixedTemplates{PBtmpl0000000000000133} = << 'END'; + + + + + + + +

    +     + + + + + +

    + + [] + + + + [] + + [] + + + + [] + +

    + + + +
    On from the '' department wrote
    +
    +
    +

    + + + + +

    +     +END + +$fixedTemplates{PBtmpl0000000000000134} = << 'END'; + +

    +     + + +

    +     + + + + + + + +^JavaScript("/coolmenus/coolmenus4.js"); + +END + +$fixedTemplates{PBtmpl0000000000000135} = << 'END'; + + + +

    +     + +^RawHeadTags(); + + +

    +     + + +

    +     + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + + +
    + + + + + + + + + + + + + +
    + + +
    + + +
    +     +
    + + +
     
    + + +
    + +     +END + +$fixedTemplates{PBtmpl0000000000000140} = << 'END'; + + + +

    +
    +
    +
    +
    + + + +
    +
    +
    +
    +     +END + +$fixedTemplates{PBtmpl0000000000000141} = << 'END'; + + + +

    +     + + +

    +     + + +
      + +
      • +       +
    +     + + + +

    + + + + + · + + · + + + · + · + +

    + + + + + + + + + + + +
    + + + + + + + + + + + + + * + +
    + +     +
    +
    + + +END + +$fixedTemplates{wCIc38CvNHUK7aY92Ww4SQ} = << 'END'; + + + +

    +     + + +

    +     + + + +

    + + + +

    + + + + + [] + + + + + + + [] + + +
    +     + + target="_blank"> + + +
    + +     + +

    + +END +}