mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixed profile page, and added profile link on right-hand user menu.

pull/106/merge
Andy Smith 2011-11-22 22:10:02 +00:00
rodzic 89227b6390
commit a70abe7496
4 zmienionych plików z 42 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
application/controllers/user.php
Wyświetl plik

@ -238,7 +238,15 @@ class User extends CI_Controller {
function profile() {
$this->load->model('user_model');
$query = $this->user_model->get_by_id($this->session->userdata('user_id'));
$data = $query->row();
$q = $query->row();
$data['page_title'] = "Profile";
$data['user_name'] = $q->user_name;
$data['user_type'] = $q->user_type;
$data['user_email'] = $q->user_email;
$data['user_firstname'] = $q->user_firstname;
$data['user_lastname'] = $q->user_lastname;
$data['user_callsign'] = $q->user_callsign;
$data['user_locator'] = $q->user_locator;
$this->load->view('layout/header', $data);
$this->load->view('user/profile');

1
application/views/layout/header.php
Wyświetl plik

@ -70,6 +70,7 @@
<li class="dropdown" data-dropdown="dropdown" >
<a href="#" class="dropdown-toggle">Logged in as <?php echo $this->session->userdata('user_callsign'); ?></a>
<ul class="dropdown-menu">
<li><a href="<?php echo site_url('user/profile');?>" title="Profile">Profile</a></li>
<li><a href="<?php echo site_url('user/logout');?>" title="Logout">Logout</a></li>
</ul>
</div>

35
application/views/user/profile.php
Wyświetl plik

@ -1,9 +1,34 @@
<h2><?php echo $this->session->userdata('user_name')."'s profile"; ?></h2>
<div class="wrap_content user">
<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
<table class="users">
<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" />
<script type="text/javascript">
$(document).ready(function() {
$(".qsobox").fancybox({
'width' : '75%',
'height' : '50%',
'autoScale' : false,
'transitionIn' : 'none',
'transitionOut' : 'none',
'type' : 'iframe'
});
});
</script>
<div id="container">
<div class="wrap_content profile">
<h2><?php echo $this->session->userdata('user_name')."'s profile"; ?></h2>
<table class="profile">
<tr>
<td>Username</td>
<td width="100px">Username</td>
<td><?php if(isset($user_name)) { echo $user_name; } ?></td>
</tr>
@ -38,7 +63,7 @@
</tr>
</table>
<div><a href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>">Edit profile</a></div>
<div><a class="btn primary" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>">Edit profile</a></div>
</form>

3
css/global.css
Wyświetl plik

@ -96,6 +96,7 @@ ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: non
#user a { float: left; display: block; color: #ebebeb; text-decoration: none; padding-top: 7px; padding-left: 6px; padding-right: 5px; text-align:center; }
#user a:hover { }
.user { padding: 5px; }
.profile { padding: 5px; }
/* Pager */
.pager { margin-top: 5px; margin-bottom: 5px; font-size: 12px; }
@ -103,4 +104,4 @@ ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: non
.pager a:hover { background-color: azure; }
/* Footer */
#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; }
#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; }