diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm index 638df4e97..a5c5a2158 100644 --- a/lib/WebGUI/Admin.pm +++ b/lib/WebGUI/Admin.pm @@ -42,9 +42,6 @@ sub BUILDARGS { return { session => $session, @args }; } -# Use the template data located in our DATA block -my $tdata = do { local $/ = undef; }; - =head1 METHODS =cut @@ -823,197 +820,11 @@ sub www_view { # Asset types for later use $var->{assetTypesJson} = JSON->new->encode( { $self->getAssetTypes } ); - # All this needs to be template attachments - $style->setCss( $url->extras('yui/build/button/assets/skins/sam/button.css')); - $style->setCss( $url->extras('yui/build/menu/assets/skins/sam/menu.css')); - $style->setCss( $url->extras('yui/build/tabview/assets/skins/sam/tabview.css')); - $style->setCss( $url->extras('yui/build/paginator/assets/skins/sam/paginator.css')); - $style->setCss( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css')); - $style->setCss( $url->extras('yui/build/container/assets/skins/sam/container.css')); - $style->setCss( $url->extras('yui/build/autocomplete/assets/skins/sam/autocomplete.css')); - $style->setCss( $url->extras('yui/build/menu/assets/skins/sam/menu.css')); - $style->setCss( $url->extras('yui/build/progressbar/assets/skins/sam/progressbar.css') ); - $style->setCss( $url->extras('admin/admin.css')); - $style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js')); - $style->setScript($url->extras('yui/build/utilities/utilities.js')); - $style->setScript($url->extras('yui/build/element/element-min.js')); - $style->setScript( $url->extras( 'yui/build/paginator/paginator-min.js ' ) ); - $style->setScript($url->extras('yui/build/animation/animation-min.js')); - $style->setScript( $url->extras( 'yui/build/datasource/datasource-min.js ' ) ); - $style->setScript( $url->extras( 'yui/build/connection/connection-min.js ' ) ); - $style->setScript( $url->extras( 'yui/build/datatable/datatable-min.js ' ) ); - $style->setScript( $url->extras( 'yui/build/dragdrop/dragdrop-min.js' ) ); - $style->setScript( $url->extras( 'yui/build/container/container-min.js' ) ); - $style->setScript($url->extras('yui/build/tabview/tabview-min.js')); - $style->setScript($url->extras('yui/build/menu/menu-min.js')); - $style->setScript($url->extras('yui/build/button/button-min.js')); - $style->setScript($url->extras('yui/build/autocomplete/autocomplete-min.js')); - $style->setScript( $url->extras( 'yui/build/json/json-min.js' ) ); - $style->setScript( $url->extras( 'yui/build/progressbar/progressbar-min.js' ) ); - $style->setScript( $url->extras( 'yui-webgui/build/i18n/i18n.js' ) ); - $style->setScript( $url->extras( 'Fork/poll.js' ) ); - $style->setScript($url->extras('admin/admin.js')); - - # Use the template in our __DATA__ block - my $tmpl = WebGUI::Asset::Template::HTMLTemplate->new( $session ); - - # Use the blank style - my $output = $style->process( $tmpl->process( $tdata, $var ), "PBtmplBlankStyle000001" ); + my $tmpl = WebGUI::Asset::Template->newById( $session, $session->setting->get('templateIdAdmin') ); + my $output = $style->process( $tmpl->process( $var ), "PBtmpl0000000000000137" ); return $output; } ## end sub www_view 1; -__DATA__ -
-
^International("admin console","AdminConsole");
-
-
    - -
  • );"> - - - - - - - -
    • -     -
-
- -
^International('version tags','VersionTag');
-
-
-
- -
^International('1082','Asset');
-
- - -
-
- -
^International('asset helpers','WebGUI');
-
-

-
    -
-

^International('history','Asset');

-
    -
-
- -
^International('1083','Macro_AdminBar');
-
-
- -
-
-
    - -
  • );"> - -
    • -     -
-
- -
-
-
- -
- - - - -
- -
-
- - - -
- - -
- - - -
-
-
-
-
-
-
-
-
- - - - - - -
-
-
-
-
-
-
-
- - - - -
- - diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 52ff65289..ffcce051a 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -257,6 +257,15 @@ sub definition { namespace => 'Asset/Edit', defaultValue => $setting->get('templateIdAssetEdit') || "yKl2HX76TSuv42vmprFbXQ", }; + push @fields, { + tab => 'ui', + fieldType => 'template', + name => 'templateIdAdmin', + label => $i18n->get('templateIdAdmin label'), + hoverHelp => $i18n->get('templateIdAdmin description'), + namespace => 'Admin', + defaultValue => $setting->get('templateIdAdmin') || "p8g7xlQaTeKSRRDo-_ejSQ", + }; push(@fields, { tab => "ui", fieldType => "yesNo", diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index c501792f3..8a6406587 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -3145,8 +3145,8 @@ or are under your current version tag.

}, 'admin console template' => { - message => q|Admin Console Template|, - lastUpdated =>1118453709, + message => q|Legacy Admin Console Template|, + lastUpdated => 0, }, 'admin console template variables' => { diff --git a/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl b/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl index 33a1dad27..e900462e3 100644 --- a/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl +++ b/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl @@ -12,4 +12,7 @@ session->config->addToArrayAfter( session->config->deleteFromHash( 'adminConsole', 'adminConsoleOff' ); session->config->deleteFromHash( 'adminConsole', 'assets' ); +# Add template setting +session->setting->set( 'templateIdAdmin' => 'p8g7xlQaTeKSRRDo-_ejSQ' ); + done; diff --git a/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_admin-interface.wgpkg b/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_admin-interface.wgpkg new file mode 100644 index 000000000..73bd45b1a Binary files /dev/null and b/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_admin-interface.wgpkg differ