summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-07 12:50:20 +0200
committerSebastian Wagner2011-09-07 12:50:20 +0200
commit9e939be8615c48c0a88cd38520cdc615807cc7fd (patch)
tree07e02cbb47c25c692d7e5cf4029d0e744e339169
parentqtip (diff)
parentkleine Korrektur (diff)
downloadpoolctrl-9e939be8615c48c0a88cd38520cdc615807cc7fd.tar.gz
poolctrl-9e939be8615c48c0a88cd38520cdc615807cc7fd.tar.xz
poolctrl-9e939be8615c48c0a88cd38520cdc615807cc7fd.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rw-r--r--application/layouts/default.phtml6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml
index 60285ac..c4111fb 100644
--- a/application/layouts/default.phtml
+++ b/application/layouts/default.phtml
@@ -16,13 +16,13 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<script type="text/javascript" src='/media/js/script.js'></script>
-<!-- files for calendar -->
<script type='text/javascript' src='/media/js/jquery-1.6.2.min.js'></script>
<script type='text/javascript' src='/media/js/jquery-ui-1.8.16.custom.min.js'></script>
+<script type="text/javascript" src='/media/js/jquery-ui-timepicker-addon.js'></script>
+<script type="text/javascript" src='/media/js/script.js'></script>
+<!-- files for calendar -->
<script type='text/javascript' src='/media/js/fullcalendar.min.js'></script>
<script type="text/javascript" src='/media/js/jquery.qtip-1.0.0-rc3.min.js'></script>
-<script type="text/javascript" src='/media/js/jquery-ui-timepicker-addon.js'></script>
</head>
<body>