From babb8099c9eb54267849a8edbc319555816b9366 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 5 Nov 2004 00:49:36 +0000 Subject: [PATCH] moved favicon and site icon to the templates where they belong --- docs/changelog/6.x.x.txt | 1 + docs/previousVersion.sql | 1 - docs/upgrades/upgrade_6.2.8-6.3.0.pl | 18 ++++++++++++++++++ lib/WebGUI/Operation/Settings.pm | 10 ---------- lib/WebGUI/Style.pm | 4 ---- lib/WebGUI/i18n/English/WebGUI.pm | 14 -------------- www/extras/adminConsole/adminConsole.css | 19 +++++++++++++++++++ 7 files changed, 38 insertions(+), 29 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 894906b74..3269fbac5 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -32,6 +32,7 @@ - Fixed a user profile vulnerability. - Fixed a sequence ordering problem with the USS. - Added internationalized URL handling. + - Moved site icon and fav icon directly into style templates. 6.2.8 diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index 4ba3e99d7..eae5e90fe 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -2817,7 +2817,6 @@ INSERT INTO template VALUES ('1','Default SMB Account Display Template','

\n INSERT INTO template VALUES ('1','Default SMB Anonymous Registration Template','

\n \r\n

\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n\r\n\r\n \r\n \r\n\r\n\r\n\r\n \r\n \r\n\r\n
\r\n\r\n\r\n\r\n
\r\n \r\n
','Auth/SMB/Create',1,1); INSERT INTO template VALUES ('1','Default WebGUI Yes/No Prompt','

\n\n

\n\n

\n\n
\n\n\">\n\n          \n\n\">\n\n
\n','prompt',1,1); INSERT INTO template VALUES ('1','Fail Safe','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n^H; / ^Navigation(TopLevelMenuHorizontal_1000); / ^Navigation(currentMenuHorizontal_1001); / ^a;\r\n
\n\n\n \n \n\n
\r\n^H; / ^Navigation(TopLevelMenuHorizontal_1000); / ^Navigation(currentMenuHorizontal_1001); / ^a;\r\n\n \n ','style',0,0); -INSERT INTO template VALUES ('1000','WebGUI 6 Admin Style','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \r\n \r\n\r\n\r\n\n \n \r\n\r\n^AdminBar(2);

\r\n\r\n
\r\n \n \n \r\n
\r\n\r\n\r\n
^H; / ^PageTitle; / ^AdminToggle; / ^LoginToggle; / ^a;
\r\n\r\n\r\n\r\n\r\n\r\n\r\n\n \n ','style',1,1); INSERT INTO template VALUES ('4','Clipboard','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n\r\n\r\n\r\n\r\n
Clipboard\r\n^H; / ^a;
\r\n
PAGES
^Navigation(FlexMenu_1002);		CONTENT
\n\n\n \n \n\n
\r\n\r\n\r\n
\r\n^H; / ^a;\r\n\n \n ','style',0,0); INSERT INTO template VALUES ('1001','WebGUI 6','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \r\n \n \n \r\n^AdminBar(2);\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n
^L(17,\"\",2); ^AdminToggle;
\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n
\n         \r\n\"home\" \n \"Email\"\r\n\"Print\" \n \"Site \"Plain\r\n^Spacer(56,1);^Spacer(26,1);
\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
^Spacer(53,59);^D(\"%c %D, %y\");
^PageTitle;
^Spacer(53,59);
\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n
^Spacer(53,1);\r\n
\r\n^Navigation(FlexMenu_1002);\r\n


\r\n\r\n		\n \n ^Spacer(53,1);
\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n

Design by Plain Black
\r\n\n \n ','style',1,1); INSERT INTO template VALUES ('3','Make Page Printable','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n
\n\n\n \n \n\n
© 2001-2004 Plain Black LLC
\r\n\n \n ','style',1,1); diff --git a/docs/upgrades/upgrade_6.2.8-6.3.0.pl b/docs/upgrades/upgrade_6.2.8-6.3.0.pl index 345ec274e..6237d5885 100644 --- a/docs/upgrades/upgrade_6.2.8-6.3.0.pl +++ b/docs/upgrades/upgrade_6.2.8-6.3.0.pl @@ -32,6 +32,24 @@ while (my $data = $sth->hashRef) { $sth->finish; +print "\tMoving site icons into style templates.\n" unless ($quiet); +my $type = lc($session{setting}{siteicon}); +$type =~ s/.*\.(.*?)$/$1/; +my $tags = ' + + + + '; +$sth = WebGUI::SQL->read("select templateId,template from template where namespace='style'"); +while (my ($id,$template) = $sth->array) { + $template =~ s/\/$tags/ig; + WebGUI::SQL->write("update template set template=".quote($template)." where templateId=".quote($id)." and namespace='style'"); +} +$sth->finish; +WebGUI::SQL->write("delete from settings where name in ('siteicon','favicon')"); + + + WebGUI::Session::close(); diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index acfc3348c..e1c9bcf0e 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -84,16 +84,6 @@ sub www_editSettings { -value=>$session{setting}{urlExtension}, -label=>$i18n->get("url extension") ); - $tabform->getTab("content")->text( - -name=>"favicon", - -label=>$i18n->get(897), - -value=>$session{setting}{favicon} - ); - $tabform->getTab("content")->text( - -name=>"siteicon", - -label=>$i18n->get(898), - -value=>$session{setting}{siteicon} - ); $tabform->getTab("content")->integer( -name=>"maxAttachmentSize", -label=>$i18n->get(130), diff --git a/lib/WebGUI/Style.pm b/lib/WebGUI/Style.pm index bc0eaf357..aebdd3f47 100644 --- a/lib/WebGUI/Style.pm +++ b/lib/WebGUI/Style.pm @@ -136,13 +136,9 @@ sub process { } elsif ($session{page}{useEmptyStyle}) { $templateId = 6; } - my $type = lc($session{setting}{siteicon}); - $type =~ s/.*\.(.*?)$/$1/; $var{'head.tags'} = ' - -