pyc-website
main website for pyc inc.
git clone https://9o.is/git/pyc-website.git
commit 8d340f2da4b726cfb91deccd6e0af4631439e32c parent 620822d3aac70d0d70f9e97f8fc7cfadf85f08ed Author: Jul <jul@9o.is> Date: Fri, 17 Oct 2014 13:55:20 -0400 replace btm with bitcoin atm Diffstat:
26 files changed, 265 insertions(+), 289 deletions(-)
diff --git a/src/main/scala/inc/pyc/config/Site.scala b/src/main/scala/inc/pyc/config/Site.scala @@ -43,9 +43,9 @@ object Site extends Locs { def host = if(Props.devMode || Props.testMode) "127.0.0.1" else domain // Regular links - val home = MenuLoc(Menu.i("Bitcoin Teller Machine Services") / "index") - val findBtm = MenuLoc(Menu.i("Find A BTM") / "find" >> TopBarGroup) - val hostBtm = MenuLoc(Menu.i("Host A BTM") / "host" >> TopBarGroup) + val home = MenuLoc(Menu.i("Bitcoin ATM Services") / "index") + val findAtm = MenuLoc(Menu.i("Find An ATM") / "find" >> TopBarGroup) + val hostAtm = MenuLoc(Menu.i("Host An ATM") / "host" >> TopBarGroup) val team = MenuLoc(Menu.i("Team") / "about" / "team" >> SiteMapGroup) val press = MenuLoc(Menu.i("Press") / "about" / "press" >> RedirectPress >> SiteMapGroup) @@ -58,11 +58,6 @@ object Site extends Locs { val faqs = MenuLoc(Menu.i("FAQs") / "faqs" >> SiteMapGroup >> FooterGroup) - - // TODO implement - val whatsBitcoin = MenuLoc(Menu.i("What Is Bitcoin") / "what-is-bitcoin") - val btmHowTo = MenuLoc(Menu.i("How To Use BTM") / "how-to-use-btm") - // Regular Links for Users val register = MenuLoc(Menu.i("Register") / "register" >> RequireNotLoggedIn >> SiteMapGroup) @@ -96,23 +91,18 @@ object Site extends Locs { // ATM pages - private val btmProfileParamMenu = Menu.param[Atm]( - "BTM", "BTM Information", Atm.findByName _, _.name.get) / "btm" - lazy val btmProfileLoc = btmProfileParamMenu.toLoc - - - + private val atmProfileParamMenu = Menu.param[Atm]( + "Bitcoin ATM", "Bitcoin ATM Information", Atm.findByName _, _.name.get) / "atm" + lazy val atmProfileLoc = atmProfileParamMenu.toLoc private def menus = List( home.menu, - findBtm.menu, - hostBtm.menu, - whatsBitcoin.menu, + findAtm.menu, + hostAtm.menu, aboutMenus, faqs.menu, login.menu, register.menu, - btmHowTo.menu, tos.menu, privacy.menu, loginToken.menu, @@ -124,7 +114,7 @@ object Site extends Locs { verifyID.menu, viewPurchaseLimits.menu, emailResetToken.menu, - btmProfileParamMenu, + atmProfileParamMenu, Menu.i("Error") / "error" >> Hidden, Menu.i("404") / "404" >> Hidden, Menu.i("Status") / "ping" >> Hidden >> CalcStateless(() => true ) >> EarlyResponse(() => Full(OkResponse())), diff --git a/src/main/scala/inc/pyc/model/Atm.scala b/src/main/scala/inc/pyc/model/Atm.scala @@ -138,9 +138,6 @@ object TimeOpen extends TimeOpen with BsonMetaRecord[TimeOpen] { TimeOpen.createRecord.open(open).close(close) } - - - object FeaturedAtm { import TimeOpen._ diff --git a/src/main/scala/inc/pyc/rest/AtmRest.scala b/src/main/scala/inc/pyc/rest/AtmRest.scala @@ -22,7 +22,7 @@ object AtmRest extends RestHelper { /** * API for uploading files to server. */ - serve("api" / "btm" prefix { + serve("api" / "atm" prefix { // /api/atm/{atm_id}/{atm_password}/user/{user_email}/{user_one-time_password}/login diff --git a/src/main/scala/inc/pyc/snippet/AtmSnip.scala b/src/main/scala/inc/pyc/snippet/AtmSnip.scala @@ -35,7 +35,7 @@ class AtmApplication extends AngularSnippet { rec.save(false) notifyByEmail(rec) - NgAlert.success(Text(S ? "btm_app_received" format rec.name.get)) + NgAlert.success(Text(S ? "atm_app_received" format rec.name.get)) case errors => NgAlert.danger(Text(S ? "Invalid_submission"), errors) } @@ -49,7 +49,7 @@ class AtmApplication extends AngularSnippet { import Mailer._ val msgTxt = s""" - Business Asking for a BTM! + Business Asking for a Bitcoin ATM! Name: ${rec.name.get} Website: ${rec.website.get} Address: @@ -62,7 +62,7 @@ class AtmApplication extends AngularSnippet { sendMail( From(MongoAuth.systemFancyEmail), - Subject("PYC: Business wants a BTM"), + Subject("PYC: Business wants a Bitcoin ATM"), To(Emails.atmBusiness), PlainMailBodyType(msgTxt) ) @@ -79,7 +79,7 @@ class FindAtm extends AngularSnippet with Logger { "notifyEmail" -> notifyEmail _, "init" -> init _) - /** Distance to check for nearby BTM's */ + /** Distance to check for nearby ATMs */ val distance = 100 // kilometers (~62 miles) def submit(model: JValue): JValue = @@ -123,13 +123,14 @@ class FindAtm extends AngularSnippet with Logger { val email = e.toLowerCase.trim loc.emails.add(email).update - NgAlert.success(Text(S ? "btm_notify")) + NgAlert.success(Text(S ? "atm_notify")) } getOrElse JNull - /* Set featured BTM on map */ + /* Set featured ATM on map */ def init(o: JValue): JValue = { - /* + + /* Don't show any windows by default (for now) FeaturedAtm.atm.asJValue merge ("id" -> 1) ~ ("showWindow" -> false) @@ -161,12 +162,12 @@ sealed trait AtmSnip extends SnippetHelper with Logger { protected def atm: Box[Atm] protected def serve(snip: Atm => JValue): JValue = - for (atm <- atm ?~ "Btm not found") yield snip(atm) + for (atm <- atm ?~ "Bitcoin ATM not found") yield snip(atm) } class AtmProfile extends AtmSnip with AngularSnippet { - override def atm = Site.btmProfileLoc.currentValue + override def atm = Site.atmProfileLoc.currentValue def roundTrips: List[RoundTripInfo] = List("init" -> init _) diff --git a/src/main/webapp/about/resources-hidden/_resources_team.html b/src/main/webapp/about/resources-hidden/_resources_team.html @@ -7,7 +7,7 @@ <res name="welcome"> <p> PYC is comprised of two Bitcoin enthusiasts that are bringing Bitcoin to the masses with easy - to use Bitcoin ATM's in the NYC area and beyond. Our goal is to help spread + to use Bitcoin ATMs in the NYC area and beyond. Our goal is to help spread awareness and adoption of this incredible new technology. </p> </res> diff --git a/src/main/webapp/app/mycontrollers/AtmHelper.js b/src/main/webapp/app/mycontrollers/AtmHelper.js @@ -1,6 +1,6 @@ angular.module("AtmHelper", []) -/** Functions used for info about BTM */ +/** Functions used for info about ATM */ .controller('AtmHelperFuncs', ['$scope', function($scope) { $scope.timeRange = function(open, clos) { var openv = open.split(":"); @@ -37,13 +37,13 @@ angular.module("AtmHelper", []) $scope.imageAtm = function(marker, i) { if(marker) { - return "https://s3.amazonaws.com/assets-pyc/btm/"+marker.name+"/"+i+".jpg"; + return "https://s3.amazonaws.com/assets-pyc/atm/"+marker.name+"/"+i+".jpg"; } }; $scope.pageAtm = function(marker) { if(marker) { - return "/btm/"+marker.name; + return "/atm/"+marker.name; } }; diff --git a/src/main/webapp/btm.html b/src/main/webapp/atm.html diff --git a/src/main/webapp/find.html b/src/main/webapp/find.html @@ -1,3 +1,3 @@ <div data-lift="surround?with=base-wrap&at=content"> - <span data-lift="embed?what=/templates-hidden/parts/btm-map"></span> + <span data-lift="embed?what=/templates-hidden/parts/atm-map"></span> </div> \ No newline at end of file diff --git a/src/main/webapp/host.html b/src/main/webapp/host.html @@ -34,7 +34,7 @@ <div class="col-xs-12 col-sm-6 simple-form"> <span - data-lift="embed?what=/templates-hidden/parts/apply-btm-form"></span> + data-lift="embed?what=/templates-hidden/parts/apply-atm-form"></span> </div> </div> </div> diff --git a/src/main/webapp/how-to-use-btm.html b/src/main/webapp/how-to-use-btm.html @@ -1,3 +0,0 @@ -<div data-lift="surround?with=base-default&at=content"> - <h1>coming soon</h1> -</div> -\ No newline at end of file diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html @@ -41,7 +41,7 @@ </div> <div id="locations" class="row"><div class="col-xs-12"></div></div> - <span data-lift="embed?what=/templates-hidden/parts/btm-map"></span> + <span data-lift="embed?what=/templates-hidden/parts/atm-map"></span> </div> diff --git a/src/main/webapp/resources-hidden/_resources.html b/src/main/webapp/resources-hidden/_resources.html @@ -1,13 +1,13 @@ <resources> - <res name="Bitcoin Teller Machine Services">Bitcoin Teller Machine Services</res> - <res name="Find A BTM">Find A BTM</res> - <res name="Host A BTM">Host A BTM</res> + <res name="Bitcoin ATM Services">Bitcoin ATM Services</res> + <res name="Find An ATM">Find An ATM</res> + <res name="Host An ATM">Host An ATM</res> <res name="About">About</res> <res name="Team">Team</res> <res name="Press">Press</res> <res name="FAQs">FAQs</res> <res name="What Is Bitcoin">What Is Bitcoin</res> - <res name="How To Use BTM">How To Use BTM</res> + <res name="How To Use Bitcoin ATM">How To Use Bitcoin ATM</res> <res name="Register">Register</res> <res name="Login">Login</res> <res name="Password Recovery">Password Recovery</res> @@ -18,8 +18,8 @@ <res name="Purchase Limit">Purchase Limit</res> <res name="Verify ID">Verify ID</res> <res name="View Purchase Limits">View Purchase Limits</res> - <res name="BTM">BTM</res> - <res name="BTM Information">BTM Information</res> + <res name="ATM">ATM</res> + <res name="ATM Information">ATM Information</res> <res name="Error">Error</res> <res name="Contact">Contact</res> <res name="ID">ID</res> @@ -47,7 +47,7 @@ <res name="Register">Register</res> <res name="Reset_Password">Reset Password</res> <res name="Send_Message">Send Message</res> - <res name="Search_BTM">Search BTM</res> + <res name="Search_ATM">Search ATM</res> <res name="Showing_Local">Only showing local time</res> <res name="browse">Browse</res> <res name="business_name">Business Name</res> @@ -60,7 +60,7 @@ <res name="sms_code">SMS Code</res> <res name="send_sms_code">Send SMS Code</res> <res name="verify_number">Verify Number</res> - <res name="btm_notify">We will notify you when there is a BTM nearby.</res> + <res name="atm_notify">We will notify you when there is a Bitcoin ATM nearby.</res> <res name="invalid_website">Invalid Website URL</res> <res name="invalid_phone">Incomplete phone number</res> <res name="invalid_email">Invalid email address</res> diff --git a/src/main/webapp/resources-hidden/_resources_faqs.html b/src/main/webapp/resources-hidden/_resources_faqs.html @@ -1,7 +1,7 @@ <resources> <res name="q1">What is PYC?</res> <res name="a1"> - PYC is a BTM (Bitcoin Teller Machine) Service Operator. + PYC is a Bitcoin ATM Service Operator. We enable customers to retrieve bitcoin instantly, just as they retrieve cash from a bank ATM. </res> @@ -10,28 +10,28 @@ <res name="a2"> We established our first machine in Albany, NY on the 27th of June, 2014. Now we're expanding to other locations such as Manhattan, New Hampshire and New Jersey. - BTMs may soon be available near your hometown -- stay tuned. + Bitcoin ATMs may soon be available near your hometown -- stay tuned. </res> - <res name="q3">How can I find a BTM (Bitcoin Teller Machine)?</res> + <res name="q3">How can I find a Bitcoin ATM?</res> <res name="a3"> - You can easily <a href="/##locations">search for a BTM near your area</a>. + You can easily <a href="/find">search for a Bitcoin ATM near your area</a>. </res> <res name="q4">I'm a merchant. How can I put a machine in my store?</res> <res name="a4"> - If you're a merchant and interested in having us host a BTM in your establishment, + If you're a merchant and interested in having us host a Bitcoin ATM in your establishment, <a data-lift="Menu.item?name=Contact" href="#">contact us and we'll respond as soon as possible</a>. Please note, there is a selection process and we cannot guarantee all requests. </res> - <res name="q5">How long does the BTM take to transfer the bitcoin to my wallet?</res> + <res name="q5">How long does the Bitcoin ATM take to transfer the bitcoin to my wallet?</res> <res name="a5"> - The BTM takes a few seconds -- no more than a minute -- it is the + The Bitcoin ATM takes a few seconds -- no more than a minute -- it is the fastest and easiest way to retrieve bitcoin, hence our slogan. </res> - <res name="q6">How much money can I take out from the BTM?</res> + <res name="q6">How much money can I take out from the Bitcoin ATM?</res> <res name="a6"> At the moment, the maximum amount of money that can be taken out per transaction is 1,000 USD. We will soon be able to sell over a thousand shortly. diff --git a/src/main/webapp/resources-hidden/_resources_host.html b/src/main/webapp/resources-hidden/_resources_host.html @@ -1,15 +1,15 @@ <resources> - <res name="welcome_title">Are you a merchant? Apply for a BTM!</res> + <res name="welcome_title">Are you a merchant? Apply for a Bitcoin ATM!</res> <res name="welcome"> <p> Are you interested in hosting a - Bitcoin Teller Machine to increase foot traffic and spread the + Bitcoin ATM to increase foot traffic and spread the acceptance of Bitcoin? We are currently accepting merchant interest - for our next NYC and greater-NY area. Contact us for more + for our next location in the Northeast region. Contact us for more information. </p> </res> - <res name="apply_btm">Apply for A BTM</res> + <res name="apply_atm">Apply for A Bitcoin ATM</res> <res name="benefit_maintenance">Free installation and maintenance</res> <res name="benefit_emerging">Hot and new emerging technology</res> @@ -25,5 +25,5 @@ <res name="business_website_tip">The website URL of your business</res> <res name="business_bestTime_tip">Enter time of day and/or week you would like to be contacted</res> <res name="business_bestTime_example">Example: Saturday, 11am. Prefer phone call</res> - <res name="btm_app_received">BTM application for %s has been received.</res> + <res name="atm_app_received">Bitcoin ATM application for %s has been received.</res> </resources> \ No newline at end of file diff --git a/src/main/webapp/resources-hidden/_resources_index.html b/src/main/webapp/resources-hidden/_resources_index.html @@ -5,5 +5,5 @@ <res name="step4">SEND</res> <res name="step5">DONE</res> <res name="step6">BUY BITCOIN NOW</res> - <res name="view_locations_btn">View BTM Locations</res> + <res name="view_locations_btn">View Bitcoin ATM Locations</res> </resources> \ No newline at end of file diff --git a/src/main/webapp/resources-hidden/_resources_settings.html b/src/main/webapp/resources-hidden/_resources_settings.html @@ -1,10 +1,10 @@ <resources> <res name="Change_Email_Address">Change Email Address</res> <res name="verify_email_msg">An email has been sent for verification.</res> - <res name="purchase_verification_title">BTM Verification</res> + <res name="purchase_verification_title">Bitcoin ATM Verification</res> <res name="purchase_limit_note"> To take advantage of your {{ model.limit }} bitcoin purchase limit, - use these credentials to authenticate with the BTM. + use these credentials to authenticate with the Bitcoin ATM. This is a one-time password only. </res> </resources> \ No newline at end of file diff --git a/src/main/webapp/robots.txt b/src/main/webapp/robots.txt @@ -3,10 +3,6 @@ User-agent: * -# not yet implemented -Disallow: /what-is-bitcoin -Disallow: /how-to-use-btm - # we want them to follow through main page Disallow: /login Disallow: /register diff --git a/src/main/webapp/settings/admin/resources-hidden/_resources_verify.html b/src/main/webapp/settings/admin/resources-hidden/_resources_verify.html @@ -8,7 +8,7 @@ <res name="verify_already_exists">Identification entered already exists with another user account</res> <res name="verify_body_success_part1"> - To purchase large amounts of bitcoin from a store BTM, you will need to authenticate with the + To purchase large amounts of bitcoin from a store Bitcoin ATM, you will need to authenticate with the machine using a one-time password available in the </res> <res name="verify_body_success_part2"> diff --git a/src/main/webapp/templates-hidden/base-wrap.html b/src/main/webapp/templates-hidden/base-wrap.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> -<meta name="description" content="PYC is a BTM or Bitcoin Teller Machine Service Operator. We enable customers to retrieve bitcoin instantly, just as they retrieve cash from a bank ATM."> +<meta name="description" content="PYC is a Bitcoin ATM Service Operator. We enable customers to retrieve bitcoin instantly, just as they retrieve cash from a bank ATM."> <meta name="author" content="PYC"> <meta name="Copyright" content="Copyright PYC Inc 2014. All Rights Reserved."> <meta name="fragment" content="!" /> 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,88 @@ +<div data-lift="AtmApplication" ng-controller="AtmApplicationCtrl" ng-cloak> + <form name="form" class="smart-form client-form" ng-submit="save()" novalidate> + <fieldset> + <section> + <label class="input" ng-class="{{ stateSuccessError('name') }}"> + <i class="icon-append fa fa-briefcase"></i> + <input name="name" ng-model="model.name" data-lift="Placeholder?name=business_name" type="text" required> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_name_tip"></span>.</b> + </label> + </section> + + <section> + <label class="input" ng-class="{{ stateSuccessError('email') }}"> + <i class="icon-append fa fa-envelope-o"></i> + <input name="email" ng-model="model.email" data-lift="Placeholder?name=Email" type="email" required> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_email_tip"></span>.</b> + <span ng-show="form.email.$invalid && form.email.$dirty" class="text-danger small"> + <span data-lift="Loc.invalid_email"></span> + </span> + </label> + </section> + + <section> + <label class="input" ng-class="{{ stateSuccessError('phone') }}"> + <i class="icon-append fa fa-phone"></i> + <input name="phone" ng-model="model.phone" ui-mask="(999) 999-9999" placeholder="(xxx) xxx-xxxx" type="text" required> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.phone_tip"></span>.</b> + <span ng-show="form.phone.$invalid && form.phone.$dirty" class="text-danger small"> + <span data-lift="Loc.invalid_phone"></span> + </span> + </label> + </section> + + <section> + <label class="input" ng-class="{{ stateSuccessError('address') }}"> + <input name="address" ng-model="model.address" data-lift="Placeholder?name=address" type="text" required> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_address_tip"></span>.</b> + </label> + </section> + + <div class="row"> + <section class="col col-6"> + <label class="input" ng-class="{{ stateSuccessError('city') }}"> + <input name="city" ng-model="model.city" data-lift="Placeholder?name=city" type="text" required> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_city_tip"></span>.</b> + </label> + </section> + <section class="col col-6" ng-class="{{ stateSuccessError('state') }}"> + <label data-lift="Selector.states" class="select"> + <select name="state" ng-model="model.state" required></select> + <i></i> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_state_tip"></span>.</b> + </label> + </section> + </div> + + <section> + <label class="input" ng-class="{{ stateSuccessError('website') }}"> + <i class="icon-append fa fa-globe"></i> + <input name="website" ng-model="model.website" data-lift="Placeholder?name=website_url" type="text" ng-pattern="url_regex"> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_website_tip"></span>.</b> + <span ng-show="form.website.$error.pattern" class="text-danger small"> + <span data-lift="Loc.invalid_website"></span> + </span> + </label> + </section> + + <section> + <label class="textarea" ng-class="{{ stateSuccess('bestTime') }}"> + <i class="icon-append fa fa-comment"></i> + <textarea name="bestTime" ng-model="model.bestTime" + data-lift="Placeholder?name=best_time" rows="2"></textarea> + <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_bestTime_tip"></span>.</b> + </label> + <em><span data-lift="Loc.business_bestTime_example"></span>.</em> + </section> + + </fieldset> + + <footer> + <div ng-controller="AtmApplicationAlert" ng-cloak> + <span data-lift="embed?what=/templates-hidden/parts/alert"></span> + </div> + + <button type="submit" class="btn btn-primary" ng-disabled="form.$invalid" disabler ng-model="loading"><span data-lift="Loc.apply_atm"></span></button> + </footer> + </form> +</div> +\ No newline at end of file diff --git a/src/main/webapp/templates-hidden/parts/apply-btm-form.html b/src/main/webapp/templates-hidden/parts/apply-btm-form.html @@ -1,88 +0,0 @@ -<div data-lift="AtmApplication" ng-controller="AtmApplicationCtrl" ng-cloak> - <form name="form" class="smart-form client-form" ng-submit="save()" novalidate> - <fieldset> - <section> - <label class="input" ng-class="{{ stateSuccessError('name') }}"> - <i class="icon-append fa fa-briefcase"></i> - <input name="name" ng-model="model.name" data-lift="Placeholder?name=business_name" type="text" required> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_name_tip"></span>.</b> - </label> - </section> - - <section> - <label class="input" ng-class="{{ stateSuccessError('email') }}"> - <i class="icon-append fa fa-envelope-o"></i> - <input name="email" ng-model="model.email" data-lift="Placeholder?name=Email" type="email" required> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_email_tip"></span>.</b> - <span ng-show="form.email.$invalid && form.email.$dirty" class="text-danger small"> - <span data-lift="Loc.invalid_email"></span> - </span> - </label> - </section> - - <section> - <label class="input" ng-class="{{ stateSuccessError('phone') }}"> - <i class="icon-append fa fa-phone"></i> - <input name="phone" ng-model="model.phone" ui-mask="(999) 999-9999" placeholder="(xxx) xxx-xxxx" type="text" required> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.phone_tip"></span>.</b> - <span ng-show="form.phone.$invalid && form.phone.$dirty" class="text-danger small"> - <span data-lift="Loc.invalid_phone"></span> - </span> - </label> - </section> - - <section> - <label class="input" ng-class="{{ stateSuccessError('address') }}"> - <input name="address" ng-model="model.address" data-lift="Placeholder?name=address" type="text" required> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_address_tip"></span>.</b> - </label> - </section> - - <div class="row"> - <section class="col col-6"> - <label class="input" ng-class="{{ stateSuccessError('city') }}"> - <input name="city" ng-model="model.city" data-lift="Placeholder?name=city" type="text" required> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_city_tip"></span>.</b> - </label> - </section> - <section class="col col-6" ng-class="{{ stateSuccessError('state') }}"> - <label data-lift="Selector.states" class="select"> - <select name="state" ng-model="model.state" required></select> - <i></i> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_state_tip"></span>.</b> - </label> - </section> - </div> - - <section> - <label class="input" ng-class="{{ stateSuccessError('website') }}"> - <i class="icon-append fa fa-globe"></i> - <input name="website" ng-model="model.website" data-lift="Placeholder?name=website_url" type="text" ng-pattern="url_regex"> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_website_tip"></span>.</b> - <span ng-show="form.website.$error.pattern" class="text-danger small"> - <span data-lift="Loc.invalid_website"></span> - </span> - </label> - </section> - - <section> - <label class="textarea" ng-class="{{ stateSuccess('bestTime') }}"> - <i class="icon-append fa fa-comment"></i> - <textarea name="bestTime" ng-model="model.bestTime" - data-lift="Placeholder?name=best_time" rows="2"></textarea> - <b class="tooltip tooltip-top-left"><span data-lift="Loc.business_bestTime_tip"></span>.</b> - </label> - <em><span data-lift="Loc.business_bestTime_example"></span>.</em> - </section> - - </fieldset> - - <footer> - <div ng-controller="AtmApplicationAlert" ng-cloak> - <span data-lift="embed?what=/templates-hidden/parts/alert"></span> - </div> - - <button type="submit" class="btn btn-primary" ng-disabled="form.$invalid" disabler ng-model="loading"><span data-lift="Loc.apply_btm"></span></button> - </footer> - </form> -</div> -\ No newline at end of file diff --git a/src/main/webapp/templates-hidden/parts/atm-map.html b/src/main/webapp/templates-hidden/parts/atm-map.html @@ -0,0 +1,122 @@ + <div id="atm-map" data-lift="FindAtm" ng-controller="FindAtmCtrl" ng-class="{'nonfound': nonfound}" class="row fade-in two"> + <div class="col-xs-12"> + <div class="margin-xs-fix"> + + <div ng-show="nonfound" class="layer-info" ng-cloak> + <div class="row"> + <div class="col-xs-10 col-md-6 col-xs-offset-1 col-md-offset-0"> + <div id="coming-soon-msg" class="fade-in"> + <h1 class="text-white">We're Not There Yet ....</h1> + <p class="message text-white"> + But if you want us there, fill out your email address and + we'll be there. + </p> + </div> + </div> + <div class="col-md-12 visible-md visible-lg"></div> + <div class="col-xs-10 col-sm-4 col-md-6 col-xs-offset-1 col-sm-offset-4 col-md-offset-0"> + <span data-lift="embed?what=/templates-hidden/parts/notify-atm-form"></span> + </div> + </div> + </div> + + <div class="layer-overlay"> + <div ng-show="nonfound || !mapExpanded" class="layer-inner animate-showhide"></div> + </div> + + <div id="zoom-buttons"> + <button type="button" ng-click="zoomIn()" class="btn btn-default btn-sm btn-block">+</button> + <button type="button" ng-click="zoomOut()" class="btn btn-default btn-sm btn-block">-</button> + </div> + + <div class="map-panel" ng-cloak> + + <div class="well preview-box" ng-hide="currentMarker == null || !mapLoaded || nonfound" ng-click="gotoPageAtm(currentMarker)"> + <div class="row"> + <div class="col-xs-4 col-md-12 col-lg-4"> + + <div class="row"> + <div class="col-md-5 col-lg-12"> + <a href="{{ pageAtm(currentMarker) }}" target="_blank"> + <img class="img-thumbnail atm-profile" ng-src="{{ imageAtm(currentMarker,0) }}" /> + </a> + </div> + <div class="col-md-7 col-lg-12"> + <a href="{{ pageAtm(currentMarker) }}" target="_blank" class="atm-profile-name break-word nounderline"> + {{currentMarker.name}} + </a> + </div> + </div> + </div> + <div class="col-xs-8 col-md-12 col-lg-8 business-times padding-0"> + <table class="small"> + <tbody> + <tr ng-repeat="time in currentMarker.times" + ng-class="{'today': today() == $index}"> + <td>{{ day($index) }}</td> + <td>{{ timeRange(time.open, time.close) }}</td> + </tr> + </tbody> + </table> + <div class="note margin-top-10"><span data-lift="Loc.Showing_Local"></span>.</div> + </div> + + </div> + </div> + + <div class="well search-box" ng-hide="!mapLoaded"> + + <form name="form" ng-submit="search()" novalidate ng-cloak> + <div class="input-group"> + <input + required + class="form-control" + autofocus="true" + type="text" + name="address" + placeholder="{{ searchPlaceholder() }}" + ng-model="model.address" + ng-maxlength="100"></input> + + <div class="input-group-btn"> + <button class="btn btn-default btn-primary" type="submit" + ng-disabled="form.$invalid" disabler ng-model="loading"> + <i class="fa fa-search"></i> <span data-lift="Loc.Search_ATM"></span> + </button> + </div> + </div> + </form> + + </div> + </div> + + <google-map + ng-cloak + center="map.center" + pan="true" + zoom="map.zoom" + draggable="true" + refresh="'true'" + events="map.events" + options="{disableDefaultUI: true, scrollwheel: false}"> + + <marker ng-repeat="m in map.dynamicMarkers" coords="m.loc" click="m.onClicked()" icon="map.icon" options="{title: m.name}"> + <window show="m.showWindow" closeClick="m.closeClick()" options="map.infoWindow.options" ng-cloak> + <div> + <address> + <strong>{{m.name}}</strong><br> + {{m.address}}<br> + {{m.city}}, {{m.state}}<br> + <abbr title="Phone">P:</abbr> {{m.phone}}<br> + <a href="{{ pageAtm(m) }}" target="_blank">Click here for help</a><br> + <h6 class="store-status text-{{m.statusLevel}}">{{m.status}}</h6> + </address> + </div> + </window> + </marker> + + </google-map> + + </div> + </div> + </div> diff --git a/src/main/webapp/templates-hidden/parts/btm-map.html b/src/main/webapp/templates-hidden/parts/btm-map.html @@ -1,122 +0,0 @@ - <div id="atm-map" data-lift="FindAtm" ng-controller="FindAtmCtrl" ng-class="{'nonfound': nonfound}" class="row fade-in two"> - <div class="col-xs-12"> - <div class="margin-xs-fix"> - - <div ng-show="nonfound" class="layer-info" ng-cloak> - <div class="row"> - <div class="col-xs-10 col-md-6 col-xs-offset-1 col-md-offset-0"> - <div id="coming-soon-msg" class="fade-in"> - <h1 class="text-white">We're Not There Yet ....</h1> - <p class="message text-white"> - But if you want us there, fill out your email address and - we'll be there. - </p> - </div> - </div> - <div class="col-md-12 visible-md visible-lg"></div> - <div class="col-xs-10 col-sm-4 col-md-6 col-xs-offset-1 col-sm-offset-4 col-md-offset-0"> - <span data-lift="embed?what=/templates-hidden/parts/notify-btm-form"></span> - </div> - </div> - </div> - - <div class="layer-overlay"> - <div ng-show="nonfound || !mapExpanded" class="layer-inner animate-showhide"></div> - </div> - - <div id="zoom-buttons"> - <button type="button" ng-click="zoomIn()" class="btn btn-default btn-sm btn-block">+</button> - <button type="button" ng-click="zoomOut()" class="btn btn-default btn-sm btn-block">-</button> - </div> - - <div class="map-panel" ng-cloak> - - <div class="well preview-box" ng-hide="currentMarker == null || !mapLoaded || nonfound" ng-click="gotoPageAtm(currentMarker)"> - <div class="row"> - <div class="col-xs-4 col-md-12 col-lg-4"> - - <div class="row"> - <div class="col-md-5 col-lg-12"> - <a href="{{ pageAtm(currentMarker) }}" target="_blank"> - <img class="img-thumbnail atm-profile" ng-src="{{ imageAtm(currentMarker,0) }}" /> - </a> - </div> - <div class="col-md-7 col-lg-12"> - <a href="{{ pageAtm(currentMarker) }}" target="_blank" class="atm-profile-name break-word nounderline"> - {{currentMarker.name}} - </a> - </div> - </div> - </div> - <div class="col-xs-8 col-md-12 col-lg-8 business-times padding-0"> - <table class="small"> - <tbody> - <tr ng-repeat="time in currentMarker.times" - ng-class="{'today': today() == $index}"> - <td>{{ day($index) }}</td> - <td>{{ timeRange(time.open, time.close) }}</td> - </tr> - </tbody> - </table> - <div class="note margin-top-10"><span data-lift="Loc.Showing_Local"></span>.</div> - </div> - - </div> - </div> - - <div class="well search-box" ng-hide="!mapLoaded"> - - <form name="form" ng-submit="search()" novalidate ng-cloak> - <div class="input-group"> - <input - required - class="form-control" - autofocus="true" - type="text" - name="address" - placeholder="{{ searchPlaceholder() }}" - ng-model="model.address" - ng-maxlength="100"></input> - - <div class="input-group-btn"> - <button class="btn btn-default btn-primary" type="submit" - ng-disabled="form.$invalid" disabler ng-model="loading"> - <i class="fa fa-search"></i> <span data-lift="Loc.Search_BTM"></span> - </button> - </div> - </div> - </form> - - </div> - </div> - - <google-map - ng-cloak - center="map.center" - pan="true" - zoom="map.zoom" - draggable="true" - refresh="'true'" - events="map.events" - options="{disableDefaultUI: true, scrollwheel: false}"> - - <marker ng-repeat="m in map.dynamicMarkers" coords="m.loc" click="m.onClicked()" icon="map.icon" options="{title: m.name}"> - <window show="m.showWindow" closeClick="m.closeClick()" options="map.infoWindow.options" ng-cloak> - <div> - <address> - <strong>{{m.name}}</strong><br> - {{m.address}}<br> - {{m.city}}, {{m.state}}<br> - <abbr title="Phone">P:</abbr> {{m.phone}}<br> - <a href="{{ pageAtm(m) }}" target="_blank">Click here for help</a><br> - <h6 class="store-status text-{{m.statusLevel}}">{{m.status}}</h6> - </address> - </div> - </window> - </marker> - - </google-map> - - </div> - </div> - </div> diff --git a/src/main/webapp/templates-hidden/parts/contact-form.html b/src/main/webapp/templates-hidden/parts/contact-form.html @@ -36,7 +36,7 @@ <select name="reason" ng-model="model.reason"> <option value="General Question">General Question</span></option> <option value="Press Inquiry">Press Inquiry</option> - <option value="Interested in hosting a BTM">Interested in hosting a BTM</option> + <option value="Interested in hosting a Bitcoin ATM">Interested in hosting a Bitcoin ATM</option> </select> <i></i> <b class="tooltip tooltip-top-left"><span data-lift="Loc.contact_reason_tip"></span>.</b> diff --git a/src/main/webapp/templates-hidden/parts/notify-btm-form.html b/src/main/webapp/templates-hidden/parts/notify-atm-form.html diff --git a/src/main/webapp/what-is-bitcoin.html b/src/main/webapp/what-is-bitcoin.html @@ -1,3 +0,0 @@ -<div data-lift="surround?with=base-default&at=content"> - <h1>coming soon</h1> -</div> -\ No newline at end of file