Changes that i cant remember about

pull/106/merge
Peter Goodhall 2011-11-09 17:11:55 +00:00
rodzic 3c5732d7dd
commit 463bed44b3
2 zmienionych plików z 13 dodań i 6 usunięć

Wyświetl plik

@ -62,7 +62,14 @@
<form method="post" action="<?php echo site_url('search'); ?>"><input type="text" name="callsign" placeholder="Search Callsign"></form>
<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<p class="pull-right">Logged in as <a href="#"><?php echo $this->session->userdata('user_callsign'); ?></a></p>
<div class="pull-right">
<ul>
<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/logout');?>" title="Logout">Logout</a></li>
</ul>
</div>
<?php } else { ?>
<form method="post" action="<?php echo site_url('user/login'); ?>" class="pull-right">
<input class="input-small" type="text" name="user_name" placeholder="Username">

Wyświetl plik

@ -63,7 +63,7 @@
"file": "css/main.css",
"settings":
{
"buffer_size": 565,
"buffer_size": 617,
"line_ending": "Windows"
}
},
@ -266,7 +266,7 @@
"groups":
[
{
"selected": 6,
"selected": 5,
"sheets":
[
{
@ -408,15 +408,15 @@
"file": "css/main.css",
"settings":
{
"buffer_size": 565,
"buffer_size": 617,
"regions":
{
},
"selection":
[
[
565,
565
555,
555
]
],
"settings":