Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'airtime-2.0.x' into devel

Browse source
This commit is contained in:
James 2012-01-17 14:48:04 -05:00
commit 087d893a60
8 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/views/scripts/login/index.phtml
View file

@ -2,6 +2,9 @@
<div class="logobox">&nbsp;</div>
<h2>Login</h2>
<div id="login" class="login-content clearfix">
<?php if(isset($this->demo) && $this->demo == 1){?>
<p style="font-weight:bold">Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.</p>
<?php }?>
<p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>
<?php echo $this->form; ?>
</div>