pyc-website
main website for pyc inc.
git clone https://9o.is/git/pyc-website.git
commit 7c88ac56f66df2130d1de1df924ee02ee0c6531c parent c258e68a1a1a3f14cb5de34b9e09b9cdd02b09ed Author: Jul <jul@9o.is> Date: Sat, 8 Mar 2014 23:26:14 -0500 ui enhancements for initial release Diffstat:
| M | src/main/scala/com/pyd/config/Site.scala | | | 13 | +++++++------ |
| M | src/main/scala/com/pyd/model/AtmApplication.scala | | | 4 | +++- |
| M | src/main/scala/com/pyd/snippet/ApplyAtmScreen.scala | | | 17 | +++++++++++++---- |
| M | src/main/webapp/404.html | | | 2 | +- |
| M | src/main/webapp/about.html | | | 2 | +- |
| M | src/main/webapp/apply-atm.html | | | 81 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ |
| D | src/main/webapp/contact.html | | | 17 | ----------------- |
| M | src/main/webapp/faqs.html | | | 56 | +++++++++++++++++++++++++++++++++++++++++--------------- |
| M | src/main/webapp/less/custom.less | | | 10 | +++------- |
| M | src/main/webapp/less/overrides.less | | | 280 | ++++++++++++++++++++++++++++++------------------------------------------------- |
| M | src/main/webapp/less/variables.less | | | 11 | +++++++++-- |
| A | src/main/webapp/locations.html | | | 152 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | src/main/webapp/templates-hidden/default.html | | | 2 | +- |
| M | src/main/webapp/templates-hidden/parts/footer.html | | | 2 | +- |
14 files changed, 408 insertions(+), 241 deletions(-)
diff --git a/src/main/scala/com/pyd/config/Site.scala b/src/main/scala/com/pyd/config/Site.scala @@ -26,12 +26,12 @@ object Site extends Locs { import MenuGroups._ // locations (for top group) - val home = MenuLoc(Menu.i("Home") / "index" /*>> EarlyResponse(() => Full(RedirectResponse(applyATM.url)))*/) + val home = MenuLoc(Menu.i("Home") / "index" >> EarlyResponse(() => Full(RedirectResponse(applyATM.url)))) val applyATM = MenuLoc(Menu.i("Apply for Bitcoin ATM") / "apply-atm" >> TopBarGroup) - val about = MenuLoc(Menu.i("About") / "about" >> TopBarGroup) - val blog = MenuLoc(Menu.i("Blog") / "blog" >> TopBarGroup >> EarlyResponse(() => Full(RedirectResponse("http://blog."+S.hostName)))) + val locations = MenuLoc(Menu.i("Locations") / "locations" >> TopBarGroup) + val about = MenuLoc(Menu.i("About Us") / "about" >> TopBarGroup) + //val blog = MenuLoc(Menu.i("Blog") / "blog" >> TopBarGroup >> EarlyResponse(() => Full(RedirectResponse("http://blog."+S.hostName)))) val faqs = MenuLoc(Menu.i("FAQs") / "faqs" >> TopBarGroup) - val contact = MenuLoc(Menu.i("Contact Us") / "contact" >> TopBarGroup) val loginToken = MenuLoc(buildLoginTokenMenu) val logout = MenuLoc(buildLogoutMenu) @@ -49,10 +49,11 @@ object Site extends Locs { private def menus = List( home.menu, applyATM.menu, + locations.menu, about.menu, - blog.menu, + // blog under construction + //blog.menu, faqs.menu, - contact.menu, //Menu.i("Login") / "login" >> RequireNotLoggedIn, //register.menu, //loginToken.menu, diff --git a/src/main/scala/com/pyd/model/AtmApplication.scala b/src/main/scala/com/pyd/model/AtmApplication.scala @@ -3,17 +3,19 @@ package model import field.USStatesField import lib.RogueMetaRecord - import net.liftweb._ import mongodb.record._ import mongodb.record.field._ import util._ import record.field._ import common._ +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" diff --git a/src/main/scala/com/pyd/snippet/ApplyAtmScreen.scala b/src/main/scala/com/pyd/snippet/ApplyAtmScreen.scala @@ -3,12 +3,16 @@ package snippet import model.AtmApplication import config.Site -import net.liftweb.http._ +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) } @@ -19,7 +23,12 @@ object ApplyAtmScreen extends BaseApplyAtmScreen { def finish() { applicationVar.is.save - S.notice("Your Bitcoin ATM application has been received." + - "We will review and contact you for further information. Thank you for applying.") + 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/webapp/404.html b/src/main/webapp/404.html @@ -1,3 +1,3 @@ <div data-lift="surround?with=default;at=content"> - <p style="font-size: 1.2em;">We're sorry but the page you are trying to access does not exist. (404)</p> + <p style="font-size: 1.2em;">We're sorry but the page you are trying to access does not exist.</p> </div> diff --git a/src/main/webapp/about.html b/src/main/webapp/about.html @@ -47,7 +47,7 @@ - <div class="row"> + <div data-lift="ignore" class="row"> <div class="ourteam-box col-xs-12 col-sm-4 col-md-4 col-lg-4"> <img src="" /> <h2 class="name">Emilio Pagan-Yourno</h2> diff --git a/src/main/webapp/apply-atm.html b/src/main/webapp/apply-atm.html @@ -1,19 +1,55 @@ -<div data-lift="surround?with=base-wrap;at=content"> +<div data-lift="surround?with=default;at=content"> <div data-lift="Notices"></div> <div id="apply-atm" class="row no-gutter"> <div class="col-xs-12 col-sm-7 col-md-8 col-lg-8"> - <div class="row bg-primary-gradient"> + <div class="row"> <div id="atm-intro" class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> - <div class="big-text-cinzel text-white">Cash to <i class="fa fa-btc"></i>itcoin</div> - </div> - </div> - - <div class="row bg-white" style="border-radius:3px"> - <div id="atm-sub-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> <h1 class="semibig-text text-primary"> Are you a merchant? Apply for a Bitcoin ATM! <br/> - <small>Fill out the form to the right and we'll contact you shortly.</small> + <small>Fill out the form and we'll contact you shortly.</small> </h1> </div> </div> @@ -40,12 +76,33 @@ </table> </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"> + <h1>What is Bitcoin?</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> </div> - <div id="atm-application" class="col-xs-12 col-sm-5 col-md-4 col-lg-4 bg-primary-gradient" > - <div class="well well-lg"> - <div data-lift="ApplyAtmScreen"></div> + <div id="atm-application" class="col-xs-12 col-sm-5 col-md-4 col-lg-4" > + <div 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> + </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> + </div> </div> + </div> </div> </div> \ No newline at end of file diff --git a/src/main/webapp/contact.html b/src/main/webapp/contact.html @@ -1,16 +0,0 @@ -<div data-lift="surround?with=default;at=content"> - -<address> - <strong>PYD LLC</strong><br> - 795 Folsom Ave, Suite 600<br> - San Francisco, CA 94107<br> - <abbr title="Phone">P:</abbr> (123) 456-7890 -</address> - -<address> - <strong>Full Name</strong><br> - <a href="mailto:#">first.last@example.com</a> -</address> - - -</div> -\ No newline at end of file diff --git a/src/main/webapp/faqs.html b/src/main/webapp/faqs.html @@ -1,20 +1,46 @@ <div data-lift="surround?with=default;at=content"> -<style> - ol li { - margin: 10px 0; - } - .list-unstyled { - margin-left: 20px; - } -</style> - <ol> - <li><strong>Question #1 goes here</strong></li> - <ul class="list-unstyled"> - <li>Answer to question #1</li> - </ul> - <li><strong>Question #2 goes here</strong></li> - </ol> +<div id="faqs" class="row"> + <div data-lift="ignore" class="col-xs-12 col-sm-8 col-md-8 col-lg-8"> + <ul> + <li><h3>1. What is bitcoin?</h3></li> + <ul> + <li>Answer to question #1</li> + </ul> + + <li><h3>2. Why do we believe in bitcoin?</h3></li> + <ul> + <li>Answer to question #1</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> + </ul> + </div> + + <div id="contact-info" class="col-xs-12 col-sm-4 col-md-4 col-lg-4"> + <address> + <strong>PYD INC</strong><br> + 341 Raven Circle<br> + Kent County, Wyoming, DE 19934<br> + <abbr title="Phone">P:</abbr> +1 (518) 441-0233 + </address> + + <address> + <strong>Emilio Pagan-Yourno</strong><br> + <a href="mailto:info@pydcoin.com">info@pydcoin.com</a> + </address> + </div> +</div> + + </div> \ No newline at end of file diff --git a/src/main/webapp/less/custom.less b/src/main/webapp/less/custom.less @@ -42,17 +42,15 @@ .semibig-text { font-size: @font-size-h1 * 1.5; - margin: 20px 0; } .big-text { font-size: @font-size-h1 * 2; - margin: 20px 0; + font-weight: 900; } .big-text-cinzel { - //font-family: @font-family-big-base; - font-weight: 900; + font-family: @font-family-big-base; .big-text(); } @@ -86,9 +84,7 @@ } .bg-primary-gradient { - // gradient from bootswatch spacelab inverse - //background-image: linear-gradient(@brand-primary, rgb(68, 110, 155) 50%, rgb(109, 148, 191)) - + .bg-primary(); #gradient > .radial(rgb(68, 110, 155), @brand-primary) } diff --git a/src/main/webapp/less/overrides.less b/src/main/webapp/less/overrides.less @@ -1,4 +1,4 @@ -//need to override just oe ortwo small stylistic things and don't want to edit the main .less files? Add those overrides here +//need to override just oe orwo small stylistic things and don't want to edit the main .less files? Add those overrides here body { overflow: auto; @@ -83,249 +83,183 @@ body { } } -.smart-form.colored-form { - background-color: @brand-primary; - & > *, label { - background: none; - color: @white; - font-weight: 400; - } - header { - border-bottom: 1px solid rgba(255,255,255, 0.1); - } - - fieldset { - padding-top: 5px; - padding-bottom: 5px; - } - - footer { - border-top: 1px solid rgba(255,255,255, 0.1); - padding-top: 0; - padding-bottom: 5px; +// Collapse to full width when xs-device is found +// ex. class="col-xs-6 xxs-collapse col-sm-6" +.xxs-collapse { + @media (max-width: @screen-xs) { + width: 100%; } } -#merchant-signup { - padding-left: 0; - z-index: 20; - - form { - padding: 10px; - margin-bottom: @line-height-computed; +.sales-box, .ourteam-box { + h2 { + color: @brand-primary; + font-weight: 400; } } -@big-pane-min-height: 330px; +#ourteam { -#big-tabs-outer { - @media (min-width: @screen-md) { - margin-top: -60px; - } + .ourteam-box { + img { + width: 70%; + margin-left: 15%; + } - padding-right: 0; + .name, .title { + text-align: center; + } - // override: keep big tabs horizontals until xs, not sm device. - #big-tabs { - @media (min-width: @screen-xs-min) { - > li { - display: table-cell; - width: 1%; - > a { - margin-bottom: 0; - } - } - } + p { + margin-top: 20px; + } } - #big-tabs > li > a { - padding-top: 15px; - padding-bottom: 15px; - font-size: 16px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; + .row.ourstory { + p { + font-size: 15px; + } + img { + width: 100%; + } } } -#big-pane-outer { - @media (min-width: @screen-md) { - margin-top: -30px; - } - @media (max-width: @screen-sm-max) { - margin-top: -30px; +.main-content > .page-header { + padding-left: 5px; + padding-right: 5px; +} + +#apply-atm { + div[id^="atm-"] { + padding-left: 30px; + padding-right: 30px; } - min-height: @big-pane-min-height; - border: 2px solid @nav-link-hover-bg; - border-top: 0; - - .tab-content { - .tab-pane { - padding: 30px; - } + #atm-benefits { + padding-top: 30px; + padding-bottom: 30px; + td { height: 70px; } } - .nj-map-pic { - width: 100%; + #atm-application { + .bg-primary-gradient(); + padding-left: 15px; + padding-right: 15px; + .box-shadow(0px 1px 1px rgb(236, 236, 236)); + border-radius: 3px; - @media (min-width: @screen-lg) { - height: @big-pane-min-height; + .page-content { + color: @white; + } + } + + #atm-bitcoin-video { + iframe { + width: 100%; + height: 300px; + } + } +} + +#atm-locations { + #map-canvas { + @media (max-width: @screen-lg) { + height: 400px; } @media (max-width: @screen-md-max) { - height: @big-pane-min-height; + height: 500px; } @media (max-width: @screen-sm-max) { - height: 460px; + height: 600px; } - background: url('http://maps.googleapis.com/maps/api/staticmap?center=40.778202,-74.122381&zoom=12&size=2000x460&sensor=false') no-repeat center center fixed; - .background-size(cover); + @media (max-width: @screen-xs-max) { + height: 700px; + } + height: 400px; + } + + .layer-outer { + padding: 10px; + } - .layer { - #gradient > .horizontal-three-colors(rgba(0,0,0,0.4), rgba(0,0,0,0.3), 50%, rgba(0,0,0,0.4)); + .layer { + #gradient > .horizontal-three-colors(rgba(0,0,0,0.6), rgba(0,0,0,0.3), 50%, rgba(0,0,0,0.6)); position: absolute; top: 0; left: 0; width: 100%; height: 100%; + z-index: @gmap-overlay-zindex; } - } +} + +#atms-coming-soon { + position: absolute; + z-index: @gmap-text-overlay-zindex; + margin: 0; - @margin-spacing: 100px; @title-font-size: 50px; - @message-font-size: 18px; + @message-font-size: 20px; - h1 { - color: @white; - + h1 { @media (max-width: @screen-xs) { font-size: @title-font-size * 0.75; + padding: 5px; } @media (min-width: @screen-xs) { font-size: @title-font-size; - } - - @media (min-width: @screen-md) { - //margin-top: @margin-spacing; - //margin-left: @margin-spacing; + padding: 20px; } } - p { - @media (min-width: @screen-md) { - //margin-left: @margin-spacing; - } - - &.message { + p.message { @media (max-width: @screen-xs){ font-size: @message-font-size * 0.85; + padding: 5px; } @media (min-width: @screen-xs) { font-size: @message-font-size; + padding: 20px; } - } - } - - #find-atms p { - color: @white; - } - - #merchant-deals h1 { - color: @brand-primary; - } - - #merchant-deals p span { - color: @brand-warning; } .right-content { - @media (min-width: @screen-lg) { - padding: 5px; - } - - @media (max-width: @screen-md-max) { - padding: 20px; - } - } -} - -// Collapse to full width when xs-device is found -// ex. class="col-xs-6 xxs-collapse col-sm-6" -.xxs-collapse { - @media (max-width: @screen-xs) { - width: 100%; + padding: 25px; } } -.sales-box, .ourteam-box { - h2 { - color: @brand-primary; - font-weight: 400; +#faqs { + ol li { + margin: 10px 0; } - - p { - + ul { + .list-unstyled(); + margin-left: 20px; } -} - -#ourteam { - - .ourteam-box { - img { - width: 70%; - margin-left: 15%; - } - .name, .title { - text-align: center; + #contact-info { + @media (max-width: @screen-xs) { + .text-center(); } - - p { + + @media (max-width: @screen-sm) { margin-top: 20px; + margin-left: 20px; } } - - .row.ourstory { - p { - font-size: 15px; - } - img { - width: 100%; - } - } -} - -.main-content > .page-header { - padding-left: 5px; - padding-right: 5px; } -body { - //background: url("http://subtlepatterns.com/patterns/fresh_snow.png") repeat scroll 0% 0% transparent; - background: url("/img/mybg.png") repeat scroll 0% 0% transparent; - //background: url("https://bitpay.com/img/bg.png") repeat scroll 0% 0% transparent; -} - -#apply-atm { - div[id^="atm-"] { - padding: 30px; - } - - #atm-intro, #atm-sub-intro { - padding-top: 0; - padding-bottom: 0; - } - - #atm-benefits { - td { height: 70px; } - } +#content.container { + .box-shadow(0 3px 5px 6px #ccc); } .alert ul { diff --git a/src/main/webapp/less/variables.less b/src/main/webapp/less/variables.less @@ -1,4 +1,4 @@ -// +/// // Variables // -------------------------------------------------- @@ -64,7 +64,7 @@ // Scaffolding // ------------------------- -@body-bg: #fff; +@body-bg: @white; @text-color: @gray-dark; // Links @@ -800,3 +800,10 @@ @table-header-color-start: #f2f2f2; @table-header-color-end: #fafafa; + + + +//-------------CUSTOMS + +@gmap-overlay-zindex: 500; +@gmap-text-overlay-zindex: 520; diff --git a/src/main/webapp/locations.html b/src/main/webapp/locations.html @@ -0,0 +1,151 @@ +<div data-lift="surround?with=base-wrap;at=content"> + <lift:head> + <style type="text/css"> + #content { padding: 10px !important; } + </style> + </lift:head> + + <div data-lift="Notices"></div> + + <div id="atm-locations"> + <div class="outer-layer"><div class="layer"></div></div> + + <div id="atms-coming-soon" class="row"> + <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6"> + <h1 class="text-white">ATMs Coming Soon</h1> + <p class="message text-white"> + Fill the form to get notified when an ATM comes to your home town. + </p> + </div> + + <div id="notify-form-outer" 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-3"> + <label class="select"> <select name="state"> + <option value="0" selected="" disabled="ST"></option> + <option value="1">AL</option> + <option value="2">AK</option> + <option value="3">AZ</option> + <option value="4">AR</option> + <option value="5">CA</option> + <option value="6">CO</option> + <option value="7">CT</option> + <option value="8">DE</option> + <option value="9">FL</option> + <option value="10">GA</option> + <option value="11">HI</option> + <option value="12">ID</option> + <option value="13">IL</option> + <option value="14">IN</option> + <option value="15">IA</option> + <option value="16">KS</option> + <option value="17">KY</option> + <option value="18">LA</option> + <option value="19">ME</option> + <option value="20">MD</option> + <option value="21">MA</option> + <option value="22">MI</option> + <option value="23">MN</option> + <option value="24">MS</option> + <option value="25">MO</option> + <option value="26">MT</option> + <option value="27">NE</option> + <option value="28">NV</option> + <option value="29">NH</option> + <option value="30">NJ</option> + <option value="31">NM</option> + <option value="32">NY</option> + <option value="33">NC</option> + <option value="34">ND</option> + <option value="35">OH</option> + <option value="36">OK</option> + <option value="37">OR</option> + <option value="38">PA</option> + <option value="39">RI</option> + <option value="40">SC</option> + <option value="41">SD</option> + <option value="42">TN</option> + <option value="43">TX</option> + <option value="44">UT</option> + <option value="45">VT</option> + <option value="46">VA</option> + <option value="47">WA</option> + <option value="48">WV</option> + <option value="49">WI</option> + <option value="50">WY</option> + </select> + </label> + </section> + + + </div> + </fieldset> + + <footer> + <button type="submit" class="btn btn-primary">Notify + Me</button> + </footer> + </form> + </div> + <!-- end of form --> + </div> + + <div id="map-canvas"></div> + </div> + + + <script data-lift="tail" type="text/javascript" + src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAehyKUHOOWL_plRJCW8R1EdCIKCfR9jkg&sensor=true"> + </script> + <script data-lift="tail" type="text/javascript"> + function initialize() { + var mapOptions = { + zoom: 12, + center: new google.maps.LatLng(40.778202,-74.122381), + disableDefaultUI: true + } + + var map = new google.maps.Map(document.getElementById("map-canvas"), + mapOptions); + } + google.maps.event.addDomListener(window, 'load', initialize); + </script> +</div> +\ No newline at end of file diff --git a/src/main/webapp/templates-hidden/default.html b/src/main/webapp/templates-hidden/default.html @@ -7,7 +7,7 @@ <h1> <span data-lift="Menu.title"></span> <div style="display:none; float:right;" id="ajax-spinner"> - <img src="/img/spinner.gif" width="16" height="16"/> + <i class="fa fa-spinner fa-spin"></i> </div> </h1> </div> 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 LLC 2014</p> + <p>© PYD INC 2014</p> </footer>