Assets are now local, for combination and speed

This commit is contained in:
Ismo Vuorinen
2013-07-11 07:49:27 +03:00
parent 7e73994e40
commit a4bdf517cb
12 changed files with 242 additions and 15 deletions

View File

@@ -9,16 +9,22 @@
</div>
</footer>
<script src="http://cdnjs.cloudflare.com/ajax/libs/foundation/4.1.6/js/vendor/jquery.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/foundation/4.1.6/js/vendor/custom.modernizr.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/foundation/4.1.6/js/foundation.min.js"></script>
<script src="http://rvera.github.io/image-picker/image-picker/image-picker.min.js"></script>
<script src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
<script src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/additional-methods.min.js"></script>
<script src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/localization/messages_fi.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.3/css/base/jquery.ui.all.min.css">
<script src="<?php echo base_url("/assets/scripts.js"); ?>"></script>
<?php
// Assets spark
assets_js(
array(
'jquery.min.js',
'custom.modernizr.min.js', // Foundation flavored Modernizr
'foundation.min.js', // Foundation 1.4.1
'image-picker.min.js', // Image Picker 0.1.4
'jquery.validate.min.js', // jQuery Validation Plugin 1.11.1
'additional-methods.min.js',// jQuery Validation Methods
'messages_fi.js', // jQuery Validation Plugin Finnish translation
'jquery-ui.min.js', // jQuery UI 1.10.3
'scripts.js' // Our scripts
)
);
?>
<!-- {elapsed_time} -->
</body>

View File

@@ -15,11 +15,15 @@ if (empty($page_title)) {
<link rel="icon" href="<?php echo site_url('/favicon.ico'); ?>">
<title><?php echo implode(" &raquo; ", $page_title); ?></title>
<?php
assets_css(array(
'normalize.min.css',
'foundation.min.css',
'style.css'
));
// Assets spark
assets_css(
array(
'normalize.min.css',
'foundation.min.css',
'jquery-ui.min.css',
'style.css'
)
);
?>
</head>