pyc-website
main website for pyc inc.
git clone https://9o.is/git/pyc-website.git
commit d7fb7999b1eef6ab052171681779a5d245aa1308 parent 82acf3b7674637e72592d95db61c838a95d14acd Author: Jul <jul@9o.is> Date: Wed, 26 Mar 2014 00:02:00 -0400 enhanced front page ui, apply atm form, website content Diffstat:
| M | src/main/scala/com/pyd/model/AtmApplication.scala | | | 46 | +++++++--------------------------------------- |
| D | src/main/scala/com/pyd/snippet/ApplyAtmScreen.scala | | | 35 | ----------------------------------- |
| A | src/main/scala/com/pyd/snippet/ApplyAtmSnip.scala | | | 62 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | src/main/scala/com/pyd/snippet/NearAtmNotifySnip.scala | | | 48 | +++++++++++++++++++++++++++++------------------- |
| M | src/main/webapp/about.html | | | 115 | ++++++++++++++++++++++++++++++++++++++----------------------------------------- |
| M | src/main/webapp/apply-atm.html | | | 144 | +++++++++++++++++++++++++++++++++++++++++++++---------------------------------- |
| M | src/main/webapp/faqs.html | | | 70 | ++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ |
| A | src/main/webapp/img/emilio.jpg | | | 0 | |
| M | src/main/webapp/img/marist.jpg | | | 0 | |
| A | src/main/webapp/img/skyhook-side.png | | | 0 | |
| A | src/main/webapp/img/skyhook.png | | | 0 | |
| D | src/main/webapp/img/ualbany.jpg | | | 0 | |
| M | src/main/webapp/less/custom.less | | | 37 | +++++++++++++++++++++++++++++++------ |
| M | src/main/webapp/less/overrides.less | | | 80 | ++++++++++++++++++++++++++++++++++++++++++++++++------------------------------- |
| M | src/main/webapp/less/variables.less | | | 5 | +++-- |
| M | src/main/webapp/locations.html | | | 69 | ++++----------------------------------------------------------------- |
| M | src/main/webapp/templates-hidden/base-wrap.html | | | 25 | +++++++++++++------------ |
| A | src/main/webapp/templates-hidden/parts/apply-atm-form.html | | | 65 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | src/main/webapp/templates-hidden/parts/footer.html | | | 2 | +- |
| A | src/main/webapp/templates-hidden/parts/notify-atm-form.html | | | 52 | ++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | src/main/webapp/templates-hidden/with-footer.html | | | 9 | +++++++++ |
21 files changed, 515 insertions(+), 349 deletions(-)
diff --git a/src/main/scala/com/pyd/model/AtmApplication.scala b/src/main/scala/com/pyd/model/AtmApplication.scala @@ -13,81 +13,49 @@ import http.Templates class AtmApplication private () extends MongoRecord[AtmApplication] with ObjectIdPk[AtmApplication] { def meta = AtmApplication - - override def toXHtml = { Templates("templates-hidden" :: "forms" :: "atm-application" :: Nil).openOr(Nil) } - + object name extends StringField(this, 64) { - override def displayName = "Business Name" - override def validations = valMaxLen(64, "Business name must be 64 characters or less") _ :: valMinLen(1, "* required") _ :: super.validations } - object email extends EmailField(this, 64) { - override def displayName = "E-mail" - + object email extends EmailField(this, 64) { override def validations = valMaxLen(64, "Email must be 64 characters or less") _ :: super.validations } - object phone extends StringField(this, 25) { - override def displayName = "Phone Number" - + object phone extends StringField(this, 25) { override def validations = valMaxLen(25, "Phone number must be 25 characters or less") _ :: super.validations } - object timeContact extends TextareaField(this, 255) { - override def displayName = "When is the best time to reach you?" - override def helpAsHtml = Full(<em>Enter time of day and/or week you would like to be contacted.</em>) - override def textareaRows = 2 - } + object bestTime extends TextareaField(this, 255) - object address extends StringField(this, 255) { - override def displayName = "Business Address" - + object address extends StringField(this, 255) { override def validations = valMaxLen(255, "Business address must be 255 characters or less") _ :: valMinLen(1, "* required") _ :: super.validations } - object city extends StringField(this, 64) { - override def displayName = "City" - + object city extends StringField(this, 64) { override def validations = valMaxLen(64, "City must be 64 characters or less") _ :: valMinLen(1, "* required") _ :: super.validations } - object state extends USStatesField(this) { - override def displayName = "State" - } + object state extends USStatesField(this) object website extends StringField(this, 255) { - override def displayName = "Website" - override def validations = valMaxLen(255, "Website must be 255 characters or less") _ :: super.validations } - - object industry extends StringField(this, 64) { - override def displayName = "Industry" - - override def validations = - valMaxLen(64, "Industry must be 64 characters or less") _ :: - super.validations - } - - def allScreenFields = new FieldContainer { - def allFields = List(name, email, phone, website, industry, address, city, state, timeContact) - } } object AtmApplication extends AtmApplication with RogueMetaRecord[AtmApplication] { diff --git a/src/main/scala/com/pyd/snippet/ApplyAtmScreen.scala b/src/main/scala/com/pyd/snippet/ApplyAtmScreen.scala @@ -1,34 +0,0 @@ -package com.pyd -package snippet - -import model.AtmApplication -import config.Site -import net.liftweb._ -import http._ -import util.Helpers._ - -sealed trait BaseApplyAtmScreen extends BaseScreen { - - override def finishButton = super.finishButton % ("class" -> "btn btn-success") % ("tabindex" -> "1") - - object applicationVar extends ScreenVar(AtmApplication.createRecord) - - override def localSetup { - Referer(Site.applyATM.url) - } -} - -object ApplyAtmScreen extends BaseApplyAtmScreen { - addFields(() => applicationVar.is.allScreenFields) - - def finish() { - applicationVar.is.save - S.notice( - <div> - <i class="fa-fw fa fa-check"></i> - <strong>Your Bitcoin ATM application has been received.</strong> - {xml.Text(" We will review and contact you for further information. Thank you for applying.")} - </div> - ) - } -} -\ No newline at end of file diff --git a/src/main/scala/com/pyd/snippet/ApplyAtmSnip.scala b/src/main/scala/com/pyd/snippet/ApplyAtmSnip.scala @@ -0,0 +1,61 @@ +package com.pyd +package snippet + +import model._ +import field._ +import net.liftweb._ +import common._ +import util._ +import Helpers._ +import http._ +import js._ +import SHtml._ +import JE.JsRaw + +class ApplyAtmSnip extends BaseSnippet[AtmApplication] with Logger { + + override val t = Full(AtmApplication.createRecord) + + val options: List[(String, String)] = + USStates.values.map(i => (i.toString, i.toString)).toList + + def render: CssSel = serve { + t => + + def stateSelection(id: String): Unit = tryo { + t.state.set(USStates.withName(id)) + } + + "@name" #> text(t.name.get, t.name.set _) & + "@email" #> text(t.email.get, t.email.set _) & + "@phone" #> email(t.phone.get, t.phone.set _) & + "@besttime" #> textarea(t.bestTime.get, t.bestTime.set _) & + "@address" #> text(t.address.get, t.address.set _) & + "@city" #> text(t.city.get, t.city.set _) & + "@state" #> select(options, Empty, stateSelection) & + "@website" #> text(t.website.get, t.website.set _) & + ":submit" #> ajaxSubmit("Apply for Bitcoin ATM", process _) + } + + private def process: JsCmd = serve { + t => + t.validate match { + case Nil => + t.save + S.notice( + <div> + <i class="fa-fw fa fa-check"></i> + <strong>Your Bitcoin ATM application has been received.</strong> + {xml.Text(" We will review and contact you for further information. Thank you for applying.")} + </div>) + + case errors => + S.error(errors) + /*JsRaw(""" + |$(".invalid-field").each(function() { + | $(this).closest("label.input").addClass("state-error"); + |}); + """.stripMargin).cmd*/ + } + } +} +\ No newline at end of file diff --git a/src/main/scala/com/pyd/snippet/NearAtmNotifySnip.scala b/src/main/scala/com/pyd/snippet/NearAtmNotifySnip.scala @@ -10,39 +10,49 @@ import Helpers._ import http._ import js._ import SHtml._ +import JE.JsRaw class NearAtmNotifySnip extends BaseSnippet[NearAtmNotify] with Logger { override val t = Full(NearAtmNotify.createRecord) - - val options: List[(String,String)] = + + val options: List[(String, String)] = USStates.values.map(i => (i.toString, i.toString)).toList - - def render: CssSel = serve { - t => - - def stateSelection(id: String) : Unit = tryo { + + def render: CssSel = serve { + t => + + def stateSelection(id: String): Unit = tryo { t.state.set(USStates.withName(id)) } - + "@fname" #> text(t.fname.get, t.fname.set _) & "@lname" #> text(t.lname.get, t.lname.set _) & "@email" #> email(t.email.get, t.email.set _) & - "@code" #> text(t.postal.get, t.postal.set _) & + "@postal" #> text(t.postal.get, t.postal.set _) & "@city" #> text(t.city.get, t.city.set _) & "@state" #> select(options, Empty, stateSelection) & ":submit" #> ajaxSubmit("Notify Me", process _) } - + private def process: JsCmd = serve { t => - t.save - - S.notice( - <div> - <i class="fa-fw fa fa-check"></i> - <strong>{s"Hi ${t.fname.get}, your notification has been received."}</strong> - {xml.Text(s" We will notify you when there is an ATM near ${t.city.get}.")} - </div> - ) + t.validate match { + case Nil => + t.save + S.notice( + <div> + <i class="fa-fw fa fa-check"></i> + <strong>{ s"Hi ${t.fname.get}, your notification has been received." }</strong> + { xml.Text(s" We will notify you when there is an ATM near ${t.city.get} ${t.state.get}.") } + </div>) + + case errors => + S.error(errors) + /*JsRaw(""" + |$(".invalid-field").each(function() { + | $(this).closest("label.input").addClass("state-error"); + |}); + """.stripMargin).cmd*/ + } } } \ No newline at end of file diff --git a/src/main/webapp/about.html b/src/main/webapp/about.html @@ -2,78 +2,75 @@ <div class="multi-column"> <p class="lg-text"> - PYD is an innovative, C-Type corporation on the forefront of the cryptocurrency: Bitcoin. Our company, - along with our business associates, provides the convenient distribution of Bitcoin in an environment - and manner that is safe and complaint for both legal and legitimate applications. We are dedicated to - helping our customers not only increase their personal wealth, but secure it by utilizing our unique cash - to Bitcoin services. PYD aspires to not only provide a state of the art service in which helps circulate and - establish reputable value in Bitcoin, but to help the everyday man or woman achieve more economically - than he or she ever thought possible. + PYD is an innovative, C-Type corporation on the forefront of the cryptocurrency: + Bitcoin. Our company, along with our business associates, provide the convenient + distribution of Bitcoin in an environment and manner that is safe and compliant + for both legal and legitimate applications. We are dedicated to helping our + customers not only increase their personal wealth, but secure it by utilizing our + unique Bitcoin services. PYD aspires to not only provide a state of the art service + in which helps circulate and establish reputable value in Bitcoin, but to help the + everyday man or woman achieve more economically than he or she ever thought possible. </p> </div> - + <br> -<div class="row ourstory"> - <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6"> - <img class="img-thumbnail" style="width:100%" src="/img/marist.jpg" /> - <p><small>Marist College</small></p> - </div> - <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6"> - <img class="img-thumbnail" style="width:100%" src="/img/ualbany.jpg" /> - <p><small>University of Albany</small></p> - </div> + <div class="row ourstory"> + <div class="col-xs-12 pagination-centered"> + <img class="img-thumbnail" src="/img/marist.jpg" /> + <p><small>Marist College, Poughkeepsie NY</small></p> </div> - - <div class="page-header"><h1>Our Team</h1></div> - - <div id="ourteam"> - <div class="row ourstory"> - <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> - <div class="multi-column"> - <p class="lg-text"> - PYD is an acronym that takes the names of its founders; Emilio Pagan-Yourno of Schenectady, NY and - Andrew Desbiens of Clifton Park, NY. In the later months of the year 2013, the increasingly popular - cryptocurrency, Bitcoin, had demonstrated vast future potential and stability but there was just one - problem: a way for the everyday person attaining their hands on it. That’s why on January 1st - PYD was born. The company, started two college students, Pagan-Yourno and Desbiens at just 21 and - 20 years of age respectively. With their eyes set on providing a unique service initially to their homes in - Upstate New York, the two had a plan to help everyone get their very own part of what certainly seems - like the future of finance and technology. - </p> - </div> - </div> + </div> + <div class="row ourstory"> + <div class="col-xs-12 multi-column"> + <p class="lg-text"> + PYD was founded by Emilio Pagan-Yourno of Schenectady, NY and Julio Cabrera + of Miami, FL where they both met in Marist College of Poughkeepsie, NY. In the + later months of the year 2013, the increasingly popular cryptocurrency, Bitcoin, + had demonstrated vast future potential and stability but there was just one + problem: a way for the everyday person attaining their hands on it. That’s why + PYD was created. With their eyes set on providing a unique service initially to + the northeastern region of the U.S., the two had a plan to help everyone get + their very own part of what certainly seems like the future of finance and + technology. + </p> </div> - + </div> + <div class="page-header"><h1>The Team</h1></div> - - <div data-lift="ignore" class="row"> - <div class="ourteam-box col-xs-12 col-sm-4 col-md-4 col-lg-4"> - <img src="" /> + <div id="ourteam"> + <div class="row"> + <div class="ourteam-box col-xs-8 col-sm-4 col-xs-offset-2 col-sm-offset-2"> + <img class="img-thumbnail" src="/img/emilio.jpg" /> <h2 class="name">Emilio Pagan-Yourno</h2> - <h5 class="title">Co-Founder</h5> - <p> - Emilio Pagan-Yourno is an outgoing bitcoin enthusiast with an unparalleled drive to learn more about potential applications with regards to bitcoin. He believes in bitcoin as a potential replacement to the archaic credit card processing system that has too easily allowed for cybercriminals to cause headaches and millions in damages. - Emilio is a Junior at Marist College. He also interns 24/hours a week for the ITS department for NYS in Albany,NY where he works in the Human Resources office as a database administrator. - In addition to working hard in school and his internship, Emilio also enjoys travelling and playing tennis. - </p> - </div> - <div class="ourteam-box col-xs-12 col-sm-4 col-md-4 col-lg-4"> - <img src="" /> - <h2 class="name">Andrew Desbiens</h2> - <h5 class="title">Co-Founder</h5> + <h5 class="title">Co-Founder, Bitcoin Enthusiast</h5> <p> - Upon graduation of Shenendehowa High School (Clifton Park, NY) as part of the class of 2011, Andrew attended Elms College (Chicopee, MA) where he made the Dean's list and was part of the NCAA Baseball team for three academic semesters. Andrew - then decided to pursue his degree at the State University of New York at Albany where he is currently majoring in Information Science with a minor in Business. In his free time, he enjoys playing and watching baseball, golf and fishing. + Emilio Pagan-Yourno is a bitcoin enthusiast with an unparalleled + drive to learn more about potential applications with regards to + the technology. He believes in bitcoin as a potential replacement + to the archaic credit card processing system that has too easily + allowed for cybercriminals to cause headaches and millions in + damages. Emilio is a Junior at Marist College. He also interns + 24/hours a week for the ITS department for NYS in Albany, NY where + he works in the Human Resources office as a database administrator. + In addition to working hard in school and his internship, Emilio also + enjoys traveling and playing tennis. </p> </div> - <div class="ourteam-box col-xs-12 col-sm-4 col-md-4 col-lg-4"> + <div class="ourteam-box col-xs-8 col-sm-4 col-xs-offset-2 col-sm-offset-0"> <img class="img-thumbnail" src="/img/julio.jpg" /> - <h2 class="name">Julio Cabrera</h2> - <h5 class="title">Software Engineer & Security Expert</h5> + <h2 class="name">Julio Enrique Cabrera</h2> + <h5 class="title">Co-Founder, Software Dev, Security Expert</h5> <p> - A visionaire, a security expert, an NSF scholar and an exceptional Marist College student. - What more could he say? + Julio is a visionary, always looking for ways to make the world an + easier, safer and better place to live in which is why he works hard + everyday to make Bitcoin the standard payment for everyone. Upon + graduation of Miami Senior High School (Miami, FL) as part of the class + of 2010, Julio attended Marist College (Poughkeepsie, NY) where he was + awarded the National Science Foundation 4-year scholarship and is currently + majoring in Computer Science. He takes security extremely seriously and + knows how he can help people migrate to Bitcoin safely. For fun, he likes + to hack while eating chili cheese nachos and watching The Colbert Report. </p> </div> </div> diff --git a/src/main/webapp/apply-atm.html b/src/main/webapp/apply-atm.html @@ -1,107 +1,127 @@ -<div data-lift="surround?with=default;at=content"> - <div id="apply-atm" class="row no-gutter"> +<div data-lift="surround?with=with-footer;at=content"> + + <div id="content-index" class="row no-gutter"> - <div class="col-xs-12 col-sm-7 col-md-8 col-lg-8"> + <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4"> <div class="row"> - <div id="atm-intro" class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> - <div data-lift="ignore"> - <h1 class="big-text text-primary">Cash to <i class="fa fa-btc"></i>itcoin</h1> - <p class="text-secondary"> - <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> <span class="fa-stack"> <i - class="fa fa-circle fa-stack-2x"></i> <i - class="fa fa-btc fa-stack-1x fa-inverse"></i> - </span> - </p> - </div> + <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> + <h1 class="semibig-text text-primary"> Are you a merchant? Apply for a Bitcoin ATM! <br/> - <small>Fill out the form and we'll contact you shortly.</small> + <small>Fill the form below & we'll contact you shortly.</small> </h1> </div> </div> <div class="row"> - <div id="atm-benefits" class="col-xs-12 col-sm-12 col-md-12 col-lg-12 text-primary"> + <div id="atm-benefits" class="col-xs-12 col-sm-12 col-md-12 col-lg-12 text-primary padding-20"> <table> <tr> <td><i class="fa fa-wrench fa-4x"></i></td> - <td><h1>Free installation and maintenance</h1></td> + <td><h4>Free installation and maintenance</h4></td> </tr> <tr> <td><i class="fa fa-bitcoin fa-4x pull-left"></i></td> - <td><h1>Hot and new emerging technology</h1></td> + <td><h4>Hot and new emerging technology</h4></td> </tr> <tr> <td><i class="fa fa-thumbs-up fa-4x pull-left"></i></td> - <td><h1>Increase business exposure</h1></td> + <td><h4>Increase business exposure</h4></td> </tr> <tr> <td><i class="fa fa-shield fa-4x pull-left"></i></td> - <td><h1>Safe and reliable way for customers to purchase Bitcoin</h1></td> + <td><h4>Safe and reliable way for customers to purchase Bitcoin</h4></td> </tr> </table> </div> </div> - <div id="atm-bitcoin-video" class="row"> + <div class="row"> <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> - <div class="page-content"> - <h1>What is Bitcoin?</h1> + <div class="page-content text-primary"> + <h1>Bitcoin ATM Application</h1> </div> </div> - <div class="col-xs-12 col-sm-12 col-md-12 col-lg-10"> - <iframe src="//www.youtube.com/embed/LP4GSvQUtBw" frameborder="0" allowfullscreen></iframe> + </div> + + <div class="row"> + <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> + <span data-lift="embed?what=/templates-hidden/parts/apply-atm-form"></span> </div> </div> + </div> - <div id="atm-application" class="col-xs-12 col-sm-5 col-md-4 col-lg-4" > + <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 bg-secondary-gradient"> <div class="row"> + <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> + <h1 class="semibig-text text-white"> + Find ATM Locations + </h1> + </div> + </div> + + <div class="padding-20"> + <div class="row"> + <div class="col-xs-5"> + <input type="text" class="form-control input-lg" placeholder="zip code"> + </div> + <div class="col-xs-3"> + <button type="button" class="btn btn-primary btn-lg btn-block">Find ATM</button> + </div> + </div> + <div class="row"> + <div class="col-xs-12"> + <span class="help-block text-white">Find nearby ATMs by searching with your zip code.</span> + </div> + </div> + </div> + + <div class="row"> + <div class="col-xs-12"> + <img src="http://maps.googleapis.com/maps/api/staticmap?center=40.736755,-74.033353&zoom=13&size=360x240&sensor=false" style="width:100%"> + </div> + </div> + + <div class="row"> + <div class="col-xs-12"> + <img src="/img/skyhook.png" style="width:100%"> + </div> + </div> + </div> + + <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4 bg-primary-gradient text-white"> + <div class="row"> + <div class="col-xs-12"> + <h1 class="semibig-text text-white"> + Who We Are + </h1> + </div> + </div> + + <div class="row"> + <div class="col-xs-12"> + <h4> + PYD is an ATM service operator for the bitcoin currency. + <small> + We enable customers to retrieve bitcoin instantly, just as they retrieve cash from a bank ATM. + </small> + </h4> + </div> + </div> + + <div id="atm-bitcoin-video" class="row"> <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> <div class="page-content"> - <h2>Bitcoin ATM Application</h2> + <h1>What is Bitcoin?</h1> </div> </div> <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> - <div class="well well-lg"> - <div data-lift="ApplyAtmScreen"></div> - </div> + <iframe src="//www.youtube.com/embed/LP4GSvQUtBw" frameborder="0" allowfullscreen></iframe> </div> </div> </div> </div> + </div> \ No newline at end of file diff --git a/src/main/webapp/faqs.html b/src/main/webapp/faqs.html @@ -2,27 +2,61 @@ <div data-lift="surround?with=default;at=content"> <div id="faqs" class="row"> - <div data-lift="ignore" class="col-xs-12 col-sm-8 col-md-8 col-lg-8"> + <div class="col-xs-12 col-sm-4 col-md-4 col-lg-4"> <ul> - <li><h3>1. What is bitcoin?</h3></li> - <ul> - <li>Answer to question #1</li> - </ul> + <li><h3>What is PYD?</h3></li> + <ul> + <li> + PYD is an ATM service operator for the bitcoin currency. + We enable customers to retrieve bitcoin instantly, just as + they retrieve cash from a bank ATM. + </li> + </ul> - <li><h3>2. Why do we believe in bitcoin?</h3></li> - <ul> - <li>Answer to question #1</li> - </ul> + <li><h3>In which states is PYD available?</h3></li> + <ul> + <li> + PYD ATMs are currently available in the state of New Jersey. + If you’re located in another state but would like to be the + next customer to benefit from our service, + <a href="#">fill out this form so we can know you’re interested</a>. + </li> + </ul> - <li><h3>3. How can my business accept bitcoin?</h3></li> - <ul> - <li>Answer to question #1</li> - </ul> - - <li><h3>4. Where can I store my bitcoin?</h3></li> - <ul> - <li>Answer to question #1</li> - </ul> + <li><h3>How long does the ATM take to transfer the bitcoin to my wallet?</h3></li> + <ul> + <li> + The ATM takes a few seconds -- no more than a minute -- it is the fastest + and easiest way to retrieve bitcoin, hence our slogan. + </li> + </ul> + </ul> + </div> + <div class="col-xs-12 col-sm-4 col-md-4 col-lg-4"> + <ul> + <li><h3>How much money can I take out from the ATM?</h3></li> + <ul> + <li> + At the moment, the maximum amount of money that can be taken out per + transaction is 500 USD. If you would like to transfer more money, you will + have to <a href="#">sign up and verify your identity</a>. + </li> + </ul> + + <li><h3>How do I use the ATM?</h3></li> + <ul> + <li> + <a href="#">Follow our tutorial</a> so we can help you find an ATM, set up a wallet, + instantly retrieve your bitcoin and find local merchants. + </li> + </ul> + + <li><h3>What is Bitcoin?</h3></li> + <ul> + <li> + <a href="#">Discover Bitcoin’s purpose and usability</a> in our easy to follow tutorial. + </li> + </ul> </ul> </div> diff --git a/src/main/webapp/img/emilio.jpg b/src/main/webapp/img/emilio.jpg Binary files differ. diff --git a/src/main/webapp/img/marist.jpg b/src/main/webapp/img/marist.jpg Binary files differ. diff --git a/src/main/webapp/img/skyhook-side.png b/src/main/webapp/img/skyhook-side.png Binary files differ. diff --git a/src/main/webapp/img/skyhook.png b/src/main/webapp/img/skyhook.png Binary files differ. diff --git a/src/main/webapp/img/ualbany.jpg b/src/main/webapp/img/ualbany.jpg Binary files differ. diff --git a/src/main/webapp/less/custom.less b/src/main/webapp/less/custom.less @@ -29,10 +29,12 @@ } .multi-column { - > p { - .column-count(2); - br { .column-span(all); } - } + @media (min-width: @screen-sm){ + > p { + .column-count(2); + br { .column-span(all); } + } + } } .lg-text { @@ -62,7 +64,7 @@ padding-right: 0; } - @media (min-width: 768px){ + @media (min-width: @screen-sm){ .row { margin-right: 0; margin-left: 0; @@ -83,17 +85,36 @@ background-color: @brand-primary; } +.body-background { + #gradient > .vertical(@brand-primary; @brand-primary-light; @navbar-height * 2; @navbar-height * 2); +} + .bg-primary-gradient { .bg-primary(); - #gradient > .radial(rgb(68, 110, 155), @brand-primary) + #gradient > .radial(lighten(@brand-primary, 5%), @brand-primary) } .bg-secondary { background-color: @brand-secondary; } +.bg-secondary-gradient { + .bg-secondary(); + #gradient > .radial(lighten(@brand-secondary, 5%), @brand-secondary) +} + +.text-primary { + color: @brand-primary; +} + .text-secondary { color: @brand-secondary; + a { + color: @brand-secondary; + &:hover { + color: lighten(@brand-secondary, 5%); + } + } } .text-white { @@ -102,4 +123,8 @@ .bg-tertiary { background-color: @brand-tertiary; +} + +.pagination-centered { + text-align: center; } \ No newline at end of file diff --git a/src/main/webapp/less/overrides.less b/src/main/webapp/less/overrides.less @@ -2,32 +2,57 @@ body { overflow: auto; - #content { - background: @white; - padding-top: 0; - padding-bottom: 0; + + > .container { + padding: 0; + + > #content { + border-left: 1px solid @brand-primary; + border-right: 1px solid @brand-primary; + background: @white; + } } } +.main-content > .page-header { + margin: 0; + padding-left: 5px; + padding-right: 5px; +} + @navbar-toprow: 0.40; @navbar-bottomrow: 0.50; +.navbar-default { + background-color: @white; + border-color: transparent; + border-left: 1px solid @brand-primary; + border-right: 1px solid @brand-primary; +} + #navbar-main { - margin-bottom: 0; + margin-bottom: 0; .navbar-brand { padding: (@navbar-padding-vertical * 0.22222) @navbar-padding-horizontal; img { - height: @navbar-height * 0.9; + height: @navbar-height * 0.8; } } .bottom-row { + margin: 0; min-height: (@navbar-height * @navbar-bottomrow); + + > div { + margin: 9px -9px; + } } .top-row { + margin: 0; + .navbar-nav > li > a { &:hover { background-color: @brand-primary; @@ -125,34 +150,19 @@ body { } } -.main-content > .page-header { - padding-left: 5px; - padding-right: 5px; -} - -#apply-atm { - div[id^="atm-"] { +#content-index { + & > div[class^="col-"] { padding-left: 30px; padding-right: 30px; } - #atm-benefits { - padding-top: 30px; - padding-bottom: 30px; - td { height: 70px; } + .padding-20 { + padding-top: 20px; + padding-bottom: 20px; } - #atm-application { - .bg-primary-gradient(); - padding-left: 15px; - padding-right: 15px; - - .box-shadow(0px 1px 1px rgb(236, 236, 236)); - border-radius: 3px; - - .page-content { - color: @white; - } + #atm-benefits { + td { height: 70px; } } #atm-bitcoin-video { @@ -248,6 +258,7 @@ body { #contact-info { @media (max-width: @screen-xs) { .text-center(); + padding-left: 0; } @media (max-width: @screen-sm) { @@ -258,15 +269,22 @@ body { } -#content.container { - .box-shadow(0 3px 5px 6px #ccc); -} + .alert { z-index: @alert-zindex; ul { .list-unstyled(); } + margin-bottom: 0; } .alert-danger { color: @white; +} + +.navbar-default .navbar-nav > .active { + > a { + &, &:hover, &:focus { + background-color: @brand-primary-light; + } + } } \ No newline at end of file diff --git a/src/main/webapp/less/variables.less b/src/main/webapp/less/variables.less @@ -54,8 +54,9 @@ //@brand-primary: #3276B1; //@brand-primary: #446E9B; @brand-primary: #3E648D; +@brand-primary-light: lighten(@brand-primary, 55%); // #EDF2F7; @brand-secondary: @orange; -@brand-tertiary: #95A9C1; +@brand-tertiary: #95A9C1; @brand-success: #739E73; @brand-warning: @orange; @brand-danger: @red; @@ -697,7 +698,7 @@ @base-url: "../img"; //urage: background-image: url("@{base-url}/images/bg.png"); -@html-background-image: "mybg.png"; +@html-background-image: "mybg-null.png"; @html-background-color: @body-bg; @body-background-image: "mybg.png"; diff --git a/src/main/webapp/locations.html b/src/main/webapp/locations.html @@ -1,12 +1,5 @@ <div data-lift="surround?with=base-wrap;at=content"> - <lift:head> - <style type="text/css"> - #content { padding: 10px !important; } - </style> - </lift:head> - - - + <div id="atm-locations"> <div class="outer-layer"><div class="layer"></div></div> @@ -18,63 +11,9 @@ </p> </div> - <div data-lift="NearAtmNotifySnip" class="col-xs-12 col-sm-12 col-md-5 col-lg-4 col-lg-offset-1 right-content"> - - <form action="" id="notify-form" class="smart-form client-form"> - <header>Notify me when there is a nearby ATM</header> - <fieldset> - <div class="row"> - <section class="col col-6"> - <label class="input"> <i - class="icon-prepend fa fa-user"></i> <input name="fname" - placeholder="First name" type="text"> - </label> - </section> - <section class="col col-6"> - <label class="input"> <i - class="icon-prepend fa fa-user"></i> <input name="lname" - placeholder="Last name" type="text"> - </label> - </section> - </div> - - <div class="row"> - <section class="col col-6"> - <label class="input"> <i - class="icon-prepend fa fa-envelope-o"></i> <input - name="email" placeholder="E-mail" type="email"> - </label> - </section> - - <section class="col col-6"> - <label class="input"> <input name="code" - placeholder="Post code" type="text"> - </label> - </section> - </div> - <div class="row"> - <section class="col col-6"> - <label class="input"> <input name="city" - placeholder="City" type="text"> - </label> - </section> - <section class="col col-6"> - <label class="select"> - <select name="state"></select> - </label> - </section> - - - </div> - </fieldset> - - <footer> - <button type="submit" class="btn btn-primary">Notify - Me</button> - </footer> - </form> - </div> - <!-- end of form --> + <div class="col-xs-12 col-sm-12 col-md-5 col-lg-4 col-lg-offset-1 right-content"> + <span data-lift="embed?what=/templates-hidden/parts/notify-atm-form"></span> + </div> </div> <div id="map-canvas"></div> diff --git a/src/main/webapp/templates-hidden/base-wrap.html b/src/main/webapp/templates-hidden/base-wrap.html @@ -19,10 +19,11 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> -<body> +<body class="body-background"> - <div id="navbar-main" class="navbar" role="navigation"> - <div class="container"> +<div class="container"> + <div id="navbar-main" class="navbar navbar-default" role="navigation"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> @@ -39,21 +40,21 @@ </div> </div> <div class="row bottom-row hidden-sm hidden-xs"> - <div class="col-md-12"> - + <div class="col-md-12 text-secondary"> + <a href="https://plus.google.com/+Pydcoin1" alt="Our Google+ Page" target="_blank"><i class="fa fa-google-plus fa-2x pull-right"></i></a> + <a href="#" alt="Our Twitter Page" target="_blank"><i class="fa fa-twitter fa-2x pull-right"></i></a> + <a href="https://www.facebook.com/PYDINC" alt="Our Facebook Page" target="_blank"><i class="fa fa-facebook fa-2x pull-right"></i></a> </div> </div> </div> </div> </div> + + <div data-lift="Notices"></div> + <div id="content"></div> +</div> - <div class="container"> - <div data-lift="Notices"></div> - </div> - <div id="content" class="container"></div> - <!-- /container --> - <!-- javascript --> - <script data-lift="Assets.js"></script> +<script data-lift="Assets.js"></script> </body> </html> diff --git a/src/main/webapp/templates-hidden/parts/apply-atm-form.html b/src/main/webapp/templates-hidden/parts/apply-atm-form.html @@ -0,0 +1,64 @@ +<div data-lift="ApplyAtmSnip"> + <form class="lift:form.ajax?class=smart-form+client-form"> + <fieldset> + <section> + <label class="input"> <i class="icon-append fa fa-briefcase"></i> + <input name="name" placeholder="Business Name" type="text"> + </label> + </section> + + <section> + <label class="input"> <i class="icon-append fa fa-envelope-o"></i> + <input name="email" placeholder="E-Mail" type="email"> + </label> + </section> + + <section> + <label class="input"> + <i class="icon-append fa fa-phone"></i> + <input name="phone" placeholder="Phone Number" type="text"> + </label> + </section> + + <section> + <label class="input"> + <input name="address" placeholder="Address" type="text"> + </label> + </section> + + <div class="row"> + <section class="col col-6"> + <label class="input"> + <input name="city" placeholder="City"> + </label> + </section> + <section class="col col-6"> + <label class="select"> + <select name="state"></select> <i></i> + </label> + </section> + </div> + + <section> + <label class="input"> + <i class="icon-append fa fa-globe"></i> + <input name="website" placeholder="Website URL" type="text"> + </label> + </section> + + <section> + <label class="textarea"> + <i class="icon-append fa fa-comment"></i> + <textarea name="besttime" + placeholder="When is the best time to contact you?" rows="2"></textarea> + </label> + <em>Enter time of day and/or week you would like to be contacted.</em> + </section> + + </fieldset> + + <footer> + <button type="submit" class="btn btn-primary"></button> + </footer> + </form> +</div> +\ No newline at end of file diff --git a/src/main/webapp/templates-hidden/parts/footer.html b/src/main/webapp/templates-hidden/parts/footer.html @@ -1,4 +1,4 @@ <footer> <br /> - <p>© PYD INC 2014</p> + <p>© 2014 PYD, Inc.</p> </footer> diff --git a/src/main/webapp/templates-hidden/parts/notify-atm-form.html b/src/main/webapp/templates-hidden/parts/notify-atm-form.html @@ -0,0 +1,51 @@ +<div data-lift="NearAtmNotifySnip"> + <form class="lift:form.ajax?class=smart-form+client-form"> + <header>Notify me when there is a nearby ATM</header> + <fieldset> + <div class="row"> + <section class="col col-6"> + <label class="input"> <i class="icon-prepend fa fa-user"></i> + <input name="fname" placeholder="First name" type="text"> + <span data-lift="Msg?id=fname_id&errorClass=invalid-field"></span> + </label> + </section> + <section class="col col-6"> + <label class="input"> <i class="icon-prepend fa fa-user"></i> + <input name="lname" placeholder="Last name" type="text"> + </label> + </section> + </div> + + <div class="row"> + <section class="col col-6"> + <label class="input"> <i + class="icon-prepend fa fa-envelope-o"></i> <input name="email" + placeholder="E-mail" type="email"> + </label> + </section> + + <section class="col col-6"> + <label class="input"> <input name="postal" + placeholder="Post code" type="text"> + </label> + </section> + </div> + <div class="row"> + <section class="col col-6"> + <label class="input"> <input name="city" placeholder="City" + type="text"> + </label> + </section> + <section class="col col-6"> + <label class="select"> <select name="state"></select> <i></i> + </label> + </section> + + </div> + </fieldset> + + <footer> + <button type="submit" class="btn btn-primary">Notify Me</button> + </footer> + </form> +</div> +\ No newline at end of file diff --git a/src/main/webapp/templates-hidden/with-footer.html b/src/main/webapp/templates-hidden/with-footer.html @@ -0,0 +1,9 @@ +<div data-lift="surround?with=base-wrap;at=content"> + <lift:head> + <title data-lift="Menu.title">PYD: %*%</title> + </lift:head> + <div class="main-content"> + <div id="content"></div> + </div> + <span data-lift="embed?what=/templates-hidden/parts/footer"></span> +</div>