diff options
Diffstat (limited to 'rt/html/Elements')
-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 |
6 files changed, 204 insertions, 183 deletions
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; |