update address standardization for cust_location changes

19 files changed, 521 insertions, 869 deletions

diff --git a/rt/share/html/NoAuth/css/web2/InHeader b/rt/share/html/NoAuth/css/web2/InHeader
index a480fc6f0..a083eec21 100644
--- a/rt/share/html/NoAuth/css/web2/InHeader
+++ b/rt/share/html/NoAuth/css/web2/InHeader
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -52,3 +52,24 @@
 <!--[if lt IE 7]>
 <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/msie6.css" type="text/css" media="all" />
 <![endif]-->
+<script type="text/javascript">
+jQuery(document).ready(function(){
+    jQuery("#quick-personal").append('<ul id="prefs-menu"></ul>');
+    jQuery("#li-preferences").detach().appendTo("#prefs-menu");
+    jQuery("#li-tools-config").detach().appendTo("#app-nav");
+    jQuery("#li-search-simple").detach().insertBefore("#li-search");
+    jQuery("#li-tools-approval").detach().appendTo("#app-nav");
+
+    jQuery("#li-page-bookmark").detach().appendTo("#li-page-actions>ul");
+    jQuery("#li-page-actions>ul").attr("id","page-action-menu").detach().insertAfter("#topactions");
+
+    jQuery.fn.supersubs.defaults = {
+        maxWidth: 30,
+        extraWidth: 2
+    };
+
+    jQuery("#page-menu.toplevel").addClass("sf-menu sf-js-enabled").supersubs().superfish({ dropShadows: false, speed: 'fast' }).supposition();
+    jQuery("#app-nav.toplevel").addClass("sf-menu sf-vertical sf-js-enabled").supersubs().superfish({ speed: 'fast' }).supposition();
+    jQuery("#prefs-menu").addClass("sf-menu sf-js-enabled").supersubs().superfish().supposition({ speed: 'fast' });
+});
+</script>
diff --git a/rt/share/html/NoAuth/css/web2/admin.css b/rt/share/html/NoAuth/css/web2/admin.css
deleted file mode 100644
index d421f66de..000000000
--- a/rt/share/html/NoAuth/css/web2/admin.css
+++ /dev/null
@@ -1,60 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
-%#                                          <sales@bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-ul.list-menu .menu-item {
- font-size: 1.25em;
-}
-ul.list-menu {
- list-style: none;
-
-}
-ul.list-menu .description {
- display: block;
- padding: 0.5em;
- font-style: italic;
- padding-left: 1em;
-}
diff --git a/rt/share/html/NoAuth/css/web2/base.css b/rt/share/html/NoAuth/css/web2/base.css
index aefe56f24..0744f0b2d 100644
--- a/rt/share/html/NoAuth/css/web2/base.css
+++ b/rt/share/html/NoAuth/css/web2/base.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -51,9 +51,8 @@ a {
 }
 
 
-div#body a:visited {
+a:visited {
     color: #666;
-
 }
 
 a:hover  {
diff --git a/rt/share/html/NoAuth/css/web2/boxes.css b/rt/share/html/NoAuth/css/web2/boxes.css
index 20be288fe..3c87c8d48 100644
--- a/rt/share/html/NoAuth/css/web2/boxes.css
+++ b/rt/share/html/NoAuth/css/web2/boxes.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -58,6 +58,10 @@
  border-bottom: 2px solid #aaa;
  border-right: 2px solid #aaa;
  padding-right: 1em;
+
+
+  border-radius: 0.5em;
+
 }
 
 * html .titlebox {
@@ -69,8 +73,6 @@
 
  background-color: #ffffff;
  margin-top: 1em;
- -moz-border-radius: 0.5em;
- -webkit-border-radius: 0.5em;
  margin-right: 0.25em;
  
 }
@@ -105,10 +107,6 @@
 
 }
 
-.titlebox .titlebox-title a:visited {
-    color: #fff;
-}
-
 .titlebox .titlebox-title .left {
     font-weight: bold;
     background: #ccc;
@@ -121,6 +119,8 @@
     border-bottom: 2px solid #aaa;
     border-right: 2px solid #aaa;
 
+    border-radius: 0.5em;
+
 
 }
 
@@ -147,9 +147,13 @@
  -moz-border-radius-topright: 0.25em;
  -webkit-border-top-right-radius: 0.25em;
 
+  border-radius: 0 0.25em 0 0.25em;
+
+
 }
 
-.titlebox .titlebox-title .right a {
+.titlebox .titlebox-title .right a,
+.titlebox .titlebox-title .right a:visited {
  color: #000;
 }
 
@@ -163,22 +167,21 @@
 .titlebox .titlebox-title .widget a {
   display: block;
   margin: 0;
-  margin-top: 0.5em;
+  margin-top: 0.6em;
   width: 20px;
 
-  background: url(<%RT->Config->Get('WebPath')%>/NoAuth/images/css/rollup-arrow.gif) no-repeat center center;
+  background: url(<%RT->Config->Get('WebPath')%>/NoAuth/images/css/rollup-arrow.gif) no-repeat center 0;
 
   position: absolute;
   top: -1em;
   left: 0.15em;
   float: left;
 
-  padding: 11px 0 0 0;
+  padding: 7px 0 0 0;
   overflow: hidden;
 }
 
 * html .titlebox .titlebox-title .widget a {
-    background-position: center 0.3em;
     top: 0em;
     left: -1.5em; 
 }
diff --git a/rt/share/html/NoAuth/css/web2/collection.css b/rt/share/html/NoAuth/css/web2/collection.css
deleted file mode 100644
index 484943d62..000000000
--- a/rt/share/html/NoAuth/css/web2/collection.css
+++ /dev/null
@@ -1,51 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
-%#                                          <sales@bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-table.collection td:first-child, table.collection th:first-child {
-    padding-left: 1em;
-}
-
diff --git a/rt/share/html/NoAuth/css/web2/forms.css b/rt/share/html/NoAuth/css/web2/forms.css
deleted file mode 100755
index 2d3435619..000000000
--- a/rt/share/html/NoAuth/css/web2/forms.css
+++ /dev/null
@@ -1,243 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
-%#                                          <sales@bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-form {
-
-    background: none;
-    border: none;
-    margin: 0;
-}
-
-
-.input-row .label {
-  position: relative;
-  text-align: right;
-  width: 4em;
-}
-
-.input-row .input {
-  position: relative;
-  left: 1em;
-  width: 10em;
-  text-align: right;
-}
-
-.value {
- font-size: 0.85em;
-
-}
-
-
-
-div.button-row {
-   text-align: right;
-   padding-right: 0.5em;
-}
-
-
-input[type=reset], input[type=submit], input[class=button] {
-   color: #fff;
-   background: #3858a3;
-   padding: 0.25em;
-   padding-left: 0.5em;
-   padding-right: 0.5em;
-   -moz-border-radius: 0.5em;
-   -webkit-border-radius: 0.5em;
-}
-
-input.button:hover, button:hover, input[type=reset]:hover, input[type=submit]:hover, input[class=button]:hover {
-   background: #1D3B7D;
-}
-
-input.button:focus, button:focus, input[type=reset]:focus, input[type=submit]:focus, input[class=button]:focus {
-   background: #1D3B7D;
-}
-
-div.error div.error {
- border: 2px solid #aa0000;
- border-top: 1px solid #bb0000;
- border-left: 1px solid #bb0000;
- background-color: #fcc;
-}
-
-div.error .titlebox-title span.left {
-  background-color: #f00;
-  color: #fff;
-  border: 1px solid #cc0000;
-  border-right: 2px solid #bb0000;
-  border-bottom: 2px solid #bb0000;
-
-}
-
-
-div.results .titlebox-title .left, div.results .titlebox {
-  border: 1px solid #aa9;
-  border-bottom: 2px solid #990;
-  border-right: 2px solid #990;
-}
-
-div.results .titlebox-title .left {
-  background: #ff9;
-
-}
-
-div.results .titlebox {
-  background: #ffc;
-
-}
-
-div.results .titlebox-content {
-  padding: 0;
-}
-
-
-.label, .labeltop {
- text-align: right;
- font-size: 0.8em;
- padding-right: .5em;
-
-} 
-
-.cflabel {
- text-align: right;
- font-size: 0.8em;
- padding-right: .5em;
- width: 25%;
-}
-
-.labeltop, .label, .value {
-  padding-top: 0.25em;
-}
-
-div.ticket-info-basics div.titlebox-content .labeltop{
-  width: 10em;
-}
-
-div.submit {
- text-align: right;
-}
-
-div.submit .extra-buttons {
- text-align: left;
-}
-
-
-div.widget {
-    padding-bottom: 0.5em;
-    clear: both;
-}
-
-div.widget .label { 
- text-align: right;
- display: block;
- width: 15em;
- float: left;
- clear: both;
- font-size: 0.9em;
- padding-right: 0.5em;
-}
-
-div.widget .hints {
-
-  display: block;
-  padding-left: 14em;
-  font-style: italic;
-}
-
-
-%# ComboBox styles... some properties like height and width must be dynamically
-%# set in the JS (at least for now).
-.combobox {
-    position: relative;
-    width: 11.5em;
-}
-
-.combobox .combo-button {
-    right: 0;
-    padding: 0;
-    margin-top: 0;
-    cursor: default;
-    color: ButtonFace;
-    background: ButtonFace;
-    border: 2px outset ButtonHighlight;
-}
-
-/* this style replaces the default down-triangle with one that looks more like
- *  native widget sets. It does not work in IE as it's an :after pseudo element 
- *  with a "content" value. but that's ok because IE can't display unicode 25be
- *  anyway */
-
-.combobox .combo-button:after {
-    color: ButtonText;
-    margin: 0;
-    padding: 0;
-    margin-top: -0.5em;
-    margin-left: -0.8em;
-    content: "\25be";
-}
-
-.combobox .combo-text {
-    border: 1px inset ButtonHighlight;
-    margin: 0;
-    padding: 0;
-}
-
-.combobox .combo-list {
-    border: 1px outset;
-    z-index: 150;
-}
-
-.value .TimeUnits{
-    margin-left: .5em;
-    width: 7em;
-}
-
-.cfinvalidfield {
-    font-style: italic;
-    color: red;
-}
-
diff --git a/rt/share/html/NoAuth/css/web2/layout.css b/rt/share/html/NoAuth/css/web2/layout.css
index b2d10702a..72a74e9b4 100644
--- a/rt/share/html/NoAuth/css/web2/layout.css
+++ b/rt/share/html/NoAuth/css/web2/layout.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -48,142 +48,92 @@
 /* body */
 
 body {
-
-
     padding:0;
     margin:0;
-
     background: #547CCC url(<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/images/background-gradient.png) top left repeat-x ;
     font-family: arial, helvetica, sans-serif;
-
     color: #000000;
 }
 
 div#body {
     position: relative;
-    padding: 1em;
-    padding-top: 1.8em;
-    -moz-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    margin-left: 10.5em;
-    margin-top: 5.2em;
-    margin-right: 1em;
+    padding: 1.8em 1em 1em 1em;
+    -moz-border-radius-topleft: 0.5em;
+    -webkit-border-top-left-radius: 0.5em;
+    -moz-border-radius-bottomleft: 0.5em;
+    -webkit-border-bottom-left-radius: 0.5em;
+    margin-left: 10em;
+    margin-top: 5.8em;
+    margin-right: 0;
     margin-bottom: 0em;
     min-height: 10%;
     background: #fff;
     border-top: 2px solid #ccc;
     border-left: 2px solid #ccc;
     z-index:1;
-
-
-}
-
-#topactions {
- position: absolute;
- background: transparent;
- top: 3.8em; 
- right: 1em;
- width: auto;
- min-width: 42em;
- font-size: 0.9em;
- z-index: 99;
-}
-
-#topactions form * {
-    vertical-align: top;
-}
-
-#topactions button, #topactions select, #topactions input{
- padding-top: 0em;
- padding-bottom: 0em;
- width: 8em;
+    border-radius: 0.5em 0 0 0.5em;
 
 }
 
-#topactions form {
- display: block;
-
-}
-
-#topactions #CreateTicketInQueue {
- text-align: right; 
-
-}
-#topactions #simple-search {
-    float: right;
-}
-
-#topactions #simple-search .field{
- margin-left: 1em;
- color: #787;
- }
-
-#topactions #simple-search .field:focus {
- color: #000;
- }
-
-#topactions #GotoTicket {
- text-align: right; 
-
+div#body.login-body {
+    top: -2.5em;
+    margin-right: 10em;
 }
 
 div#footer {
  position: absolute;
  right: 0;
-  text-align: right;
+ text-align: right;
  font-size: 0.9em;
  margin-top: 2em;
  background: #fff;
  margin-bottom: 0;
  padding-left: 3em;
  padding-right: 1em;
-
-
-
-
-
  border-top: 2px solid #aaa;
  border-left: 2px solid #aaa;
-
-
-
  -moz-border-radius-topleft: 0.5em;
  -webkit-border-top-left-radius: 0.5em;
  -moz-border-radius-bottomleft: 0.5em;
  -webkit-border-bottom-left-radius: 0.5em;
+
+  border-radius: 0.5em 0 0.5em 0;
 }
 
 div#footer #time {
-display: none ;
+    display: none ;
 }
 
 div#footer #bpscredits {
  text-align: right;
- background: url(<%RT->Config->Get('WebPath')%>/NoAuth/images//bplogo.gif) no-repeat top right;
+ background: url(<%RT->Config->Get('WebPath')%>/NoAuth/images/bpslogo.png) no-repeat top right;
  padding-top: 4em;
-} 
+}
 
 
 /* logo stuff */
 
 div#logo {
-}
-
-
-div#logo a {
-     display: none;
     position: absolute;
-    left: 0;
-    bottom: 0;
+    right: 2px;
+    top: 0;
+    height: 2.3em;
 }
+
 div#logo a img {
     border: 0;
+    height: 100% !important;
+    width: auto !important;
+    float: right;
 }
+
 div#logo .rtname {
-    position: absolute;
+    position: relative;
     font-weight: bold;
-    top: 1em;
-    left: 1em;
+    text-align: center;
+    top: 0.7em;
+    padding-right: 1em;
+    float:left;
 }
 
 
@@ -204,16 +154,42 @@ div#quickbar {
  border-bottom: 1px solid #ccc;
 
 }
-div#quick-personal {
-    float: right;
-    margin-right: 1em;
+
+#prefs-menu.sf-menu li li {
+    background: #eaeaea;
 }
 
+#prefs-menu.sf-menu #li-preferences {
+    background: none;
+}
+
+#prefs-menu.sf-menu li:hover,
+#prefs-menu.sf-menu li.sfHover,
+#prefs-menu.sf-menu #li-preferences.sfHover,
+#prefs-menu.sf-menu #li-preferences:hover,
+#prefs-menu.sf-menu a:focus,
+#prefs-menu.sf-menu a:hover,
+#prefs-menu.sf-menu a:active,
+{
+    background-color: #CFDEFF;
+    text-color: #000;
+    color: #000;
+    border: none;
+}
+
+#prefs-menu .sfHover a,
+#prefs-menu .sfHover a:visited {
+    color: #000;
+    border: none;
+}
+
+
 
 div#header h1 {
  position: absolute;
- left: 7.25em;
+ left: 7em;
  right: 20em;
+ top: 1.4em;
  overflow: hidden;
  height: 1em;
  font-size: 1.4em;
diff --git a/rt/share/html/NoAuth/css/web2/login.css b/rt/share/html/NoAuth/css/web2/login.css
deleted file mode 100644
index f58de3dbe..000000000
--- a/rt/share/html/NoAuth/css/web2/login.css
+++ /dev/null
@@ -1,86 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
-%#                                          <sales@bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-.login-body .action-results {
-    list-style: none;
-}
-
-#login-box hr {
- display: none;
-}
-
-#login-box {
-
- width: 30em;
- 
-margin-right:auto;margin-left:auto;
- padding-top: 2em;
- padding-bottom: 2em;
-
-
-}
-
-
-#login-box .input-row {
-  position: relative;
-  height: 1.5em;
-  padding-top: 1em;
-}
-
-#login-box .input-row .label {
-
- float: left;
- width: 8em;
- text-align: right;
- font-weight: bold;
-
-
-}
-
-#login-box .button-row {
-  margin-top: 0.5em;
-}
diff --git a/rt/share/html/NoAuth/css/web2/main.css b/rt/share/html/NoAuth/css/web2/main.css
index 477478ce7..b184894d3 100644
--- a/rt/share/html/NoAuth/css/web2/main.css
+++ b/rt/share/html/NoAuth/css/web2/main.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -47,22 +47,15 @@
 %# END BPS TAGGED BLOCK }}}
 % $m->callback(CallbackName => 'Begin');
 
-@import "yui-fonts.css";
-@import "base.css";
+@import "../base/main.css";
 
+@import "base.css";
 @import "layout.css";
 @import "nav.css";
-@import "forms.css";
 @import "boxes.css";
-
-@import "login.css";
 @import "ticket-lists.css";
 @import "ticket-search.css";
-@import "portlets.css";
 @import "ticket.css";
-@import "tools.css";
-@import "admin.css";
-@import "collection.css";
 @import "misc.css";
 
 % $m->callback(CallbackName => 'End');
diff --git a/rt/share/html/NoAuth/css/web2/misc.css b/rt/share/html/NoAuth/css/web2/misc.css
index 3243fc55e..655c40031 100644
--- a/rt/share/html/NoAuth/css/web2/misc.css
+++ b/rt/share/html/NoAuth/css/web2/misc.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,34 +45,6 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-@import "../base/misc.css";
-
-#body.calpopup {
-    margin-left: 1em;
-    margin-top: 1em;
-} 
-
-#body.calpopup a.today {
-    font-size: 1em;
-    font-weight: bold;
-}
-
-#body.calpopup a {
-    font-size: 0.8em;
-}
-
-.calendar {
-    text-align: center;
-    margin: 0 0 0 0;
-}
-
-.calendar td, .calendar th { padding: 0.1em 0.1em 0.1em 0.1em; }
-
-.calendar caption .month {
-    padding: 0 0.25em 0 0.25em;
-    font-size: 1.5em;
-}
-
 .comment { 
  padding-left: 0.5em;
  color: #999;
diff --git a/rt/share/html/NoAuth/css/web2/msie.css b/rt/share/html/NoAuth/css/web2/msie.css
index 023657525..81b31e4f6 100644
--- a/rt/share/html/NoAuth/css/web2/msie.css
+++ b/rt/share/html/NoAuth/css/web2/msie.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -48,10 +48,12 @@
 div#body {
     left: 0.25em;
     height: 100%;
-    top: 1em;
-
+    top: 6em;
 }
 
+#main-navigation {
+    padding-bottom: 1em;
+}
 
 #footer {
     padding: 1em;
@@ -71,9 +73,10 @@ div#header h1 {
 
 
 #topactions {
-    top: 4.1em;
+    top: 3.5em;
     width: auto;
 }
+
 .topaction form * { 
     vertical-align: top;
 }
@@ -90,14 +93,6 @@ div#header h1 {
     margin-top: 0.2em;
 }
 
-div#page-navigation ul#actions-menu {
-    margin-top: -2.9em;
-    margin-right: -0.2em;
-    border-top: 1px solid #ccc;
-    border-right: none;
-}
-
-
 div#page-navigation {
     position: absolute;
     top: 6.2em;
@@ -109,8 +104,6 @@ div#page-navigation {
 
 
 div#page-navigation ul#page-menu {
-    margin-top: -2.5em;
-    margin-left: 4em;
     background: none;
     border: none;
 }
@@ -166,6 +159,9 @@ div#nav li.last {
 
 .titlebox .titlebox-title .right {
     border-right: 2px solid #aaa;
+    display: block;
+    margin-top: 0.1em;
+    right: -0.2em;
 
 }
 
@@ -174,7 +170,8 @@ div#nav li.last {
     padding-top: 2.2em;
 }
 
-.titlebox table.ticket-list, .titlebox table.queue-summary {
+
+.titlebox table.collection-as-table, .titlebox table.queue-summary {
     width: 95%;
     padding: 0.5em;
     margin-left: auto;
@@ -205,12 +202,6 @@ table.queue-summary td, td.collection-as-table {
     left: 0.5em;
 }
 
-
-.titlebox .titlebox-title .right{
-    top: 0.2em;
-    right: -0.2em;
-}
-
 /* nested things. like the ticket dates tab */
 .titlebox .titlebox .titlebox-title .right{
     top: 0.25em;
@@ -244,3 +235,16 @@ table.queue-summary td, td.collection-as-table {
   word-wrap  */
 }
 
+div#logo .rtname {
+    float: right;
+    padding-right: 1em;
+}
+
+#page-action-menu {
+    top: 9.5em;
+}
+
+#rt-portal .titlebox-content {
+    height: 23em;
+}
+
diff --git a/rt/share/html/NoAuth/css/web2/msie6.css b/rt/share/html/NoAuth/css/web2/msie6.css
index 420ed88f0..25ef8584d 100644
--- a/rt/share/html/NoAuth/css/web2/msie6.css
+++ b/rt/share/html/NoAuth/css/web2/msie6.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -49,8 +49,8 @@
     margin-top: 0;
 }
 
-div#page-navigation ul#page-menu {
-    margin-top: -3.2em;
+div#page-navigation {
+    width: 100%;
 }
 
 .titlebox-title .widget {
@@ -86,3 +86,11 @@ div#page-navigation ul#page-menu {
     width: expression(this.width > 401 ? 400 : true);
 }
 
+#prefs-menu .sf-sub-indicator {
+    background-image: url(<%RT->Config->Get('WebPath')%>/NoAuth/css/images/arrows-grey.gif);
+}
+
+#app-nav .sf-sub-indicator {
+    background-image: url(<%RT->Config->Get('WebPath')%>/NoAuth/css/images/arrows-grey.gif);
+}
+
diff --git a/rt/share/html/NoAuth/css/web2/nav.css b/rt/share/html/NoAuth/css/web2/nav.css
index bbde2d447..e404b61c8 100644
--- a/rt/share/html/NoAuth/css/web2/nav.css
+++ b/rt/share/html/NoAuth/css/web2/nav.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,157 +45,248 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-div#nav {
- position: absolute;
- left: 0;
- font-size: 0.9em;
- top: 3.2em;
- width: 10.5em;
- background: #fff;
- -moz-border-radius-bottomright: 0.5em;
- -webkit-border-bottom-right-radius: 0.5em;
-  border-left: 1px solid #999;  
-border-top: 1px solid #999;
-
- -moz-border-radius-topright: 0.5em;
- -webkit-border-top-right-radius: 0.5em;
- z-index: 99;
+#main-navigation {
+    background-color: #fff;
+    -moz-border-radius-bottomright: 0.5em;
+    -moz-border-radius-topright: 0.5em;
+    -webkit-border-top-right-radius: 0.5em;
+    -webkit-border-bottom-right-radius: 0.5em;
+    border-radius: 0 0.5em 0.5em 0;
+    width: 10em;
+    font-size: 0.85em;
+    position: absolute;
+    top: 3.4em;
+    left: 0em;
+    z-index: 9997;
+    padding-top: 1em;
+    padding-right: 0.5em;
+    padding-left: 0.5em;
+}
+
+.sf-sub-indicator {
+    background-image: url(<%RT->Config->Get('WebPath')%>/NoAuth/css/images/arrows-grey.png);
+    margin-top: -3px;
+}
 
+#app-nav.sf-vertical li:hover ul,
+#app-nav.sf-vertical li.sfHover ul {
+    top: -1px;
+}
 
+#prefs-menu > li, #prefs-menu > li > a {
+    background-color: transparent;
 }
 
-div#nav ul {
- padding-left: 0.75em;
- margin-left: 0;
- padding-right: 0.75em;
- list-style-type: none;
+#prefs-menu.sf-menu a,
+#prefs-menu .sf-menu a
+{
+    border: none;
 }
 
-div#nav li:first-child {
- border-top: 1px solid #ccc;
- padding-top: 0.25em;
+#prefs-menu.sf-menu li li li {
+    border-left: 1px solid #ccc;
+}
 
+#prefs-menu.sf-menu li:hover ul,
+#prefs-menu.sf-menu li.sfHover ul {
+    top: 2.4em; /* match the height of the top level li */
 }
 
-div#nav li {
- padding: 0.125em;
- padding-bottom: 0.25em;
- margin-bottom: 0.25em;
- border-bottom: 1px solid #ccc;
- padding-left: 0.5em;
- margin-right: 0.25em;
- margin-left: 0em;
+#prefs-menu.sf-menu li li:hover ul,
+#prefs-menu.sf-menu li li.sfHover ul {
+    top: 0;
 }
 
-div#nav li li:first-child {
-    margin-top: 0.25em;
+#prefs-menu .sf-sub-indicator {
+    background-image: url(<%RT->Config->Get('WebPath')%>/NoAuth/css/images/arrows-grey.png);
+    margin-top: 0;
 }
-div#nav li li {
-    margin-left: -0.5em;
-    padding-left: 0.25em;
-    margin-right: -0.5em;
+
+#main-navigation ul li {
 }
 
-div#nav li li:last-child {
-    margin-bottom: 0; 
-    padding-bottom: 0;
+
+#main-navigation .sf-menu {
+    text-color: #000;
+}
+
+#main-navigation .sf-menu li {
+    background: none;
+}
+
+#main-navigation .sf-menu li:first-child {
+    border-top: 1px solid #ccc;
+}
+
+#main-navigation .sf-menu a,
+#main-navigation .sf-menu a:visited {
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+    color: #000;
     border: none;
 }
 
-div#nav .bullet {
- display: none;
+#main-navigation .sf-menu li {
+    border-bottom: 1px solid #ccc;
+
 }
 
-div#nav .separator {
-display: none;
+
+#main-navigation .sf-menu ul a,
+#main-navigation .sf-menu ul a:visited {
+    color: #000;
 }
 
 
-div#nav a, div#page-navigation a{
- text-decoration: none;
- font-weight: normal;
- color: #000;
+#main-navigation .sf-menu li li, #main-navigation .sf-menu li li li {
+    border-left: none;
+    background-color: #fff;
+    text-color: #547CCC;
+}
+
+#main-navigation .sf-menu li:hover, #main-navigation .sf-menu li.sfHover, #main-navigation .sf-menu a:focus, #main-navigation .sf-menu a:hover, #main-navigation .sf-menu a:active {
+    background-color: #CFDEFF;
+    text-color: #000;
+    color: #000;
 }
 
-div#nav a:hover, div#page-navigation a:hover {
- text-decoration: underline;
+#main-navigation .sfHover a,
+#main-navigation .sfHover a:visited {
+    color: #000;
 }
 
+/* to stop a "flash" of an unstyled menu on an older browser,  hide the menu until superfish has initialized it */
+#app-nav.toplevel { display: none; }
+#app-nav.toplevel.sf-menu { display:block; }
+#page-menu.toplevel { display: none; }
+#page-menu.toplevel.sf-menu { display:block; }
+
+
+
+#page-navigation {
+    position: absolute;
+    top: 5.7em;
+    left: 10em;
+    right: 0em;
+    height: 2.1em;
+    z-index: 9995;
+    font-size: 0.9em;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    -moz-border-radius-bottomleft: 0.5em;
+    -webkit-border-bottom-left-radius: 0.5em;
+    border-right: none;
+    border-radius: 0 0 0 0.5em;
+}
 
+#page-navigation .sf-menu {
+    margin: 0;
+}
 
-div#nav a.selected, div#page-navigation a.selected {
-  font-weight: bold;
+#page-navigation .sf-menu li, #page-navigation .sf-menu li li, #page-navigation .sf-menu li li li {
+    background: none;
+    height: 2em;
+    padding-top: 0.25em;
+    padding-bottom: 0;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+    display: inline-block;
 }
 
 
-div#nav a.selected:after {
-/* content: " > " */
+#page-navigation .sf-menu ul {
+    background: white;
+    border-bottom: 2px solid #ccc;
 }
 
-div#page-navigation {
- background: white;
- position: relative;
- width:100%;
- z-index: 10;
 
+#page-navigation .sf-menu li:hover, #page-navigation .sf-menu li.sfHover, #page-navigation .sf-menu a:focus, #page-navigation .sf-menu a:hover, #page-navigation .sf-menu a:active {
+    background: none;
 }
 
+#page-navigation .sf-menu a:visited, #page-navigation .sf-menu a {
+    border: none;
+    color: #000;
+}
 
-div#page-navigation ul#page-menu {
- display: block;
- position: absolute;
- left: 8em;
- font-size: 0.9em;
- top: 2.3em;
- /* if bigger than 0.87em, firefox/opera will show the 2nd line a bit, ugly */
- height: 0.87em;
- background-color: white;
- right: 0em;
- padding-top:0.3em;
- padding-bottom:0.5em;
- border-top: 1px solid #aaa;
- overflow: auto;
+#page-navigation .sf-menu a {
+    padding: 0.25em;
 }
 
-/* ie hack */
-* html div#page-navigation ul#page-menu {
-    left: 6.5em;
-    top: 3.2em;
-    padding-left: 2em;
-    width: 88%;
+#page-navigation .sf-menu a.sf-with-ul {
+    /* allow space for the submenu indicator */
+    padding-right: 2em;
 }
 
+#page-menu.sf-menu li .sf-sub-indicator {
+    top: 0.7em;
+}
 
-div#page-navigation ul#actions-menu {
- position: absolute;
- right: 1em;
- top: 5.2em;
- margin-top: 0em;
- padding: 0.25em;
- padding-left: 0.5em;
- padding-right: 0.5em;
 
- background: #dedede;
- border-left: 1px solid #aaa;
- border-bottom: 2px solid #aaa;
- -moz-border-radius-bottomleft: 0.5em;
- -webkit-border-bottom-left-radius: 0.5em;
- -moz-border-radius-topright: 0.25em;
- -webkit-border-top-right-radius: 0.25em;
+#page-actions {
+    display: none;
+}
 
+#page-action-menu {
+    position: absolute;
+    display: block;
+    top: 8.2em;
+    right: 0em;
+    left: auto;
+    z-index: 9995;
+    font-size: 0.9em;
+    background-color: #eee;
+    border: 1px solid #ccc;
+    -moz-border-radius-bottomleft: 0.5em;
+    -webkit-border-bottom-left-radius: 0.5em;
+    border-bottom-left-radius: 0.5em;
+    border-right: none;
+    border-top: none;
+    list-style-type: none;
+    padding: 0.5em;
+}
 
 
+#page-action-menu li {
+    display: inline;
 }
 
+#page-action-menu a, #page-action-menu a:visited {
+    border: none;
+    padding: 0.25em;
+    color: #000;
+}
 
 
-div#page-navigation ul li{
- display: inline;
+#topactions {
+ position: absolute;
+ background: transparent;
+ top: 3.2em;
+ right: 0.7em;
+ width: auto;
+ min-width: 42em;
+ font-size: 0.9em;
+ z-index: 99;
+}
 
+#topactions form * {
+    vertical-align: top;
 }
 
+#topactions button, #topactions select, #topactions input{
+ padding-top: 0em;
+ padding-bottom: 0em;
+ width: 8em;
 
-ul.page-navigation ul.page-menu {
- float: right;
 }
 
+#topactions #simple-search .field{
+ margin-left: 1em;
+ color: #787;
+ }
+
+#topactions #simple-search .field:focus {
+ color: #000;
+ }
+
+
diff --git a/rt/share/html/NoAuth/css/web2/portlets.css b/rt/share/html/NoAuth/css/web2/portlets.css
deleted file mode 100644
index f295171a7..000000000
--- a/rt/share/html/NoAuth/css/web2/portlets.css
+++ /dev/null
@@ -1,71 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
-%#                                          <sales@bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-table.myrt {
-    width: 100%;
-}
-
-table.dashboard {
-    width: 100%;
-    border: 0;
-}
-
-.quick-create .select-queue {
-   width: 12em;
-}
-
-.quick-create input[type="text"], .quick-create textarea {
-    width: 100%;
-
-} 
-    
-.reminders blockquote {
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-    margin-left: 1em;
-    margin-right: 1em;
-}
diff --git a/rt/share/html/NoAuth/css/web2/ticket-lists.css b/rt/share/html/NoAuth/css/web2/ticket-lists.css
index a53f388fb..9da15dae3 100644
--- a/rt/share/html/NoAuth/css/web2/ticket-lists.css
+++ b/rt/share/html/NoAuth/css/web2/ticket-lists.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,13 +45,14 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-table.ticket-list, table.queue-summary, table.collection {
+table.queue-summary, table.collection-as-table {
   margin-top: 0.75em;
   font-size: 0.9em;
   border: 1px solid #aaa;
   border-bottom: 2px solid #999;
   border-right: 2px solid #999;
-
+  border-spacing: 0;
+  width: 100%;
 
 }
 
@@ -66,12 +67,12 @@ table.queue-summary tr>*:last-child {
 
 }
 
-table.ticket-list a, table.queue-summary a, table.collection a  {
+table.queue-summary a, table.collection-as-table a  {
   font-weight: bold;
 }
 
 
-table.ticket-list th.collection-as-table, table.collection th.collection-as-table {
+table.collection-as-table th.collection-as-table {
   background: #ddd;
  font-size: 0.9em;
   margin-bottom: 0.5em;
@@ -130,11 +131,12 @@ tr.evenline+tr.evenline td, tr.oddline+tr.oddline td{
 
 
 
-table.ticket-list td:first-child, table.ticket-list th:first-child {
+table.collection-as-table td:first-child,
+table.collection-as-table th:first-child {
   padding-left: 1em;
 }
 
-table.ticket-list td:last-child, table.ticket-list th:last-child {
+table.collection-as-table td:last-child, table.collection-as-table th:last-child {
   padding-right: 1em;
 }
 
@@ -164,9 +166,71 @@ padding-bottom: 1em;
 
  
 /* full-page ticket lists */
-#body>table.ticket-list {
+#body>table.collection-as-table {
     margin-bottom: 2em;
 
 }
 
+.chart.image {
+    margin-top: -1em;
+    padding-right: 2em;
+    float: left;
+    clear: both;
+}
+
+.chart-wrapper {
+    display: block;
+    width: auto;
+}
+
+.chart-wrapper .collection-as-table {
+    width: auto;
+    font-size: 1em;
+}
+
+.chart-wrapper .collection-as-table th.collection-as-table {
+    text-align: center;
+    padding: 0.5em;
+    padding-right: 1em;
+    padding-left:  1em;
+}
+
+.chart-wrapper .collection-as-table tr.total td {
+    border-top: 1px solid #ccc;
+}
+
+.chart-wrapper .collection-as-table td.value {
+    padding-left: 0.5em;
+}
+
+.chart-wrapper .query {
+    clear: both;
+    text-align: center;
+    font-size: 1.2em;
+    padding: 1em;
+}
+
+.chart-wrapper .collection-as-table .label {
+    font-weight: bold;
+}
+
+
+.chart-wrapper .query .label {
+    font-weight: bold;
+}
+
+.chart-meta {
+    padding-top: 2em;
+    border-top: 1px solid #ccc;
+}
+
+.chart-meta .chart-type {
+    display: inline-block;
+    float: left;
+    padding-right: 2em;
+    clear: both;
+}
 
+.chart-meta .saved-search {
+    display: inline-block;
+}
diff --git a/rt/share/html/NoAuth/css/web2/ticket-search.css b/rt/share/html/NoAuth/css/web2/ticket-search.css
index 49dc9ae37..f5267fa32 100644
--- a/rt/share/html/NoAuth/css/web2/ticket-search.css
+++ b/rt/share/html/NoAuth/css/web2/ticket-search.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -63,11 +63,8 @@
     width: 11em;
 }
 
-#pick-criteria td.label * {
- width: 8.5em;
-}
-
 #pick-criteria td.label select {
+  width: 8.5em;
   text-align: right;
 }
 
@@ -84,11 +81,11 @@
 
 #pick-criteria td.value input,
 #pick-criteria td.value select {
- width: 10em;
+ width: 11em;
 }
 
 #pick-criteria td.value #ValueOfDate {
- width: 6em;
+ width: 11em;
 }
 
 
@@ -136,7 +133,7 @@
  overflow-x: auto;
 }
 
-#comp-Search-Build .submit {
+#BuildQuery .submit {
  width: 58%;
 }
 
@@ -146,9 +143,6 @@
  padding-right: 1em;
 }
 
-#comp-Search-Build #columns {
-}
-
 #display-options .submit {
  width: 100%;
 }
@@ -169,6 +163,7 @@
  border-bottom: 1px solid #999;
  -moz-border-radius-bottomleft: 0.5em;
  -webkit-border-bottom-left-radius: 0.5em;
+ border-radius: 0 0 0 0.5em;
 }
 
 
@@ -187,6 +182,56 @@
 
 }
 
+.edit-saved-searches .label {
+    display: inline-block;
+    width: 10em;
+    font-weight: bold;
+}
+
+span#display-options {
+    display: block;
+    padding-top: 2em;
+    margin-top: 2em;
+    border-top: 1px solid #ccc;
+    clear: both;
+}
+
+span#display-options .titlebox#sorting {
+    float: left;
+    width: auto;
+    margin-right: 2em;
+    min-width: 35%;
+}
+
+span#display-options .titlebox#columns {
+    float: left;
+}
+
+span#display-options .titlebox#columns table.edit-columns td {
+    padding: 0.5em;
+}
+
+span#display-options .titlebox#columns table.edit-columns div.row {
+    width: 9em; 
+}
+span#display-options .titlebox#columns table.edit-columns span.label {
+    width: 2em;
+}
+
+span#display-options .titlebox#columns table.edit-columns span.value input,
+span#display-options .titlebox#columns table.edit-columns span.value select {
+    width: 7em;
+    padding: 0;
+}
+
+span#display-options .titlebox#columns table.edit-columns span.value {
+    display: inline-block;
+    width:7em;
+}
+
+#BuildQuery #formatbuttons.submit{
+    width: 85%;
+}
 
 .refresh {
     float: left;
diff --git a/rt/share/html/NoAuth/css/web2/ticket.css b/rt/share/html/NoAuth/css/web2/ticket.css
index 6dbaed3f7..7d08166bc 100644
--- a/rt/share/html/NoAuth/css/web2/ticket.css
+++ b/rt/share/html/NoAuth/css/web2/ticket.css
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -48,7 +48,7 @@
 div#ticket-history div.ticket-transaction {
  border-top: 1px solid #ccc;
  padding-bottom: 0.25em;
-
+    position: relative; /* gives us a container for position: absolute */
 }
 
 div#ticket-history div.odd {
@@ -67,7 +67,8 @@ div#ticket-history {
 
 .ticket-transaction div.metadata span.actions {
  position: absolute;
- right: 2.3em;
+ top: 0;
+ right: 0;
  padding: 0em;
  background: #ccc;
  text-align: right;
@@ -77,6 +78,8 @@ div#ticket-history {
  -moz-border-radius-bottomleft: 0.5em;
  -webkit-border-bottom-left-radius: 0.5em;
  white-space: nowrap;
+
+ border-radius: 0 0 0 0.5em;
 }
 
 .ticket-transaction div.metadata  span.type {
@@ -88,8 +91,11 @@ div#ticket-history {
  padding: 0.75em 0 0 0;
  border-right: 1px solid #999;
  border-bottom: 1px solid #999;
- -moz-border-radius: 0.25em;
+ -moz-border-radius-bottomright: 0.25em;
  -webkit-border-bottom-right-radius: 0.25em;
+
+ border-radius: 0 0 0.25em 0;
+
 }
 
 div#ticket-history span.type a {
@@ -114,15 +120,9 @@ div#ticket-history span.time-taken {
 div#ticket-history div.content {
  padding-right: 1em;
  padding-bottom: 0.7em;
- font-size: 1.1em;
  margin-left: 1.5em;
 }
 
-.plain-text-white-space {
- white-space: pre-wrap;
- font-family: monospace;
-}
-
 .ticket-transaction .messagebody {
  font-size: 1em;
  padding-left: 1em;
@@ -133,6 +133,7 @@ div#ticket-history div.content {
  min-height: 2.5em;
  /* To avoid overlapping of "downloadattachment" by messagebody */
  clear: left;
+ word-wrap: break-word;
 }
 
 .ticket-transaction .messagebody img {
@@ -154,7 +155,7 @@ border-bottom: 2px solid #aaa;
 margin-top: 0.5em;
 -moz-border-radius: 0.5em;
 -webkit-border-radius: 0.5em;
-
+ border-radius: 0.5em;
 }
 
 div#ticket-history div.downloadattachment .downloadcontenttype{
@@ -201,7 +202,7 @@ div#ticket-history .messagebody .messagebody{
 .ticket-info-attachments .titlebox-title .left { background-color: #993366;  color: #fff;}
 
 
-.ticket-summary .titlebox-title a, div#body .ticket-summary .titlebox-title a:visited { color: #fff;}
+.ticket-summary .titlebox-title .left a, .ticket-summary .titlebox-title .left a:visited { color: #fff;}
 
 .unread-messages .titlebox , .unread-messages .titlebox-title .left { 
   border: 1px solid #99a;
@@ -228,3 +229,52 @@ table.ticket-summary td.boxcontainer:first-child {
   width: 50%;
 }
 
+div.requestor-ticket-links {
+    text-align: left;
+    font-size: 0.8em;
+    padding-top: 0.25em;
+}
+
+.more-about-requestor-extra-field .label {
+    display: inline-block;
+    width: 8em;
+    font-weight: bold;
+    text-align: right;
+}
+
+.more-about-requestor-extra-field .value {
+    display: inline-block;
+}
+
+.ticket-info-requestor .more-about-requestor-extra,
+.ticket-info-requestor .comments-about-user,
+.ticket-info-requestor .more-about-requestor-tickets,
+.ticket-info-requestor .more-about-user-groups
+{
+    margin: 1em 0;
+}
+
+.ticket-info-requestor .comments-about-user .label,
+.ticket-info-requestor .more-about-user-groups .label,
+.ticket-info-requestor .more-about-requestor-tickets .label
+{
+    display: block;
+    font-weight: bold;
+    text-align: left;
+}
+
+.ticket-info-requestor .more-about-user-groups .value ul,
+.ticket-info-requestor .more-about-requestor-tickets ul
+{
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+
+/* textareas get to be bigger when we're in a table */
+tr.edit-custom-field.cftype-Text textarea,
+tr.edit-custom-field.cftype-Freeform input,
+tr.edit-custom-field.cftype-Wikitext textarea
+{
+    width: 100%;
+}
diff --git a/rt/share/html/NoAuth/css/web2/tools.css b/rt/share/html/NoAuth/css/web2/tools.css
deleted file mode 100644
index 69126b11b..000000000
--- a/rt/share/html/NoAuth/css/web2/tools.css
+++ /dev/null
@@ -1,56 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
-%#                                          <sales@bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-table.myday td { 
- padding: 1em;
-}
-
-ol.dashboard-queries {
-    padding-left: 1.5em;
-}
-
-
diff --git a/rt/share/html/NoAuth/css/web2/yui-fonts.css b/rt/share/html/NoAuth/css/web2/yui-fonts.css
deleted file mode 100644
index fdae8d98f..000000000
--- a/rt/share/html/NoAuth/css/web2/yui-fonts.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.5.1
-*/
-body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}table {font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}