FluxBB.org

Changeset 724

Show
Ignore:
Timestamp:
11/11/08 03:37:13 (2 months ago)
Author:
Paul
Message:

See note to r.719
A further update of the profile language file will be necessary when the profile page is committed.

Location:
fluxbb/branches/fluxbb-1.3-dev/upload
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/profile.php

    r659 r724  
    6161// About and Identity sections 
    6262'Users profile'                         =>      '%s\'s profile', 
     63'Your profile'                          =>      'Your profile', 
    6364'Section about'                         =>      'Introduction', 
    6465'Profile welcome'                       =>      'Welcome to your profile', 
    … …  
    206207'No new regs'                           =>      'This forum is not accepting new registrations.', 
    207208'Reg cancel redirect'           =>      'Registration cancelled. Redirecting 
', 
    208 'Agreement'                                     =>      'Agreement:', 
     209'Agreement'                                     =>      'Agreement', 
    209210'Agreement label'                       =>      'I agree to the rules set out above and wish to register.', 
    210211'Agree'                                         =>      'Agree', 
    … …  
    220221'Register errors'                       =>      '<strong>Warning!</strong> The following errors must be corrected before you can register:', 
    221222'E-mail info'                           =>      '<strong>Important!</strong> An e-mail will be sent to your new address with an activation link. You must click the link in the e-mail you receive to activate the new address. You must therefore ensure that you enter a valid and current e-mail address.', 
    222 'Reg e-mail info'                       =>      '<strong>Important!</strong> An e-mail with an activation link will be sent to the address you provide. You must click the link in the e-mail in order to activate your new account. You must therefore ensure that you enter a valid and current e-mail address.', 
    223223'Register at'                           =>      'Register at %s', 
    224 'Register intro'                        =>      'Registration enables you to use features not available when browsing the board as a guest. The fields below only make up a small part of all the settings you can alter in your profile. If you have any questions regarding this forum you should ask an administrator. Please complete the form below in order to register.', 
    225 'Username'                                      =>      'Username:', 
     224'Register intro'                        =>      'To register and enjoy all the features the board has to offer, please complete the form below.', 
     225'Username'                                      =>      'Username', 
    226226'Username help'                         =>      'Between 2 and 25 characters.', 
    227 'Password'                                      =>      'Password:', 
     227'Password'                                      =>      'Password', 
    228228'Password help'                         =>      'Minimum 4 characters. Case sensitive.', 
    229 'Confirm password'                      =>      'Confirm password:', 
     229'Confirm password'                      =>      'Confirm password', 
    230230'Confirm password help'         =>      'Re-enter your password exactly as before.', 
    231 'E-mail'                                        =>      'E-mail:', 
    232 'E-mail help'                           =>      'A current valid e-mail address.', 
    233 'Confirm e-mail'                        =>      'Confirm e-mail:', 
     231'E-mail'                                        =>      'E-mail address', 
     232'E-mail help'                           =>      'Enter a current valid e-mail address.', 
     233'E-mail activation help'        =>      'Enter a current valid e-mail address. An e-mail with an activation link will be sent to this address. You must click the link in the e-mail in order to activate your new account.', 
     234'Confirm e-mail'                        =>      'Confirm e-mail', 
    234235'Confirm e-mail help'           =>      'Re-enter your e-mail address exactly as before.', 
    235236'Optional legend'                       =>      'Optional settings', 
    236237'Language'                                      =>      'Language', 
    237 'Timezone'                                      =>      'Your timezone:', 
    238 'Adjust for DST'                        =>      'Adjust for DST:', 
     238'Timezone'                                      =>      'Your timezone', 
     239'Timezone help'                         =>      'You need to set your timezone for the board to function correctly. You can change it later via your profile.', 
     240'Adjust for DST'                        =>      'Adjust for DST', 
    239241'DST label'                                     =>      'Daylight savings is in effect (advance times by 1 hour).', 
    240 'E-mail settings'                       =>      'E-mail settings:', 
     242'E-mail settings'                       =>      'E-mail settings', 
    241243'E-mail setting 1'                      =>      'Display your e-mail address to other users.', 
    242244'E-mail setting 2'                      =>      'Hide your e-mail address but allow e-mail via the forum.', 
    243245'E-mail setting 3'                      =>      'Hide your e-mail address and disallow e-mail via the forum.', 
    244 'Reg rules head'                        =>      'You must agree to the forum rules set out below in order to register.', 
     246'Reg rules head'                        =>      'You must agree to the forum rules in order to register.', 
    245247'Register'                                      =>      'Register', // Registration button text 
    246248 

  • fluxbb/branches/fluxbb-1.3-dev/upload/register.php

    r703 r724  
    210210        ); 
    211211 
     212        // Setup main heading 
     213        $forum_page['main_hd'] = end($forum_page['crumbs']); 
     214 
    212215        ($hook = get_hook('rg_rules_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 
    213216 
    … …  
    220223        ($hook = get_hook('rg_rules_output_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 
    221224 
    222         $forum_page['set_count'] = $forum_page['fld_count'] = 0; 
    223  
    224 ?> 
    225         <div class="main-subhead"> 
    226                 <h2 class="hn"><span><?php echo $lang_profile['Reg rules head'] ?></span></h2> 
    227         </div> 
    228         <div class="main-content main-frm"> 
     225        // Setup form 
     226        $forum_page['fld_count'] = 0; 
     227 
     228?> 
     229        <div class="content"> 
     230                <div class="section section-1 data"> 
     231                        <div class="section-hd"> 
     232                                <h2 class="hn"><span><?php echo $lang_profile['Reg rules head'] ?></span></h2> 
     233                        </div> 
     234                        <div class="user-box"> 
     235                                <?php echo $forum_config['o_rules_message']."\n" ?> 
     236                        </div> 
     237                </div> 
     238                <div class="section datafrm"> 
     239                <form method="get" accept-charset="utf-8" action="<?php echo $base_url ?>/register.php"> 
     240 
    229241<?php 
    230242 
    … …  
    239251 
    240252?> 
    241                 <div class="ct-box error-box"> 
    242                         <h2 class="hn"><span><?php echo $lang_profile['Register errors'] ?></span></h2> 
    243                         <ul> 
    244                                 <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?> 
    245                         </ul> 
    246                 </div> 
     253                        <div class="error-box"> 
     254                                <h2 class="hn"><span><?php echo $lang_profile['Register errors'] ?></span></h2> 
     255                                <ul> 
     256                                        <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?> 
     257                                </ul> 
     258                        </div> 
    247259<?php 
    248260 
    … …  
    250262 
    251263?> 
    252                 <div class="ct-box user-box"> 
    253                         <?php echo $forum_config['o_rules_message']."\n" ?> 
    254                 </div> 
    255                 <form class="frm-form" method="get" accept-charset="utf-8" action="<?php echo $base_url ?>/register.php"> 
    256264<?php ($hook = get_hook('rg_rules_pre_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    257                         <div class="frm-group group<?php echo ++$forum_page['group_count'] ?>"> 
     265                        <div class="frm-group frm-group-<?php echo ++$forum_page['group_count'] ?>"> 
    258266<?php ($hook = get_hook('rg_rules_pre_agree_checkbox')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    259                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     267                                <div class="sf-set frm-set frm-set-<?php echo ++$forum_page['item_count'] ?>"> 
    260268                                        <div class="sf-box checkbox"> 
    261269                                                <span class="fld-input"><input type="checkbox" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="req_agreement" value="1" /></span> 
    262                                                 <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Agreement'] ?></span> <?php echo $lang_profile['Agreement label'] ?></label> 
     270                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Agreement'] ?></span> <br /><small><?php echo $lang_profile['Agreement label'] ?></small></label> 
    263271                                        </div> 
    264272                                </div> 
    … …  
    267275<?php ($hook = get_hook('rg_rules_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    268276                        <div class="frm-buttons"> 
    269                                 <span class="submit"><input type="submit" name="agree" value="<?php echo $lang_profile['Agree'] ?>" /></span> 
    270                                 <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span> 
     277                                <p><span class="submit"><input type="submit" name="agree" value="<?php echo $lang_profile['Agree'] ?>" /></span> <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span></p> 
    271278                        </div> 
    272279                </form> 
     280                </div> 
    273281        </div> 
    274282<?php 
    … …  
    277285 
    278286        $tpl_temp = forum_trim(ob_get_contents()); 
    279         $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main); 
     287        $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main); 
    280288        ob_end_clean(); 
    281289        // END SUBST - <!-- forum_main --> 
    … …  
    285293 
    286294// Setup form 
    287 $forum_page['group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0; 
     295$forum_page['fld_count'] = 0; 
    288296$forum_page['form_action'] = $base_url.'/register.php?action=register'; 
    289  
    290 // Setup form information 
    291 $forum_page['frm_info']['intro'] = '<p>'.$lang_profile['Register intro'].'</p>'; 
    292 if ($forum_config['o_regs_verify'] != '0') 
    293         $forum_page['frm_info']['email'] = '<p class="warn">'.$lang_profile['Reg e-mail info'].'</p>'; 
    294297 
    295298// Setup breadcrumbs 
    … …  
    299302); 
    300303 
     304// Setup main heading 
     305$forum_page['main_hd'] = end($forum_page['crumbs']); 
     306 
    301307($hook = get_hook('rg_register_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 
    302308 
    … …  
    310316 
    311317?> 
    312         <div class="main-content main-frm"> 
    313                 <div class="ct-box info-box"> 
    314                         <?php echo implode("\n\t\t\t", $forum_page['frm_info'])."\n" ?> 
    315                 </div> 
     318        <div class="content"> 
     319                <div class="section section-1 datafrm"> 
     320                <form id="afocus" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 
     321                        <div class="hidden"> 
     322                                <input type="hidden" name="form_sent" value="1" /> 
     323                                <input type="hidden" name="csrf_token" value="<?php echo generate_form_token($forum_page['form_action']) ?>" /> 
     324                        </div> 
     325 
    316326<?php 
    317327 
    … …  
    326336 
    327337?> 
    328                 <div class="ct-box error-box"> 
    329                         <h2 class="hn"><span><?php echo $lang_profile['Register errors'] ?></span></h2> 
    330                         <ul> 
    331                                 <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?> 
    332                         </ul> 
    333                 </div> 
     338                        <div class="error-box"> 
     339                                <h2 class="hn"><span><?php echo $lang_profile['Register errors'] ?></span></h2> 
     340                                <ul> 
     341                                        <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?> 
     342                                </ul> 
     343                        </div> 
    334344<?php 
    335345 
    … …  
    337347 
    338348?> 
    339                 <div id="req-msg" class="req-warn ct-box error-box"> 
    340                         <p class="important"><?php printf($lang_common['Required warn'], '<em>'.$lang_common['Required'].'</em>') ?></p> 
    341                 </div> 
    342                 <form class="frm-form" id="afocus" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 
    343                         <div class="hidden"> 
    344                                 <input type="hidden" name="form_sent" value="1" /> 
    345                                 <input type="hidden" name="csrf_token" value="<?php echo generate_form_token($forum_page['form_action']) ?>" /> 
     349                        <div id="req-msg" class="req-warn error-box"> 
     350                                <p class="important"><?php printf($lang_common['Required warn'], '<span><em>'.$lang_common['Required'].'</em></span>') ?></p> 
    346351                        </div> 
    347352<?php ($hook = get_hook('rg_register_pre_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    348                         <div class="frm-group group<?php echo ++$forum_page['group_count'] ?>"> 
     353                        <div class="frm-group frm-group-1"> 
    349354<?php ($hook = get_hook('rg_register_pre_username')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    350                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     355                                <div class="sf-set frm-set frm-set-1"> 
    351356                                        <div class="sf-box text required"> 
    352                                                 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Username'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Username help'] ?></small></label><br /> 
     357                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Username'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <br /><small><?php echo $lang_profile['Username help'] ?></small></label><br /> 
    353358                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_username" value="<?php echo(isset($_POST['req_username']) ? forum_htmlencode($_POST['req_username']) : '') ?>" size="35" maxlength="25" /></span> 
    354359                                        </div> 
    355360                                </div> 
    356361<?php ($hook = get_hook('rg_register_pre_password')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    357 <?php if ($forum_config['o_regs_verify'] == '0'): ?>                            <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     362<?php if ($forum_config['o_regs_verify'] == '0'): ?>                            <div class="sf-set frm-set"> 
    358363                                        <div class="sf-box text required"> 
    359                                                 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Password help'] ?></small></label><br /> 
     364                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <br /><small><?php echo $lang_profile['Password help'] ?></small></label><br /> 
    360365                                                <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_password1" size="35" /></span> 
    361366                                        </div> 
    362367                                </div> 
    363368<?php ($hook = get_hook('rg_register_pre_confirm_password')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    364                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     369                                <div class="sf-set frm-set"> 
    365370                                        <div class="sf-box text required"> 
    366                                                 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Confirm password help'] ?></small></label><br /> 
     371                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <br /><small><?php echo $lang_profile['Confirm password help'] ?></small></label><br /> 
    367372                                                <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_password2" size="35" /></span> 
    368373                                        </div> 
    369374                                </div> 
    370 <?php endif; ($hook = get_hook('rg_register_pre_email')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>                              <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     375<?php endif; ($hook = get_hook('rg_register_pre_email')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>                              <div class="sf-set frm-set"> 
    371376                                        <div class="sf-box text required"> 
    372                                                 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['E-mail'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['E-mail help'] ?></small></label><br /> 
     377                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['E-mail'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <br /><small<?php echo ($forum_config['o_regs_verify'] != '0') ? ' class="important"' : '' ?>><?php echo ($forum_config['o_regs_verify'] != '0') ? $lang_profile['E-mail activation help'] : $lang_profile['E-mail help'] ?></small></label><br /> 
    373378                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_email1" value="<?php echo(isset($_POST['req_email1']) ? forum_htmlencode($_POST['req_email1']) : '') ?>" size="35" maxlength="80" /></span> 
    374379                                        </div> 
    375380                                </div> 
    376381<?php ($hook = get_hook('rg_register_pre_email_confirm')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    377 <?php if ($forum_config['o_regs_verify'] == '1'): ?>                            <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     382<?php if ($forum_config['o_regs_verify'] == '1'): ?>                                    <div class="sf-set frm-set"> 
    378383                                        <div class="sf-box text required"> 
    379                                                 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm e-mail'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Confirm e-mail help'] ?></small></label><br /> 
     384                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm e-mail'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <br /><small><?php echo $lang_profile['Confirm e-mail help'] ?></small></label><br /> 
    380385                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_email2" value="<?php echo(isset($_POST['req_email2']) ? forum_htmlencode($_POST['req_email2']) : '') ?>" size="35" maxlength="80" /></span> 
    381386                                        </div> 
    … …  
    392397 
    393398?> 
    394                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     399                                <div class="sf-set frm-set"> 
    395400                                        <div class="sf-box select"> 
    396401                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Language'] ?></span></label><br /> 
    … …  
    421426 
    422427?> 
    423                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     428                                <div class="sf-set frm-set"> 
    424429                                        <div class="sf-box select"> 
    425430                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Timezone'] ?></span></label><br /> 
    … …  
    468473                                </div> 
    469474<?php ($hook = get_hook('rg_register_pre_dst_checkbox')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    470                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> 
     475                                <div class="sf-set frm-set"> 
    471476                                        <div class="sf-box checkbox"> 
    472477                                                <span class="fld-input"><input type="checkbox" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="dst"<?php if ($select_dst) echo ' checked="checked"' ?> /></span> 
    473                                                 <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Adjust for DST'] ?></span> <?php echo $lang_profile['DST label'] ?></label> 
     478                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Adjust for DST'] ?></span> <br /><small><?php echo $lang_profile['DST label'] ?></small></label> 
    474479                                        </div> 
    475480                                </div> 
    … …  
    478483<?php ($hook = get_hook('rg_register_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 
    479484                        <div class="frm-buttons"> 
    480                                 <span class="submit"><input type="submit" name="register" value="<?php echo $lang_profile['Register'] ?>" /></span> 
     485                                <p><span class="submit"><input type="submit" name="register" value="<?php echo $lang_profile['Register'] ?>" /></span></p> 
    481486                        </div> 
    482487                </form> 
     488                </div> 
    483489        </div> 
    484490<?php 
    … …  
    487493 
    488494$tpl_temp = forum_trim(ob_get_contents()); 
    489 $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main); 
     495$tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main); 
    490496ob_end_clean(); 
    491497// END SUBST - <!-- forum_main -->