6 files changed, 77 insertions, 62 deletions
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index bf599cbe4..676b01205 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -16,9 +16,8 @@ lib/RT/URI/freeside.pm
 lib/RT/URI/freeside/Internal.pm
 lib/RT/URI/freeside/XMLRPC.pm
  share/html/Admin/Users/Modify.html
- html/Elements/Header
- html/Elements/Menu
- html/Elements/PageLayout
+ share/html/Elements/Header
+ share/html/Elements/PageLayout
  html/Elements/QuickCreate
  html/Elements/SelectDate
  html/Elements/SimpleSearch
@@ -38,6 +37,9 @@ share/html/Ticket/ModifyCustomers.html
  html/NoAuth/css/3.5-default/misc.css
  html/NoAuth/css/3.5-default/titlebox.css
 share/html/NoAuth/css/freeside2.1/freeside.css
+share/html/NoAuth/css/freeside2.1/nav.css
+share/html/NoAuth/css/freeside2.1/base.css
+share/html/NoAuth/css/freeside2.1/layout.css
 
 html/Widgets/TitleBoxStart
 
diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 953efcb22..d970ac52f 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -45,61 +45,67 @@
 %# 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">
+<% include( '/elements/header.html', {
+              'title' => $Title,
+              'head'  => $head,
+              'etc'   => $etc,
+              'nobr'  => 1,
+              'nocss' => 1,
+          }) |n
+%>
+<%INIT>
+$r->headers_out->{'Pragma'} = 'no-cache';
+$r->headers_out->{'Cache-control'} = 'no-cache';
 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-<title><%$Title%></title>
+my $id = $m->request_comp->path;
+$id =~ s|^/||g;
+$id =~ s|/|-|g;
+$id =~ s|\.html$||g;
+$id =~ s|index$||g
+    if $id ne 'index';
+$id =~ s|-$||g;
 
+my $head = '';
 
-% if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) {
-    <meta http-equiv="refresh" content="<% $Refresh %>" />
-% }
+if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) {
+  $head .= '<meta http-equiv="refresh" content="$Refresh" />';
+}
 
-<link rel="shortcut icon" href="<%RT->Config->Get('WebImagesURL')%>/favicon.png" type="image/png" />
-<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/<% RT->Config->Get( 'WebDefaultStylesheet', $session{'CurrentUser'} ) %>/main<% RT->Config->Get('DevelMode')? '' : '-squished' %>.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/print.css" type="text/css" media="print" />
+my $WebPath = RT->Config->Get('WebPath');
+my $WebImagesURL = RT->Config->Get('WebImagesURL');
+my $WebDefaultStylesheet =
+  RT->Config->Get('WebDefaultStylesheet', $session{'CurrentUser'});
+my $squished = RT->Config->Get('DevelMode') ? '' : '-squished';
 
-% for (keys %{$LinkRel || {}}) {
-    <link rel="<% $_ %>" href="<% RT->Config->Get('WebPath') . $LinkRel->{$_} %>" />
-% }
+$head .= <<END;
+<link rel="shortcut icon" href="$WebImagesURL/favicon.png" type="image/png" />
+<link rel="stylesheet" href="$WebPath/NoAuth/css/$WebDefaultStylesheet/main$squished.css" type="text/css" media="all" />
+<link rel="stylesheet" href="$WebPath/NoAuth/css/print.css" type="text/css" media="print" />
+END
 
-% if ( $RSSAutoDiscovery ) {
-    <link rel="alternate" href="<%$RSSAutoDiscovery%>" type="application/rss+xml" title="RSS RT Search" />
-% }
+for (keys %{$LinkRel || {}}) {
+  $head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />';
+}
 
-% if ($JavaScript) {
-<& HeaderJavascript, focus => $Focus, onload => $onload &>
-% }
+if ( $RSSAutoDiscovery ) {
+    $head .= qq(<link rel="alternate" href="$RSSAutoDiscovery" type="application/rss+xml" title="RSS RT Search" />);
+}
 
-% my $stylesheet_plugin = "/NoAuth/css/". RT->Config->Get( 'WebDefaultStylesheet', $session{'CurrentUser'} )."/InHeader";
-% if ($m->comp_exists($stylesheet_plugin) ) {
-<& $stylesheet_plugin &>
-% }
-% $m->callback( %ARGS, CallbackName => 'Head' );
+if ($JavaScript) {
+    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload);
+}
 
-</head>
-  <body<% $id && qq[ id="comp-$id"] |n %>>
+my $stylesheet_plugin = "/NoAuth/css/$WebDefaultStylesheet/InHeader";
+if ($m->comp_exists($stylesheet_plugin) ) {
+    $head .= $m->scomp($stylesheet_plugin);
+}
 
-% if ($ShowBar) {
-<& /Elements/Logo, %ARGS &>
+# $m->callback( %ARGS, CallbackName => 'Head' );
+$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS );
 
-<div id="quickbar">
-  <& /Elements/PersonalQuickbar, %ARGS &>
-% }
+my $etc = '';
+$etc .= qq[ id="comp-$id"] if $id;
 
-<%INIT>
-$r->headers_out->{'Pragma'} = 'no-cache';
-$r->headers_out->{'Cache-control'} = 'no-cache';
-
-my $id = $m->request_comp->path;
-$id =~ s|^/||g;
-$id =~ s|/|-|g;
-$id =~ s|\.html$||g;
-$id =~ s|index$||g
-    if $id ne 'index';
-$id =~ s|-$||g;
 </%INIT>
 
 <%ARGS>
diff --git a/rt/share/html/Elements/PageLayout b/rt/share/html/Elements/PageLayout
index 981e58a3c..b5800ce70 100755
--- a/rt/share/html/Elements/PageLayout
+++ b/rt/share/html/Elements/PageLayout
@@ -45,23 +45,25 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
+
+% if (0) { ## new ticket via customer, and we already have a ticket search box
 <div id="topactions">
 % foreach my $action (reverse sort keys %{$topactions}) {
 <span class="topaction" id="topaction-<%$action%>"><% $topactions->{"$action"}->{'html'} |n %></span>
 % }
 </div>
+% }
 
-%# End of div#quickbar from /Elements/Header
-</div>
-
+% 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>
 <div id="page-navigation">
 % my $sep       = 0;
 % my $postsep   = 0;
diff --git a/rt/share/html/NoAuth/css/freeside2.1/freeside.css b/rt/share/html/NoAuth/css/freeside2.1/freeside.css
index 5e7e0a04a..6e5f3b576 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/freeside.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/freeside.css
@@ -1,9 +1,9 @@
 
-div.titlebox {
-        background: #d4d4d4;
-}
-
-div.titlebox-title {
-        background: #e8e8e8;
-}
+%# div.titlebox {
+%#         background: #d4d4d4;
+%# }
+%# 
+%# div.titlebox-title {
+%#         background: #e8e8e8;
+%# }
 
diff --git a/rt/share/html/NoAuth/css/freeside2.1/layout.css b/rt/share/html/NoAuth/css/freeside2.1/layout.css
index 71fbb7f4e..b7b87abc2 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/layout.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/layout.css
@@ -65,8 +65,10 @@ div#body {
     padding-top: 1.8em;
     -moz-border-radius: 0.5em;
     -webkit-border-radius: 0.5em;
-    margin-left: 10.5em;
-    margin-top: 5.2em;
+    /* margin-left: 10.5em; */
+    /* margin-top: 5.2em; */
+    margin-left: .5em;
+    margin-top: 3.0em;
     margin-right: 1em;
     margin-bottom: 0em;
     min-height: 10%;
diff --git a/rt/share/html/NoAuth/css/freeside2.1/nav.css b/rt/share/html/NoAuth/css/freeside2.1/nav.css
index b8e5da348..8a52e62c4 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/nav.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/nav.css
@@ -135,7 +135,7 @@ div#nav a.selected:after {
 div#page-navigation {
  background: white;
  position: relative;
- width:100%;
+ /* width:100%; */
  z-index: 10;
 
 }
@@ -147,7 +147,8 @@ div#page-navigation ul {
 
 div#page-navigation ul#page-menu {
  display: block;
- position: absolute;
+ /* position: absolute; */
+ float: left;
  left: 8em;
  font-size: 0.9em;
  top: 2.3em;
@@ -156,6 +157,7 @@ div#page-navigation ul#page-menu {
  right: 0em;
  padding-top:0.3em;
  padding-bottom:0.5em;
+ padding-right: 4em;
  border-top: 1px solid #aaa;
 
 }
@@ -169,7 +171,8 @@ div#page-navigation ul#page-menu {
 
 
 div#page-navigation ul#actions-menu {
- position: absolute;
+ /* position: absolute; */
+ float: right;
  right: 1em;
  top: 5.2em;
  margin-top: 0em;