[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[6062] trunk
- Subject: SF.net SVN: ledger-smb:[6062] trunk
- From: ..hidden..
- Date: Thu, 19 Sep 2013 14:01:19 +0000
Revision: 6062
http://sourceforge.net/p/ledger-smb/code/6062
Author: einhverfr
Date: 2013-09-19 14:01:18 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
1. Password textboxes now supported by dojo setup.
2. Login screen mostly works (login indicator not working right now, working on that
Modified Paths:
--------------
trunk/UI/lib/setup.js
trunk/UI/login.html
trunk/UI/login.js
trunk/css/ledgersmb.css
Modified: trunk/UI/lib/setup.js
===================================================================
--- trunk/UI/lib/setup.js 2013-09-19 11:36:36 UTC (rev 6061)
+++ trunk/UI/lib/setup.js 2013-09-19 14:01:18 UTC (rev 6062)
@@ -69,6 +69,24 @@
"checked": input.checked
}, input);
} else if (input.type == 'radio'){
+ return new radio({
+ "name": input.name,
+ "value": input.value,
+ "checked": input.checked
+ }, input);
+ } else if (input.type == 'password'){
+ var style = {};
+ if (input.size !== undefined && input.size !== ''){
+ style['width'] = (input.size * 0.6) + 'em';
+ }
+ return new textbox({
+ "label": input.title,
+ "value": input.value,
+ "name": input.name,
+ "style": style,
+ "id": input.id,
+ "type": 'password'
+ }, input);
}
} else if (input.nodeName == 'SELECT'){
Modified: trunk/UI/login.html
===================================================================
--- trunk/UI/login.html 2013-09-19 11:36:36 UTC (rev 6061)
+++ trunk/UI/login.html 2013-09-19 14:01:18 UTC (rev 6062)
@@ -8,8 +8,7 @@
-<body class="login" onload="setup_page('<?lsmb text('Name')?>',
- '<?lsmb text('Password') ?>');">
+<body class="login, <?lsmb dojo_theme ?>" id="login-body">
<br /><br />
<center>
<form method="post" action="login.pl" name="login"
@@ -29,23 +28,43 @@
<a href="http://www.ledgersmb.org/"; target="_top"><img src="images/ledgersmb.png" class="logo" alt="LedgerSMB Logo" /></a>
<h1 class="login" align="center"><?lsmb text("LedgerSMB [_1]", VERSION) ?></h1>
<div align="center">
- <div id="credentials"></div>
<div id="company_div">
- <div class="labelledinput">
- <div class="label">
- <label for="company">
- <?lsmb text('Company')
- ?>:
- </label>
- </div>
- <div class="input">
- <input class="login"
+ <div class="tabular col-1">
+ <div class="noshow">
+ <div>
+ <?lsmb PROCESS input
+ element_data = {
+ class="login"
type="text"
+ name="login"
+ size="20"
+ id="username"
+ label=text('User Name')
+ value = login
+ accesskey="l" } #' ?>
+ </div>
+ <div>
+ <?lsmb PROCESS input
+ element_data = {
+ class="password"
+ type="password"
+ name="password"
+ size="20"
+ id="password"
+ label=text('Password')
+ value = ''
+ accesskey="p" } ?>
+ </div></div>
+ <?lsmb PROCESS input
+ element_data = {
+ class="login"
+ type="text"
name="company"
- size="30"
+ size="20"
id="company"
- value = "<?lsmb company ?>"
- accesskey="c" />
+ label=text('Company')
+ value = company
+ accesskey="c" } ?>
</div>
</div>
</div>
Modified: trunk/UI/login.js
===================================================================
--- trunk/UI/login.js 2013-09-19 11:36:36 UTC (rev 6061)
+++ trunk/UI/login.js 2013-09-19 14:01:18 UTC (rev 6062)
@@ -43,44 +43,3 @@
);
}
-function setup_page(login_label, password_label) {
- var credential_html;
-
- var cred_div = document.getElementById("credentials");
- credential_html =
- '<div class="labelledinput">' +
- '<div class="label">' +
- '<label for="login">' +
- login_label+
- ":</label>" +
- '</div>' +
- '<div class="input">' +
- '<input class="login" ' +
- 'name="login" size="30" ' +
- 'value="" id="login" '+
- 'accesskey="n" />' +
- '</div>' +
- '</div>' +
- '<div class="labelledinput">' +
- '<div class="label">' +
- '<label for="password">' +
- password_label +
- ':</label>' +
- '</div>' +
- '<div class="input">' +
- '<input class="login" ' +
- 'type="password" ' +
- 'name="password" ' +
- 'size="30" ' +
- 'id="password" ' +
- 'accesskey="p" />' +
- '</div>' +
- '</div>';
- if (!document.login.blacklisted.value && get_http_request_object()){
- cred_div.innerHTML = credential_html;
- document.login.login.focus();
- }
- else {
- document.login.company.focus();
- }
-}
Modified: trunk/css/ledgersmb.css
===================================================================
--- trunk/css/ledgersmb.css 2013-09-19 11:36:36 UTC (rev 6061)
+++ trunk/css/ledgersmb.css 2013-09-19 14:01:18 UTC (rev 6062)
@@ -54,7 +54,7 @@
.login {
font-family: Verdana, Arial, Helvetica, sans-serif;
}
-body.login {
+body#login-body {
background: #5a7d9b;
color: black;
}
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/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits