Permalink
Browse files

Login page work

  • Loading branch information...
1 parent f967a67 commit 676ee6d8249b2fa756553e042d3e13a51addb8a2 @benkeen committed Jan 5, 2013
View
@@ -9,13 +9,12 @@ whatever format you require.
### Version 1.0.0
There's a free online version found on our website:
http://www.generatedata.com/#generator
-
The online demo is actually running a very old version of the code, no longer available.
### Version 2.x
Version 2 was never fully completed. A proof of concept was gotten up and running back in 2010, which
added (basic) modularity and improved a few things, but I abandoned it in favour of some other projects
-I was working on at the time.
+I was working on at the time. However, the tag is available if you want a copy.
### Version 3.0.0 alpha
http://alpha.generatedata.com
@@ -241,3 +241,4 @@
$L["installation_plugin_intro"] = "Almost done! Now we're going to install the plugins: these are what make the Data Generator actually <i>useful</i> - i.e. the type of data you can generate (Data Types), the format of the generated data (Export Types) and all the Country-specific data like regions and cities.";
$L["install_plugins_rightarrow"] = "Install Plugins &raquo;";
$L["installation_complete_text"] = "The Data Generator has been successfully installed! Click the button below to go to the script.";
+$L["please_login"] = "Please Login";
@@ -1,16 +1,15 @@
/*global $:false,browser:true*/
require([
"manager",
- "pluginManager",
"lang",
"utils",
"pageinit"
-], function(manager, pluginManager, L, utils) {
+], function(manager, L, utils) {
"use strict";
$(function() {
manager.start();
-
+ $("#email").focus();
});
});
@@ -18,7 +18,7 @@
{$cssIncludes}
{$codeMirrorIncludes}
</head>
-<body>
+<body class="gdLoginPage">
<header>
<nav>
<a href="http://www.generatedata.com">{$L.website}</a> |
@@ -39,9 +39,20 @@
<div id="gdContent">
<ul class="gdMainTabContent">
<li id="gdMainTab1Content">
-
- <h2>Please login below</h2>
-
+ <h1>{$L.please_login}</h1>
+ <div class="gdFields">
+ <div class="gdField">
+ <label for="email">{$L.email}</label>
+ <input type="text" id="email" value="" />
+ </div>
+ <div class="gdError" id="dbHostname_error"></div>
+ <div class="gdField">
+ <label for="password">{$L.password}</label>
+ <input type="password" id="password" value="" />
+ </div>
+ </div>
+ <div class="gdClear"></div>
+ <button class="gdPrimaryButton">{$L.continue_rightarrow}</button>
</li>
<li id="gdMainTab2Content">
@@ -78,3 +78,28 @@ ul {
#gdReportBug {
background: transparent url(../images/bug.png) center right no-repeat;
padding: 5px 22px 5px 0px; }
+
+.gdFields .gdField {
+ float: left;
+ width: 376px;
+ border-bottom: 1px solid #efefef;
+ clear: left; }
+.gdFields .gdRadioGroup input {
+ width: 20px;
+ float: left; }
+.gdFields .gdRadioGroup label {
+ width: inherit;
+ float: left; }
+.gdFields .gdDisabledRow label, .gdFields .gdDisabledRow input {
+ color: #cccccc; }
+.gdFields label {
+ float: left;
+ width: 160px;
+ color: #777777;
+ margin-top: 2px; }
+.gdFields input {
+ float: left;
+ width: 210px;
+ margin-top: 2px; }
+.gdFields div {
+ margin-top: 2px; }
@@ -4,30 +4,6 @@
padding-bottom: 8px;
margin-bottom: 8px;
float: none; }
-.gdInstallPage .gdFields .gdField {
- float: left;
- width: 376px;
- border-bottom: 1px solid #efefef;
- clear: left; }
-.gdInstallPage .gdFields .gdRadioGroup input {
- width: 20px;
- float: left; }
-.gdInstallPage .gdFields .gdRadioGroup label {
- width: inherit;
- float: left; }
-.gdInstallPage .gdFields .gdDisabledRow label, .gdInstallPage .gdFields .gdDisabledRow input {
- color: #cccccc; }
-.gdInstallPage .gdFields label {
- float: left;
- width: 160px;
- color: #777777;
- margin-top: 2px; }
-.gdInstallPage .gdFields input {
- float: left;
- width: 210px;
- margin-top: 2px; }
-.gdInstallPage .gdFields div {
- margin-top: 2px; }
.gdInstallPage #dbTablePrefix {
width: 60px; }
.gdInstallPage input.pwdField {
@@ -0,0 +1,5 @@
+.gdLoginPage h1 {
+ float: none; }
+
+.gdLoginPage #password {
+ width: 120px; }
@@ -79,6 +79,31 @@ ul {
background: transparent url(../images/bug.png) center right no-repeat;
padding: 5px 22px 5px 0px; }
+.gdFields .gdField {
+ float: left;
+ width: 376px;
+ border-bottom: 1px solid #efefef;
+ clear: left; }
+.gdFields .gdRadioGroup input {
+ width: 20px;
+ float: left; }
+.gdFields .gdRadioGroup label {
+ width: inherit;
+ float: left; }
+.gdFields .gdDisabledRow label, .gdFields .gdDisabledRow input {
+ color: #cccccc; }
+.gdFields label {
+ float: left;
+ width: 160px;
+ color: #777777;
+ margin-top: 2px; }
+.gdFields input {
+ float: left;
+ width: 210px;
+ margin-top: 2px; }
+.gdFields div {
+ margin-top: 2px; }
+
header {
background-image: url(../images/siteHeader.jpg);
background-repeat: no-repeat;
@@ -974,30 +999,6 @@ body.gdErrorPage #gdSeriousError {
padding-bottom: 8px;
margin-bottom: 8px;
float: none; }
-.gdInstallPage .gdFields .gdField {
- float: left;
- width: 376px;
- border-bottom: 1px solid #efefef;
- clear: left; }
-.gdInstallPage .gdFields .gdRadioGroup input {
- width: 20px;
- float: left; }
-.gdInstallPage .gdFields .gdRadioGroup label {
- width: inherit;
- float: left; }
-.gdInstallPage .gdFields .gdDisabledRow label, .gdInstallPage .gdFields .gdDisabledRow input {
- color: #cccccc; }
-.gdInstallPage .gdFields label {
- float: left;
- width: 160px;
- color: #777777;
- margin-top: 2px; }
-.gdInstallPage .gdFields input {
- float: left;
- width: 210px;
- margin-top: 2px; }
-.gdInstallPage .gdFields div {
- margin-top: 2px; }
.gdInstallPage #dbTablePrefix {
width: 60px; }
.gdInstallPage input.pwdField {
@@ -1076,6 +1077,12 @@ body.gdErrorPage #gdSeriousError {
.gdInstallPage #gdInstallAccountDetailsMessage {
font-style: italic; }
+.gdLoginPage h1 {
+ float: none; }
+
+.gdLoginPage #password {
+ width: 120px; }
+
#gdMainDialog {
border: 1px solid #cccccc;
padding: 0px;
@@ -77,4 +77,43 @@ ul {
#gdReportBug {
background: transparent url(../images/bug.png) center right no-repeat;
padding: 5px 22px 5px 0px;
-}
+}
+
+.gdFields {
+ .gdField {
+ float: left;
+ width: 376px;
+ border-bottom: 1px solid #efefef;
+ clear: left;
+ }
+ .gdRadioGroup {
+ input {
+ width: 20px;
+ float: left;
+ }
+ label {
+ width: inherit;
+ float: left;
+ }
+ }
+
+ .gdDisabledRow {
+ label, input {
+ color: #cccccc;
+ }
+ }
+ label {
+ float: left;
+ width: 160px;
+ color: #777777;
+ margin-top: 2px;
+ }
+ input {
+ float: left;
+ width: 210px;
+ margin-top: 2px;
+ }
+ div {
+ margin-top: 2px;
+ }
+}
@@ -6,44 +6,6 @@
margin-bottom: 8px;
float: none;
}
- .gdFields {
- .gdField {
- float: left;
- width: 376px;
- border-bottom: 1px solid #efefef;
- clear: left;
- }
- .gdRadioGroup {
- input {
- width: 20px;
- float: left;
- }
- label {
- width: inherit;
- float: left;
- }
- }
-
- .gdDisabledRow {
- label, input {
- color: #cccccc;
- }
- }
- label {
- float: left;
- width: 160px;
- color: #777777;
- margin-top: 2px;
- }
- input {
- float: left;
- width: 210px;
- margin-top: 2px;
- }
- div {
- margin-top: 2px;
- }
- }
#dbTablePrefix {
width: 60px;
}
@@ -0,0 +1,6 @@
+.gdLoginPage h1 {
+ float: none;
+}
+.gdLoginPage #password {
+ width: 120px;
+}
@@ -1 +1 @@
-@import "general", "layout", "generator", "buttons", "misc", "notifications", "errorPage", "install", "dialogs";
+@import "general", "layout", "generator", "buttons", "misc", "notifications", "errorPage", "install", "login", "dialogs";

0 comments on commit 676ee6d

Please sign in to comment.