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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Awilum
2013-02-28 20:22:59 +02:00
parent 00abeaba1b 5b15c1c284
commit 362ec1f2a2
3 changed files with 517 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
admin/themes/default/index.template.php
View File

@@ -16,8 +16,9 @@
<!-- JavaScripts -->
<?php Javascript::add('public/assets/js/jquery.js', 'backend', 1); ?>
<?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 2); ?>
<?php Javascript::add('admin/themes/default/js/default.js', 'backend', 3); ?>
<?php Javascript::add('public/assets/js/jquery-migrate-1.1.1.js', 'backend', 2); ?>
<?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 3); ?>
<?php Javascript::add('admin/themes/default/js/default.js', 'backend', 4); ?>
<?php Javascript::load(); ?>
<?php Action::run('admin_header'); ?>

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

@@ -16,8 +16,9 @@
<!-- JavaScripts -->
<?php Javascript::add('public/assets/js/jquery.js', 'backend', 1); ?>
<?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 2); ?>
<?php Javascript::add('admin/themes/default/js/default.js', 'backend', 3); ?>
<?php Javascript::add('public/assets/js/jquery-migrate-1.1.1.js', 'backend', 2); ?>
<?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 3); ?>
<?php Javascript::add('admin/themes/default/js/default.js', 'backend', 4); ?>
<?php Javascript::load(); ?>
<script type="text/javascript">
$().ready(function () {