correction to form

* change name to name id
* change the radio button to be in 1 group
* add file upload

Signed-off-by: Toshaan Bharvani <toshaan@vantosh.com>

config/development/params.toml

@@ -3,6 +3,8 @@
 	URI = "http://localhost:8080/forms/contactus/test/opf"
 [forms.hub]
 	URI = "http://localhost:8080/forms/hub/test/opf"
+[forms.isarfc]
+	URI = "http://localhost:8080/forms/isarfc/test/opf"
 [forms.passport]
 	URI = "http://localhost:8080/forms/passport/test/opf"
 [forms.mailmonk]

config/production/params.toml

@@ -6,6 +6,8 @@
 	URI = "https://webscripts.vantosh.com/forms/contactus/prod/opf"
 [forms.hub]
 	URI = "https://webscripts.vantosh.com/forms/hub/prod/opf"
+[forms.isarfc]
+	URI = "https://webscripts.vantosh.com/forms/isarfc/prod/opf"
 [forms.passport]
 	URI = "https://webscripts.vantosh.com/forms/passport/prod/opf"
 [forms.mailmonk]

themes/openpowerfoundation/assets/css/header.scss

@@ -287,7 +287,7 @@ body {
 	color: $white;
 	background-color: $primary;
 	vertical-align: top;
-	z-index: 1;
+	z-index: -100;
 }
 .headline p {
 	position: absolute;
@@ -295,12 +295,14 @@ body {
 	height: 100%;
 	margin: 0;
 	text-align: center;
+/*
 	-moz-transform: translateX(100%);
 	-webkit-transform: translateX(100%);
 	transform: translateX(100%);
 	-moz-animation: scroll-left 1s linear infinite;
 	-webkit-animation: scroll-left 1s linear infinite;
 	animation: scroll-left 45s linear infinite;
+*/
 }
 .headline a {
 	color: $white;

themes/openpowerfoundation/layouts/partials/hubform.html

@@ -7,12 +7,14 @@ var goal = "{{ .Site.Params.forms.hub.goal }}";
 {{ end }}
 </script>
 <section id="hub">
-<div class="container"><div class="row wow fadeInUp">
+<div class="container"><div class="row">
 	<div class="col-lg-12 col-md-12 mt-5 mb-5"><div class="form">
 		<div class="col-lg-12 text-center"><h2>HUB Access Request Form</h2></div>
 		<div id="sendmessage" style="display:none">Your request has been sent. Thank you!</div>
 		<div id="errormessage" style="display:none">Error</div>
 		<form role="form" name="hubRequestForm" class="hubRequestForm" id="hubRequestForm" action="" method="post">
+			<input type="hidden" name="providercode" id="providercode" value="{{ .File.BaseFileName }}">
+			<input type="hidden" name="providername" id="providername" value="{{ .Title }}">
 			<div class="form-row">
 				<div class="form-group col-lg-6">
 					<input type="text" name="name" class="form-control" id="name" placeholder="Your Name" data-rule="minlen:4" data-msg="Please enter at least 4 characters" />
@@ -44,61 +46,66 @@ var goal = "{{ .Site.Params.forms.hub.goal }}";
 				</div>
 			</div>
 			<div class="form-row">
-			{{ $projects := .Param "projects" }}
-			{{ if $projects }}
+				{{ $projects := .Param "projects" }}
+				{{ if $projects }}
+					<div class="form-group col-lg-6">
+						What is your project?
+						<select id="projecttype" name="projecttype">
+						{{ range $projects }}
+							<option value="{{ . }}">{{ . }}</option>
+						{{ end }}
+						</select>
+					</div>
+				{{ end }}
+				{{ $systems := .Param "systems" }}
+				{{ if $systems }}
+					<div class="form-group col-lg-6">
+						What POWER system would you like?
+						<select id="system" name="system">
+						{{ range $systems }}
+							<option value="{{ . }}">{{ . }}</option>
+						{{ end }}
+						</select>
+					</div>
+				{{ end }}
+				{{ $provides := .Param "provides" }}
+				{{ if $provides }}
+					<div class="form-group col-lg-6">
+						What POWER resources do you require?
+						<select id="provides" name="provides">
+						{{ range $provides }}
+							<option value="{{ . }}">{{ . }}</option>
+						{{ end }}
+						</select>
+					</div>
+				{{ end }}
+				{{ $addons := .Param "addons" }}
+				{{ if $addons }}
+					<div class="form-group col-lg-6">
+						What POWER addons do you require?
+						<select id="addons" name="addons">
+						{{ range $addons }}
+							<option value="{{ . }}">{{ . }}</option>
+						{{ end }}
+						</select>
+					</div>
+				{{ end }}
+				{{ $operatingsystems := .Param "operatingsystems" }}
+				{{ if $operatingsystems }}
+					<div class="form-group col-lg-6">
+						What Operating System would you like on your POWER resource?
+						<select id="operatingsystem" name="operatingsystem">
+						{{ range $operatingsystems }}
+							<option value="{{ . }}">{{ . }}</option>
+						{{ end }}
+						</select>
+						</div>
+				{{ end }}
 				<div class="form-group col-lg-6">
-					What is your project?
-					<select id="project" name="project">
-					{{ range $projects }}
-						<option value="{{ . }}">{{ . }}</option>
-					{{ end }}
-					</select>
+					SSH Public Key File Upload : <input type="file" name="sshpubkeyupload" id="sshpubkeyupload" class="file" placeholder="Select your Public SSH Key File" onChange="getFileContents()" accept=".pub"><br>
+					<input type="hidden" name="sshpubkey" id="sshpubkey" value="">
+					<span class="comment">Please only add your public ssh key file (ending on <u>.pub</u>)</span>
 				</div>
-			{{ end }}
-			{{ $systems := .Param "systems" }}
-			{{ if $systems }}
-				<div class="form-group col-lg-6">
-					What POWER system would you like?
-					<select id="system" name="system">
-					{{ range $systems }}
-						<option value="{{ . }}">{{ . }}</option>
-					{{ end }}
-					</select>
-				</div>
-			{{ end }}
-			{{ $provides := .Param "provides" }}
-			{{ if $provides }}
-				<div class="form-group col-lg-6">
-					What POWER resources do you require?
-					<select id="provides" name="provides">
-					{{ range $provides }}
-						<option value="{{ . }}">{{ . }}</option>
-					{{ end }}
-					</select>
-				</div>
-			{{ end }}
-			{{ $addons := .Param "addons" }}
-			{{ if $addons }}
-				<div class="form-group col-lg-6">
-					What POWER addons do you require?
-					<select id="addons" name="addons">
-					{{ range $addons }}
-						<option value="{{ . }}">{{ . }}</option>
-					{{ end }}
-					</select>
-				</div>
-			{{ end }}
-			{{ $operatingsystems := .Param "operatingsystems" }}
-			{{ if $operatingsystems }}
-				<div class="form-group col-lg-12">
-					What Operating System would you like on your POWER resource?
-					<select id="operatingsystem" name="operatingsystem">
-					{{ range $operatingsystems }}
-						<option value="{{ . }}">{{ . }}</option>
-					{{ end }}
-					</select>
-				</div>
-			{{ end }}
 			</div>
 			<div class="form-group">
 				<textarea class="form-control" name="message" rows="5" data-rule="required" data-msg="Please write a short explanation about getting access. (Why, How, Whatfor, how long)" placeholder="Please write a short explanation about getting access. (Why, How, Whatfor, how long)"></textarea>
@@ -109,3 +116,14 @@ var goal = "{{ .Site.Params.forms.hub.goal }}";
 	</div></div>
 </div></div>
 </section>
+<script>
+function getFileContents() {
+	const reader = new FileReader()
+	reader.onload = handleFileLoad;
+	reader.readAsText(event.target.files[0])
+}
+function handleFileLoad(event) {
+	document.getElementById('sshpubkey').value = event.target.result;
+}
+</script>
+

themes/openpowerfoundation/layouts/partials/isarfcform.html

@@ -6,12 +6,12 @@ var goal = "{{ .Site.Params.forms.isarfc.goal }}";
 {{ end }}
 </script>
 <section id="isarfc">
-<div class="container"><div class="row wow fadeInUp">
+<div class="container"><div class="row">
 	<div class="col-lg-8 offset-lg-2 col-md-12"><div class="form">
 	<form role="form" name="isarfcForm" class="isarfcForm" id="isarfcForm" action="" method="post">
 		<div class="form-row">
 			<div class="form-group col-lg-12">
-				<input type="text" class="form-control" name="uid" id="uid" placeholder="Your First and Last Name" data-rule="minlen:4" data-msg="Please enter at least 4 characters" />
+				<input type="text" class="form-control" name="name" id="name" placeholder="Your First and Last Name" data-rule="minlen:4" data-msg="Please enter at least 4 characters" />
 				<div class="validation"></div>
 			</div>
 		</div>
@@ -39,15 +39,15 @@ var goal = "{{ .Site.Params.forms.isarfc.goal }}";
 		</div>
 		<div class="form-row text-center">
 			<div class="form-group col-lg-4">
-				<input type="radio" class="mr-2" id="minorcorrection" name="minnorcorrection" value="Minor Correction">Minor Correction<br>
+				<input type="radio" class="mr-2" id="requesttype" name="requesttype" value="Minor Correction">Minor Correction<br>
 				<span class="comment">For minor changes, please send a diff or a git am patch file.</span>
 			</div>
 			<div class="form-group col-lg-4">
-				<input type="radio" class="mr-2" id="formalproposal" name="formalproposal" value="Formal Proposal">Formal Proposal<br>
+				<input type="radio" class="mr-2" id="requesttype" name="requesttype" value="Formal Proposal">Formal Proposal<br>
 				<span class="comment">Please send your proposal including a summary and some use cases.</span>
 			</div>
 			<div class="form-group col-lg-4">
-				<input type="radio" class="mr-2" id="rfc" name="rfc" value="RFC">RFC<br>
+				<input type="radio" class="mr-2" id="requestype" name="requesttype" value="Detailed RFC">Detailed RFC<br>
 				<span class="comment">Please send the patch/diff files and the change document, including a short presentation why this is relevant.</span>
 			</div>
 		</div>
@@ -62,7 +62,9 @@ var goal = "{{ .Site.Params.forms.isarfc.goal }}";
 		</div>
 		<div class="form-row">
 			<div class="form-group col-lg-12">
-				RFC File upload : <input type="file" name="rfcfile" id="rfcfile" class="file" placeholder="Add your RFC file"><br>
+				RFC File upload : <input type="file" name="rfcfile" id="rfcfile" class="file" placeholder="Add your RFC file" onChange="getFileContents()"><br>
+				<input type="hidden" name="rfcfilename" id="rfcfilename" value="RFC File">
+				<input type="hidden" name="rfcfilecontent" id="rfcfilecontent" value="">
 				<span class="comment">Acceptable file formats : text, PDF, LaTeX, patch, diff, tar, zip, xz, bz2, gz</span>
 			</div>
 		</div>
@@ -94,3 +96,13 @@ var goal = "{{ .Site.Params.forms.isarfc.goal }}";
 	</div></div>
 </div>
 </section>
+<script>
+function getFileContents() {
+	const reader = new FileReader()
+	reader.onload = handleFileLoad;
+	reader.readAsText(event.target.files[0])
+}
+function handleFileLoad(event) {
+	document.getElementById('rfcfilecontent').value = event.target.result;
+}
+</script>