projects / zf2.biz / galerie.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
conditional include of html5 shim
[zf2.biz/galerie.git] / module / Application / view / layout / layout.phtml
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index 00c4478..31e99f1 100644 (file)
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -3,7 +3,9 @@ $this->headTitle()->setSeparator(' - ')
                   ->setAutoEscape(false);
 
 $basePath = $this->basePath();
-$this->headLink()->appendStylesheet($basePath . '/css/bootstrap.min.css');
+$this->headLink()->appendStylesheet($basePath . '/css/bootstrap.min.css')
+                 ->appendStylesheet($basePath . '/css/style.css')
+                 ->appendStylesheet($basePath . '/css/bootstrap-responsive.min.css');
 
 $this->headLink(array(
             'rel'  => 'shortcut icon',
@@ -13,7 +15,7 @@ $this->headLink(array(
 
 // HTML5 shim, for IE6-8 support of HTML elements
 $this->headScript()->appendFile($basePath . '/js/html5.js', 'text/javascript', 
-    array('conditional' => 'lt IE9',));
+    array('conditional' => 'lt IE 9',));
 
 echo $this->doctype();
 ?>
@@ -23,17 +25,11 @@ echo $this->doctype();
     <meta charset="utf-8">
     <?php echo $this->headTitle('ZF2 Skeleton Application') ?>
 
-    <?php echo $this->headMeta() ?>
+    <?php echo $this->headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ?>
 
     <!-- Le styles -->
     <?php echo $this->headLink() ?>
     
-    <style type="text/css">
-      body {
-        padding-top: 60px;
-      }
-    </style>
-
     <!-- Scripts -->
     <?php echo $this->headScript() ?>
 
@@ -41,24 +37,33 @@ echo $this->doctype();
 
   <body>
 
-    <div class="topbar">
-      <div class="fill">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
         <div class="container">
-          <a class="brand" href="<?php echo $this->url('home') ?>">ZF2 Skeleton Application</a>
-
-          <ul class="nav">
-            <li class="active"><a href="<?php echo $this->url('home') ?>">Home</a></li>
-          </ul>
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+          <a class="brand" href="<?php echo $this->url('home') ?>">Skeleton Application</a>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="active"><a href="<?php echo $this->url('home') ?>">Home</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
         </div>
       </div>
-
     </div>
 
     <div class="container">
-      <?php echo $this->raw('content'); ?>
+
+      <?php echo $this->content; ?>
+
+      <hr>
 
       <footer>
-        <p>&copy; 2006 - <?php echo date('Y') ?> by Zend Technologies Ltd. All rights reserved.</p>
+        <p>&copy; 2006 - 2012 by Zend Technologies Ltd. All rights reserved.</p>
       </footer>
 
     </div> <!-- /container -->
ZF2, éditions ENI : Galerie.