From 179d2b80d4f706a9b7c48fe64e491f47b9e42c82 Mon Sep 17 00:00:00 2001 From: manolobevia Date: Tue, 28 Jun 2011 12:15:51 +0000 Subject: [PATCH] NIHVIVO-2280: Created account.css in VITRO, and moved some wilma specific styles to VIVO. Tweaked styles in general for all account templates and rganized images related to account management. --- webapp/web/css/account/account.css | 152 ++++++++++++++++++ webapp/web/images/account/sort-asc.gif | Bin 0 -> 262 bytes webapp/web/images/account/sort-desc.gif | Bin 0 -> 264 bytes .../body/accounts/userAccounts-add.ftl | 3 +- .../accounts/userAccounts-createPassword.ftl | 1 + .../body/accounts/userAccounts-edit.ftl | 1 + .../userAccounts-firstTimeExternal.ftl | 5 +- .../body/accounts/userAccounts-list.ftl | 4 +- .../body/accounts/userAccounts-myAccount.ftl | 1 + .../accounts/userAccounts-resetPassword.ftl | 1 + 10 files changed, 163 insertions(+), 5 deletions(-) create mode 100644 webapp/web/css/account/account.css create mode 100644 webapp/web/images/account/sort-asc.gif create mode 100644 webapp/web/images/account/sort-desc.gif diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css new file mode 100644 index 000000000..0af6660cf --- /dev/null +++ b/webapp/web/css/account/account.css @@ -0,0 +1,152 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/* -------------------------------------------------> */ +/* ACCOUNT PAGE ------------------------------------> */ +/* -------------------------------------------------> */ +.account-feedback p { + line-height: 1.5em; + border: 1px dotted #E2C822; + background-color: #FFF9D7; + padding: .5em; + margin-bottom: 20px; +} +table#account { + table-layout: auto; + width: 930px; + text-align: left; + margin: 0 auto; + border-collapse: collapse; + empty-cells: show; + caption-side: top; + margin: 20px 0 20px 0; +} +table#account caption { + display: none; +} +table#account th { + background-color: #F7F9F9; + height: 40px; + color: #064D68; + padding-top: 7px; + border: 1px solid #d9e4ea; + border-bottom: none; + padding-left: 6px; +} +table#account td { + vertical-align: top; + padding: .5em; + border: 1px solid #d9e4ea; + font-size: .9em; +} +table#account tr { + background-color: #fff; +} +table#account tr:nth-child(2n+1) { + background-color: rgba(200, 200, 180,.25); +} +#filter-roles { + float: left; + padding-bottom: 20px; +} +#search-accounts { + float: right; + height: 60px; +} +.account-alpha-browse { + width: 10px; + height: 22px; + float: right; + padding-right: 10px; +} +.sort-asc { + width: 9px; + height:10px; + padding-top: 4px; + background: url(../../images/account/sort-asc.gif) 0 4px no-repeat; + display: block; +} +.sort-desc { + width: 9px; + height:10px; + padding-bottom: 4px; + background: url(../../images/account/sort-desc.gif) 0 4px no-repeat; + display: block; +} +.accounts { + clear: left; + height: 60px; + border-top: 1px dotted #e1e5e7; + padding-top: 0; + border-bottom: 1px dotted #e1e5e7; + padding-bottom: 0; + width: 100%; +} +section.accounts .delete-account{ + float: left; + margin-top: 10px; +} +.display-tools { + float: left; + font-size: .875em; +} +.hide { + display: none; +} +.accounts-per-page-form { + display: inline-block; +} +nav.alpha-browse-account { + width: 20px; + border: 1px solid green; + width: 18px; + height: 12px; +} +nav.alpha-browse-account a { + margin: 0; + padding: 0; +} +/* ADD ACCOUNTS ------> */ +form.customForm #reset-password { + margin-top: 20px; + margin-left: 0; +} +form.customForm p.note { + padding-bottom: 20px; + padding-top: 5px; +} +#add-account p.note { + margin-top: 20px; + width: 400px; +} +#add-account input[type="text"], +#create-account input[type="text"], +#edit-account input[type="text"], +#my-account input[type="text"], +#my-account input[type="password"] { + width: 20em; +} +/* CREATE PASSWORD ------> */ +#create-password p.note { + margin-top: 0; +} +/* EDIT ACCOUNT ------> */ +#edit-account p.note { + margin-top: 3px; + width: 400px; +} +/* MY ACCOUNT ------> */ +#my-account p.note { + padding-bottom: 10px; + width: 400px; +} +#my-account input#email-address, +#my-account input#new-password { + margin-bottom: 0; +} +section.account-feedback img { +padding-right: 5px; +} +/* RESET PASSWORD ------> */ +#reset-password p.note { + margin-top: 0; +} \ No newline at end of file diff --git a/webapp/web/images/account/sort-asc.gif b/webapp/web/images/account/sort-asc.gif new file mode 100644 index 0000000000000000000000000000000000000000..906b7573c0c348f62a90088b62ea314feca8f33b GIT binary patch literal 262 zcmZ?wbhEHbzbP4l9T`c|Ia`hp!k!8k%2*pK?h_!$WIJx$_^6^HZI`k kZ<_F_IYq;nHO*CWN5vGr?jog28itE}pWS%T(Zpa40GfSb5&!@I literal 0 HcmV?d00001 diff --git a/webapp/web/images/account/sort-desc.gif b/webapp/web/images/account/sort-desc.gif new file mode 100644 index 0000000000000000000000000000000000000000..dcc043eb5f952802efa7a66c718e5ed6a856a681 GIT binary patch literal 264 zcmZ?wbhEHbzbP4l9T`c|Ia`hp!k!8k%2*pK?h_!$WIJxst$q66}8gL llzcRn2>MPFJASE{Q%8G|f1+d(M_1%Kah*jvLJt%etN|8fUg-b; literal 0 HcmV?d00001 diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl index 5013f2bfa..13ccc3009 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl @@ -65,7 +65,7 @@ - +

Roles *

@@ -107,4 +107,5 @@ +${stylesheets.add('')} ${stylesheets.add('')} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl index 9c1f93f5c..46551ca32 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl @@ -43,4 +43,5 @@ +${stylesheets.add('')} ${stylesheets.add('')} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl index 2117e3b5e..a1ee51358 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl @@ -114,4 +114,5 @@ +${stylesheets.add('')} ${stylesheets.add('')} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl index fed4e4486..c77af6dc5 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl @@ -33,9 +33,7 @@
-

- Please provide your contact information to finish creating your account. -

+

Please provide your contact information to finish creating your account.

@@ -62,4 +60,5 @@
+${stylesheets.add('')} ${stylesheets.add('')} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl index 87fcc51f9..ec41c3e1c 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl @@ -82,7 +82,7 @@ - + Email Address