diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 98701ea4a..53953c139 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -6,6 +6,7 @@ - fixed #9873: third-> first in post template help - fixed #9892: Typo in "Default Gallery View Album" Template [TEMPLATE] - fixed #9826: Inbox messages sent by email don't include from username + - rfe: added Asset History browser (perlDreamer Consulting, LLC and Plain Black) 7.6.14 - fixed: IE6 shows Admin Bar over Asset Manager diff --git a/docs/upgrades/upgrade_7.6.14-7.7.0.pl b/docs/upgrades/upgrade_7.6.14-7.7.0.pl index c2faa3b62..1c0d5cc30 100644 --- a/docs/upgrades/upgrade_7.6.14-7.7.0.pl +++ b/docs/upgrades/upgrade_7.6.14-7.7.0.pl @@ -109,7 +109,7 @@ sub installAssetHistory { } ##Admin Console $session->config->addToHash('adminConsole', 'assetHistory', { - "icon" => "assets.gif", + "icon" => "assetHistory.gif", "groupSetting" => "groupIdAdminHistory", "uiLevel" => 5, "url" => "^PageUrl(\"\",op=assetHistory);", diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original index 0fd8fd04c..47690798c 100644 --- a/etc/WebGUI.conf.original +++ b/etc/WebGUI.conf.original @@ -332,7 +332,7 @@ "title" : "^International(assets,Asset);" }, "assetHistory" : { - "icon" : "assets.gif", + "icon" : "assetHistory.gif", "groupSetting" : "groupIdAdminHistory", "uiLevel" : 5, "url" : "^PageUrl(\"\",op=assetHistory);", diff --git a/lib/WebGUI/Content/AssetHistory.pm b/lib/WebGUI/Content/AssetHistory.pm index 2b47ff5a7..7522eee18 100644 --- a/lib/WebGUI/Content/AssetHistory.pm +++ b/lib/WebGUI/Content/AssetHistory.pm @@ -125,7 +125,7 @@ sub www_view { return $session->privilege->insufficient unless $session->user->isInGroup(12); ##YUI specific datatable CSS - my $ac = WebGUI::AdminConsole->new( $session, "assets", { + my $ac = WebGUI::AdminConsole->new( $session, "assetHistory", { showAdminBar => 1 } ); my ($style, $url) = $session->quick(qw(style url)); diff --git a/www/extras/adminConsole/assetHistory.gif b/www/extras/adminConsole/assetHistory.gif new file mode 100644 index 000000000..a3fbd8bad Binary files /dev/null and b/www/extras/adminConsole/assetHistory.gif differ diff --git a/www/extras/adminConsole/small/assetHistory.gif b/www/extras/adminConsole/small/assetHistory.gif new file mode 100644 index 000000000..4a97a172c Binary files /dev/null and b/www/extras/adminConsole/small/assetHistory.gif differ