<%$title%>

+%#already shown

<%$title%>

% my $sep = 0; % my $postsep = 0; diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs index 9d1eea602..36ecfa5a6 100644 --- a/rt/html/Elements/Tabs +++ b/rt/html/Elements/Tabs @@ -59,20 +59,6 @@ <%INIT> my $action; -my $basetopactions = { -# A => { html => $m->scomp('/Elements/CreateTicket') -# }, - A => { html => $m->scomp('/Elements/FreesideNewCust') - }, - B => { html => $m->scomp('/Elements/FreesideSearch') - }, - C => { html => $m->scomp('/Elements/FreesideInvoiceSearch') - }, - D => { html => $m->scomp('/Elements/FreesideSvcSearch') - }, - E => { html => $m->scomp('/Elements/SimpleSearch') - } - }; my $basetabs = { ' A'=> { title => 'Billing Main', path => &RT::URI::freeside::FreesideURL(), @@ -112,9 +98,6 @@ if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', if (!defined $toptabs) { $toptabs = $basetabs; } -if (!defined $topactions) { - $topactions = $basetopactions; -} require RT::URI::freeside; diff --git a/rt/html/Prefs/SearchOptions.html b/rt/html/Prefs/SearchOptions.html index 7cc71b0cd..fd292d8eb 100644 --- a/rt/html/Prefs/SearchOptions.html +++ b/rt/html/Prefs/SearchOptions.html @@ -46,7 +46,7 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Elements/Header, Title => loc("Search Preferences") &> +<& /Elements/Header, Title => loc("Ticketing Search Preferences") &> <& /User/Elements/Tabs, current_tab => "Prefs/SearchOptions.html", Title => loc("Search Preferences") diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html index 8c6d5f18e..bb38760da 100644 --- a/rt/html/User/Prefs.html +++ b/rt/html/User/Prefs.html @@ -45,7 +45,7 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Elements/Header, Title=>loc("Preferences") &> +<& /Elements/Header, Title=>loc("Ticketing Preferences") &> <& /User/Elements/Tabs, current_tab => 'User/Prefs.html', Title=>loc("Preferences") &> -- cgit v1.2.1 From 0380dc395f5aade2841360f261cdf90344e006e3 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 9 Jul 2009 02:34:04 +0000 Subject: doh, fix RT onLoadHook; this fixes "Undefined subroutine &HTML::Mason::Commands::onLoadHook" error on ticket creation and otherwise, RT#1169 --- rt/html/Elements/Header | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rt') diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index ffe653666..ab92e3287 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -95,10 +95,10 @@ $head .= < Date: Sun, 12 Jul 2009 23:22:06 +0000 Subject: resolve style weirdness (fallout from RT integration), especially non-fixed-width comment boxes, menu/searchbar differences, RT#1169 --- rt/FREESIDE_MODIFIED | 3 ++ rt/etc/RT_SiteConfig.pm | 2 + rt/html/Elements/Header | 3 +- rt/html/NoAuth/css/3.5-default/freeside.css | 75 +---------------------------- rt/html/NoAuth/css/3.5-default/misc.css | 5 +- rt/html/Ticket/Display.html | 4 +- 6 files changed, 14 insertions(+), 78 deletions(-) (limited to 'rt') diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index 948eeab66..cf2ac4289 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -15,6 +15,7 @@ lib/RT/URI/freeside/XMLRPC.pm html/Elements/Tabs html/Elements/Footer html/Elements/CollectionAsTable/Row #backport from 3.3-TESTING + html/Ticket/Display.html html/Ticket/Elements/AddCustomers html/Ticket/Elements/EditCustomers html/Ticket/Elements/ShowCustomers @@ -23,6 +24,8 @@ html/Ticket/Elements/ShowCustomers html/Ticket/ModifyCustomers.html html/NoAuth/images/small-logo.png html/NoAuth/css/3.5-default/main.css + html/NoAuth/css/3.5-default/misc.css + html/NoAuth/css/3.5-default/titlebox.css html/NoAuth/css/3.5-default/freeside.css html/Widgets/TitleBoxStart diff --git a/rt/etc/RT_SiteConfig.pm b/rt/etc/RT_SiteConfig.pm index c3d6a66ce..7a6f40735 100644 --- a/rt/etc/RT_SiteConfig.pm +++ b/rt/etc/RT_SiteConfig.pm @@ -49,4 +49,6 @@ $RT::QuickCreateLong = 0; #set to true to cause quick ticket creation to #redirect to the "long" ticket creation screen #instead of just creating a ticket with the subject. +Set($MessageBoxWidth , 80); + 1; diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index ab92e3287..a32784e35 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -49,6 +49,7 @@ 'title' => $Title, 'head' => $head, 'nobr' => 1, + 'nocss' => 1, }) |n %> @@ -79,7 +80,7 @@ if ($Refresh && $Refresh > 0) { $head .= < - + END if ( $RSSAutoDiscovery ) { diff --git a/rt/html/NoAuth/css/3.5-default/freeside.css b/rt/html/NoAuth/css/3.5-default/freeside.css index a595061b9..5e7e0a04a 100644 --- a/rt/html/NoAuth/css/3.5-default/freeside.css +++ b/rt/html/NoAuth/css/3.5-default/freeside.css @@ -1,77 +1,3 @@ -.black { - background-color: #000000; - color: #ffffff; - background-position: left top; - vertical-align: top; - text-align: left; -} - -.blackright { - background-color: #000000; - color: #ffffff; - background-position: left top; - vertical-align: center; - text-align: right; - font-size:16px; - padding-right:4px -} - -input.fsblackbutton { - background-color:#333333; - color: #ffffff; - border:1px solid; - border-top-color:#cccccc; - border-left-color:#cccccc; - border-right-color:#aaaaaa; - border-bottom-color:#aaaaaa; - font-family: Arial, Verdana, Helvetica, sans-serif; - font-weight:bold; - padding-left:12px; - padding-right:12px; - overflow:visible; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666') -} - -input.fsblackbuttonselected { - background-color:#7e0079; - color: #ffffff; - border:1px solid; - border-top-color:#cccccc; - border-left-color:#cccccc; - border-right-color:#aaaaaa; - border-bottom-color:#aaaaaa; - font-family: Arial, Verdana, Helvetica, sans-serif; - font-weight:bold; - padding-left:12px; - padding-right:12px; - overflow:visible; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079') -} - -.darkmediumgray { - background-color: #aaaaaa; - background-position: left top; - vertical-align: top; - text-align: left; -} -.darkmediumgrayright { - background-color: #aaaaaa; - background-position: left top; - vertical-align: top; - text-align: right; -} -.bggray { - background-color: #e8e8e8; - background-position: left top; - vertical-align: top; - text-align: left; -} -.bggrayright { - background-color: #e8e8e8; - background-position: left top; - vertical-align: top; - text-align: right; -} div.titlebox { background: #d4d4d4; @@ -80,3 +6,4 @@ div.titlebox { div.titlebox-title { background: #e8e8e8; } + diff --git a/rt/html/NoAuth/css/3.5-default/misc.css b/rt/html/NoAuth/css/3.5-default/misc.css index ddb2e687b..cf7068a87 100755 --- a/rt/html/NoAuth/css/3.5-default/misc.css +++ b/rt/html/NoAuth/css/3.5-default/misc.css @@ -46,7 +46,8 @@ %# %# END BPS TAGGED BLOCK }}} body { - font-family: Verdana, sans-serif; + /* font-family: Verdana, sans-serif; */ + font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 76%; margin: 0; /* background-color: white; */ @@ -74,9 +75,11 @@ body { .evenline { background-color: white; } .oddline { background-color: #ddd; } +/* td { padding: 0.1em 0.5em 0.1em 0.5em; } +*/ .clear { clear: both; } diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html index 17d00a00c..ca6939821 100644 --- a/rt/html/Ticket/Display.html +++ b/rt/html/Ticket/Display.html @@ -46,11 +46,11 @@ %# %# END BPS TAGGED BLOCK }}} <& /Elements/Header, - Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> + Title => loc("Ticket #[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> <& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => 'Ticket/Display.html?id='.$TicketObj->id, - Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> + Title => loc("Ticket #[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> <& /Elements/ListActions, actions => \@Actions &> <& /Elements/Callback, _CallbackName => 'BeforeShowSummary', Ticket => $TicketObj, %ARGS &> -- cgit v1.2.1 From 17f02a6d77256011422e952728e826d302c7c33a Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 12 Jul 2009 23:27:47 +0000 Subject: fix excessive RT margins --- rt/html/NoAuth/css/3.5-default/titlebox.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rt') diff --git a/rt/html/NoAuth/css/3.5-default/titlebox.css b/rt/html/NoAuth/css/3.5-default/titlebox.css index 79d8040a7..1e3f7c48e 100644 --- a/rt/html/NoAuth/css/3.5-default/titlebox.css +++ b/rt/html/NoAuth/css/3.5-default/titlebox.css @@ -51,7 +51,8 @@ .titlebox .titlebox-content { margin-top: -1px; - padding: 1em 2em 0.5em 2em; + padding: 0.25em .50em 0.125em .50em; + /*padding: 1em 2em 0.5em 2em;*/ margin: 0; /*margin: 1em 2em 0.5em 2em;*/ } -- cgit v1.2.1 From 1bbea609e08016811912bc0dfc59b9c54fea7825 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 13 Jul 2009 02:33:55 +0000 Subject: style RT's menubars like ours --- rt/html/Elements/PageLayout | 137 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 114 insertions(+), 23 deletions(-) (limited to 'rt') diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index 6a392270c..35e080cb3 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -45,9 +45,91 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} +% #false laziness w/menubar.html... shouldn't these just go in freeside.css? + -

% if (0) { ##FREESIDE MENUS INSTEAD## if ( $show_menu ) { %# if ( $show_menu ) { @@ -56,7 +138,6 @@ % } -

%#already shown

<%$title%>

% my $sep = 0; @@ -64,8 +145,14 @@ % my $count = 0; % my $class = { }; % -

+ + + + + + + + + + +

+ +%#

{li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && "· "|n%>{a}|n%><% $class->{a} ? ' name="focus"' : ''|n %>><% $page_tabs->{$tab}->{'title'} %> -% -% if ($sep) { -

···

-% } -% $postsep = $sep; + +%# {li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && "· "|n%>{a}|n%><% $class->{a} ? ' name="focus"' : ''|n %>><% $page_tabs->{$tab}->{'title'} %> + +% $class->{a} = $path eq $current ? ' class="fsblackbuttonselected"' : ' class="fsblackbutton"'; + {a}|n%><% $class->{a} =~ 'selected' ? ' name="focus"' : ''|n %>><% $page_tabs->{$tab}->{'title'} %> + % } % } else { % } - -

% if (($actions && %$actions) || ($subactions && %$subactions)) { -

% $sep = 0; % $postsep = 0; % $count = 0; @@ -135,24 +222,28 @@ % % $class->{li} = join ' ', @li; % - {li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && qq[· ]|n%> + +%# {li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && qq[· ]|n%> + +% #$class->{a} = $path eq $current ? ' class="fsblackbuttonselected"' : ' class="fsblackbutton"'; +% $type->{$action}->{class} ||= 'fsdarkbutton'; + % if ($type->{"$action"}->{'html'}) { <% $type->{"$action"}->{'html'} | n %> % } else { {$action}->{class} && ' class="'.$type->{$action}->{class}.'"' |n %><% $type->{$action}->{id} && ' id="'.$type->{$action}->{id}.'"' |n %>><%$type->{$action}->{'title'}%> % } - -% if ($sep) { -

···

-% } -% $postsep = $sep; + % } % } % } - - + % } - +

<& /Elements/Callback, _CallbackName => 'BeforeBody', %ARGS &> -- cgit v1.2.1 From 09a7302ecaca7eb96795f8fda8208aa1f61932a8 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 13 Jul 2009 03:15:32 +0000 Subject: no need for Time to display either --- rt/html/Elements/Footer | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'rt') diff --git a/rt/html/Elements/Footer b/rt/html/Elements/Footer index 0cb528f19..6604bd211 100644 --- a/rt/html/Elements/Footer +++ b/rt/html/Elements/Footer @@ -52,26 +52,26 @@

<& /Elements/Callback, %ARGS &> -

- <&|/l&>Time to display: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%> -

- % if ($Debug >= 2 ) { % require Data::Dumper; % my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]); -- cgit v1.2.1 From 74357e390809f40ae3552090c145b541e929906e Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 13 Jul 2009 03:24:44 +0000 Subject: think that should be it, fix bar when there's no primary $page_tabs --- rt/html/Elements/PageLayout | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'rt') diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index 35e080cb3..3210b4e3e 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -148,12 +148,12 @@ a:visited:hover.fsdarkbutton { - - + +%# } else { +%# % } % if (($actions && %$actions) || ($subactions && %$subactions)) { - - + +% if ( $page_tabs ) { +% } + % } - +

% foreach my $tab (sort keys %{$page_tabs}) { % next if $tab =~ /^(?:current_toptab|this)$/; % $count++; @@ -188,14 +188,16 @@ a:visited:hover.fsdarkbutton { {a}|n%><% $class->{a} =~ 'selected' ? ' name="focus"' : ''|n %>><% $page_tabs->{$tab}->{'title'} %> % } -% } else { - +

% $sep = 0; % $postsep = 0; @@ -238,8 +240,10 @@ a:visited:hover.fsdarkbutton { % } % } +

-- cgit v1.2.1 From 2a644303258fb8f60de91bab271fd0422e5a959d Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 20 Jul 2009 04:14:27 +0000 Subject: fix badly styled links on ticket create (fallout from RT borging/styling) --- rt/FREESIDE_MODIFIED | 1 + rt/html/Ticket/Create.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'rt') diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index cf2ac4289..d5f35e38a 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -15,6 +15,7 @@ lib/RT/URI/freeside/XMLRPC.pm html/Elements/Tabs html/Elements/Footer html/Elements/CollectionAsTable/Row #backport from 3.3-TESTING + html/Ticket/Create.html html/Ticket/Display.html html/Ticket/Elements/AddCustomers html/Ticket/Elements/EditCustomers diff --git a/rt/html/Ticket/Create.html b/rt/html/Ticket/Create.html index 2061b3be3..b22a67593 100644 --- a/rt/html/Ticket/Create.html +++ b/rt/html/Ticket/Create.html @@ -387,10 +387,10 @@ if ((!exists $ARGS{'AddMoreAttach'}) and ($ARGS{'id'} eq 'new')) { # new ticket? my $actions = { A => { - html => q[] . loc('Show basics') . q[], + html => q[] . loc('Show basics') . q[], }, B => { - html => q[] . loc('Show details') . q[], + html => q[] . loc('Show details') . q[], }, }; -- cgit v1.2.1 From 3aa3b1bab64f02a54d0b82e8e7268da56a88e019 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 20 Jul 2009 04:40:41 +0000 Subject: slightly improve terrible quoting behavior when you change MessageBoxWidth --- rt/FREESIDE_MODIFIED | 1 + rt/lib/RT/Transaction_Overlay.pm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'rt') diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index d5f35e38a..dc5e2bc2a 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -4,6 +4,7 @@ config.layout.in etc/RT_SiteConfig.pm lib/RT/Interface/Web_Vendor.pm lib/RT/SearchBuilder.pm #need DBIx::SearchBuilder >= 1.36 for Pg 8.1+ +lib/RT/Transaction_Overlay.pm lib/RT/URI/freeside.pm lib/RT/URI/freeside/Internal.pm lib/RT/URI/freeside/XMLRPC.pm diff --git a/rt/lib/RT/Transaction_Overlay.pm b/rt/lib/RT/Transaction_Overlay.pm index 451f9d732..dd1887e33 100644 --- a/rt/lib/RT/Transaction_Overlay.pm +++ b/rt/lib/RT/Transaction_Overlay.pm @@ -276,7 +276,7 @@ textual part (as defined in RT::I18N::IsTextualContentType). Otherwise, returns undef. Takes a paramhash. If the $args{'Quote'} parameter is set, wraps this message -at $args{'Wrap'}. $args{'Wrap'} defaults to 70. +at $args{'Wrap'}. $args{'Wrap'} defaults to $RT::MessageBoxWidth - 2 or 70. If $args{'Type'} is set to C, plain texts are upgraded to HTML. Otherwise, HTML texts are downgraded to plain text. If $args{'Type'} is @@ -290,6 +290,7 @@ sub Content { Type => $PreferredContentType, Quote => 0, Wrap => 70, + Wrap => ( $RT::MessageBoxWidth || 72 ) - 2, @_ ); @@ -335,7 +336,7 @@ sub Content { $max = length if ( length > $max ); } - if ( $max > 76 ) { + if ( $max > $args{'Wrap'}+6 ) { # 76 ) { require Text::Wrapper; my $wrapper = new Text::Wrapper( columns => $args{'Wrap'}, -- cgit v1.2.1 From f83f9129cc2e67d20ef0d512cce9f0b327e26052 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 26 Jul 2009 19:36:08 +0000 Subject: fix the date picker in RT to use jscalendar instead of an HTML popup (that had acquired the page header, eek), RT#1682 --- rt/FREESIDE_MODIFIED | 1 + rt/html/Elements/PageLayout | 1 + rt/html/Elements/SelectDate | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'rt') diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index dc5e2bc2a..e82078992 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -12,6 +12,7 @@ lib/RT/URI/freeside/XMLRPC.pm html/Elements/Menu html/Elements/PageLayout html/Elements/QuickCreate + html/Elements/SelectDate html/Elements/SimpleSearch html/Elements/Tabs html/Elements/Footer diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index 3210b4e3e..b9d15e9d3 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -127,6 +127,7 @@ a:visited:hover.fsdarkbutton { filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079') } +<% include('/elements/init_calendar.html') |n %>

diff --git a/rt/html/Elements/SelectDate b/rt/html/Elements/SelectDate index b43f324ac..23df246ce 100644 --- a/rt/html/Elements/SelectDate +++ b/rt/html/Elements/SelectDate @@ -45,10 +45,21 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} +%# in PageLayout instead, once <% include('/elements/init_calendar.html') |n %> + +

- <%init> unless ((defined $Default) or ($current <= 0)) { -- cgit v1.2.1 From ad8f95a4fa225465436e5e9d77bb3ab09b0fa931 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 11 Oct 2009 01:46:43 +0000 Subject: huh --- rt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rt') diff --git a/rt/Makefile b/rt/Makefile index e6a5ddee5..7d510c81b 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -60,7 +60,7 @@ SITE_CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_SiteConfig.pm RT_VERSION_MAJOR = 3 RT_VERSION_MINOR = 6 -RT_VERSION_PATCH = 4 +RT_VERSION_PATCH = 6 RT_VERSION = $(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH) TAG = rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH) @@ -83,7 +83,7 @@ WEB_USER = freeside WEB_GROUP = freeside -APACHECTL = /usr/sbin/apachectl +APACHECTL = # {{{ Files and directories -- cgit v1.2.1 From 8166c86a5e6312f88e84f9d9107ef11a99bf8545 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 11 Oct 2009 01:48:25 +0000 Subject: huh #2 --- rt/lib/RT.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'rt') diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm index 0d0c0f509..22fb9a11c 100644 --- a/rt/lib/RT.pm +++ b/rt/lib/RT.pm @@ -68,7 +68,7 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger $MasonSessionDir ); -$VERSION = '3.6.4'; +$VERSION = '3.6.6'; $CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm"; $SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm"; @@ -161,12 +161,12 @@ EOF } eval { require $CORE_CONFIG_FILE }; if ($@) { - my ($fileuid,$filegid) = (stat($SITE_CONFIG_FILE))[4,5]; + my ($fileuid,$filegid) = (stat($CORE_CONFIG_FILE))[4,5]; my $fileusername = getpwuid($fileuid); my $filegroup = getgrgid($filegid); - my $errormessage = sprintf($message, $SITE_CONFIG_FILE, + my $errormessage = sprintf($message, $CORE_CONFIG_FILE, $fileusername, $filegroup, $filegroup); - die ("$errormessage '$CORE_CONFIG_FILE'\n$@") + die ("$errormessage\n$@") } # RT::Essentials mistakenly recommends that WebPath be set to '/'. @@ -459,6 +459,8 @@ ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname"); =cut +eval "require RT_Vendor"; +die $@ if ($@ && $@ !~ qr{^Can't locate RT_Vendor.pm}); eval "require RT_Local"; die $@ if ($@ && $@ !~ qr{^Can't locate RT_Local.pm}); -- cgit v1.2.1


-% $m->out($topactions->{"$action"}->{'html'}); -