Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / rt / share / html / Prefs / MyRT.html

diff --git a/rt/share/html/Prefs/MyRT.html b/rt/share/html/Prefs/MyRT.html
index 3bcea53..a595ccf 100644 (file)
--- a/rt/share/html/Prefs/MyRT.html
+++ b/rt/share/html/Prefs/MyRT.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,19 +46,12 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/Header, Title => $title &>
-<& /Prefs/Elements/Tabs,
-    current_tab => 'Prefs/MyRT.html',
-    Title => $title,
-    Searches => \@sys_searches
+<& /Elements/Tabs
 &>
 <& /Elements/ListActions, actions => \@results &>
 
 <& /Widgets/SelectionBox:header, nojs => 1 &>
 
-<form method="post" action="MyRT.html">
-<input type="hidden" name="Reset" value="1" />
-<input type="submit" class="button" value="<% loc('Reset to default') %>">
-</form>
 
 <br />
 
@@ -78,6 +71,13 @@
 <input type="submit" class="button" name="UpdateSummaryRows" value="<% loc('Save') %>" />
 </form>
 </&>
+<&|/Widgets/TitleBox, title => loc("Reset RT at a glance") &>
+<form method="post" action="MyRT.html">
+<input type="hidden" name="Reset" value="1" />
+<input type="submit" class="button" value="<% loc('Reset to default') %>">
+</form>
+</&>
+
 
 <%INIT>
 my @results;
@@ -105,24 +105,25 @@ if ($ARGS{Reset}) {
 unless (exists $session{'my_rt_portlets'}) {
     my ($default_portlets) = RT::System->new($session{'CurrentUser'})->Attributes->Named('HomepageSettings');
     my $portlets = $default_portlets ? $default_portlets->Content : {};
+
     $session{'my_rt_portlets'} = $user->Preferences('HomepageSettings', $portlets);
 }
 my $portlets = $session{'my_rt_portlets'};
 
 my %seen;
-my @items = map ["component-$_", $_], grep !$seen{$_}++, @{RT->Config->Get('HomepageComponents')};
+my @items = map ["component-$_", loc($_)], grep !$seen{$_}++, @{RT->Config->Get('HomepageComponents')};
 
 my $sys = RT::System->new($session{'CurrentUser'});
 my @objs = ($sys);
 
-push @objs, RT::SavedSearches->new( $session{CurrentUser} )->_PrivacyObjects
+push @objs, RT::SavedSearch->new( $session{CurrentUser} )->ObjectsForLoading
     if $session{'CurrentUser'}->HasRight( Right  => 'LoadSavedSearch',
                                           Object => $RT::System );
 
 my @sys_searches;
 for my $object (@objs) {
     for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
-        my ($desc, $search) = @$_;
+        my ($desc, $loc_desc, $search) = @$_;
 
         my $SearchType = 'Ticket';
         if ((ref($search->Content)||'') eq 'HASH') {
@@ -134,14 +135,14 @@ for my $object (@objs) {
         }
 
         if ($object eq $sys && $SearchType eq 'Ticket') {
-            push @items, ["system-$desc", $desc];
+            push @items, ["system-$desc", $loc_desc];
             push @sys_searches, [$desc, $search];
         }
         else {
             my $oid = ref($object).'-'.$object->Id.'-SavedSearch-'.$search->Id;
             my $type = ($SearchType eq 'Ticket')
                 ? 'Saved Search' : $SearchType; # loc
-            push @items, ["saved-$oid", loc($type).": $desc"];
+            push @items, ["saved-$oid", loc($type).": $loc_desc"];
         }
     }
 }