Skip to content

Commit

Permalink
BaseUrl Added
Browse files Browse the repository at this point in the history
  • Loading branch information
dextervip committed Jan 31, 2012
1 parent e50a726 commit 3855078
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
16 changes: 8 additions & 8 deletions application/modules/admin/layouts/scripts/admin.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/favicon.ico">
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<link rel="shortcut icon" href="<?=$this->baseUrl('/favicon.ico')?>">
<link rel="apple-touch-icon" href="<?=$this->baseUrl('/apple-touch-icon.png')?>">


<!-- CSS: implied media="all" -->
<link rel="stylesheet" href="css/style.css?v=2">
<link rel="stylesheet" href="<?=$this->baseUrl('css/style.css?v=2')?>">

<!-- Uncomment if you are specifically targeting less enabled mobile browsers
<link rel="stylesheet" media="handheld" href="css/handheld.css?v=2"> -->
<link rel="stylesheet" media="handheld" href="<?=$this->baseUrl('css/handheld.css?v=2')?>"> -->

<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
<script src="js/libs/modernizr-1.7.min.js"></script>
<script src="<?=$this->baseUrl('js/libs/modernizr-1.7.min.js')?>"></script>

</head>

Expand All @@ -57,13 +57,13 @@


<!-- scripts concatenated and minified via ant build script-->
<script src="js/plugins.js"></script>
<script src="js/script.js"></script>
<script src="<?=$this->baseUrl('js/plugins.js')?>"></script>
<script src="<?=$this->baseUrl('js/script.js')?>"></script>
<!-- end scripts-->


<!--[if lt IE 7 ]>
<script src="js/libs/dd_belatedpng.js"></script>
<script src="<?=$this->baseUrl('js/libs/dd_belatedpng.js')?>"></script>
<script>DD_belatedPNG.fix('img, .png_bg'); // Fix any <img> or .png_bg bg-images. Also, please read goo.gl/mZiyb </script>
<![endif]-->

Expand Down
16 changes: 8 additions & 8 deletions application/modules/my/layouts/scripts/my.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/favicon.ico">
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<link rel="shortcut icon" href="<?=$this->baseUrl('/favicon.ico')?>">
<link rel="apple-touch-icon" href="<?=$this->baseUrl('/apple-touch-icon.png')?>">


<!-- CSS: implied media="all" -->
<link rel="stylesheet" href="css/style.css?v=2">
<link rel="stylesheet" href="<?=$this->baseUrl('css/style.css?v=2')?>">

<!-- Uncomment if you are specifically targeting less enabled mobile browsers
<link rel="stylesheet" media="handheld" href="css/handheld.css?v=2"> -->
<link rel="stylesheet" media="handheld" href="<?=$this->baseUrl('css/handheld.css?v=2')?>"> -->

<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
<script src="js/libs/modernizr-1.7.min.js"></script>
<script src="<?=$this->baseUrl('js/libs/modernizr-1.7.min.js')?>"></script>

</head>

Expand All @@ -57,13 +57,13 @@


<!-- scripts concatenated and minified via ant build script-->
<script src="js/plugins.js"></script>
<script src="js/script.js"></script>
<script src="<?=$this->baseUrl('js/plugins.js')?>"></script>
<script src="<?=$this->baseUrl('js/script.js')?>"></script>
<!-- end scripts-->


<!--[if lt IE 7 ]>
<script src="js/libs/dd_belatedpng.js"></script>
<script src="<?=$this->baseUrl('js/libs/dd_belatedpng.js')?>"></script>
<script>DD_belatedPNG.fix('img, .png_bg'); // Fix any <img> or .png_bg bg-images. Also, please read goo.gl/mZiyb </script>
<![endif]-->

Expand Down
10 changes: 5 additions & 5 deletions application/modules/site/layouts/scripts/site.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@

<!-- CSS: implied media=all -->
<!-- CSS concatenated and minified via ant build script-->
<link rel="stylesheet" href="/css/style.css">
<link rel="stylesheet" href="/css/bootstrap.css">
<link rel="stylesheet" href="<?=$this->baseUrl('/css/style.css')?>">
<link rel="stylesheet" href="<?=$this->baseUrl('/css/bootstrap.css')?>">
<!-- end CSS-->

<!-- More ideas for your <head> here: h5bp.com/d/head-Tips -->

<!-- All JavaScript at the bottom, except for Modernizr / Respond.
Modernizr enables HTML5 elements & feature detects; Respond is a polyfill for min/max-width CSS3 Media Queries
For optimal performance, use a custom Modernizr build: www.modernizr.com/download/ -->
<script src="js/libs/modernizr-2.0.6.min.js"></script>
<script src="<?=$this->baseUrl('js/libs/modernizr-2.0.6.min.js')?>"></script>
</head>

<body>
Expand All @@ -55,8 +55,8 @@


<!-- scripts concatenated and minified via ant build script-->
<script defer src="js/plugins.js"></script>
<script defer src="js/script.js"></script>
<script defer src="<?=$this->baseUrl('js/plugins.js')?>"></script>
<script defer src="<?=$this->baseUrl('js/script.js')?>"></script>
<!-- end scripts-->


Expand Down
2 changes: 1 addition & 1 deletion application/modules/site/views/scripts/index/header.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<a class="brand" href="/">ZF-Boilerplate</a>
<?php echo $this->navigation()->menu(); ?>
<form action="/index/search" class="pull-right">
<form action="<?=$this->baseUrl('/index/search')?>" class="pull-right">
<input class="input" name="query" type="text" placeholder="Cherralea Morgen">
<button class="btn" type="submit"><?php echo $this->translate("Find Quote"); ?></button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion library/App/Form/AddQuote.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function init()
{
// $this->setDefaultTranslator(\Zend_Registry::get('Zend_Translate')); ???
$this->setMethod('POST');
$this->setAction('/index/add-custom');
$this->setAction($this->getView()->baseUrl('/index/add-custom'));
$this->setAttrib('id', 'addQuote');

$quote = new \Zend_Form_Element_Textarea('quote');
Expand Down

0 comments on commit 3855078

Please sign in to comment.