[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[6071] trunk
- Subject: SF.net SVN: ledger-smb:[6071] trunk
- From: ..hidden..
- Date: Sat, 21 Sep 2013 01:40:46 +0000
Revision: 6071
http://sourceforge.net/p/ledger-smb/code/6071
Author: einhverfr
Date: 2013-09-21 01:40:44 +0000 (Sat, 21 Sep 2013)
Log Message:
-----------
Dojo fixes for setup.pl
Modified Paths:
--------------
trunk/LedgerSMB/Template/HTML.pm
trunk/LedgerSMB/Template.pm
trunk/UI/setup/credentials.html
Modified: trunk/LedgerSMB/Template/HTML.pm
===================================================================
--- trunk/LedgerSMB/Template/HTML.pm 2013-09-20 16:43:19 UTC (rev 6070)
+++ trunk/LedgerSMB/Template/HTML.pm 2013-09-21 01:40:44 UTC (rev 6071)
@@ -53,6 +53,7 @@
use LedgerSMB::Sysconfig;
use LedgerSMB::Company_Config;
use LedgerSMB::App_State;
+use LedgerSMB::Company_Config;
my $binmode = ':utf8';
binmode STDOUT, $binmode;
@@ -113,10 +114,12 @@
my $dojo_theme;
if ($LedgerSMB::App_State::DBH){
- $LedgerSMB::Company_Config->initialize()
- unless $LedgerSMB::App_State::Company_Config;
- $dojo_theme = $LedgerSMB::App_State::Company_Config->{dojo_theme}
+ eval { $LedgerSMB::Company_Config->initialize()
+ unless $LedgerSMB::App_State::Company_Config;
+ $dojo_theme = $LedgerSMB::App_State::Company_Config->{dojo_theme};
+ }; # eval required to make setup.pl work as advertised
}
+ $dojo_theme ||= $LedgerSMB::Sysconfig::dojo_theme;
$cleanvars->{dojo_theme} ||= $dojo_theme;
if ($parent->{outputfile}) {
Modified: trunk/LedgerSMB/Template.pm
===================================================================
--- trunk/LedgerSMB/Template.pm 2013-09-20 16:43:19 UTC (rev 6070)
+++ trunk/LedgerSMB/Template.pm 2013-09-21 01:40:44 UTC (rev 6071)
@@ -289,6 +289,7 @@
$vars->{LIST_FORMATS} = sub { return $self->available_formats} ;
$vars->{ENVARS} = \%ENV;
$vars->{USER} = $LedgerSMB::App_State::User;
+ $fars->{USER} ||= {dateformat => 'yyyy-mm-dd'};
$vars->{CSSDIR} = $LedgerSMB::Sysconfig::cssdir;
$vars->{DBNAME} = $LedgerSMB::App_State::DBName;
my @stdformats = ();
Modified: trunk/UI/setup/credentials.html
===================================================================
--- trunk/UI/setup/credentials.html 2013-09-20 16:43:19 UTC (rev 6070)
+++ trunk/UI/setup/credentials.html 2013-09-21 01:40:44 UTC (rev 6071)
@@ -3,11 +3,12 @@
include_stylesheet=["UI/setup/stylesheet.css"]
include_script = ['UI/setup/login.js', 'UI/util.js'] ?>
<?lsmb PROCESS elements.html ?>
-<body onLoad="init()">
+<body class="<?lsmb dojo_theme?>">
<h2><?lsmb text('Database Management Console') ?></h2>
<div class="listtop"><?lsmb text('Superuser Credentials') ?></div>
<form action="setup.pl" id="loginform" method="POST" name="credentials">
<div class="login_form">
+<div class="tabular col-1">
<div id="userpass">
<div class="inputrow">
<?lsmb IF !s_user; s_user = 'postgres'; END;
@@ -40,7 +41,7 @@
class = 'database'
label = text('Database')
} ?>
-</div>
+</div></div>
<div class="inputrow">
<?lsmb INCLUDE button element_data = {
name = 'action'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits