Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
Choose a Head Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
  • 1 commit
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 03, 2014
RawKStar77 RawKStar77
RawKStar77 and RawKStar77
Update delete account UI to no longer use window.confirm. Format dele…
…te account text and add a confirm password step.
Showing with 37 additions and 16 deletions.
  1. +1 −0 AUTHORS
  2. +11 −11 h/js/directives.coffee
  3. +25 −5 h/templates/accountmanagement.html
View
@@ -7,3 +7,4 @@ Jehan Tremback <jehan@hypothes.is>
Randall Leeds <tilgovi@hypothes.is>
Kristof Csillag <csillag@hypothes.is>
Gergely Ujvari <ujvari@hypothes.is>
Jake Hartnell <jakehartnell@hypothes.is>
View
@@ -512,18 +512,18 @@ accountManagement = ->
# Checks to see if email is duplicate.
return
controller: ($scope, $rootScope, $filter, $element) ->
$scope.deleteAccount = ->
r = window.confirm "Are you sure you want to delete your account? Deleting an account is irreversible.
If you have contributed to public conversations that others have replied to we will not delete your
individual annotations. If you want to delete your annotations, you must do so before deleting your
account, and you must delete each annotation individually, by hand. Deleting an annotation does not
delete replies to that annotation, it creates a blank stub that replies are still attached to."
if r
return
$scope.confirmDelete = false
$scope.toggleConfirmDelete = ->
$scope.confirmDelete = !$scope.confirmDelete
$scope.deleteAcount = (form) ->
# If the password is correct, the account is deleted.
# The extension is then removed from the page.
# Confirmation of success is given.
alert("Account deleted.")
$scope.submit = (form) ->
console.log form
# Handles submitting of the form.
# Handles submitting of the form.
# Jake's Note: there is an addional piece of UI I would like to implement. The basic idea being
# to give some visual indication that the changes they have made have been applied successfully.
@@ -549,7 +549,7 @@ accountProfile = ->
name : "Jake Hartnell"
password : "password"
location : "Berkeley, CA"
bio : "Science Fiction Writer currently working as a Product designer and frontend engineer at Hypothes.is."
bio : "A short bio..."
website : "http://jakehartnell.com"
gravatar : ""
restrict: 'C'
@@ -1,6 +1,5 @@
<!-- Account -->
<form name="edit_profile"
ng-show="activePanel.name == 'Account'"
ng-show="activePanel.name == 'Account' && !confirmDelete"
novalidate>
<h2>Change Email</h2>
@@ -36,7 +35,7 @@ <h2>Change Email</h2>
</form>
<form name="changepassword"
ng-show="activePanel.name == 'Account'"
ng-show="activePanel.name == 'Account' && !confirmDelete"
novalidate>
<h2>Change Password</h2>
@@ -68,6 +67,27 @@ <h2>Change Password</h2>
</span>
<button class="btn check-icon" ng-click="submit(changepassword)" ng-disabled="!changepassword.$valid">Save</button>
<a class="pull-right" href="" ng-click="deleteAccount()">Delete account</a>
</form>
<!-- / Account -->
<form name="deleteaccount"
ng-show="activePanel.name == 'Account'"
novalidate>
<h2>Delete Account</h2>
<button class="btn" ng-click="toggleConfirmDelete()" ng-hide="confirmDelete">Delete account</button>
<div ng-show="confirmDelete">
<p>Deleting an account is irreversible. If you have contributed to public conversations that others have replied to we will not delete your individual annotations.</p>
<p><em>If you want to delete your annotations, you must do so before deleting your account</em>, and you must delete each annotation individually, by hand. Deleting an annotation does not delete replies to that annotation, it creates a blank stub that replies are still attached to.</p>
<p>Are you sure you want to delete your account? Please enter your password to confirm:</p>
<input class="fullwidth" type="password" name="password" ng-model="model.password" placeholder="Password" required autocapitalize="false" >
<span slow-validate="password">
<span ng-show="deleteaccount.password.$error.minlength"
>Your password does not match the one we have on record.</span>
</span>
<br />
<button class="btn" ng-click="deleteAccount()" ng-disabled="!deleteaccount.$valid">Delete account</button>
<button class="btn" ng-click="toggleConfirmDelete()">Cancel</button>
</div>
</form>

No commit comments for this range