more RT integration / reskin / 2.1, RT#6640

7 files changed, 26 insertions, 36 deletions

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index 676b01205..ea3887833 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -18,13 +18,10 @@ lib/RT/URI/freeside/XMLRPC.pm
  share/html/Admin/Users/Modify.html
  share/html/Elements/Header
  share/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/Elements/QuickCreate
+ share/html/Elements/SelectDate
+ share/html/Elements/Footer
+ html/Ticket/Create.html #XXX TODO
  share/html/Ticket/Display.html
 share/html/Ticket/Elements/AddCustomers
 share/html/Ticket/Elements/EditCustomers
@@ -41,10 +38,8 @@ 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
-
 share/html/Elements/AddCustomers
 share/html/Elements/EditCustomers
 
- html/User/Prefs.html
- html/Prefs/SearchOptions.html
+ share/html/User/Prefs.html
+ share/html/Prefs/SearchOptions.html
diff --git a/rt/share/html/Elements/Footer b/rt/share/html/Elements/Footer
index 2fcdee949..59547e238 100755
--- a/rt/share/html/Elements/Footer
+++ b/rt/share/html/Elements/Footer
@@ -48,25 +48,6 @@
 %# End of div#body from /Elements/PageLayout
 </div>
 % $m->callback( %ARGS );
-<div id="footer">
-% if ($m->{'rt_base_time'}) {
-  <p id="time">
-    <span><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></span>
-  </p>
-%}
-  <p id="bpscredits">
-    <span>
-<&|/l,     '&#187;&#124;&#171;', $RT::VERSION, '2009', '<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>
 % if ($Debug >= 2 ) {
 % require Data::Dumper;
 % my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]);
diff --git a/rt/share/html/Elements/PageLayout b/rt/share/html/Elements/PageLayout
index b5800ce70..f30d815a5 100755
--- a/rt/share/html/Elements/PageLayout
+++ b/rt/share/html/Elements/PageLayout
@@ -46,6 +46,8 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 
+<% include('/elements/init_calendar.html') |n %>
+
 % if (0) { ## new ticket via customer, and we already have a ticket search box
 <div id="topactions">
 % foreach my $action (reverse sort keys %{$topactions}) {
diff --git a/rt/share/html/Elements/SelectDate b/rt/share/html/Elements/SelectDate
index 32a173db4..183086f3d 100755
--- a/rt/share/html/Elements/SelectDate
+++ b/rt/share/html/Elements/SelectDate
@@ -45,10 +45,21 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<script type="text/javascript"><!--
-    onLoadHook('createCalendarLink("<% $Name %>");');
---></script>
+%# in PageLayout instead, once <% include('/elements/init_calendar.html') |n %>
 <input type="text" id="<% $Name %>" name="<% $Name %>" value="<% $Value %>" size="<% $Size %>" />
+<IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $Name %>_date_button" STYLE="cursor: pointer" TITLE="Select date">
+<script type="text/javascript">
+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>
 <%init>
 unless ((defined $Default) or 
 	($current <= 0)) {
diff --git a/rt/share/html/NoAuth/css/freeside2.1/layout.css b/rt/share/html/NoAuth/css/freeside2.1/layout.css
index b7b87abc2..0e7912d98 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/layout.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/layout.css
@@ -53,7 +53,8 @@ body {
     padding:0;
     margin:0;
 
-    background: #547CCC url(<%RT->Config->Get('WebPath')%>/NoAuth/css/freeside2.1/images/background-gradient.png) top left repeat-x ;
+    /*background: #547CCC url(<%RT->Config->Get('WebPath')%>/NoAuth/css/freeside2.1/images/background-gradient.png) top left repeat-x ; */
+    background: #f8f8f8;
     font-family: arial, helvetica, sans-serif;
 
     color: #000000;
diff --git a/rt/share/html/Prefs/SearchOptions.html b/rt/share/html/Prefs/SearchOptions.html
index e40265f23..5e5ed46f1 100644
--- a/rt/share/html/Prefs/SearchOptions.html
+++ b/rt/share/html/Prefs/SearchOptions.html
@@ -45,7 +45,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/share/html/User/Prefs.html b/rt/share/html/User/Prefs.html
index f52fdcbdf..43c981dea 100755
--- a/rt/share/html/User/Prefs.html
+++ b/rt/share/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") &>