[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4756] branches/1.3
- Subject: SF.net SVN: ledger-smb:[4756] branches/1.3
- From: ..hidden..
- Date: Wed, 23 May 2012 01:43:09 +0000
Revision: 4756
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4756&view=rev
Author: einhverfr
Date: 2012-05-23 01:43:09 +0000 (Wed, 23 May 2012)
Log Message:
-----------
CSS directory is now configurable
Modified Paths:
--------------
branches/1.3/Changelog
branches/1.3/LedgerSMB/Form.pm
branches/1.3/LedgerSMB/Sysconfig.pm
branches/1.3/LedgerSMB/Template.pm
branches/1.3/UI/lib/ui-header.html
branches/1.3/UI/menu/expanding.html
branches/1.3/UI/payments/payment1.html
branches/1.3/UI/payments/payment1_5.html
branches/1.3/UI/payments/payment2.html
branches/1.3/UI/payments/use_overpayment1.html
branches/1.3/UI/payments/use_overpayment2.html
branches/1.3/ledgersmb.conf.default
Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/Changelog 2012-05-23 01:43:09 UTC (rev 4756)
@@ -8,8 +8,12 @@
* Better CSV escaping (Chris T, h/t Erik H)
* Fixed menu errors preventing quote/rfq template editing (Chris T, 3524793)
* Fixed customer email not showing emailing statements (Chris T and Erik H)
+* Approved recon reports no longer show invalid balance info (Chris T,3518283)
+* CSS directory is now configurable (Chris T, 3516730, h/t Robert C)
+Robert C is Robert James Clay
+
Changelog for 1.3.17
* Address now shows on ECA selection screen (Erik H)
* Taxes::Simple now respects min/max values based on subtotal (Chris T)
Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/LedgerSMB/Form.pm 2012-05-23 01:43:09 UTC (rev 4756)
@@ -612,7 +612,8 @@
if ( $ENV{GATEWAY_INTERFACE} ) {
if ( $self->{stylesheet} && ( -f "css/$self->{stylesheet}" ) ) {
$stylesheet =
-qq|<link rel="stylesheet" href="css/$self->{stylesheet}" type="text/css" title="LedgerSMB stylesheet" />\n|;
+qq|<link rel="stylesheet" href="$LedgerSMB::Sysconfig::cssdir| .
+qq|$self->{stylesheet}" type="text/css" title="LedgerSMB stylesheet" />\n|;
}
$self->{charset} ||= "utf-8";
Modified: branches/1.3/LedgerSMB/Sysconfig.pm
===================================================================
--- branches/1.3/LedgerSMB/Sysconfig.pm 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/LedgerSMB/Sysconfig.pm 2012-05-23 01:43:09 UTC (rev 4756)
@@ -20,6 +20,7 @@
our $auth = 'DB';
our $logging = 0; # No logging on by default
our $images = getcwd() . '/images';
+our $cssdir = 'css/';
our $force_username_case = undef; # don't force case
@@ -105,12 +106,16 @@
for my $var (
qw(pathsep logging log_level DBI_TRACE check_max_invoices language auth latex
db_autoupdate force_username_case max_post_size decimal_places cookie_name
- return_accno no_db_str tempdir cache_templates)
+ return_accno no_db_str tempdir cache_templates cssdir)
)
{
${$var} = $config{''}{$var} if $config{''}{$var};
}
+if ($cssdir !~ m|/$|){
+ $cssdir = "$cssdir/";
+}
+
%printer = %{ $config{printers} } if $config{printers};
# ENV Paths
Modified: branches/1.3/LedgerSMB/Template.pm
===================================================================
--- branches/1.3/LedgerSMB/Template.pm 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/LedgerSMB/Template.pm 2012-05-23 01:43:09 UTC (rev 4756)
@@ -277,6 +277,7 @@
my $self = shift;
my $vars = shift;
$vars->{FORMATS} = $self->available_formats;
+ $vars->{CSSDIR} = $LedgerSMB::Sysconfig::cssdir;
if ($self->{format} !~ /^\p{IsAlnum}+$/) {
throw Error::Simple "Invalid format";
}
Modified: branches/1.3/UI/lib/ui-header.html
===================================================================
--- branches/1.3/UI/lib/ui-header.html 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/UI/lib/ui-header.html 2012-05-23 01:43:09 UTC (rev 4756)
@@ -11,9 +11,9 @@
<?lsmb END -?>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<?lsmb IF form.stylesheet ?>
- <link rel="stylesheet" href="css/<?lsmb form.stylesheet ?>" type="text/css" title="LedgerSMB stylesheet" />
+ <link rel="stylesheet" href="<?lsmb CSSDIR ?><?lsmb form.stylesheet ?>" type="text/css" title="LedgerSMB stylesheet" />
<?lsmb ELSIF stylesheet ?>
- <link rel="stylesheet" href="css/<?lsmb stylesheet ?>" type="text/css" title="LedgerSMB stylesheet" />
+ <link rel="stylesheet" href="<?lsmb CSSDIR ?><?lsmb stylesheet ?>" type="text/css" title="LedgerSMB stylesheet" />
<?lsmb ELSE ?>
<?lsmb END ?>
<?lsmb FOREACH s = include_stylesheet ?>
Modified: branches/1.3/UI/menu/expanding.html
===================================================================
--- branches/1.3/UI/menu/expanding.html 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/UI/menu/expanding.html 2012-05-23 01:43:09 UTC (rev 4756)
@@ -7,7 +7,7 @@
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="-1" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" title="Stylesheet" href="css/<?lsmb stylesheet ?>" />
+ <link rel="stylesheet" title="Stylesheet" href="<?lsmb CSSDIR ?><?lsmb stylesheet ?>" />
<link rel="stylesheet" title="Stylesheet" href="UI/menu/expanding.css" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
Modified: branches/1.3/UI/payments/payment1.html
===================================================================
--- branches/1.3/UI/payments/payment1.html 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/UI/payments/payment1.html 2012-05-23 01:43:09 UTC (rev 4756)
@@ -1,18 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
- <title><?lsmb titlebar -?></title>
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" href="css/<?lsmb stylesheet ?>" type="text/css" />
-
- <meta http-equiv="content-type" content="text/html; charset=<?lsmb charset ?>" />
- <meta name="robots" content="noindex,nofollow" />
-
-</head>
-
+<?lsmb INCLUDE 'ui-header.html' ?>
<body id="payment-1-body">
<form name="search" method="post" action="payment.pl">
Modified: branches/1.3/UI/payments/payment1_5.html
===================================================================
--- branches/1.3/UI/payments/payment1_5.html 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/UI/payments/payment1_5.html 2012-05-23 01:43:09 UTC (rev 4756)
@@ -1,18 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
- <title><?lsmb titlebar -?></title>
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" href="css/<?lsmb stylesheet ?>" type="text/css" />
-
- <meta http-equiv="content-type" content="text/html; charset=<?lsmb charset ?>" />
- <meta name="robots" content="noindex,nofollow" />
-
-</head>
-
+<?lsmb INCLUDE 'ui-header.html' ?>
<body id="payment-1-body">
<form name="search" method="post" action="payment.pl">
Modified: branches/1.3/UI/payments/payment2.html
===================================================================
--- branches/1.3/UI/payments/payment2.html 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/UI/payments/payment2.html 2012-05-23 01:43:09 UTC (rev 4756)
@@ -1,16 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
- <title><?lsmb titlebar ?></title>
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" href="css/<?lsmb stylesheet ?>" type="text/css" />
- <script language="JavaScript" src="UI/payments/javascript/maximize_minimize.js"></script>
- <meta http-equiv="content-type" content="text/html; charset=<?lsmb charset ?>" />
- <meta name="robots" content="noindex,nofollow" />
-</head>
+<?lsmb INCLUDE "ui-header.html" ?>
<body id="payment_2_body"
onLoad="maximize_minimize_on_load('div_topay_state', 'UI/payments/img/down.gif','UI/payments/img/up.gif') ">
<form name="pay_single_dues" method="post" action="payment.pl">
Modified: branches/1.3/UI/payments/use_overpayment1.html
===================================================================
--- branches/1.3/UI/payments/use_overpayment1.html 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/UI/payments/use_overpayment1.html 2012-05-23 01:43:09 UTC (rev 4756)
@@ -1,17 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
- <title><?lsmb titlebar -?></title>
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" href="css/<?lsmb stylesheet ?>" type="text/css" />
-
- <meta http-equiv="content-type" content="text/html; charset=<?lsmb charset ?>" />
- <meta name="robots" content="noindex,nofollow" />
-</head>
-
+<?lsmb INCLUDE "ui-header.html" ?>
<body id="use_overpayment1">
<form name="search" method="post" action="payment.pl">
<?lsmb PROCESS elements.html # Include form elements helper. -?>
Modified: branches/1.3/UI/payments/use_overpayment2.html
===================================================================
--- branches/1.3/UI/payments/use_overpayment2.html 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/UI/payments/use_overpayment2.html 2012-05-23 01:43:09 UTC (rev 4756)
@@ -1,16 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
- <title><?lsmb titlebar ?></title>
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" href="css/<?lsmb stylesheet ?>" type="text/css" />
- <script language="JavaScript" src="UI/payments/javascript/maximize_minimize.js"></script>
- <meta http-equiv="content-type" content="text/html; charset=<?lsmb charset ?>" />
- <meta name="robots" content="noindex,nofollow" />
-</head>
+<?lsmb INCLUDE "ui-header.html" ?>
<body id="payment_2_body" onLoad="maximize_minimize_on_load('div_topay_state', 'UI/payments/img/down.gif','UI/payments/img/up.gif') ">
<form name="pay_single_dues" method="post" action="payment.pl">
@@ -322,4 +310,4 @@
<?lsmb END -?>
</form>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/1.3/ledgersmb.conf.default
===================================================================
--- branches/1.3/ledgersmb.conf.default 2012-05-23 01:00:36 UTC (rev 4755)
+++ branches/1.3/ledgersmb.conf.default 2012-05-23 01:43:09 UTC (rev 4756)
@@ -3,6 +3,8 @@
#Be aware of tempdir setting.If client_browser and server_apache on same machine, sharing tmp-dir , problems 'Permission denied' if server tries to write temp-file wich already exists as client-owned
tempdir : /tmp/ledgersmb
+cssdir = css/
+
# Set language for login and admin pages
language :
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.