Changeset 5136

Show
Ignore:
Timestamp:
02/01/07 13:33:27 (2 years ago)
Author:
bergie
Message:

Go for 2.6 toolbars service only and clean up userinfo area

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/templates/OpenPsa2/package.xml

    r4527 r5136  
    1313        <active>yes</active> 
    1414    </lead> 
    15     <date>2006-10-31</date> 
     15    <date>2007-02-01</date> 
    1616    <time>13:50:00</time> 
    1717    <version> 
    18         <release>1.0.7</release> 
     18        <release>1.1.0</release> 
    1919        <api>1.0.0</api> 
    2020    </version> 
    …… 
    2525    <license>GPL</license> 
    2626    <notes> 
    27         Added support for two frames. Created two new style sheets (`content.css`, which contains 
    28         the style information shown for all media types; and `print.css` for showing the print 
    29         style respectively). Fixed some minor CSS bugs in `style.css`. Minor style modifications. 
     27        Removed the userinfo dynamic load 
    3028    </notes> 
    3129    <contents> 

  • trunk/templates/OpenPsa2/toolbar-bottom.php

    r3799 r5136  
    11<?php 
    2 $toolbars =& midcom_helper_toolbars::get_instance(); 
    3 if (count($toolbars->bottom->items) > 0) 
    4 { 
    5     echo $toolbars->bottom->render(); 
    6 } 
    7 else 
    8 { 
    9     $_MIDCOM->toolbars->show_view_toolbar(); 
    10 } 
     2$_MIDCOM->toolbars->show_view_toolbar(); 
    113?> 

  • trunk/templates/OpenPsa2/toolbar.php

    r3799 r5136  
    11<?php 
    2 // User is logged in and MidCOM is running 
    3 $toolbars =& midcom_helper_toolbars::get_instance(); 
    4 if (count($toolbars->top->items) > 0) 
    5 { 
    6     echo $toolbars->top->render(); 
    7 } 
    8  
    92$_MIDCOM->toolbars->show_node_toolbar(); 
    103?> 

  • trunk/templates/OpenPsa2/userinfo.php

    r3799 r5136  
    11<?php 
    2 if ($_MIDGARD['user']) 
     2if ($_MIDCOM->auth->user) 
    33{ 
    4     /* Only try to load userinfo if we actually have a user, otherwise it will 
    5        trigger require_valid_user and thus messing up all anonymous operations */ 
    6     $mypage = midcom_helper_find_node_by_component('org.openpsa.mypage'); 
    7     if ($mypage) 
    8     { 
    9        $_MIDCOM->dynamic_load($mypage[MIDCOM_NAV_RELATIVEURL]."userinfo"); 
    10     } 
     4    $user = $_MIDCOM->auth->user->get_storage(); 
     5    $contact = new org_openpsa_contactwidget($user); 
     6     
     7    echo "<ul>\n"; 
     8    echo "    <li class=\"user\">".$contact->show_inline()."</li>\n"; 
     9    echo "    <li class=\"logout\"><a href=\"{$_MIDGARD['self']}midcom-logout-\"><img src=\"".MIDCOM_STATIC_URL."/stock-icons/16x16/exit.png\" title=\"" . $_MIDCOM->i18n->get_string('logout', 'midcom') . "\" alt=\"" . $_MIDCOM->i18n->get_string('logout', 'midcom') . "\" /></a></li>\n"; 
     10    echo "</ul>\n"; 
    1111} 
    1212?>