diff --git a/docs/upgrades/upgrade_6.2.9-6.3.0.pl b/docs/upgrades/upgrade_6.2.9-6.3.0.pl index f9ad4f95a..c6de35a5d 100644 --- a/docs/upgrades/upgrade_6.2.9-6.3.0.pl +++ b/docs/upgrades/upgrade_6.2.9-6.3.0.pl @@ -773,12 +773,13 @@ sub walkTree { $className = 'WebGUI::Asset::Redirect'; } WebGUI::SQL->write("insert into asset (assetId, parentId, lineage, className, state, title, menuTitle, url, startDate, - endDate, synopsis, newWindow, isHidden, ownerUserId, groupIdView, groupIdEdit, encryptPage, assetSize ) values (".quote($pageId).", + endDate, synopsis, newWindow, isHidden, ownerUserId, groupIdView, groupIdEdit, encryptPage, assetSize, + extraHeadTags ) values (".quote($pageId).", ".quote($newParentId).", ".quote($pageLineage).", ".quote($className).",'published',".quote($page->{title}).", ".quote($page->{menuTitle}).", ".quote($pageUrl).", ".quote($page->{startDate}).", ".quote($page->{endDate}).", ".quote($page->{synopsis}).", ".quote($page->{newWindow}).", ".quote($page->{hideFromNavigation}).", ".quote($page->{ownerId}).", ".quote($page->{groupIdView}).", ".quote($page->{groupIdEdit}).", ".quote($page->{encryptPage}).", - ".length($page->{title}.$page->{menuTitle}.$page->{synopsis}.$page->{urlizedTitle}).")"); + ".length($page->{title}.$page->{menuTitle}.$page->{synopsis}.$page->{urlizedTitle}).", ".quote($page->{metaTags}).")"); if ($page->{redirectURL} ne "") { WebGUI::SQL->write("insert into redirect (assetId, redirectUrl) values (".quote($pageId).",".quote($page->{redirectURL}).")"); } else { diff --git a/docs/upgrades/upgrade_6.2.9-6.3.0.sql b/docs/upgrades/upgrade_6.2.9-6.3.0.sql index 87a5474c8..bd78860b6 100644 --- a/docs/upgrades/upgrade_6.2.9-6.3.0.sql +++ b/docs/upgrades/upgrade_6.2.9-6.3.0.sql @@ -66,6 +66,7 @@ create table asset ( lastUpdated bigint not null default 0, lastUpdatedBy varchar(22), isPackage int not null default 0, + extraHeadTags text, unique index (lineage asc), unique index (url), index (parentId) diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index adf2a6342..5763d69cc 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -291,6 +291,10 @@ sub definition { fieldType=>'textarea', defaultValue=>undef }, + extraHeadTags=>{ + fieldType=>'textarea', + defaultValue=>undef + }, url=>{ fieldType=>'text', defaultValue=>undef, @@ -740,12 +744,6 @@ sub getEditForm { -value=>$self->get("url"), -uiLevel=>3 ); - $tabform->getTab("properties")->textarea( - -name=>"synopsis", - -label=>WebGUI::International::get(412), - -value=>$self->get("synopsis"), - -uiLevel=>3 - ); $tabform->addTab("display",WebGUI::International::get(105),5); $tabform->getTab("display")->yesNo( -name=>"isHidden", @@ -814,7 +812,20 @@ sub getEditForm { -excludeGroups=>[1,7], -uiLevel=>6 ); - $tabform->getTab("properties")->yesNo( + $tabform->addTab("meta","Meta",3); + $tabform->getTab("meta")->textarea( + -name=>"synopsis", + -label=>WebGUI::International::get(412), + -value=>$self->get("synopsis"), + -uiLevel=>3 + ); + $tabform->getTab("meta")->textarea( + -name=>"extraHeadTags", + -label=>"Extra Head Tags", + -value=>$self->get("extraHeadTags"), + -uiLevel=>5 + ); + $tabform->getTab("meta")->yesNo( -name=>"isPackage", -label=>"Make available as package?", -value=>$self->getValue("isPackage"), diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index 7c4ddddc4..4fada14d9 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -115,7 +115,7 @@ sub getEditForm { -label=>WebGUI::International::get(5,"HttpProxy"), -value=>$self->getValue("followExternal") ); - $tabform->getTab("properties")->yesNo( + $tabform->getTab("security")->yesNo( -name=>"followRedirect", -label=>WebGUI::International::get(8,"HttpProxy"), -value=>$self->getValue("followRedirect") diff --git a/www/extras/adminConsole/adminConsole.css b/www/extras/adminConsole/adminConsole.css index d3d94b6de..05e45649d 100644 --- a/www/extras/adminConsole/adminConsole.css +++ b/www/extras/adminConsole/adminConsole.css @@ -187,7 +187,7 @@ div.tabs { .formDescription { font-family: helvetica, arial; - font-size: 14px; + font-size: 12px; } .formSubtext {