From d466e757e4becd2b73e71aadf8b293387ca4912f Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Wed, 13 Apr 2011 17:51:18 -0500 Subject: [PATCH] make Admin interface into a settings template --- lib/WebGUI/Admin.pm | 193 +----------------- lib/WebGUI/Operation/Settings.pm | 9 + lib/WebGUI/i18n/English/WebGUI.pm | 4 +- .../7.10.4-8.0.0/addNewAdminConsole.pl | 3 + ..._import_adminconsole_admin-interface.wgpkg | Bin 0 -> 4091 bytes 5 files changed, 16 insertions(+), 193 deletions(-) create mode 100644 share/upgrades/7.10.4-8.0.0/root_import_adminconsole_admin-interface.wgpkg 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 0000000000000000000000000000000000000000..73bd45b1ae4b879c24bb2ad8d90556a6f72b1614 GIT binary patch literal 4091 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 literal 0 HcmV?d00001