Sync dev

added robots.txt added favicon fix server name fix parent redirect (iframe sandboxed)
faktiva · Feb 1, 2016 · 08d962a · 08d962a
1 parent fa0c3ad
commit 08d962a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Installation:
 - just clone the repo into your vhost root directory (**not the document root**)
 
     ```
-    composer create-project dralbert/php-admin-tk /var/www/your-admin-vhost [--ignore-platform-reqs]
+    composer create-project [--ignore-platform-reqs] dralbert/php-admin-tk /var/www/your-admin-vhost
     ```
 
 # License

diff --git a/httpdocs/favicon.ico b/httpdocs/favicon.ico
diff --git a/httpdocs/index.php b/httpdocs/index.php
@@ -19,6 +19,8 @@ function ($dir) {
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="shortcut icon" href="/favicon.ico">
+    <link rel="icon" sizes="16x16 32x32 64x64" href="/favicon.ico">
     <title><?php echo getenv('HOSTNAME') ?> admin console</title>
     <style type="text/css">
         * { margin:0; padding:0 }
@@ -44,7 +46,7 @@ function resizeIframe(obj) {
 </head>
 <body>
     <header>
-        <h1><span class="server-name"><?php echo getenv('HOSTNAME') ?></span> admin console</h1>
+        <h1><span class="server-name"><?php echo php_uname('n') ?></span> admin console</h1>
         <nav>
             <ul>
                 <?php foreach ($tools as $tool): ?>
@@ -53,7 +55,7 @@ function resizeIframe(obj) {
             </ul>
         </nav>
     </header>
-    <iframe id="appframe" src="" frameborder="0" scrolling="auto" onload="resizeIframe(this);"></iframe>
+    <iframe id="appframe" src="" frameborder="0" scrolling="auto" onload="resizeIframe(this);" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
     <footer>
         <a id="github" href="https://github.com/dralbert/php-admin-tk" target="_blank">drAlberT/php-admin-tk</a>
     </footer>

diff --git a/httpdocs/robots.txt b/httpdocs/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /