projects / freeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8cccb4)
commiting rt 3.4.5 to HEAD
authorivan <ivan>
Tue, 17 Oct 2006 09:03:49 +0000 (09:03 +0000)
committerivan <ivan>
Tue, 17 Oct 2006 09:03:49 +0000 (09:03 +0000)
rt/html/Elements/CollectionAsTable/Row patch | blob | history
rt/html/Elements/Header patch | blob | history
rt/html/NoAuth/webrt.css patch | blob | history
rt/sbin/rt-setup-database.in patch | blob | history

diff --git a/rt/html/Elements/CollectionAsTable/Row b/rt/html/Elements/CollectionAsTable/Row
index 3316bc0..0de362e 100644 (file)
--- a/rt/html/Elements/CollectionAsTable/Row
+++ b/rt/html/Elements/CollectionAsTable/Row
@@ -71,6 +71,7 @@ foreach my $column (@Format) {
     $item++;
     $m->out('<td class="collection-as-table" ');
     $m->out( 'align="' . $column->{align} . '"' ) if ( $column->{align} );
+    $m->out( 'style="' . $column->{style} . '"' ) if ( $column->{style} );
     $m->out('>');
     foreach my $subcol ( @{ $column->{output} } ) {
         if ( $subcol =~ /^__(.*?)__$/o ) {
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index c1bc92a..88556ee 100644 (file)
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -47,12 +47,14 @@
 <HTML>
 <HEAD>
 <TITLE><%$Title%></TITLE>
-% if ($Refresh > 0) {
+% 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/webrt.css" type="text/css">
+<link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png" />
+<link media="all" rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css" />
+<link media="print" rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/printrt.css" type="text/css" />
+
 <script>
 function hideshow(num) {
     idstring = "element-" + num;
diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index 5c241f9..5da0f83 100644 (file)
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -84,37 +84,37 @@ SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 %# style sheet control over the formats.
 */
 
-a.topnav-0 {  font-family: Verdana, sans-serif;
+a.topnav-0 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 16px;
         font-weight: normal;
         color: #FFFFFF;
         text-decoration: none;
         white-space: nowrap}
-a.topnav-1 {  font-family: Verdana, sans-serif;
+a.topnav-1 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 14px;
         font-weight: normal;
         color: #FFFFFF;
         text-decoration: none;
         white-space: nowrap}
-a.topnav-2 {  font-family: Verdana, sans-serif;
+a.topnav-2 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 12px;
         font-weight: normal;
         color: #FFFFFF;
         text-decoration: none;
         white-space: nowrap}
-a.topnav-3 {  font-family: Verdana, sans-serif;
+a.topnav-3 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 11px;
         font-weight: normal;
         color: #FFFFFF;
         text-decoration: none;
         white-space: nowrap}
-a.topnav-4 {  font-family: Verdana, sans-serif;
+a.topnav-4 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 11px;
         font-weight: normal;
         color: #FFFFFF;
         text-decoration: none;
         white-space: nowrap}
-a.topnav-5 {  font-family: Verdana, sans-serif;
+a.topnav-5 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 11px;
         font-weight: normal;
         color: #FFFFFF;
@@ -195,37 +195,37 @@ li.topnav-5-major {
 %# style sheet control over the formats
 */
 
-a.currenttopnav-0 {  font-family: Verdana, sans-serif;
+a.currenttopnav-0 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 16px;
          font-weight: bold;
         color: #ffffff; background-color: #7e0079;
         text-decoration: none;
         white-space: nowrap}
-a.currenttopnav-1 {  font-family: Verdana, sans-serif;
+a.currenttopnav-1 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 14px;
          font-weight: bold;
         color: #ffffff; background-color: #7e0079;
         text-decoration: none;
         white-space: nowrap}
-a.currenttopnav-2 {  font-family: Verdana, sans-serif;
+a.currenttopnav-2 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 12px;
          font-weight: normal;
         color: #ffffff; background-color: #7e0079;
         text-decoration: none;
         white-space: nowrap}
-a.currenttopnav-3 {  font-family: Verdana, sans-serif;
+a.currenttopnav-3 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 11px;
          font-weight: normal;
         color: #ffffff; background-color: #7e0079;
         text-decoration: none;
         white-space: nowrap}
-a.currenttopnav-4 {  font-family: Verdana, sans-serif;
+a.currenttopnav-4 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 11px;
          font-weight: normal;
         color: #ffffff; background-color: #7e0079;
         text-decoration: none;
         white-space: nowrap}
-a.currenttopnav-5 {  font-family: Verdana, sans-serif;
+a.currenttopnav-5 {  font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 11px;
          font-weight: normal;
         color: #ffffff; background-color: #7e0079;
@@ -580,7 +580,7 @@ SPAN.message {
 BODY {
   color: #000;
   background: #FFFFFF;
-  font-family: "Helvetica", sans-serif;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   margin-top: 0px;
   margin-bottom: 0px;
   margin-left: 0px;
@@ -603,7 +603,7 @@ TR.evenline {
 H1, H2, H3 { 
   margin-top: 0.2em;
   color: #336699;
-  font-family: "Helvetica", sans-serif;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
 
   clear: both;
 }
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 49feba8..06c04dc 100644 (file)
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -130,7 +130,14 @@ if ( $args{'action'} eq 'init' ) {
     unless ($RT::DatabaseType eq 'SQLite') {
 
         $dbh->disconnect;
+
+       if ($RT::DatabaseType eq "Oracle") {
+        $RT::DatabasePassword = $RT::DatabasePassword; #Warning avidance
+        $dbh = DBI->connect( $Handle->DSN, ${RT::DatabaseUser}, ${RT::DatabasePassword} ) || die $DBI::errstr;
+       } else {
+       
         $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} ) || die $DBI::errstr;
+       }
     }
     print "Now populating database schema.\n";
     insert_schema();
Freeside billing, trouble ticketing, network monitoring and provisioning