Changeset 1246


Ignore:
Timestamp:
02/26/10 12:44:59 (3 years ago)
Author:
nick_ramsay
Message:

[Branch 1.2] Users 1.4 - User pages (profile, account, etc.) reworked for plugins to extend more easily; Fixed title tags.

Location:
branches/1.2/content/plugins/users
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • branches/1.2/content/plugins/users/css/users.css

    r847 r1246  
    33 ************************************** */ 
    44 
    5 .user_tabs { margin-bottom: 1.0em; background-color: #f0f0f0; padding-top: 0.4em; padding-bottom: 0.4em; } 
    6 .user_tabs li { display: inline; padding-left: 0.6em; padding-right: 0.6em; } 
     5.profile_navigation { 
     6    width: 18%; 
     7    margin-right: 2%; 
     8    float: left;  
     9    display: inline;  
     10} 
     11 
     12.users_content { 
     13    width: 80%; 
     14    float: left; 
     15} 
     16 
     17#users_posts_filter#sort_box.sort_menu li { display: block; margin: 0;} 
     18#users_posts_filter#sort_box.sort_menu li.active { background-color: #f8f8f8; } 
     19#users_posts_filter#sort_box.sort_menu li.active a { color: #000; font-weight: bold; } 
    720 
    821#profile_avatar { float: left; margin: 0.6em 1.0em 1.0em 0; } 

  • branches/1.2/content/plugins/users/languages/users_language.php

    r1229 r1246  
    4545$lang["users_settings_saved"] = "Settings Saved"; 
    4646 
    47 /* User Tabs */ 
     47/* User Navigation */ 
     48$lang["users_all_posts"] = "All Posts"; 
     49$lang["users_all_comments"] = "All Comments"; 
    4850$lang["users_edit"] = "Edit"; 
    4951$lang["user_man_link"] = "User Manager"; 
    … …  
    8991$lang['users_permissions_updated'] = "Permissions Updated"; 
    9092 
    91 /* User Profile */ 
    92 $lang['users_profile_usage'] = "Use the links above to see all the stories I've submitted"; 
    93  
    9493/* Admin Stats */ 
    9594$lang["users_admin_stats_total_users"] = "Total users"; 
    … …  
    108107 
    109108/* Posts */ 
     109$lang['users_posts'] = "Posts"; 
    110110$lang['userfunctions_notifymods_subject_post'] = "New post submitted at " . SITE_NAME; 
    111111$lang['userfunctions_notifymods_body_about_post'] = "A new post has been submitted at " . SITE_NAME; 

  • branches/1.2/content/plugins/users/readme.txt

    r1229 r1246  
    1414Changelog 
    1515--------- 
     16v.1.4 2010/02/26 - Nick - User pages (profile, account, etc.) reworked for plugins to extend more easily; Fixed title tags 
    1617v.1.3 2010/02/23 - Nick - Fix for profile refresh bug, mail sent through Email class, instructions added to Account update form. 
    1718v.1.2 2010/02/20 - Nick - Meta tags generated from user details and profile 

  • branches/1.2/content/plugins/users/templates/users_account.php

    r1229 r1246  
    2929 
    3030?> 
    31 <div id="users_account"> 
     31<div id="users_account" class="users_content"> 
    3232 
    3333    <h2><?php echo $h->lang["users_account"]; ?>: <?php echo $username; ?></h2> 

  • branches/1.2/content/plugins/users/templates/users_edit_profile.php

    r1100 r1246  
    4747 
    4848?> 
    49 <div id="users_edit_profile"> 
     49<div id="users_edit_profile" class="users_content"> 
    5050 
    5151    <h2><?php echo $h->lang["users_profile_edit"]; ?>: <?php echo $h->vars['user']->name; ?></h2> 

  • branches/1.2/content/plugins/users/templates/users_permissions.php

    r980 r1246  
    2525 */ 
    2626?> 
    27 <div id="users_permissions"> 
     27<div id="users_permissions" class="users_content"> 
    2828 
    2929    <h2><?php echo $h->lang["users_permissions"]; ?>: <?php echo $h->vars['user']->name; ?></h2> 

  • branches/1.2/content/plugins/users/templates/users_profile.php

    r847 r1246  
    3232?> 
    3333 
    34 <div id="profile"> 
     34<div id="profile" class="users_content"> 
    3535 
    3636    <?php  
    … …  
    4949    <div class="clear"></div> 
    5050     
    51     <div id="profile_usage"> 
    52         <?php echo $h->lang['users_profile_usage']; ?> 
    53         <?php $h->pluginHook('profile_usage'); ?> 
    54     </div> 
    55      
    5651    <?php $h->pluginHook('profile'); ?> 
    5752     

  • branches/1.2/content/plugins/users/templates/users_settings.php

    r980 r1246  
    3939 
    4040?> 
    41 <div id="users_settings"> 
     41<div id="users_settings" class="users_content"> 
    4242 
    4343    <h2><?php echo $h->lang["users_settings"]; ?>: <?php echo $h->vars['user']->name; ?></h2> 

  • branches/1.2/content/plugins/users/users.php

    r1229 r1246  
    33 * name: Users 
    44 * description: Provides profile, settings and permission pages 
    5  * version: 1.3 
     5 * version: 1.4 
    66 * folder: users 
    77 * type: users 
    88 * class: Users 
    9  * hooks: pagehandling_getpagename, theme_index_top, header_include, sb_base_functions_preparelist, breadcrumbs, theme_index_post_breadcrumbs, theme_index_main, users_edit_profile_save, user_settings_save, admin_theme_main_stats, header_meta 
     9 * requires: sb_base 0.1 
     10 * hooks: pagehandling_getpagename, sb_base_theme_index_top, header_include, sb_base_functions_preparelist, breadcrumbs, theme_index_main, users_edit_profile_save, user_settings_save, admin_theme_main_stats, header_meta 
    1011 * author: Nick Ramsay 
    1112 * authorurl: http://hotarucms.org/member.php?1-Nick 
    … …  
    5051     * Determine what page we're looking at 
    5152     */ 
    52     public function theme_index_top($h) 
     53    public function sb_base_theme_index_top($h) 
    5354    { 
    5455        if ($h->cage->get->keyExists('user')) { 
    5556            $h->subPage = 'user'; 
     57            $user = $h->cage->get->testUsername('user'); 
    5658        } 
    5759         
    … …  
    5961        { 
    6062            case 'profile': 
    61                 $user = $h->cage->get->testUsername('user'); 
    6263                $h->pageTitle = $h->lang["users_profile"] . '[delimiter]' . $user; 
    6364                $h->pageType = 'user'; 
    6465                break; 
    6566            case 'account': 
    66                 $user = $h->cage->get->testUsername('user'); 
    6767                $h->pageTitle = $h->lang["users_account"] . '[delimiter]' . $user; 
    6868                $h->pageType = 'user'; 
    6969                break; 
    7070            case 'edit-profile': 
    71                 $user = $h->cage->get->testUsername('user'); 
    7271                $h->pageTitle = $h->lang["users_profile_edit"] . '[delimiter]' . $user; 
    7372                $h->pageType = 'user'; 
    7473                break; 
    7574            case 'user-settings': 
    76                 $user = $h->cage->get->testUsername('user'); 
    7775                $h->pageTitle = $h->lang["users_settings"] . '[delimiter]' . $user; 
    7876                $h->pageType = 'user'; 
    7977                break; 
    8078            case 'permissions': 
    81                 $user = $h->cage->get->testUsername('user'); 
    8279                $h->pageTitle = $h->lang["users_permissions"] . '[delimiter]' . $user; 
    8380                $h->pageType = 'user'; 
     81                break; 
     82            case 'index': 
     83                if ($h->subPage == 'user') { $h->pageTitle = $h->lang["sb_base_top"] . '[delimiter]' . $user . '[delimiter]' . $h->pageTitle = $h->lang["sb_base_site_name"]; } 
     84                break; 
     85            case 'latest': 
     86                if ($h->subPage == 'user') { $h->pageTitle = $h->lang["sb_base_latest"] . '[delimiter]' . $user; } 
     87                break; 
     88            case 'upcoming': 
     89                if ($h->subPage == 'user') { $h->pageTitle = $h->lang["sb_base_upcoming"] . '[delimiter]' . $user; } 
     90                break; 
     91            case 'all': 
     92                if ($h->subPage == 'user') { $h->pageTitle = $h->lang["sb_base_all"] . '[delimiter]' . $user; } 
     93                break; 
     94            case 'sort': 
     95                if ($h->subPage == 'user') {  
     96                    $sort = $h->cage->get->testPage('sort'); 
     97                    $sort_lang = 'sb_base_' . str_replace('-', '_', $sort); 
     98                    $h->pageTitle = $h->lang[$sort_lang] . '[delimiter]' . $user; 
     99                } 
    84100                break; 
    85101        } 
    … …  
    200216        // This is used for filtered story pages, e.g. popular, latest, etc: 
    201217        if ($h->subPage == 'user' && $h->pageType == 'list') { 
     218            switch ($h->pageName) { 
     219                case 'index': 
     220                    if ($h->subPage == 'user') { $title = $h->lang["sb_base_top"]; } 
     221                    break; 
     222                case 'latest': 
     223                    if ($h->subPage == 'user') { $title = $h->lang["sb_base_latest"]; } 
     224                    break; 
     225                case 'upcoming': 
     226                    if ($h->subPage == 'user') { $title = $h->lang["sb_base_upcoming"]; } 
     227                    break; 
     228                case 'all': 
     229                    if ($h->subPage == 'user') { $title = $h->lang["sb_base_all"]; } 
     230                    break; 
     231                case 'sort': 
     232                    $sort = $h->cage->get->testPage('sort'); 
     233                    $sort_lang = 'sb_base_' . str_replace('-', '_', $sort); 
     234                    $title = $h->lang[$sort_lang]; 
     235                    break; 
     236                default: 
     237                    $title = $h->lang['users_posts']; 
     238                    break; 
     239            } 
     240             
    202241            $user = $h->cage->get->testUsername('user'); 
    203242            $crumbs = "<a href='" . $h->url(array('user'=>$user)) . "'>\n"; 
    204243            $crumbs .= $user . "</a>\n "; 
    205             $crumbs .= " &raquo; " . $h->pageTitle; 
     244            $crumbs .= " &raquo; " . $title; 
    206245             
    207246            return $crumbs . $h->rssBreadcrumbsLink('', array('user'=>$user)); 
    208247        } 
    209     } 
    210      
    211     /** 
    212      * Display the user tabs 
    213      */ 
    214     public function theme_index_post_breadcrumbs($h) 
    215     { 
    216         if ($h->pageType != 'user') { return false; } 
    217          
    218         $h->displayTemplate('users_tabs'); 
    219         return true; 
    220248    } 
    221249     
    … …  
    232260        if ($h->currentUser->getPermission('can_access_admin') == 'yes') { $admin = true; } 
    233261        if ($h->currentUser->id == $h->vars['user']->id) { $own = true; } 
     262         
     263        $h->displayTemplate('users_navigation'); 
    234264         
    235265        switch($h->pageName) { 
Note: See TracChangeset for help on using the changeset viewer.