Log in with username/password: lyceum/lyceum

Changeset 1264

Show
Ignore:
Timestamp:
11/24/07 00:22:10 (11 months ago)
Author:
jjb
Message:

In r1195, Justin applied his (fantastic) changes using trunk code instead of 1.0 branch code. We just reverted back to r1160 (which is the state settings.php was in before r1195). Now, we are applying all the non-whitespace, non-1.0-feature-removing changes from r1195.

svn merge -r1084:1195 -x -w settings.php

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0/src/lyceum/system-admin/settings.php

    r1263 r1264  
    22require('system-config.php'); 
    33require('../../lib/taglib.php'); 
     4$site_title = get_settings('site_title'); 
     5 
     6$myblogs = get_userblogs(); 
     7arrayify($myblogs); 
     8 
     9// =========================================================================== 
    410?> 
    5 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     11<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
     12   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     13 
    614<html xmlns="http://www.w3.org/1999/xhtml"> 
    715 
    816<head> 
    9    <title>Lyceum System Settings</title> 
    10    <link rel="stylesheet" href="../wp-admin/wp-admin.css" type="text/css" /> 
    11    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 
     17   <title><?php echo $site_title ?>: Lyceum System Settings</title> 
     18 
     19   <link rel="stylesheet" href="<?php echo LURL ?>/wp-admin/wp-admin.css" type="text/css" /> 
     20   <link rel="stylesheet" href="<?php echo LURL ?>/system-admin/lyceum.css" type="text/css" /> 
     21 
     22   <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" /> 
    1223</head> 
     24 
    1325 
    1426<body> 
    1527 
    16 <div id="lyceumhead"> 
    17    <div id="lyceumheadleft"> 
    18 <?php 
    19    echo '<strong>'.get_settings('site_title').'</strong>: '; 
    20    echo '<a href="'.LURL.'/profile">'. __('My Account') . '</a>'; 
     28<div id="PageWrapper" class="AdminMain"> 
    2129 
    22    $myblogs = get_userblogs(); 
    23    arrayify($myblogs); 
    24    foreach ($myblogs as $b){ 
    25       if ($b->id == $blog && !$inprofile) 
    26          echo ' &bull; <strong>'.$b->blogname.'</strong>'; 
    27       else  
    28          echo ' &bull; <a href="'.$b->home.'/admin/">'.$b->blogname.'</a>'; 
    29    } 
     30<?php require(ABSPATH . '/system-admin/lyceum-header.php'); ?> 
    3031    
    31    echo ' &bull; <strong>System Settings</strong>'; 
    32 ?>  
    33    </div> 
     32   <hr /> 
    3433 
    35    <div id="user_info"><?php printf(__('<strong>%s</strong>'), $user_identity) ?>  
    36       [<a href="<?php echo LURL?>/login?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>] 
    37       [<a href="<?php echo LURL?>/register?action=addblog" title="<?php _e('Create new blog with currently logged in account') ?>"><?php _e('Create Blog'); ?></a>] 
    38    </div> 
    39 </div> 
     34   <!-- BEGIN: body --> 
     35   <div id="BodyWrapper"> 
    4036 
     37      <!-- BEGIN: main column --> 
     38      <div id="MainColumn"> 
    4139 
    42 <ul> 
    43    <li><a href="systemplugins.php">System-wide plugins</a></li> 
    44    <li><a href="blog-management.php">Blogs</a></li> 
    45    <li><a href="user-management.php">Users</a></li> 
    46    <li><a href="rewriterules.php">Rewrite Rules</a></li> 
     40         <!-- BEGIN: main nav --> 
     41         <ul id="MainNav"> 
     42            <li class="Selected"><span><a href="settings.php">System Settings</a></span></li> 
     43            <li><span><a href="blog-management.php">Manage Blogs</a></span></li> 
     44            <li><span><a href="user-management.php">Manage Users</a></span></li> 
     45            <li><span><a href="systemplugins.php">Manage Plugins</a></span></li> 
     46            <li><span><a href="rewriterules.php">Rewrite Rules</a></span></li> 
    4747</ul> 
     48         <div class="ClearFix TabBorder"><!-- do not remove --></div> 
     49         <!-- END: main nav --> 
    4850 
     51         <div class="wrap"> 
     52            <h2>Lyceum Config</h2> 
    4953 
    5054<?php 
     
    144148<?php 
    145149$ips = get_admin_ips(); 
    146 foreach($ips as $ip) 
    147    echo '<li>'.$ip.'</li>'; 
     150foreach($ips as $ip) { 
     151?> 
     152                              <li><?php echo $ip ?></li> 
     153<?php 
     154
    148155?> 
    149156               </ul> 
     
    155162</form> 
    156163 
     164         </div> 
     165 
     166      </div> 
     167      <!-- END: main column --> 
     168 
     169   </div> 
     170   <!-- END: body --> 
     171 
     172   <hr /> 
     173 
     174<?php include(ABSPATH . 'wp-admin/admin-footer.php'); ?> 
     175 
     176</div> 
     177 
     178 
    157179</body> 
    158180 
Log in with username/password: lyceum/lyceum