From: Bharat M. <bh...@us...> - 2003-08-08 05:20:21
|
Update of /cvsroot/gallery/gallery2/modules/core/templates In directory sc8-pr-cvs1:/tmp/cvs-serv15789/templates Modified Files: Tag: BRANCH_dev_new_ui UserPreferences.tpl Added Files: Tag: BRANCH_dev_new_ui UserAdmin.tpl UserAdminHead.tpl Log Message: Created the concept of a "User Admin" section where modules can register views that can be used for user administration, like changing account settings or passwords. Other modules can use this to manage their own user-related settings. Refactored the change-password functionality out of UserPreferences and into UserChangePassword, then made both of them work with UserAdmin. --- NEW FILE --- {gallery->pathbar} {gallery->pathbaritem} {gallery->text text="Your Account"} {/gallery->pathbaritem} » {gallery->pathbaritem} {gallery->text text=$user.fullName|default:$user.userName} {/gallery->pathbaritem} {/gallery->pathbar} {gallery->main} {gallery->sidebar1} {gallery->sidebarbox} {gallery->sidebarboxtitle} {gallery->text text="User Options"} {/gallery->sidebarboxtitle} {gallery->sidebarboxbody} {gallery->listing} {foreach from=$subViewChoices item=choice} {if ($subViewName == $choice.view)} {gallery->listingselecteditem} {$choice.name} {/gallery->listingselecteditem} {else} {gallery->listingitem} {gallery->link url_view='core:UserAdmin' url_subView=$choice.view} {$choice.name} {/gallery->link} {/gallery->listingitem} {/if} {/foreach} {/gallery->listing} {/gallery->sidebarboxbody} {/gallery->sidebarbox} {gallery->sidebarbox} {gallery->sidebarboxtitle} {gallery->text text="Navigation"} {/gallery->sidebarboxtitle} {gallery->sidebarboxbody} {gallery->listing} {gallery->listingitem} {gallery->link} {gallery->text text="Browse Gallery"} {/gallery->link} {/gallery->listingitem} {/gallery->listing} {/gallery->sidebarboxbody} {/gallery->sidebarbox} {/gallery->sidebar1} {$subViewHtml} {/gallery->main} --- NEW FILE --- <title> {gallery->text text="Gallery User Administration"} </title> {gallery->style} Index: UserPreferences.tpl =================================================================== RCS file: /cvsroot/gallery/gallery2/modules/core/templates/UserPreferences.tpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- UserPreferences.tpl 13 Jul 2003 22:47:03 -0000 1.1 +++ UserPreferences.tpl 8 Aug 2003 05:20:15 -0000 1.1.2.1 @@ -1,140 +1,82 @@ - {gallery->form controller="$controller"} - {gallery->input type="hidden" name="form.formName"}AdminEditUser{/gallery->input} - - <!-- Embed the hidden return fields --> - {foreach from=$return key=key item=value} - {gallery->input type="hidden" name=return.$key}{$value}{/gallery->input} - {/foreach} - - <table width="100%" border="0" cellspacing="3" cellpadding="3"> - - <tr> - <td align="center" colspan="2"> - {gallery->bigFontSize} - {gallery->text text="Edit your preferences"} - {/gallery->bigFontSize} - </td> - </tr> - - <tr> - <td align="right" width="40%"> - {gallery->text text="Username"} - </td> - <td width="60%"> - {$user.userName} - </td> - </tr> - - <tr> - <td align="right"> - {gallery->text text="Full name"} - </td> - <td> - {gallery->input type="text" name="form.fullName"}{$form.fullName}{/gallery->input} - {gallery->warningFontColor} - {gallery->text text="[required]"} - {/gallery->warningFontColor} - </td> - </tr> - - <!-- {if isset($form.error.fullName.missing)} --> - <tr> - <td> - - </td> - <td> - {gallery->errorFontColor} - {gallery->text text="You must enter a name"} - {/gallery->errorFontColor} - </td> - </tr> - <!-- {/if} --> - - <tr> - <td align="right"> - {gallery->text text="Email address"} - </td> - <td> - {gallery->input type="text" name="form.email"}{$form.email}{/gallery->input} - {gallery->warningFontColor} - {gallery->text text="[required]"} - {/gallery->warningFontColor} - </td> - </tr> - - <!-- {if isset($form.error.email.missing)} --> - <tr> - <td> - - </td> - <td> - {gallery->errorFontColor} - {gallery->text text="You must enter an email address"} - {/gallery->errorFontColor} - </td> - </tr> - <!-- {/if} --> - - <tr> - <td align="right"> - {gallery->text text="Language"} - </td> - <td> - {gallery->select name="form.language"} - {html_options options=$languageList selected=$form.language} - {/gallery->select} - </td> - </tr> - - <tr> - <td colspan="2" align="right"> - - </td> - </tr> - - <tr> - <td rowspan="2" align="right"> - {gallery->text text="Enter a new password twice to change passwords, or leave it blank to leave password unchanged."} - </td> - <td> - {gallery->input type="password" name="form.password1"}{/gallery->input} - {gallery->warningFontColor} - {gallery->text text="[required]"} - {/gallery->warningFontColor} - </td> - </tr> - - <tr> - <td> - {gallery->input type="password" name="form.password2"}{/gallery->input} - {gallery->warningFontColor} - {gallery->text text="[required]"} - {/gallery->warningFontColor} - </td> - </tr> - - <!-- {if isset($form.error.password.mismatch)} --> - <tr> - <td> - - </td> - <td> - {gallery->errorFontColor} - {gallery->text text="The passwords you entered did not match"} - {/gallery->errorFontColor} - </td> - </tr> - <!-- {/if} --> - - <tr> - <td align="center" colspan="2"> - {gallery->input type="submit" name="form.action.save"}{gallery->text text="Save"}{/gallery->input} - {gallery->input type="submit" name="form.action.undo"}{gallery->text text="Undo"}{/gallery->input} - {gallery->input type="submit" name="form.action.cancel"}{gallery->text text="Cancel"}{/gallery->input} - </td> - </tr> - - </table> - {/gallery->form} - - \ No newline at end of file +{gallery->mainbody1} + {gallery->form action_controller="$controller"} + {gallery->input type="hidden" name="form.formName"}UserPreferences{/gallery->input} + + {gallery->maintitle1} + {gallery->text text="Account Settings"} + {/gallery->maintitle1} + + {if isset($status)} + {gallery->detailedbox} + {gallery->detailedboxbody} + {gallery->status} + {if isset($status.saved)} + {gallery->text text="Account settings saved successfully"} + {/if} + {/gallery->status} + {/gallery->detailedboxbody} + {/gallery->detailedbox} + {/if} + + {gallery->detailedbox} + {gallery->detailedboxbody} + {gallery->widget2set} + {gallery->widget2} + {gallery->widget2title} + {gallery->text text="Username"} + {/gallery->widget2title} + {gallery->widget2body} + {$user.userName} + {/gallery->widget2body} + {/gallery->widget2} + + {gallery->widget2} + {gallery->widget2title} + {gallery->text text="Full name"} + {/gallery->widget2title} + {gallery->widget2body} + {gallery->input type="text" name="form.fullName"}{$form.fullName}{/gallery->input} + {/gallery->widget2body} + {/gallery->widget2} + + {gallery->widget2} + {gallery->widget2title} + {gallery->text text="Email address"} + {gallery->textmodifier1} + {gallery->text text="required"} + {/gallery->textmodifier1} + {/gallery->widget2title} + {gallery->widget2body} + {gallery->input type="text" name="form.email"}{$form.email}{/gallery->input} + {if isset($form.error.email.missing)} + {gallery->error} + {gallery->text text="You must enter an email address"} + {/gallery->error} + {/if} + {/gallery->widget2body} + {/gallery->widget2} + + {gallery->widget2} + {gallery->widget2title} + {gallery->text text="Language"} + {/gallery->widget2title} + {gallery->widget2body} + {gallery->select name="form.language"} + {html_options options=$languageList selected=$form.language} + {/gallery->select} + {/gallery->widget2body} + {/gallery->widget2} + + {gallery->widget2} + {gallery->widget2body} + {gallery->input type="submit" name="form.action.save"}{gallery->text text="Save"}{/gallery->input} + {gallery->input type="submit" name="form.action.undo"}{gallery->text text="Undo"}{/gallery->input} + {gallery->input type="submit" name="form.action.cancel"}{gallery->text text="Cancel"}{/gallery->input} + {/gallery->widget2body} + {/gallery->widget2} + + {/gallery->widget2set} + {/gallery->detailedboxbody} + {/gallery->detailedbox} + {/gallery->form} +{/gallery->mainbody1} |