Changeset 865

Show
Ignore:
Timestamp:
01/25/07 17:26:43 (2 years ago)
Author:
ben
Message:

Toolbar updates: you can now log in from any page if you're logged out.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • devel/mod/toolbar/css

    r863 r865  
    1313 width:100%; 
    1414 background:url({{url}}mod/toolbar/images/toolbar_nav_grey.gif) repeat-x bottom; 
    15  color:#fff
     15 color:#000
    1616 margin:0; 
    1717 padding:0 0 4px 0; 
     
    122122} 
    123123 
     124div#toolbar form { 
     125    margin: 4px 0 0 4px; 
     126    width: 600px; 
     127    float: left; 
     128} 
     129 
     130div#toolbar #powered-by-elgg { 
     131    margin: 7px 4px 0 0; 
     132    float: right; 
     133} 
     134 
    124135div#container { 
    125136        margin-top:35px; 
  • devel/mod/toolbar/lib.php

    r853 r865  
    1919        global $CFG; 
    2020        require_once($CFG->dirroot.'lib/filelib.php'); // to ensure file_get_contents() 
    21         $toolbar = file_get_contents($CFG->dirroot . "mod/toolbar/toolbar.inc"); 
     21        if (logged_on) { 
     22            $toolbar = file_get_contents($CFG->dirroot . "mod/toolbar/toolbar.inc"); 
     23        } else { 
     24            $toolbar = file_get_contents($CFG->dirroot . "mod/toolbar/toolbarloggedout.inc"); 
     25        } 
    2226        $toolbar = str_replace("{{url}}", $CFG->wwwroot, $toolbar); 
    2327        $toolbar = str_replace("{{menu}}", templates_variables_substitute(array(array(),"menu")), $toolbar); 
    2428        $toolbar = str_replace("{{topmenu}}", templates_variables_substitute(array(array(),"topmenu")), $toolbar); 
     29        $toolbar = str_replace("{{logon}}", __gettext("Log on:"), $toolbar); 
     30        $toolbar = str_replace("{{username}}", __gettext("Username"), $toolbar); 
     31        $toolbar = str_replace("{{password}}", __gettext("Password"), $toolbar); 
     32        $toolbar = str_replace("{{poweredby}}", __gettext("Powered by Elgg"), $toolbar); 
    2533         
    2634        return $toolbar;