summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon2011-03-25 18:08:43 +0100
committerSimon2011-03-25 18:08:43 +0100
commitb3ea8d74f70c107f1b85aae1b788585528128eae (patch)
tree092fa61529558a1d03c12fbd7a4a40674df47361
parentNicht Benötigte Tabellen, Models, Mapper und Dateien entfernt (diff)
downloadpbs2-b3ea8d74f70c107f1b85aae1b788585528128eae.tar.gz
pbs2-b3ea8d74f70c107f1b85aae1b788585528128eae.tar.xz
pbs2-b3ea8d74f70c107f1b85aae1b788585528128eae.zip
jquery wird von unserem Server geladen, nicht von google
-rw-r--r--application/Bootstrap.php4
-rw-r--r--application/layouts/default.phtml6
-rw-r--r--application/modules/dev/layouts/dev.phtml6
-rw-r--r--application/modules/fbgui/layouts/fbgui.phtml7
-rw-r--r--application/modules/user/layouts/user.phtml7
5 files changed, 12 insertions, 18 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 45d1be4..865898b 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -48,6 +48,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->doctype('XHTML1_STRICT');
$view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=utf-8');
$view->headLink()->appendStylesheet('/media/css/style.css');
+ $view->headLink()->appendStylesheet('/media/css/jquery-ui.css');
+ #$this->headScript()->appendFile('/media/js/jquery.min.js');
+ #$this->headScript()->appendFile('/media/js/jquery-ui.min.js');
+
$view->headTitle('pbs²')
->setSeparator(' :: ');
}
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml
index 3fb177d..abb2347 100644
--- a/application/layouts/default.phtml
+++ b/application/layouts/default.phtml
@@ -13,10 +13,8 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
-
+<script src='/media/js/jquery.min.js'></script>
+<script src='/media/js/jquery-ui.min.js'></script>
</head>
<body>
<div id='sidepannel'>
diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml
index a1a2897..3fd2971 100644
--- a/application/modules/dev/layouts/dev.phtml
+++ b/application/modules/dev/layouts/dev.phtml
@@ -13,10 +13,8 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<link href="/media/css/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="/media/js/jquery.min.js"></script>
-<script src="/media/js/jquery-ui.min.js"></script>
-
+<script src='/media/js/jquery.min.js'></script>
+<script src='/media/js/jquery-ui.min.js'></script>
</head>
<body>
<div id='sidepannel'>
diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml
index d04664a..93159b6 100644
--- a/application/modules/fbgui/layouts/fbgui.phtml
+++ b/application/modules/fbgui/layouts/fbgui.phtml
@@ -13,13 +13,10 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
-
+<script src='/media/js/jquery.min.js'></script>
+<script src='/media/js/jquery-ui.min.js'></script>
</head>
<body>
-
<div id='sidepannel'>
<div id="logo"><div id="logo-bar-gray"></div></div>
<div id="sidepannel-top">
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index 36d73b4..d792bcd 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -13,13 +13,10 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
-
+<script src='/media/js/jquery.min.js'></script>
+<script src='/media/js/jquery-ui.min.js'></script>
</head>
<body>
-
<div id='sidepannel'>
<div id="logo"><div id="logo-bar-gray"></div></div>
<div id="sidepannel-top">