[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5950] trunk
- Subject: SF.net SVN: ledger-smb:[5950] trunk
- From: ..hidden..
- Date: Sun, 18 Aug 2013 16:10:27 +0000
Revision: 5950
http://sourceforge.net/p/ledger-smb/code/5950
Author: freelock
Date: 2013-08-18 16:10:27 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Load dojo on all screens, set up default theme.
Note that this is probably not the best place to set the default theme -- move to USER?
Modified Paths:
--------------
trunk/LedgerSMB/Template/HTML.pm
trunk/UI/Contact/contact.html
trunk/UI/journal/journal_entry.html
trunk/UI/lib/ui-header.html
Modified: trunk/LedgerSMB/Template/HTML.pm
===================================================================
--- trunk/LedgerSMB/Template/HTML.pm 2013-08-18 15:44:04 UTC (rev 5949)
+++ trunk/LedgerSMB/Template/HTML.pm 2013-08-18 16:10:27 UTC (rev 5950)
@@ -109,6 +109,7 @@
my $source;
$parent->{binmode} = $binmode;
+ $cleanvars->{dojo_theme} = 'claro';
if ($parent->{outputfile}) {
$output = "$parent->{outputfile}.html";
Modified: trunk/UI/Contact/contact.html
===================================================================
--- trunk/UI/Contact/contact.html 2013-08-18 15:44:04 UTC (rev 5949)
+++ trunk/UI/Contact/contact.html 2013-08-18 16:10:27 UTC (rev 5950)
@@ -2,8 +2,6 @@
INCLUDE 'ui-header.html'
stylesheet = USER.stylesheet
include_stylesheet = [
- 'UI/lib/dojo/dijit/themes/claro/claro.css',
- 'UI/lib/dojo/dojo/resources/dojo.css',
'UI/Contact/contact.css'
]
dojo_load = 'lsmb/Contact/tabs'
@@ -14,7 +12,7 @@
<?lsmb IF !country_id_t; country_id_t = default_country; END -?>
<?lsmb # Target_div handling now moved to controller script -- CT -?>
-<body class="claro">
+<body class="<?lsmb dojo_theme ?>">
<?lsmb IF name ?>
<div class="pageheading"><?lsmb text('Company') ?>: <?lsmb name ?></div>
<?lsmb END ?>
Modified: trunk/UI/journal/journal_entry.html
===================================================================
--- trunk/UI/journal/journal_entry.html 2013-08-18 15:44:04 UTC (rev 5949)
+++ trunk/UI/journal/journal_entry.html 2013-08-18 16:10:27 UTC (rev 5950)
@@ -1,14 +1,8 @@
<?lsmb INCLUDE 'ui-header.html'
- dojo_require = [
- ]
- include_stylesheet = [
- 'UI/lib/dojo/dijit/themes/claro/claro.css',
- 'UI/lib/dojo/dojo/resources/dojo.css'
- ]
stylesheet=form.stylesheet ?>
<?lsmb PROCESS elements.html ?>
-<body class="claro">
+<body class="<?lsmb dojo_theme ?>">
<?lsmb INCLUDE OPEN_STATUS_DIV
id=form.id approved = form.approved action=form.action ?>
Modified: trunk/UI/lib/ui-header.html
===================================================================
--- trunk/UI/lib/ui-header.html 2013-08-18 15:44:04 UTC (rev 5949)
+++ trunk/UI/lib/ui-header.html 2013-08-18 16:10:27 UTC (rev 5950)
@@ -16,13 +16,14 @@
<link rel="stylesheet" href="<?lsmb CSSDIR ?><?lsmb stylesheet ?>" type="text/css" title="LedgerSMB stylesheet" />
<?lsmb ELSE ?>
<?lsmb END ?>
+ <link rel="stylesheet" href="UI/lib/dojo/dijit/themes/<?lsmb dojo_theme ?>/<?lsmb dojo_theme ?>.css" type="text/css" title="LedgerSMB stylesheet" />
+ <link rel="stylesheet" href="UI/lib/dojo/dojo/resources/dojo.css" type="text/css" title="LedgerSMB stylesheet" />
<?lsmb FOREACH s = include_stylesheet ?>
<link rel="stylesheet" href="<?lsmb s ?>" type="text/css" title="LedgerSMB stylesheet" />
<?lsmb END ?>
<?lsmb FOREACH s = include_script ?>
<script type="text/javascript" language="JavaScript" src="<?lsmb s ?>" ></script>
<?lsmb END ?>
- <?lsmb IF dojo_require || dojo_load ?>
<script type="text/javascript">
var dojoConfig = {
async: 1,
@@ -30,7 +31,7 @@
packages: [{"name":"lsmb","location":"../../.."}]
}
</script>
- <script type="text/javascript" language="JavaScript" src="UI/lib/dojo/dojo/dojo.js.uncompressed.js"></script>
+ <script type="text/javascript" language="JavaScript" src="UI/lib/dojo/dojo/dojo.js"></script>
<script type="text/javascript">
require([
<?lsmb IF dojo_load ?>
@@ -51,7 +52,6 @@
<?lsmb END ?>
});
</script>
- <?lsmb END ?>
<?lsmb IF warn_expire ?>
<script type="text/javascript" language="JavaScript">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits