projects / pharext / pharext.org / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree | github
raw | inline | side by side
views: fix base url to omit scheme for when we connect through a https gateway
[pharext/pharext.org] / app / views / layout.phtml
diff --git a/app/views/layout.phtml b/app/views/layout.phtml
index a321f8093037b7c430e977b5cc73a42cdd142a37..e8e40571f13cf160346c5f4b98ad06a16332c20e 100644 (file)
--- a/app/views/layout.phtml
+++ b/app/views/layout.phtml
@@ -4,35 +4,69 @@
                <meta charset="utf-8">
                <title>
                        <?php if (!empty($title)) : ?>
-                               <?= $this->e($title) ?>
+                               <?= $this->e($title) ?> &ndash;
                        <?php endif; ?>
                        PHARext
                </title>
                <meta name="viewport" content="width=device-width, initial-scale=1">
                <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
-               <link rel="stylesheet" href="<?= $baseUrl->mod("./octicons/octicons.css") ?>">
-               <link rel="stylesheet" href="<?= $baseUrl->mod("./index.css") ?>">
+               <link rel="stylesheet" href="<?= $baseUrl->mod(":./octicons/octicons.css") ?>">
+               <link rel="stylesheet" href="<?= $baseUrl->mod(":./index.css") ?>">
+               
+               <?php if (!empty($styles)) : ?>
+                       <?php foreach($styles as $style) : ?>
+                               <?php if ($style instanceof \http\Url) : ?>
+               
+                               <link rel="stylesheet" href="<?= $style ?>">
+                               
+                               <?php else : ?>
+                               
+                               <style><?= $style ?></style>
+                               
+                               <?php endif; ?>
+                       <?php endforeach; ?>
+               <?php endif; ?>
+               
        </head>
        <body>
+               
                <?php include "navbar.phtml" ?>
+               
                <div id="content" class="<?= (isset($container) && !$container) ? "":"container" ?>">
                        
                        <?= $this->section("content") ?>
                        
                </div>
+               <?php if (isset($modal)) : ?>
+                       <?= $this->fetch("modal/$modal") ?>
+               <?php endif; ?>
                <footer class="footer">
                        <div class="container">
                                <p>
-                                       &copy; 2015 m6w6, Michael Wallner — Powered by <a href="//github.com/m6w6/pharext">pharext
-                                       <?php
-                                       include_once __DIR__."/../../vendor/m6w6/pharext/src/pharext/Version.php";
-                                       echo pharext\VERSION;
-                                       ?>
+                                       &copy; 2015 <abbr title="Michael Wallner">m6w6</abbr> 
+                                       <addr>&lt;mike&#x40;php&#x2e;net&gt;</addr>
+                                       &mdash; Powered by <a href="//github.com/m6w6/pharext">pharext
+                                       <?= \pharext\Metadata::version() ?>
                                        </a>
                                </p>
                        </div>
                </footer>
                <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-               <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+               <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+               <script>$(".modal").modal("show")</script>
+               <?php if (!empty($scripts)) : ?>
+                       <?php foreach ($scripts as $script) : ?>
+                               <?php if ($script instanceof \http\Url) : ?>
+               
+                               <script src="<?= $script ?>"></script>
+                               
+                               <?php else : ?>
+                               
+                               <script><?= $script ?></script>
+                               
+                               <?php endif; ?>
+                       <?php endforeach; ?>
+               <?php endif; ?>
+               
        </body>
 </html>
pharext.org