Skip to content
This repository has been archived by the owner on Feb 8, 2023. It is now read-only.

Commit

Permalink
Merge pull request #103 from Shufflepuck/release/release-1.3.0
Browse files Browse the repository at this point in the history
Release 1.3.0
  • Loading branch information
damien-rivet authored Oct 18, 2018
2 parents 718b2b4 + f0b9179 commit 3bc3415
Show file tree
Hide file tree
Showing 53 changed files with 925 additions and 506 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [1.3.0]

### Added

* Reworked localization [[#81](https://github.com/Shufflepuck/SplashBuddy/issues/81)]
* Added Spanish localization [[#85](https://github.com/Shufflepuck/SplashBuddy/issues/85)]
* Added User Input
* Added Japanese localization [[#96](https://github.com/Shufflepuck/SplashBuddy/issues/96)]
* Added support for `macOS 10.14`

## [1.2.2]

### Fixed
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
html {
padding: 0;
text-align: center;
background-image: linear-gradient(#8b9da9, #fff6e4);
box-shadow: inset 0 0 100px hsla(0,0%,0%,.3);
min-height: 100%;
}

body {
font-family: -apple-system, "Helvetica Neue", "Lucida Grande";
}

.form-container {
background: black;
position: fixed;
bottom: 0;
left: 50%;
transform: translateX(-50%);
margin: auto;
display: inline-block;
vertical-align: middle;
width: 80%;
height: 55%;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
border-top-left-radius: 30px;
border-top-right-radius: 30px;
border-style: solid;
border-width: 3px;
border-color: grey;
display: flex;
align-items: center;
padding-top: 20px;
padding-right: 20px;
padding-left: 20px;
}

.desktop {
background-color: #082746;
background-image: linear-gradient(70deg, transparent 67%, hsla(0,0%,100%,.05) 67%, hsla(0,0%,100%,.025)),
linear-gradient(#ddd 11px, transparent 11px),
linear-gradient(#132d4e, #4f7d90);
margin: auto;
width: 100%;
height: 100%;
}

.center {
margin: auto;
text-align: center;
vertical-align: middle;
display: inline-block;
}

h1 {
font-weight: 200;
margin-top: 50px;
}

h2 {
color: white;
font-weight: 100;
margin-top: 30px;
margin-bottom: 30px;
}

.form-title {
color: white;
font-weight: 200;
padding-top: 30px;
margin-bottom: 5px;
}

.form-field {

margin-bottom: 10px;
-webkit-appearance: none;
-webkit-box-shadow: none;
-webkit-rtl-ordering: logical;
-webkit-user-select: text;
background-color: rgb(255, 255, 255);
border-color: grey;
border-radius: 6px;
border-style: solid;
border-width: 1px;
box-shadow: none;
box-sizing: border-box;
color: grey;
cursor: auto;
display: block;
font-family: Courier, sans-serif;
font-size: 15px;
font-stretch: normal;
font-style: normal;
font-variant-caps: normal;
font-weight: normal;
height: 42px;
letter-spacing: normal;
line-height: 22px;
margin: 0px;
padding-bottom: 8px;
padding-left: 12px;
padding-right: 12px;
padding-top: 8px;
text-align: start;
text-indent: 0px;
text-shadow: none;
text-transform: none;
transition-delay: 0s, 0s, 0s;
transition-duration: 0.25s, 0.25s, 0.25s;
transition-property: border, color, background-color;
transition-timing-function: linear, linear, linear;
width: 212.5px;
word-spacing: 0px;
writing-mode: horizontal-tb;
text-align: center;
}

.uppercase {
text-transform: uppercase;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
<html>
<head>
<script src="jquery-3.2.1.min.js" ></script>
<script src="popper.js"></script>
<script src="bootstrap.min.js" ></script>
<scrpt src="form.js" ></script>
<link rel="stylesheet" type="text/css" href="bootstrap.min.css">
<!--<link rel="stylesheet" type="text/css" href="form.css">-->
<script>
let infoDict = {
'United States':
{
'New York': {
'New York City': {
'prefix':"HQ",
'domains':["Domain1", "Domain2"]
}
},
'New Jersey': {
'Trenton': {
'prefix': "MN",
'domains': ["Domain1"]
}
}
},
'India': {
'prefix':"IN",
'domains':["Domain1"]
}
};

var countryKey = "";
var divisionKey = "";
var siteKey = "";

function stagingView() {
$('#country').html('');
$('#division').html('');
$('#site').html('');
$('#division').parent().hide();
$('#site').parent().hide();
$('#domainOptions').hide();
}

function populateCountryList(){
$('#country').html('');
$('#division').html('');
$('#site').html('');
$('#country').append('<option checked>-- Select Your Country --</option>');
for (var key in infoDict) {
var optVal = infoDict[key]['prefix'];
if (typeof optVal == "undefined") {optVal = (key);}
$('#country').append('<option value="'+optVal+'">'+key+'</option>');
}
}

function populateDivsionList(){
$('#division').html('');
$('#division').append('<option checked>-- Select Your Division --</option>');
$('#division').parent().show();
for (var division in infoDict[countryKey]) {
var divOptVal = infoDict[countryKey][division]['prefix'];
if (typeof divOptVal == "undefined") {divOptVal = division;}
$('#division').append('<option value="'+divOptVal+'">'+division+'</option>');
}
}

function populateSiteList(){
$('#site').html('');
$('#site').append('<option checked>-- Select Your Site --</option>');
$('#site').parent().show();
for (var site in infoDict[countryKey][divisionKey]) {
var siteOptVal = infoDict[countryKey][divisionKey][site]['prefix'];
if (typeof siteOptVal == "undefined") {siteOptVal = site;}
$('#site').append('<option value="'+siteOptVal+'">'+site+'</option>');
}
}

function populateDomainOptions(domains) {
$('#domainOptions').html('');
$('#domainOptions').show('');
if (domains.length == 1) {
$('#domainOptions').append('<div class="form-check form-check-inline"><label class="form-check-label"><input id="'+domains[0]+'" value="'+domains[0]+'" name="domain" type="radio" class="form-check-input" checked></div>'+domains[0]+'</label>');
} else {
for (var d = 0; d < domains.length; d++) {
if (d == 0) {$('#domainOptions').append('<div class="form-check form-check-inline"><label class="form-check-label"><input id="'+domains[d]+'" value="'+domains[d]+'" name="domain" type="radio" class="form-check-input" checked></div>'+domains[d]+'</label>');}
else {
$('#domainOptions').append('<div class="form-check form-check-inline"><label class="form-check-label"><input id="'+domains[d]+'" value="'+domains[d]+'" name="domain" type="radio" class="form-check-input"></div>'+domains[d]+'</label>');
}
}
}
}

$('document').ready(function() {
stagingView();
populateCountryList();

// Actions
$('#country').change(function(){ // Country Selected
$('#division').html('');
$('#site').html('');
$('#division').parent().hide();
$('#site').parent().hide();
countryKey = $('#country option:selected').val();
if (countryKey.length <= 2) {
populateDomainOptions(infoDict[$('#country option:selected').text()]['domains']);
} else {
populateDivsionList();
$('#site').parent().hide();
}
});

$('#division').change(function(){ // Division Selected
$('#site').html('');
$('#site').parent().hide();
divisionKey = $('#division option:selected').val();
if (divisionKey.length <= 2) {
populateDomainOptions(infoDict[countryKey][$('#division option:selected').text()]['domains']);
} else {
populateSiteList();
}
});
$('#site').change(function(){ // Site Selected
siteKey = $('#site option:selected').text();
populateDomainOptions(infoDict[countryKey][divisionKey][siteKey]['domains']);
});
});
</script>
</head>
<body>
<div class='jumbotron jumbotron-fluid'>
<div class='container'>
<div class='text-center'>
<img src='https://placehold.it/100x50' alt='Comcast Logo' class='img-fluid' style='max-width:100px;'/>
</div>
<h1 class='display-4 text-center'>Welcome to your Mac!</h1>
<p class='lead text-center'>We need some info to proceed.</p>
</div>
</div>
<div class='container-fluid'>
<form>
<div class='row'>
<div class='col'>
<div class='form-group'>
<label for='asset-tag'>Asset Tag</label>
<input type='text' class='form-control' id='asset-tag' name='asset-tag' aria-describedby='asset-tagHelp' placeholder='Asset Tag' />
<small id='asset-tagHelp' class='form-text text-muted'>Usually found on the top lid of your computer.</small>
</div>
</div>
<div class='col'>
<img class='img-fluid' src='asset.jpg' alt='assettag image' />
</div>
</div>
<div class='row'>
<div class='col'>
<div class='form-group'>
<label for='username'>Username</label>
<input type='text' class='form-control' id='username' name='username' aria-describedby='usernameHelp' placeholder='Your NTID' />
<small id='usernameHelp' class='form-text text-muted'>This is your username you use to log into your machines and resources.</small>
</div>
</div>
<div class='col'>
<div class='form-group'>
<label for='lastName'>Last Name</label>
<input type='text' class='form-control' id='lastName' name='lastName' aria-describedby='lastNameHelp' placeholder='Your Last Name' />
<small id='lastNameHelp' class='form-text text-muted'>This is needed to properly assign the asset.</small>
</div>
</div>
</div>
<div class='row'>
<div class='col'>
<div class='form-group'>
<label for='country'>Country</label>
<select class='form-control' id='country' name='country' aria-describedby='countryHelp' >
</select>
<small id='countryHelp' class='form-text text-muted'>This is used to help deploy your computer properly</small>
</div>
</div>
<div class='col'>
<div class='form-group'>
<label for='division'>Division</label>
<select class='form-control' id='division' name='division' aria-describedby='divisionHelp' >
</select>
<small id='divisionHelp' class='form-text text-muted'>The state your team resides in.</small>
</div>
</div>
</div>
<div class='form-group'>
<label for='site'>Site</label>
<select class='form-control' id='site' name='site' aria-describedby='siteHelp' >
</select>
<small id='siteHelp' class='form-text text-muted'>The city your team resides in.</small>
</div>
<div class='form-check'>
<label class='form-check-label'>
<input type='checkbox' class='form-check-input' name='joinDomain' checked>
Join Domain
</label>
</div>
<div id='domainOptions'>
<!-- Domain options get rendered dynamically -->
</div>
</form>
</div>
<br />
<br />
<br />
</body>

</html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html><head><meta charset="UTF-8"><body><div style="color:white;font-size:40px;border:0px;text-align:center;background-image:url('login_background.png');padding:20px;width:95%">
<html><head><meta charset="UTF-8"><body><div style="color:white;font-size:40px;border:10px;text-align:center;background-image:url('login_background.png');padding:20px;width:95%">

LAB INSTALL COMPLETE
DEMO PAGE
Expand Down
Loading

0 comments on commit 3bc3415

Please sign in to comment.