Skip to content

Commit

Permalink
Merge pull request #6 from renich/master
Browse files Browse the repository at this point in the history 
Style normalization and identation corrections
  • Loading branch information
@michael-romer
michael-romer committed Dec 2, 2012
2 parents 7207dc9 + 24aeea2 commit e2f3a16
Show file tree
Hide file tree
Showing 5 changed files with 231 additions and 226 deletions.
146 changes: 72 additions & 74 deletions application/modules/admin/layouts/scripts/admin.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,75 @@
<!--[if IE 7 ]> <html class="no-js ie7" lang="en"> <![endif]-->
<!--[if IE 8 ]> <html class="no-js ie8" lang="en"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8">

<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
Remove this if you use the .htaccess -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

<title></title>
<meta name="description" content="">
<meta name="author" content="">

<!-- Mobile viewport optimized: j.mp/bplateviewport -->
<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="<?=$this->baseUrl('/favicon.ico')?>">
<link rel="apple-touch-icon" href="<?=$this->baseUrl('/apple-touch-icon.png')?>">


<!-- CSS: implied media="all" -->
<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="<?=$this->baseUrl('css/handheld.css?v=2')?>"> -->

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

</head>

<body>

<div id="container">
<header>
<?= $this->action('header', 'index', 'admin'); ?>
</header>
<div id="main" role="main">
<?php echo $this->layout()->content; ?>
</div>
<footer>
<?= $this->action('footer', 'index', 'admin'); ?>
</footer>
</div> <!--! end of #container -->


<!-- JavaScript at the bottom for fast page loading -->

<!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if necessary -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
<script>window.jQuery || document.write('<script src="js/libs/jquery-1.5.1.min.js">\x3C/script>')</script>


<!-- scripts concatenated and minified via ant build 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="<?=$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]-->


<!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
<script>
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>

</body>
</html>
<head>
<meta charset="utf-8">

<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
Remove this if you use the .htaccess -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

<title></title>
<meta name="description" content="">
<meta name="author" content="">

<!-- Mobile viewport optimized: j.mp/bplateviewport -->
<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="<?php echo $this->baseUrl('/favicon.ico')?>">
<link rel="apple-touch-icon" href="<?php echo $this->baseUrl('/apple-touch-icon.png')?>">


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

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

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

<body>
<div id="container">
<header>
<?php echo $this->action('header', 'index', 'admin'); ?>
</header>

<div id="main" role="main">
<?php echo $this->layout()->content; ?>
</div>

<footer>
<?php echo $this->action('footer', 'index', 'admin'); ?>
</footer>
</div> <!--! end of #container -->


<!-- JavaScript at the bottom for fast page loading -->

<!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if necessary -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
<script>window.jQuery || document.write('<script src="js/libs/jquery-1.5.1.min.js">\x3C/script>')</script>


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


<!--[if lt IE 7 ]>
<script src="<?php echo $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]-->

<!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
<script>
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>
</body>
</html>
111 changes: 55 additions & 56 deletions application/modules/my/layouts/scripts/my.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,76 @@
<!--[if IE 7 ]> <html class="no-js ie7" lang="en"> <![endif]-->
<!--[if IE 8 ]> <html class="no-js ie8" lang="en"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<head>
<meta charset="utf-8">

<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
Remove this if you use the .htaccess -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
Remove this if you use the .htaccess -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

<title></title>
<meta name="description" content="">
<meta name="author" content="">
<title></title>
<meta name="description" content="">
<meta name="author" content="">

<!-- Mobile viewport optimized: j.mp/bplateviewport -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Mobile viewport optimized: j.mp/bplateviewport -->
<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="<?=$this->baseUrl('/favicon.ico')?>">
<link rel="apple-touch-icon" href="<?=$this->baseUrl('/apple-touch-icon.png')?>">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="<?php echo $this->baseUrl('/favicon.ico')?>">
<link rel="apple-touch-icon" href="<?php echo $this->baseUrl('/apple-touch-icon.png')?>">


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

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

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

</head>
<body>
<div id="container">
<header>
<?php echo $this->action('header', 'index', 'my'); ?>
</header>

<div id="main" role="main">
<?php echo $this->layout()->content; ?>
</div>

<footer>
<?php echo $this->action('footer', 'index', 'my'); ?>
</footer>
</div> <!--! end of #container -->

<body>

<div id="container">
<header>
<?= $this->action('header', 'index', 'my'); ?>
</header>
<div id="main" role="main">
<?php echo $this->layout()->content; ?>
</div>
<footer>
<?= $this->action('footer', 'index', 'my'); ?>
</footer>
</div> <!--! end of #container -->
<!-- JavaScript at the bottom for fast page loading -->

<!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if necessary -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
<script>window.jQuery || document.write('<script src="js/libs/jquery-1.5.1.min.js">\x3C/script>')</script>

<!-- JavaScript at the bottom for fast page loading -->

<!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if necessary -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
<script>window.jQuery || document.write('<script src="js/libs/jquery-1.5.1.min.js">\x3C/script>')</script>
<!-- scripts concatenated and minified via ant build script-->
<script src="<?php echo $this->baseUrl('js/plugins.js')?>"></script>
<script src="<?php echo $this->baseUrl('js/script.js')?>"></script>
<!-- end scripts-->


<!-- scripts concatenated and minified via ant build 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="<?php echo $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]-->


<!--[if lt IE 7 ]>
<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]-->


<!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
<script>
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>

</body>
</html>
<!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
<script>
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>
</body>
</html>
Loading

0 comments on commit e2f3a16

Please sign in to comment.