Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#95 allow user to choose timezone #104

Merged
merged 7 commits into from
Sep 14, 2015
Merged

#95 allow user to choose timezone #104

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9de28ef
#95: add timezone to user
jmiranda Sep 14, 2015
9a54c14
#95: set default timezone on session after user authentication and af…
jmiranda Sep 14, 2015
1d6f12a
#95: allow user to change timezone preference on signup and when edit…
jmiranda Sep 14, 2015
5c76200
fixed minor sorting bug on user list page
jmiranda Sep 14, 2015
c3c0146
disabled SQL logging in development
jmiranda Sep 14, 2015
8a214fa
#95: override default formatDate taglib to use timezone if available
jmiranda Sep 14, 2015
931854b
added cache directories and slack notifications to travis-ci
jmiranda Sep 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#95: allow user to change timezone preference on signup and when edit… 
…ing an account
  • Loading branch information
@jmiranda
jmiranda committed Sep 14, 2015
commit 1d6f12a0f61bf7684563ae2e458c82ecfe5b14c0
75 changes: 38 additions & 37 deletions grails-app/views/auth/signup.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,30 @@
</g:hasErrors>

<div id="loginBox" class="box">

<h2>
<img src="${createLinkTo(dir:'images/icons/silk',file:'lock.png')}" class="middle"/> Signup for an account
</h2>
<table>
<tbody>
<tr class="">
<td>

<tr class="prop">
<td colspan="2">
<warehouse:message code="auth.alreadyHaveAccount.text"/>
<g:link class="list" controller="auth" action="login">
<warehouse:message code="auth.login.label" default="Login"/>
</g:link>
</td>

</tr>
<tr class="">

<tr class="prop">
<td class="name middle right">
<label for="email"><warehouse:message code="user.email.label" default="Email" /></label>
</td>
<td class="value ${hasErrors(bean: userInstance, field: 'email', 'errors')}">
<g:textField name="email" value="${userInstance?.email}" class="text" size="40"/>
</td>
</tr>
<tr class="">
<tr class="prop">
<td class="name middle right" width="35%">
<label for="firstName"><warehouse:message code="user.firstName.label" default="First Name" /></label>
</td>
Expand All @@ -55,7 +59,7 @@
</td>
</tr>

<tr class="">
<tr class="prop">
<td class="name middle right">
<label for="lastName"><warehouse:message code="user.lastName.label" default="Last Name" /></label>
</td>
Expand All @@ -64,20 +68,29 @@
</td>
</tr>

<tr class="">
<td class="middle right">
<label for="locale"><warehouse:message code="default.locale.label"/></label>
</td>
<td class="value ${hasErrors(bean: userInstance, field: 'locale', 'errors')}">
<div style="width: 235px">
<g:select name="locale" from="${ grailsApplication.config.openboxes.locale.supportedLocales.collect{ new Locale(it) } }"
optionValue="displayName" value="${userInstance?.locale}" noSelection="['':'']" class="chzn-select-deselect"/>
</div>
</td>
</tr>
<tr class="prop">
<td class="name middle right">
<label for="locale"><warehouse:message code="default.locale.label"/></label>
</td>
<td class="value ${hasErrors(bean: userInstance, field: 'locale', 'errors')}">
<div style="width: 235px">
<g:select name="locale" from="${ grailsApplication.config.openboxes.locale.supportedLocales.collect{ new Locale(it) } }"
optionValue="displayName" value="${userInstance?.locale}" noSelection="['':'']" class="chzn-select-deselect"/>
</div>
</td>
</tr>
<tr class="prop">
<td valign="top" class="name">
<label for="locale"><warehouse:message
code="default.timezone.label" default="Timezone" /></label></td>
<td valign="top" class="value">
<g:select id="timezone" name="timezone" from="${TimeZone.getAvailableIDs().sort()}"
noSelection="['':'']" value="${userInstance?.timezone}" class="chzn-select-deselect"/>
</td>
</tr>

<tr class="">
<td class="middle right">
<tr class="prop">
<td class="name middle right">
<label for="username"><warehouse:message code="user.username.label" default="Username" /></label>
</td>
<td class="${hasErrors(bean: userInstance, field: 'username', 'errors')}">
Expand All @@ -86,7 +99,7 @@
</tr>


<tr class="">
<tr class="prop">
<td class="name middle right">
<label for="password"><warehouse:message code="user.password.label" default="Password" /></label>
</td>
Expand All @@ -95,35 +108,23 @@
</td>
</tr>

<tr class="">
<td class="middle right">
<tr class="prop">
<td class="name middle right">
<label for="passwordConfirm"><warehouse:message code="user.confirmPassword.label" default="Confirm Password" /></label>
</td>
<td class="value ${hasErrors(bean: userInstance, field: 'passwordConfirm', 'errors')}">
<g:passwordField name="passwordConfirm" value="${userInstance?.passwordConfirm}" class="text" size="40" />
</td>
</tr>
<tr class="">
<tr class="prop">
<td class="middle right"></td>
<td valign="top">
<button type="submit" class="button icon approve">
<warehouse:message code="auth.signup.label"/>
</button>



</td>
</tr>
<tr class="prop">
<td colspan="2">
<warehouse:message code="auth.alreadyHaveAccount.text"/>
<g:link class="list" controller="auth" action="login">
<warehouse:message code="auth.login.label" default="Login"/>
</g:link>
</td>

</tr>
</tbody>
</tbody>
</table>
</div>

Expand Down
15 changes: 6 additions & 9 deletions grails-app/views/user/edit.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,16 @@
optionValue="displayName" value="${userInstance?.locale}" noSelection="['null':'']" class="chzn-select-deselect"/>
</td>
</tr>
<%--
<tr class="prop">
<td valign="top" class="name"><warehouse:message
code="default.timezone.label" default="Timezone" /></td>
<td valign="top" class="name">
<label for="locale"><warehouse:message
code="default.timezone.label" default="Timezone" /></label></td>
<td valign="top" class="value">
${session?.timezone?.ID}
${session?.timezone?.displayName}

<g:timeZoneSelect name="myTimeZone" value="" />
<g:select id="timezone" name="timezone" from="${TimeZone.getAvailableIDs().sort()}"
noSelection="['':'']"
value="${userInstance?.timezone}" class="chzn-select-deselect"/>
</td>
</tr>
--%>

</tbody>
</table>
</div>
Expand Down
3 changes: 1 addition & 2 deletions grails-app/views/user/show.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@
<td valign="top" class="name"><label><warehouse:message
code="default.timezone.label" default="Timezone" /></label></td>
<td valign="top" class="value">
${session?.timezone?.ID}
${session?.timezone?.displayName}
${userInstance?.timezone}
</td>
</tr>
<tr class="prop">
Expand Down