Merge branch 'master' of git://git.neuf.no/inside

This commit is contained in:
root@amen committed 2013-08-29 04:45:31 +02:00
commit f907d2fbc5
5 files changed
+2016 -2

No files matched your search

+1 -2
View File
@@ -14,8 +14,7 @@ class Messages {
}
public function display($msg = NULL){?>
<div class="messages fancybox">
<!-- h3>Beskjeder</h3 -->
<div class="messages fancybox alert alert-warning">
<ul>
<?php
+1
View File
@@ -512,6 +512,7 @@ class Page {
<script type="text/javascript" src="<?php echo $GLOBALS['static_path'];?>js/XMLZipRequest.js"></script>
<script type="text/javascript" src="<?php echo $GLOBALS['static_path'];?>js/XMLCatRequest.js"></script>
<script type="text/javascript" src="<?php echo $GLOBALS['static_path'];?>js/XMLUsernameRequest.js"></script>
<script type="text/javascript" src="<?php echo $GLOBALS['static_path'];?>js/bootstrap.min.js"></script>
<script type="text/javascript" src="<?php print $GLOBALS['include_path'];?>tiny_mce/tiny_mce.js"></script>
<script type="text/javascript">
tinyMCE.init({