Changeset 460

Show
Ignore:
Timestamp:
05/07/08 19:19:10 (8 months ago)
Author:
aarkerio
Message:

I improved layouts and users display

Location:
trunk/app
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/app/models/vclassroom.php

    r456 r460  
    4242                     'conditions'   => '', 
    4343                                         'fields'       => 'username, id, email, name', 
    44                      'order'        => '', 
     44                     'order'        => 'name', 
    4545                     'limit'        => '', 
    4646                     'unique'       => true, 
  • trunk/app/views/layouts/admin.ctp

    r459 r460  
    2929 
    3030<div id="header"> 
    31 <h1><?php echo $html->link('Karamelo: Control Panel', '/admin/entries/start'); ?></h1> e-Learning platform 
    32 <?php  
    33   echo $html->link($cU['User']['username'] . '\'s blog',  '/blog/'. $cU['User']['username'],  array("style"=>"color:white;text-decoration:none;font-weight:bold;"));  
    34 ?> 
     31<div style="width:300px;float:left;margin-right:15px;"> 
     32<h1><?php echo $html->link('Karamelo: Control Panel', '/admin/entries/start'); ?></h1>  
     33<?php echo $html->para(null, 'e-Learning platform'); ?> 
     34</div> 
     35<div style="width:700px;float:left;">  
    3536Logged in as <strong><?php echo $cU['User']['username']; ?></strong> | 
    36     <?php echo $html->link($_SERVER['SERVER_NAME'], '/').' '. $html->link('My Account', '/admin/users/edit') .' | '. $html->link('Logout', '/users/logout'); ?> 
     37<?php   
     38  echo $html->link($cU['User']['username'] . '\'s blog',  '/blog/'. $cU['User']['username']) . ' | ';  
     39  echo $html->link($_SERVER['SERVER_NAME'], '/').' | '; 
     40  echo $html->link('My Account', '/admin/users/edit') .' | '. $html->link('Logout', '/users/logout'); ?> 
     41</div> 
    3742</div><!-- header ends--> 
    38 <div style="clear:both;"></div> 
     43 
    3944<?php echo $this->renderElement('admin_menu'); ?> 
    4045 
     
    4651<?php echo $html->div('footer', 'Powered by the '. $html->link('Karamelo Project &copy; 2002-2008 GPLv3', 'http://www.chipotle-software.com/', null, false, false)); ?> 
    4752 
    48 <div style="position:absolute;top:15px;left:800px"><!-- help button--> 
     53<div style="position:absolute;top:22px;left:950px"><!-- help button--> 
    4954  <?php  
    5055     // help popup window 
     
    6166?> 
    6267</div>  
    63  
    6468</body> 
    6569</html> 
  • trunk/app/webroot/css/cpanel/cpanel.css

    r459 r460  
    1616    margin: 0 auto; 
    1717    padding: 6px; 
     18    color:#fff; 
    1819    text-align: left; 
    1920    font-size: smaller; 
     
    4041#header h1 { 
    4142    margin: 0; 
    42     padding-top: 7px; 
     43    padding-top: 2px; 
    4344    color: #fff; 
    44     font-weight: bold; 
     45    font-weight: bolder; 
    4546    font-size: large; 
    4647} 
    4748 
    4849#header h1 a, #header h1 a:hover { 
     50    color: #fff; 
     51    text-decoration: none; 
     52    font-size: smaller; 
     53} 
     54#header a, #header a:hover { 
    4955    color: #fff; 
    5056    text-decoration: none; 
     
    442448    font-weight: bold; 
    443449} 
    444  
    445450 
    446451/* Layout */