mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-11 15:45:07 +02:00
Code Issues Releases Wiki Activity

Merge branch 'origin/dev'

Browse Source 
Conflicts:
	engine/Monstra.php
	public/assets/js/bootstrap.js
This commit is contained in:
Awilum
2014-01-01 21:32:20 +02:00
parent 83f80306d3 cd0d8296a5
commit 5ea80e31e0
20 changed files with 5290 additions and 3342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/themes/default/login.template.php
View File

@@ -62,7 +62,7 @@
<div class="container form-signin">
<div style="text-align:center;"><a class="brand" href="<?php echo Option::get('siteurl'); ?>admin"><img src="<?php echo Option::get('siteurl'); ?>public/assets/img/monstra-logo.png" height="27" width="171"></a></div>
<div style="text-align:center;"><a class="brand" href="<?php echo Option::get('siteurl'); ?>admin"><img src="<?php echo Option::get('siteurl'); ?>public/assets/img/monstra-logo.png" height="27" width="171" alt="monstra" /></a></div>
<div class="administration-area">
<hr>
<div>
@@ -127,7 +127,7 @@
</div>
<div style="text-align:center">
<span class="small-grey-text">© 2012 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
<span class="small-grey-text">© 2012 - 2014 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
</div>
</body>