diff options
Diffstat (limited to 'rt')
-rw-r--r-- | rt/FREESIDE_MODIFIED | 9 | ||||
-rw-r--r-- | rt/Makefile | 4 | ||||
-rw-r--r-- | rt/etc/RT_SiteConfig.pm | 2 | ||||
-rw-r--r-- | rt/html/Elements/Footer | 36 | ||||
-rw-r--r-- | rt/html/Elements/FreesideSvcSearch | 2 | ||||
-rw-r--r-- | rt/html/Elements/Header | 146 | ||||
-rw-r--r-- | rt/html/Elements/PageLayout | 171 | ||||
-rw-r--r-- | rt/html/Elements/SelectDate | 15 | ||||
-rw-r--r-- | rt/html/Elements/Tabs | 17 | ||||
-rw-r--r-- | rt/html/NoAuth/css/3.5-default/freeside.css | 75 | ||||
-rwxr-xr-x | rt/html/NoAuth/css/3.5-default/misc.css | 5 | ||||
-rw-r--r-- | rt/html/NoAuth/css/3.5-default/titlebox.css | 3 | ||||
-rw-r--r-- | rt/html/Prefs/SearchOptions.html | 2 | ||||
-rw-r--r-- | rt/html/Ticket/Create.html | 4 | ||||
-rw-r--r-- | rt/html/Ticket/Display.html | 4 | ||||
-rw-r--r-- | rt/html/User/Prefs.html | 2 | ||||
-rw-r--r-- | rt/lib/RT.pm | 10 | ||||
-rw-r--r-- | rt/lib/RT/Transaction_Overlay.pm | 5 |
18 files changed, 238 insertions, 274 deletions
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index 66917795c..e82078992 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 @@ -11,10 +12,13 @@ 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 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 html/Ticket/Elements/ShowCustomers @@ -23,6 +27,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 @@ -31,4 +37,5 @@ html/Elements/FreesideNewCust html/Elements/FreesideSearch html/Elements/FreesideSvcSearch - + html/User/Prefs.html + html/Prefs/SearchOptions.html 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 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/Footer b/rt/html/Elements/Footer index 0cb528f19..6604bd211 100644 --- a/rt/html/Elements/Footer +++ b/rt/html/Elements/Footer @@ -52,26 +52,26 @@ <tr> <td> <& /Elements/Callback, %ARGS &> -<div id="footer"> - <p id="time"> - <span><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></span> - </p> -<!-- - <p id="bpscredits"> - <span> -<&|/l, '»|«', $RT::VERSION, '2006', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&> -</span> -</p> -% if (!$Menu) { - <p id="legal"> -<&|/l&>Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a></&><br /> -<&|/l, '<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>' &>To inquire about support, training, custom development or licensing, please contact [_1].</&><br /> - </p> -% } +%# <div id="footer"> +%# <p id="time"> +%# <span><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></span> +%# </p> + +%# <p id="bpscredits"> +%# <span> +%# <&|/l, '»|«', $RT::VERSION, '2006', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&> +%# </span> +%# </p> +%# % if (!$Menu) { +%# <p id="legal"> +%# <&|/l&>Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a></&><br /> +%# <&|/l, '<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>' &>To inquire about support, training, custom development or licensing, please contact [_1].</&><br /> +%# </p> +%# % } + +%# </div> -</div> ---> % if ($Debug >= 2 ) { % require Data::Dumper; % my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]); diff --git a/rt/html/Elements/FreesideSvcSearch b/rt/html/Elements/FreesideSvcSearch index 4a5942421..d68122da5 100644 --- a/rt/html/Elements/FreesideSvcSearch +++ b/rt/html/Elements/FreesideSvcSearch @@ -1,3 +1,4 @@ +% if ( $FS::CurrentUser::CurrentUser->access_right('View customer services') ) { <form action="<% $RT::URI::freeside::URL %>/search/cust_svc.html" STYLE="margin:0"> <SCRIPT TYPE="text/javascript"> function clearhint_search_svc (what) { @@ -9,3 +10,4 @@ <A NOTYET="<% $RT::URI::freeside::URL %>search/svc_Smarter.html" STYLE="color: #000000; font-size: 70%; font-weight:normal">Advanced</A> <input type="submit" value="<&|/l&>Search services</&>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%"> </form> +% } diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index bf6fa46fa..a32784e35 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -45,102 +45,17 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head> - -<title><%$Title%></title> - -% if ($Refresh && $Refresh > 0) { - <meta http-equiv="refresh" content="<%$Refresh%>" /> -% } - -<link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png" /> -<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/<% $RT::WebDefaultStylesheet %>/main-squished.css" type="text/css" media="all" /> -<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/print.css" type="text/css" media="print" /> - -% if ( $RSSAutoDiscovery ) { - <link rel="alternate" href="<%$RSSAutoDiscovery%>" type="application/rss+xml" title="RSS RT Search" /> -% } - -<script type="text/javascript" src="<%$RT::WebPath%>/NoAuth/js/util.js"></script> -<script type="text/javascript" src="<%$RT::WebPath%>/NoAuth/js/ahah.js"></script> -<script type="text/javascript" src="<%$RT::WebPath%>/NoAuth/js/titlebox-state.js"></script> -<script type="text/javascript"><!-- - onLoadHook("loadTitleBoxStates()"); -% if ( $Focus ) { - onLoadHook("focusElementById('<% $Focus %>')"); -% } -% if ( $onload ) { - onLoadHook("<% $onload |n %>"); -% } ---></script> - -<& /Elements/Callback, _CallbackName => 'Head', %ARGS &> - -</head> - <body NOTBACKGROUND="<% $RT::URI::freeside::URL %>/images/background-cheat.png" - STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0" - <% $id && qq[ id="comp-$id"] |n %> - > - -% if ($ShowBar) { - -<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" STYLE="padding-left:0; padding-right:4"> - <tr> - <td colspan=2 rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td> - <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') || 'ExampleCo' %></font></td> - <td align="right" valign="top"> - -<div id="quickbar"> - <div id="quick-personal"> - <span class="hide"><a href="#skipnav"><&|/l&>Skip Menu</&></a> | </span> -% if ($session{'CurrentUser'}->Name) { - <&|/l, "<span>".$session{'CurrentUser'}->Name."</span>" &>Logged in as [_1]</&> -% if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) { - | <a href="<%$RT::WebPath%><%$Prefs%>"><&|/l&>Preferences</&></a> -% } -% } else { - <&|/l&>Not logged in.</&> -% } - <& /Elements/Callback, %ARGS &> -% unless (!$session{'CurrentUser'}->Name -% or ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth)) { - | <a href="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL ? "?URL=".$URL : ''%>"><&|/l&>Logout</&></a> -% } - </div> -% } - - </td> - - </tr> - <tr> - - <td align=right valign=bottom> - <table> - <tr> - <td align=right> - <FONT SIZE="-3"> - <A HREF="http://www.sisd.com/freeside">Freeside</A> v<% &RT::URI::freeside::FreesideVersion() %><BR> - <A HREF="<% FS::Conf->new->config('support-key') ? "http://www.sisd.com/mediawiki/index.php/Supported:Documentation" : "http://www.sisd.com/mediawiki/index.php/Freeside:1.9:Documentation" %>">Documentation</A><BR> - </FONT> - </td> - <td bgcolor=#000000></td> - <td align=left> - <FONT SIZE="-3"> - <A HREF="http://www.bestpractical.com/rt">RT</A> v<% $RT::VERSION %><BR> - <A HREF="http://wiki.bestpractical.com/">Documentation</A><BR> - </FONT> - </td> - - </tr> - </table> - </td> - - </tr> -</table> +<% include( '/elements/header.html', { + 'title' => $Title, + 'head' => $head, + 'nobr' => 1, + 'nocss' => 1, + }) |n +%> + +%# if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) { +%# | <a href="<%$RT::WebPath%><%$Prefs%>"><&|/l&>Preferences</&></a> +%# } <%INIT> $r->headers_out->{'Pragma'} = 'no-cache'; @@ -155,6 +70,45 @@ $id =~ s|\.html$||g; $id =~ s|index$||g if $id ne 'index'; $id =~ s|-$||g; + +my $head = ''; + +if ($Refresh && $Refresh > 0) { + $head .= '<meta http-equiv="refresh" content="$Refresh" />'; +} + +$head .= <<END; +<link rel="shortcut icon" href="$RT::WebImagesURL/favicon.png" type="image/png" /> +<link rel="stylesheet" href="$RT::WebPath/NoAuth/css/$RT::WebDefaultStylesheet/main-squished.css" type="text/css" media="all" /> +<link rel="stylesheet" href="$RT::WebPath/NoAuth/css/print.css" type="text/css" media="print" /> +END + +if ( $RSSAutoDiscovery ) { + $head .= qq(<link rel="alternate" href="$RSSAutoDiscovery" type="application/rss+xml" title="RSS RT Search" />); +} + +$head .= <<END; +<script type="text/javascript" src="$RT::WebPath/NoAuth/js/util.js"></script> +<script type="text/javascript" src="$RT::WebPath/NoAuth/js/ahah.js"></script> +<script type="text/javascript" src="$RT::WebPath/NoAuth/js/titlebox-state.js"></script> +<script type="text/javascript"><!-- + onLoadHook("loadTitleBoxStates()"); +END + +if ( $Focus ) { + $head .= qq{ onLoadHook("focusElementById('$Focus')");\n}; +} +if ( $onload ) { + $head .= qq{ onLoadHook("$onload");\n}; +} + +$head .= '--></script>'; + +$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS ); + +my $etc = ''; +$etc .= qq[ id="comp-$id"] if $id; + </%INIT> <%ARGS> diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index b9fd31f71..b9d15e9d3 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -45,53 +45,116 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} +% #false laziness w/menubar.html... shouldn't these just go in freeside.css? +<style type="text/css"> +a.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-weight:bold;*/ + /*padding-left:12px; + padding-right:12px;*/ + padding-left:4px; + padding-right:4px; + font-size:16px; + text-decoration:none; + overflow:visible; + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666') +} -<table class="black" border=0 cellspacing=0 cellpadding=0 width="100%"> -<tr> - <TD colspan=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>/images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD> -</tr> -<tr> - - <div id="topactions"> -% my $notfirst = 0; foreach my $action (sort keys %{$topactions}) { - <span class="topaction"> - <td class="blackright" ALIGN="right" VALIGN="center"> -% $m->out($topactions->{"$action"}->{'html'}); - </td> - </span> -% } - </div> - -</tr> -</table> +a.fsblackbuttonselected, +a:link:hover.fsblackbutton, +a:visited:hover.fsblackbutton { + 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-weight:bold;*/ + /*padding-left:12px; + padding-right:12px;*/ + padding-left:4px; + padding-right:4px; + font-size:16px; + text-decoration:none; + overflow:visible; + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079') +} -%# End of div#quickbar from /Elements/Header -</div> +a.fsdarkbutton { + background-color:#555555; + color: #ffffff; + border:1px solid; + border-top-color:#cccccc; + border-left-color:#cccccc; + border-right-color:#aaaaaa; + border-bottom-color:#aaaaaa; + /*font-weight:bold;*/ + /*padding-left:12px; + padding-right:12px;*/ + padding-left:4px; + padding-right:4px; + font-size:16px; + text-decoration:none; + overflow:visible; + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff555555',EndColorStr='#ff666666') +} +a.fsdarkbuttonselected, +a:link:hover.fsdarkbutton, +a:visited:hover.fsdarkbutton { + 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-weight:bold;*/ + /*padding-left:12px; + padding-right:12px;*/ + padding-left:4px; + padding-right:4px; + font-size:16px; + text-decoration:none; + overflow:visible; + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079') +} +</style> +<% include('/elements/init_calendar.html') |n %> <table border=0 cellspacing=0 cellpadding=0 width="100%" height="100%"> - <TR> - <TD STYLE="padding:0" WIDTH="100%"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>/images/black-gray-top.png" HEIGHT="13" WIDTH="100%"></TD> - </TR> <TR HEIGHT="100%"> - <TD> + <TD valign="top"> -% if ( $show_menu ) { +% if (0) { ##FREESIDE MENUS INSTEAD## if ( $show_menu ) { +%# if ( $show_menu ) { <div id="nav"> <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &> </div> % } -<div id="header"> - <h1><%$title%></h1> +%#already shown <h1><%$title%></h1> % my $sep = 0; % my $postsep = 0; % my $count = 0; % my $class = { }; % - <ul id="page-menu"<% (($actions && %$actions) || ($subactions && %$subactions)) && q[ class="actions-present"] | n %>> - <div><div><div> + + <TABLE BGCOLOR="#000000" BORDER=0 CELLSPACING=0 CELLPADDING=0> + <TR> + +%# <ul id="page-menu"<% (($actions && %$actions) || ($subactions && %$subactions)) && q[ class="actions-present"] | n %>> + % if ($page_tabs) { + <TD><IMG SRC="<%$fsurl%>images/gray-black-side.png" WIDTH=13 HEIGHT=25></TD> + <TD> % foreach my $tab (sort keys %{$page_tabs}) { % next if $tab =~ /^(?:current_toptab|this)$/; % $count++; @@ -119,22 +182,24 @@ % $class->{li} = join ' ', @li; % % - <li<% $class->{li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && "· "|n%><a href="<%$RT::WebPath%>/<%$page_tabs->{$tab}->{'path'}%>"<%$class->{a}|n%><% $class->{a} ? ' name="focus"' : ''|n %>><% $page_tabs->{$tab}->{'title'} %></a></li> -% -% if ($sep) { - <li class="separator">···</li> -% } -% $postsep = $sep; + +%# <li<% $class->{li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && "· "|n%><a href="<%$RT::WebPath%>/<%$page_tabs->{$tab}->{'path'}%>"<%$class->{a}|n%><% $class->{a} ? ' name="focus"' : ''|n %>><% $page_tabs->{$tab}->{'title'} %></a></li> + +% $class->{a} = $path eq $current ? ' class="fsblackbuttonselected"' : ' class="fsblackbutton"'; + <a href="<%$RT::WebPath%>/<%$page_tabs->{$tab}->{'path'}%>"<%$class->{a}|n%><% $class->{a} =~ 'selected' ? ' name="focus"' : ''|n %>><% $page_tabs->{$tab}->{'title'} %></a> + % } -% } else { - + </TD> +%# } else { +%# % } - </div></div></div> - </ul> % if (($actions && %$actions) || ($subactions && %$subactions)) { - <ul id="actions-menu"> - <div><div><div> + <TD><IMG SRC="<%$fsurl%>images/<% $page_tabs ? 'black-gray' : 'gray-black' %>-side.png" WIDTH=13 HEIGHT=25></TD> +% if ( $page_tabs ) { + <TD BGCOLOR="#333333"> </TD> +% } + <TD BGCOLOR="#333333"> % $sep = 0; % $postsep = 0; % $count = 0; @@ -160,24 +225,30 @@ % % $class->{li} = join ' ', @li; % - <li<% $class->{li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && qq[<span class="bullet">· </span>]|n%> + +%# <li<% $class->{li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && qq[<span class="bullet">· </span>]|n%> + +% #$class->{a} = $path eq $current ? ' class="fsblackbuttonselected"' : ' class="fsblackbutton"'; +% $type->{$action}->{class} ||= 'fsdarkbutton'; + % if ($type->{"$action"}->{'html'}) { <% $type->{"$action"}->{'html'} | n %> % } else { <a href="<%$RT::WebPath%>/<%$type->{$action}->{'path'}%>"<% $type->{$action}->{class} && ' class="'.$type->{$action}->{class}.'"' |n %><% $type->{$action}->{id} && ' id="'.$type->{$action}->{id}.'"' |n %>><%$type->{$action}->{'title'}%></a> % } - </li> -% if ($sep) { - <li class="separator">···</li> -% } -% $postsep = $sep; + % } % } % } - </div></div></div> - </ul> + + </TD> + % } -</div> + + <TD><IMG SRC="<%$fsurl%>images/black-gray-side.png" WIDTH=13 HEIGHT=25></TD> + </TR> +</TABLE> + <div id="body"> <& /Elements/Callback, _CallbackName => 'BeforeBody', %ARGS &> 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 %> +<input type="text" id="<% $Name %>" name="<% $Name %>" value="<% $Default %>" size="<% $Size %>" /> +<IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $Name %>_date_button" STYLE="cursor: pointer" TITLE="Select date"> <script type="text/javascript"><!-- - onLoadHook('createCalendarLink("<% $Name %>");'); +Calendar.setup({ + inputField: "<%$Name%>", +% if ( defined($ShowTime) && $ShowTime ) { + ifFormat: "%Y-%m-%d %H:%M", + showsTime: true, +% } else { + ifFormat: "%Y-%m-%d", +% } + button: "<%$Name%>_date_button", +}); --></script> -<input type="text" id="<% $Name %>" name="<% $Name %>" value="<% $Default %>" size="<% $Size %>" /> <%init> unless ((defined $Default) or ($current <= 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 @@ <a name="skipnav" id="skipnav" accesskey="8"></a> <%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/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/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;*/ } 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/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[<a href="#basics" onclick="return switchVisibility('Ticket-Create-basics','Ticket-Create-details');">] . loc('Show basics') . q[</a>], + html => q[<a href="#basics" onclick="return switchVisibility('Ticket-Create-basics','Ticket-Create-details');" CLASS="fsblackbutton">] . loc('Show basics') . q[</a>], }, B => { - html => q[<a href="#details" onclick="return switchVisibility('Ticket-Create-details','Ticket-Create-basics');">] . loc('Show details') . q[</a>], + html => q[<a href="#details" onclick="return switchVisibility('Ticket-Create-details','Ticket-Create-basics');" CLASS="fsblackbutton">] . loc('Show details') . q[</a>], }, }; </%INIT> 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 &> 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") &> 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}); 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<text/html>, 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'}, |