litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-22 18:47:44 +00:00
parent fa77c80a91
commit a82411b2f0
13 changed files with 256 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/js/imageUpload/cropImage.js
View file

@ -9,9 +9,13 @@
onSelect: showPreview,
setSelect: [ 0, 0, 115, 115 ],
minSize: [ 115, 115 ],
boxWidth: 450,
aspectRatio: 1
});
var bounds = jcrop_api.getBounds();
var boundx = bounds[0];

7
webapp/web/js/imageUpload/imageUploadUtils.js
View file

@ -2,13 +2,12 @@
$(document).ready(function(){
// upload form is hidden by default; use JavaScript to reveal
$("#photoUploadContainer").removeClass("hidden");
// Confirmation alert for photo deletion
$('a.thumbnail').click(function(){
var answer = confirm('Are you sure you want to delete your photo?');
return answer;
});
});
});

1
webapp/web/js/login/loginUtils.js
View file

@ -9,4 +9,3 @@ $(document).ready(function(){
$('.focus').focus();
});

11
webapp/web/js/login/loginUtils.js.merge-left.r5323 Normal file
View file

@ -0,0 +1,11 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
$(document).ready(function(){
// login form is hidden by default; use JavaScript to reveal
$("#formLogin").removeClass("hidden");
// focus on email or newpassword field
$('.focus').focus();
});

28
webapp/web/js/login/loginUtils.js.merge-right.r5325 Normal file
View file

@ -0,0 +1,28 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
$(document).ready(function(){
// login form is hidden by default; use JavaScript to reveal
$("#formLogin").removeClass("hidden");
// focus on email or newpassword field
$('.focus').focus();
});
//The above code for revealing the login form doesn't work IE 6 or 7. The code below fix the problem
var Browser = {
Version: function() {
var version;
if (navigator.appVersion.indexOf("MSIE") != -1)
version = parseFloat(navigator.appVersion.split("MSIE")[1]);
return version;
}
}
if (Browser.Version() <= 7) {
document.getElementById('formLogin').style.display = 'block';
}

12
webapp/web/js/login/loginUtils.js.working Normal file
View file

@ -0,0 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
$(document).ready(function(){
// login form is hidden by default; use JavaScript to reveal
$("#formLogin").removeClass("hidden");
// focus on email or newpassword field
$('.focus').focus();
});