Changeset 722
- Timestamp:
- 11/08/08 22:04:48 (2 months ago)
- Location:
- fluxbb/branches/fluxbb-1.3-dev/upload
- Files:
-
- 2 modified
-
lang/English/userlist.php (modified) (3 diffs)
-
userlist.php (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/userlist.php
r546 r722 5 5 6 6 'Users' => 'Users', 7 'Users found' => 'Users found matching your criteria', 7 'Users all' => '%s users in total', 8 'Users found' => '%s users match your criteria', 8 9 'No users found' => 'No users were found matching your criteria', 9 10 'User search head' => 'Search for users by username or by predefined criteria', 10 'User results all' => 'All currently registered users', 11 'User results matching' => 'Currently registered users matching your criteria', 12 'User find legend' => 'Find users:', 11 'User find legend' => 'Find, filter and sort users', 13 12 'Username' => 'Username', 14 'Search for username' => 'Username to search for :',13 'Search for username' => 'Username to search for', 15 14 'Username help' => 'May be left blank. Use wildcard character <strong>*</strong> for partial matches.', 16 'User group' => 'Show users from group :',17 'Sort users by' => 'Sort user list by :',18 'User sort order' => 'User list sort order :',15 'User group' => 'Show users from group', 16 'Sort users by' => 'Sort user list by', 17 'User sort order' => 'User list sort order', 19 18 'No of posts' => 'Number of posts', 20 19 'Registered' => 'Registration date', … … 23 22 'All users' => 'All users', 24 23 'Perform new search' => 'Perform new user search', 25 'Table summary' => 'List of users filtered and sorted according to the criteria (if any) you have chosen.',26 24 'User list options' => 'User list options', 27 25 'Perform new search' => 'Perform new user search', … … 29 27 'Title' => 'Title', 30 28 'Posts' => 'Posts', 31 'User list options' => 'User list options' 32 29 'User list options' => 'User list options', 30 'Registered label' => 'Registration date', 31 'Title label' => 'Title', 32 'Posts label' => 'Posts', 33 'Info separator' => ':', 34 'Registered users' => 'Registered users', 33 35 34 36 ); -
fluxbb/branches/fluxbb-1.3-dev/upload/userlist.php
r705 r722 75 75 76 76 if ($forum_page['num_users'] != 0) 77 $forum_page['items_info'] = generate_ items_info( (($forum_page['users_searched']) ? $lang_ul['Users found'] : $lang_ul['Users']), ($forum_page['start_from'] + 1), $forum_page['num_users']);77 $forum_page['items_info'] = generate_page_info( (($forum_page['users_searched']) ? $lang_ul['Users found'] : $lang_ul['Users']), ($forum_page['start_from'] + 1), $forum_page['num_users']); 78 78 else 79 79 $forum_page['items_info'] = $lang_ul['No users found']; … … 110 110 111 111 // Setup main heading 112 if ($forum_page['num_pages'] > 1) 113 $forum_page['main_head_pages'] = sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']); 112 $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf((($forum_page['users_searched']) ? $lang_ul['Users found'] : $lang_ul['Users all']), $forum_page['num_users']).'</small>'; 114 113 115 114 ($hook = get_hook('ul_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; … … 126 125 127 126 ?> 128 <div class="main-pagehead"> 129 <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2> 130 </div> 131 <div class="main-content main-frm"> 132 <form id="afocus" method="get" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 133 <div class="frm-form"> 134 <?php ($hook = get_hook('ul_search_fieldset_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 135 <fieldset class="frm-group group<?php echo ++$forum_page['group_count'] ?>"> 136 <legend class="group-legend"><strong><?php echo $lang_ul['User find legend'] ?></strong></legend> 127 <div id="main-ulist" class="content"> 128 <div id="ulist-search" class="section section-1"> 129 <div class="section-hd"> 130 <h2 class="hn"><span><?php echo $lang_ul['User find legend'] ?></span></h2> 131 </div> 132 <form id="afocus" method="get" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 133 <?php ($hook = get_hook('ul_search_group_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 134 <div class="frm-group frm-group-1"> 137 135 <?php ($hook = get_hook('ul_pre_username')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 138 <?php if ($forum_user['g_search_users'] == '1'): ?> <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">136 <?php if ($forum_user['g_search_users'] == '1'): ?> <div class="sf-set frm-set frm-set-1"> 139 137 <div class="sf-box text"> 140 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_ul['Search for username'] ?></span> < small><?php echo $lang_ul['Username help'] ?></small></label><br />138 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_ul['Search for username'] ?></span> <br /><small><?php echo $lang_ul['Username help'] ?></small></label><br /> 141 139 <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="username" value="<?php echo forum_htmlencode($forum_page['username']) ?>" size="35" maxlength="25" /></span> 142 140 </div> … … 144 142 <?php endif; ?> 145 143 <?php ($hook = get_hook('ul_pre_group_select')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 146 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">144 <div class="sf-set frm-set"> 147 145 <div class="sf-box select"> 148 146 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_ul['User group'] ?></span></label><br /> … … 177 175 </div> 178 176 <?php ($hook = get_hook('ul_pre_sort_by')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 179 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">177 <div class="sf-set frm-set"> 180 178 <div class="sf-box select"> 181 179 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_ul['Sort users by'] ?></span></label><br /> … … 184 182 <option value="registered"<?php if ($forum_page['sort_by'] == 'registered') echo ' selected="selected"' ?>><?php echo $lang_ul['Registered'] ?></option> 185 183 <?php if ($forum_page['show_post_count']): ?> <option value="num_posts"<?php if ($forum_page['sort_by'] == 'num_posts') echo ' selected="selected"' ?>><?php echo $lang_ul['No of posts'] ?></option> 186 <?php endif; ($hook = get_hook('ul_new_sort_by_option')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 184 <?php endif; ($hook = get_hook('ul_new_sort_by_option')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> </select></span> 187 185 </div> 188 186 </div> 189 187 <?php ($hook = get_hook('ul_pre_sort_order_fieldset')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 190 <fieldset class=" mf-set set<?php echo ++$forum_page['item_count'] ?>">188 <fieldset class="gf-set frm-set"> 191 189 <legend><span><?php echo $lang_ul['User sort order'] ?></span></legend> 192 190 <?php ($hook = get_hook('ul_pre_sort_order')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 193 <div class=" mf-box mf-yesno">194 <div class=" mf-item">191 <div class="gf-box gf-yesno"> 192 <div class="gf-item"> 195 193 <span class="fld-input"><input type="radio" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="sort_dir" value="ASC"<?php if ($forum_page['sort_dir'] == 'ASC') echo ' checked="checked"' ?> /></span> 196 194 <label for="fld<?php echo $forum_page['fld_count'] ?>"><?php echo $lang_ul['Ascending'] ?></label> 197 195 </div> 198 <div class=" mf-item">196 <div class="gf-item"> 199 197 <span class="fld-input"><input type="radio" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="sort_dir" value="DESC"<?php if ($forum_page['sort_dir'] == 'DESC') echo ' checked="checked"' ?> /></span> 200 198 <label for="fld<?php echo $forum_page['fld_count'] ?>"><?php echo $lang_ul['Descending'] ?></label> … … 203 201 <?php ($hook = get_hook('ul_pre_sort_order_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 204 202 </fieldset> 205 <?php ($hook = get_hook('ul_pre_search_ fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>206 </ fieldset>207 <?php ($hook = get_hook('ul_search_ fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>203 <?php ($hook = get_hook('ul_pre_search_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 204 </div> 205 <?php ($hook = get_hook('ul_search_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 208 206 <div class="frm-buttons"> 209 <span class="submit"><input type="submit" name="search" value="<?php echo $lang_ul['Submit user search'] ?>" /></span> 210 </div> 207 <p><span class="submit"><input type="submit" name="search" value="<?php echo $lang_ul['Submit user search'] ?>" /></span></p> 208 </div> 209 </form> 211 210 </div> 212 </form>213 211 <?php 214 212 … … 235 233 $forum_page['item_count'] = 0; 236 234 235 ?> 236 <div id="ulist-view" class="section section-1<?php echo ($forum_page['show_post_count']) ? ' ulistposts' : ' ulistnoposts' ?>"> 237 <div class="section-hd"> 238 <h2><span><?php echo $lang_ul['Registered users'] ?></span></h2> 239 </div> 240 <?php 241 237 242 if ($forum_db->num_rows($result)) 238 243 { 239 244 ($hook = get_hook('ul_results_pre_header')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 240 245 241 $forum_page['table_header'] = array();242 $forum_page['table_header']['username'] = '<th class="tc'.count($forum_page['table_header']).'" scope="col">'.$lang_ul['Username'].'</th>';243 $forum_page['table_header']['title'] = '<th class="tc'.count($forum_page['table_header']).'" scope="col">'.$lang_ul['Title'].'</th>';244 245 if ($forum_page['show_post_count'])246 $forum_page['table_header']['posts'] = '<th class="tc'.count($forum_page['table_header']).'" scope="col">'.$lang_ul['Posts'].'</th>';247 248 $forum_page['table_header']['registered'] = '<th class="tc'.count($forum_page['table_header']).'" scope="col">'.$lang_ul['Registered'].'</th>';249 250 246 ($hook = get_hook('ul_results_pre_header_output')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 251 247 252 248 ?> 253 <div class="ct-group"> 254 <table cellspacing="0" summary="<?php echo $lang_ul['Table summary'] ?>"> 255 <thead> 256 <tr> 257 <?php echo implode("\n\t\t\t\t\t\t", $forum_page['table_header'])."\n" ?> 258 </tr> 259 </thead> 260 <tbody> 249 <div class="rep-group rep-group-1"> 261 250 <?php 262 251 … … 265 254 ($hook = get_hook('ul_results_row_pre_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 266 255 267 $forum_page['table_row'] = array(); 268 $forum_page['table_row']['username'] = '<td class="tc'.count($forum_page['table_row']).'"><a href="'.forum_link($forum_url['user'], $user_data['id']).'">'.forum_htmlencode($user_data['username']).'</a></td>'; 269 $forum_page['table_row']['title'] = '<td class="tc'.count($forum_page['table_row']).'">'.get_title($user_data).'</td>'; 256 $forum_page['rep_item']['info'] = array(); 270 257 271 258 if ($forum_page['show_post_count']) 272 $forum_page['table_row']['posts'] = '<td class="tc'.count($forum_page['table_row']).'">'.forum_number_format($user_data['num_posts']).'</td>'; 273 274 $forum_page['table_row']['registered'] = '<td class="tc'.count($forum_page['table_row']).'">'.format_time($user_data['registered'], 1).'</td>'; 259 $forum_page['rep_item']['info']['posts'] = '<li class="info-stats"><span class="label">'.$lang_ul['Posts label'].'<span>'.$lang_ul['Info separator'].'</span></span> <strong>'.forum_number_format($user_data['num_posts']).'</strong></li>'; 260 261 $forum_page['rep_item']['info']['title'] = '<li class="info-data"><span class="label">'.$lang_ul['Title label'].'<span>'.$lang_ul['Info separator'].'</span></span> <strong>'.get_title($user_data).'</strong></li>'; 262 $forum_page['rep_item']['info']['registered'] = '<li class="info-data"><span class="label">'.$lang_ul['Registered label'].'<span>'.$lang_ul['Info separator'].'</span></span> <strong>'.format_time($user_data['registered'], 1).'</strong></li>'; 275 263 276 264 ++$forum_page['item_count']; … … 279 267 280 268 ?> 281 <tr class="<?php echo ($forum_page['item_count'] % 2 != 0) ? 'odd' : 'even' ?><?php echo ($forum_page['item_count'] == 1) ? ' row1' : '' ?>"> 282 <?php echo implode("\n\t\t\t\t\t\t", $forum_page['table_row'])."\n" ?> 283 </tr> 269 <div class="rep-item<?php echo ($forum_page['item_count'] % 2 != 0) ? ' rep-item-odd' : ' rep-item-even' ?><?php echo ($forum_page['item_count'] == 1) ? ' rep-item-1' : '' ?>"> 270 <div class="rep-subject"> 271 <h3 class="hn"><span><?php echo '<a href="'.forum_link($forum_url['user'], $user_data['id']).'">'.forum_htmlencode($user_data['username']).'</a>' ?></span></h3> 272 </div> 273 <ul class="rep-info"> 274 <?php echo implode("\n\t\t\t\t\t", $forum_page['rep_item']['info'])."\n" ?> 275 </ul> 276 </div> 284 277 <?php 285 278 … … 287 280 288 281 ?> 289 </tbody> 290 </table> 282 </div> 283 284 <?php 285 286 } 287 else 288 { 289 290 ?> 291 <div class="info-box"> 292 <p><?php echo $lang_ul['No users found'] ?></p> 293 </div> 294 <?php 295 296 } 297 298 ?> 291 299 </div> 292 300 </div> 293 301 <?php 294 302 295 }296 297 303 ($hook = get_hook('ul_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 298 304 299 305 $tpl_temp = forum_trim(ob_get_contents()); 300 $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);306 $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main); 301 307 ob_end_clean(); 302 308 // END SUBST - <!-- forum_main -->
