diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css new file mode 100644 index 000000000..1e8664796 --- /dev/null +++ b/webapp/web/css/login.css @@ -0,0 +1,182 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/* styles for log in */ +#formLogin{ + width:600px; + padding:0px; + margin:0px; + text-align:left; + background-color:#FFF; + + +} + +.noOutterBox{ + width:340px; + padding:0px; + border: none; + margin:0px; + + +} + +#formLogin h2 { +font-size:1.3em; +line-height:1em; +margin-top:0px; +margin-bottom:1em; +color:#111; +} + + +#formLogin h6 { +font-size:1.2em; +line-height:1em; +margin-top:0px; +margin-bottom:1em; +color:#111; +} + +#formLogin form { +margin: 0; +padding: 0; + +} + +#formLogin label{ +display:block; +margin-bottom:0.5em; +font-weight:bold; + + +} + +#formLogin label span{ +color:#900; + + +} + +#formLogin input{ +display:block; +margin-bottom:1.5em; +width: 200px; + +} +#formLogin textarea{ +width: 300px; +display:block; +margin-bottom:1.5em; + + +} + +#formLogin .checkBox{ +display:inline; +width:1em; +margin-bottom: 1em; + +} +#formLogin p.small{ + font-size: 0.8em; + +} + + + +#formLogin input.submit{ + + width: auto; + padding: 0 0.9em; + display:inline; + +} + +.requestAccount{ + padding: 1em 0 0 2em; + margin-bottom:0; +} + +.requestAccountNoOutterBox{ + padding: 1em 0 0 0; + margin-bottom:0; +} + +#errorAlert{ + color:#900; + padding:0px; + margin-bottom:5px; + + height:30px; + +} + + +#errorAlert img{ + float:left; + margin:0; + padding:0; + vertical-align:middle; + + +} + +#errorAlert p{ +padding-left:35px; +font-size:0.9em; +line-height:30px; + +} + + +##confirmationAlert { + color:#169f43; + padding:0px; + margin-bottom:5px; + + height:30px; + +} + + +##confirmationAlert img{ + float:left; + margin:0; + padding:0; + vertical-align:middle; + + +} + +#confirmationAlert p{ +padding-left:30px; +font-size:0.9em; +line-height:30px; + +} + +.formFieldAlert{ + border:2px solid #900; +} + +.red{ +color:#900; +} + +/* In IE6/7, .hidden defined in screen.css doesn't override + * display: inline-block defined for #adminDashboard .pageBodyGroup, + * so define again with context selector here. + */ +#adminDashboard .pageBodyGroup.hidden { + display: none !important; +} + +p.passwordNote{ +margin:0; +padding:0; +margin-top:-8px; +font-size:0.8em; +color:#615e5e; +} + + diff --git a/webapp/web/js/imageUpload/cropImage.js b/webapp/web/js/imageUpload/cropImage.js index b1d1b9843..659017f72 100644 --- a/webapp/web/js/imageUpload/cropImage.js +++ b/webapp/web/js/imageUpload/cropImage.js @@ -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]; diff --git a/webapp/web/js/imageUpload/imageUploadUtils.js b/webapp/web/js/imageUpload/imageUploadUtils.js index 286970b45..ef5d5295c 100644 --- a/webapp/web/js/imageUpload/imageUploadUtils.js +++ b/webapp/web/js/imageUpload/imageUploadUtils.js @@ -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; }); -}); \ No newline at end of file +}); + + diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js index 76117467e..946adf807 100644 --- a/webapp/web/js/login/loginUtils.js +++ b/webapp/web/js/login/loginUtils.js @@ -9,4 +9,3 @@ $(document).ready(function(){ $('.focus').focus(); }); - diff --git a/webapp/web/js/login/loginUtils.js.merge-left.r5323 b/webapp/web/js/login/loginUtils.js.merge-left.r5323 new file mode 100644 index 000000000..946adf807 --- /dev/null +++ b/webapp/web/js/login/loginUtils.js.merge-left.r5323 @@ -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(); + +}); diff --git a/webapp/web/js/login/loginUtils.js.merge-right.r5325 b/webapp/web/js/login/loginUtils.js.merge-right.r5325 new file mode 100644 index 000000000..67d998f9e --- /dev/null +++ b/webapp/web/js/login/loginUtils.js.merge-right.r5325 @@ -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'; +} + + diff --git a/webapp/web/js/login/loginUtils.js.working b/webapp/web/js/login/loginUtils.js.working new file mode 100644 index 000000000..76117467e --- /dev/null +++ b/webapp/web/js/login/loginUtils.js.working @@ -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(); + +}); + diff --git a/webapp/web/siteAdmin/siteAdminHeadContent.jsp b/webapp/web/siteAdmin/siteAdminHeadContent.jsp index ab2700bad..cee7517ac 100644 --- a/webapp/web/siteAdmin/siteAdminHeadContent.jsp +++ b/webapp/web/siteAdmin/siteAdminHeadContent.jsp @@ -8,8 +8,8 @@ - + - - \ No newline at end of file + + \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl index 0dd6cc75a..f216d7239 100644 --- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl +++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl @@ -16,11 +16,11 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")} the script below will reduce the width to 500 pixels and the height will be in proportion to the new height--> -<#macro newImageSize> +<#--<#macro newImageSize> <#if (imageWidth >= 500)> width="500" height="${(500*imageHeight)/imageWidth}" - +-->
@@ -47,7 +47,7 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
- id="cropbox" /> + --> id="cropbox" />
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl index c9be46884..e1c138e2c 100644 --- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl +++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl @@ -10,19 +10,9 @@ ${scripts.add("/js/imageUpload/imageUploadUtils.js")} ${stylesheets.addFromTheme("/uploadImages.css")} - - - - diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl index f41074972..c3178b1ca 100644 --- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl +++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl @@ -27,7 +27,9 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
- or Cancel + + or + Cancel
diff --git a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl index b83d18fb2..bde909170 100644 --- a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl +++ b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl @@ -3,7 +3,7 @@ <#-- Log in template for accessing site admin --> -
+

Create Your New Password

<#if errorMessage??> diff --git a/webapp/web/templates/freemarker/body/login/login-form.ftl b/webapp/web/templates/freemarker/body/login/login-form.ftl index 823bd0726..e965209fc 100644 --- a/webapp/web/templates/freemarker/body/login/login-form.ftl +++ b/webapp/web/templates/freemarker/body/login/login-form.ftl @@ -11,7 +11,7 @@
-