From 258515014a6e737eb7218610fbc5946b04b1d665 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Sat, 31 Jan 2015 17:32:43 -0800 Subject: [PATCH] edit profile button if logged in and looking at own profile, and update a CDN --- views/account/account.jade | 3 +-- views/account/show.jade | 3 +++ views/layout.jade | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/views/account/account.jade b/views/account/account.jade index 465c4fcb15..05d68eb9b0 100644 --- a/views/account/account.jade +++ b/views/account/account.jade @@ -254,8 +254,7 @@ block content .form-group label.col-sm-3.col-sm-offset-2.control-label(for='website3Image') Image Link (4:3 ratio) .col-sm-4 -<<<<<<< HEAD - input.form-control(type='url', name='website3Image', id='website3Image', autocomplete="off", ng-model='user.portfolio.website3Image', placeholder='http://www.example.com/image.jpg', ng-pattern="/[\.](jpg|png|jpeg|gif)?$/") + input.form-control(type='url', name='website3Image', id='website3Image', autocomplete="off", ng-model='user.portfolio.website3Image', placeholder='http://www.example.com/image.jpg', ng-pattern='/[\.](jpg|png|jpeg|gif)(\s+)?$/') .col-sm-4.col-sm-offset-5(ng-show="profileForm.website3Image.$error.url && !profileForm.website3Image.$pristine") alert(type='danger') span.ion-close-circled diff --git a/views/account/show.jade b/views/account/show.jade index ff5c9e3ffe..cae103557f 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -33,6 +33,9 @@ block content h3.flat-top.bolded.wrappable= location h4.flat-top.wrappable= bio .col-xs-12.col-sm-12.col-md-3.text-center + if (user && user.profile.username === username) + a.btn.btn-warning(href="/account") Edit my Profile + .background-svg.img-center .points-on-top = "[ " + points + " ]" diff --git a/views/layout.jade b/views/layout.jade index d9cbb7bd0a..83ef4770e8 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -2,7 +2,7 @@ doctype html html(ng-app='profileValidation', lang='en') head script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") - script(src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js") + script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css')