Merge pull request #137 from cytopia/DVL-013

WIP: DVL-013 Logos and layout

.devilbox/www/htdocs/assets/css/custom.css

@@ -150,6 +150,9 @@ body {
 a.navbar-brand {
 	background-color: transparent !important;
 }
+a.navbar-brand img {
+	margin-right: 10px;
+}
 a.nav-link {
 	background-color: transparent !important;
 }

.devilbox/www/htdocs/index.php

@@ -247,7 +247,7 @@ $HEALTH_PERCENT = 100 - ceil(100 * $HEALTH_FAILS / $HEALTH_TOTAL);
 				</div>
 
 				<div class="col-md-4 col-sm-4 col-xs-12 col-margin">
-					<img src="/assets/img/devilbox_80.png" style="width:100%;" />
+					<img src="/assets/img/banner.png" style="width:100%;" />
 				</div>
 
 				<div class="col-md-4 col-sm-4 col-xs-12 col-margin">

.devilbox/www/htdocs/login.php

@@ -35,7 +35,7 @@ if (isset($_POST['username']) && isset($_POST['password'])) {
 					<div class="container">
 						<div class="inner cover">
 
-							<img src="/assets/img/devilbox_80.png" style="width:60%; padding-bottom:20px;"/>
+							<img src="/assets/img/banner.png" style="width:60%; padding-bottom:20px;"/>
 							<h1 class="cover-heading">Devilbox Login</h1>
 
 							<div class="text-danger"><?php echo $login_error; ?></div>

.devilbox/www/include/lib/Html.php

@@ -197,7 +197,7 @@ HTML;
 					<span class="navbar-toggler-icon"></span>
 				</button>
 				<a class="navbar-brand" href="/index.php">
-					<img src="/assets/img/logo_30.png" width="30" height="30" class="d-inline-block align-top" alt="">devilbox
+					<img src="/assets/img/logo.png" width="30" height="30" class="d-inline-block align-top" alt="">devilbox
 				</a>
 
 				<div class="collapse navbar-collapse" id="navbarSupportedContent">

README.md

@@ -1,42 +1,42 @@
-# ![Devilbox](https://raw.githubusercontent.com/cytopia/devilbox/master/.devilbox/www/htdocs/assets/img/devilbox_80.png) The devilbox
+
+<p align="center">
+    <h1 align="center">The devilbox</h1>
+</p>
+
+![Devilbox](docs/img/devilbox-banner.png)
 
 [![Join the chat at https://gitter.im/devilbox/Lobby](https://badges.gitter.im/devilbox/Lobby.svg)](https://gitter.im/devilbox/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
-[Usage](#usage) |
-[Features](#feature-overview) |
-[Documentation](#documentation) |
-[Run-time Matrix](#run-time-matrix) |
-[Intranet](#intranet-overview) |
-[Screenshots](#screenshots) |
-[Contributing](#contributing) |
-[License](#license)
+**[Usage](#usage)** |
+**[Features](#feature-overview)** |
+**[Documentation](#documentation)** |
+**[Intranet](#intranet-overview)** |
+**[Screenshots](#screenshots)** |
+**[Contributing](#contributing)** |
+**[Logos](#logos)** |
+**[License](#license)**
 
-![Devilbox](docs/img/devilbox-dash.png)
+![Devilbox](docs/img/devilbox-dash-full.png)
 
 [![Build Status](https://travis-ci.org/cytopia/devilbox.svg?branch=master)](https://travis-ci.org/cytopia/devilbox) ![Tag](https://img.shields.io/github/tag/cytopia/devilbox.svg) [![type](https://img.shields.io/badge/type-Docker-orange.svg)](https://www.docker.com/) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-The devilbox is a modern and highly customisable **LAMP** and **MEAN** stack replacement based purely on docker and docker-compose running on all major platforms. It supports an unlimited number of projects for which vhosts and DNS records are created automatically. Email catch-all and popular development tools will be at your service as well.
-
-Configuration is not necessary, as everything is pre-setup with mass virtual hosting and also offers Auto-DNS.
-
-**Supported operating systems**
+The devilbox is a modern and highly customisable **dockerized PHP stack** supporting full **LAMP** and **MEAN** and running on all major platforms. The main goal is to easily switch and combine any version required for local development. It supports an unlimited number of projects for which vhosts and DNS records are created automatically. Email catch-all and popular development tools will be at your service as well.  Configuration is not necessary, as everything is pre-setup with mass virtual hosting.
 
 ![Linux](https://raw.githubusercontent.com/cytopia/icons/master/64x64/linux.png) ![Windows](https://raw.githubusercontent.com/cytopia/icons/master/64x64/windows.png) ![OSX](https://raw.githubusercontent.com/cytopia/icons/master/64x64/osx.png)
 
-<sub>It might run on FreeBSD, but I don't know the status of docker-compose there.</sub>
-
-
----
-
 
 ## Usage
 
 #### Quick start
 
-You are up and running in three simple steps:
+You are up and running in four simple steps:
 
 ```shell
+# Get the devilbox
+$ git clone https://github.com/cytopia/devilbox
+$ cd devilbox
+
 # Create docker-compose environment file
 $ cp env-example .env
 
@@ -54,11 +54,11 @@ The above will start all containers, you can however also just start the contain
 ```shell
 $ docker-compose up httpd php mysql redis
 ```
-![Devilbox](docs/img/devilbox-dash-01.png)
+![Devilbox](docs/img/devilbox-dash-selective.png)
 
 #### Run different versions
 
-Every single attachable container comes with many different versions. In order to select the desired version for a container, simply edit the `.env` file and uncomment the version of choice.
+Every single attachable container comes with many different versions. In order to select the desired version for a container, simply edit the `.env` file and uncomment the version of choice. Any combination is possible.
 
 <table>
   <thead>
@@ -180,56 +180,136 @@ root@php-7.0.19 in /shared/httpd $
 
 Your projects can be found in `/shared/httpd`. DNS records are automatically available inside the php container. Also every other service will be available on `127.0.0.1` inside the php container (tricky socat port-forwarding).
 
+#### Quick Video intro
+
+[![Devilbox setup and workflow](docs/img/devilbox_01-setup-and-workflow.png "devilbox - setup and workflow")](https://www.youtube.com/watch?v=reyZMyt2Zzo)
+[![Devilbox email catch-all](docs/img/devilbox_02-email-catch-all.png "devilbox - email catch-all")](https://www.youtube.com/watch?v=e-U-C5WhxGY)
+
 
 ## Feature overview
 
-The devilbox has everything setup for you. The only thing you will have to install is `docker` and `docker-compose`. Virtual hosts and DNS entries will be created automatically, just by adding new project folders.
+The devilbox has everything setup for you. The only thing you will have to install is [docker](https://docs.docker.com/engine/installation/) and [docker-compose](https://docs.docker.com/compose/install/). Virtual hosts and DNS entries will be created automatically, just by adding new project folders.
 
 #### Features
 
-* **Mass virtual host**
-* **Custom domains** (`*.loc`, `*.local`, `*.dev`, `*.example.com`, ...)
-* **Auto-DNS** (Internal Bind server running)
-* **Email catch-all** (Internal postfix with catch-all)
-* **Log files** (available on host computer)
-* **Config overwrites** (`my.cnf`, `nginx.conf`, `httpd.conf` or `php.ini`)
-* **Custom PHP modules** (can be loaded on the fly)
-* **Self-validation** (projects and configured options are validated and marked in the intranet)
-* **Xdebug**
+<table>
+<tbody>
+  <tr>
+    <td width="220" style="width:220px;">:star: Mass virtual hosts</td>
+    <td>New vhosts are created automatically whenever you add a project directory. This is done internally and automatically via <a href="https://travis-ci.org/devilbox/vhost-gen">vhost-gen</a> and <a href="https://github.com/devilbox/watcherd">watcherd</a>.</td>
+  </tr>
+  <tr>
+    <td>:star: Custom vhosts</td>
+    <td>You can overwrite and customise the default applied vhost configuration for every single vhost.</td>
+  </tr>
+  <tr>
+    <td>:star: Custom domains</td>
+    <td>Choose whatever development domain you desire: <code>*.loc</code>, <code>*.local</code>, <code>*.dev</code> or use real domains as well: <code>*.example.com</code></td>
+  </tr>
+  <tr>
+    <td>:star: Auto DNS</td>
+    <td>An integraded BIND server is able to create DNS entries automatically for your chosen domains.</td>
+  </tr>
+  <tr>
+    <td>:star: Custom PHP config</td>
+    <td>Overwrite any setting for PHP.</td>
+  </tr>
+  <tr>
+    <td>:star: Custom PHP modules</td>
+    <td>Load custom PHP modules on the fly.</td>
+  </tr>
+  <tr>
+    <td>:star: Email catch-all</td>
+    <td>All outgoing emails are catched and will be presented in the included intranet.</td>
+  </tr>
+  <tr>
+    <td>:star: Self-validation</td>
+    <td>Projects and configuration options are validated and marked in the intranet.</td>
+  </tr>
+  <tr>
+    <td>:star: Xdebug</td>
+    <td>Xdebug and a full blown PHP-FPM/HHVM server is ready to serve.</td>
+  </tr>
+  <tr>
+    <td>:star: Many more</td>
+    <td>See Documentation for all available features.</td>
+  </tr>
+</tbody>
+</table>
+
 
 #### Batteries
 
-* [phpMyAdmin](https://www.phpmyadmin.net)
-* [Adminer](https://www.adminer.org)
-* [OpcacheGUI](https://github.com/PeeHaa/OpCacheGUI)
-* Mail viewer
+<table>
+<tbody>
+  <tr>
+    <td>:open_file_folder:</td>
+    <td><a href="https://www.phpmyadmin.net">phpMyAdmin</a></td>
+  </tr>
+  <tr>
+    <td>:open_file_folder:</td>
+    <td><a href="https://www.adminer.org">Adminer</a></td>
+  </tr>
+  <tr>
+    <td>:bar_chart:</td>
+    <td><a href="https://github.com/PeeHaa/OpCacheGUI">OpCache GUI</a></td>
+  </tr>
+  <tr>
+    <td>:email:</td>
+    <td>Mail viewer</td>
+  </tr>
+</tbody>
+</table>
+
 
 #### Tools
 
-| tool           | binary |
-|----------------|---------|
-| [awesome-ci](https://github.com/cytopia/awesome-ci)    | `file-cr`, `file-crlf`, `file-empty`, `file-nullbyte-char`, `file-trailing-newline`, `file-trailing-single-newline`, `file-trailing-space`, `file-utf8`, `file-utf8-bom`, `git-conflicts`, `git-ignored`, `inline-css`, `inline-js`, `regex-grep`, `regex-perl`, `syntax-bash`, `syntax-css`, `syntax-js`, `syntax-json`, `syntax-markdown`, `syntax-perl`, `syntax-php`, `syntax-python`, `syntax-ruby`, `syntax-scss`, `syntax-sh` |
-| [composer](https://getcomposer.org)    | `composer` |
-| [drupal-console](https://drupalconsole.com) | `drupal` |
-| [drush](http://www.drush.org)          | `drush` |
-| [git](https://git-scm.com)             | `git` |
-| [laravel installer](https://github.com/laravel/installer)     | `laravel` |
-| [mysqldump-secure](https://mysqldump-secure.org) | `mysqldump-secure` |
-| [node](https://nodejs.org)             | `node` |
-| [npm](https://www.npmjs.com)           | `npm` |
-| [phalcon-devtools](https://github.com/phalcon/phalcon-devtools)   | `phalcon` |
-| [symfony installer](https://github.com/symfony/symfony-installer) | `symfony` |
-| [wp-cli](https://wp-cli.org)           | `wp` |
+The following tools will assist you on creating new projects easily as well as helping you check your code against guidelines.
 
-Require additional tools? Have a look at [Hacking](docs/Hacking.md) for information about how to add your own tools or open up an issue with a new tool request.
+<table>
+<tbody>
+  <tr>
+    <td width="220" style="width:220px;">:wrench: <a href="https://github.com/cytopia/awesome-ci">awesome-ci</a></td>
+    <td>A set of tools for static code analysis:<br/><br/><code>file-cr</code>, <code>file-crlf</code>, <code>file-empty</code>, <code>file-nullbyte-char</code>, <code>file-trailing-newline</code>, <code>file-trailing-single-newline</code>, <code>file-trailing-space</code>, <code>file-utf8</code>, <code>file-utf8-bom</code>, <code>git-conflicts</code>, <code>git-ignored</code>, <code>inline-css</code>, <code>inline-js</code>, <code>regex-grep</code>, <code>regex-perl</code>, <code>syntax-bash</code>, <code>syntax-css</code>, <code>syntax-js</code>, <code>syntax-json</code>, <code>syntax-markdown</code>, <code>syntax-perl</code>, <code>syntax-php</code>, <code>syntax-python</code>, <code>syntax-ruby</code>, <code>syntax-scss</code>, <code>syntax-sh</code></td>
+  </tr>
+  <tr>
+    <td>:wrench: <a href="https://github.com/laravel/installer">laravel installer</a></td>
+    <td><code>laravel</code> is a command line tool that lets you easily install the Laravel framework.</td>
+  </tr>
+  <tr>
+    <td>:wrench: <a href="https://github.com/phalcon/phalcon-devtools">phalcon devtools</a></td>
+    <td><code>phalcon</code> is a command line tool that lets you easily install the PhalconPHP framework.</td>
+  </tr>
+  <tr>
+    <td>:wrench: <a href="https://github.com/symfony/symfony-installer">symfony installer</a></td>
+    <td><code>symfony</code> is a command line tool that lets you easily install the Symfony framework.</td>
+  </tr>
+  <tr>
+    <td>:wrench: <a href="https://wp-cli.org">wp-cli</a></td>
+    <td><code>wp</code> is a command line tool that lets you easily install Wordpress.</td>
+  </tr>
+</tbody>
+</table>
 
-#### PHP Modules
+Well-known and popular tools will be at your service as well:
+
+<a target="_blank" title="Composer" href="https://getcomposer.org"><img width="64" style="width:64px" src="docs/img/logo_tools/composer.png" alt="Devilbox"/></a>
+<a target="_blank" title="Drupal Console" href="https://drupalconsole.com"><img width="64" style="battery" src="docs/img/logo_tools/drupal-console.png" alt="Devilbox"/></a>
+<a target="_blank" title="Drush" href="https://www.drupal.org/project/drush"><img width="64" style="width:64px;" src="docs/img/logo_tools/drush.png" alt="Devilbox"/></a>
+<a target="_blank" title="Git" href="https://git-scm.com"><img width="64" style="width:64px;" src="docs/img/logo_tools/git.png" alt="Devilbox"/></a>
+<a target="_blank" title="mysqldump-secure" href="https://mysqldump-secure.org"><img width="64" style="width:64px;" src="docs/img/logo_tools/mysqldump-secure.png" alt="Devilbox"/></a>
+<a target="_blank" title="NodeJS" href="https://nodejs.org"><img width="64" style="width:64px;" src="docs/img/logo_tools/nodejs.png" alt="Devilbox"/></a>
+<a target="_blank" title="NPM" href="https://www.npmjs.com"><img width="64" style="width:64px;" src="docs/img/logo_tools/npm.png" alt="Devilbox"/></a>
+
+Require additional tools? Have a look at **[Hacking](docs/Hacking.md)** for information about how to add your own tools or open up an issue with a new tool request.
+
+#### Available PHP Modules
 
 The devilbox is a development stack, so it is made sure that a lot of PHP modules are available out of the box in order to work with many different frameworks.
 
 > *apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dom, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, magickwand, mbstring, mcrypt, memcache, memcached, mhash, mongodb, msgpack, mysql, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, soap, sockets, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib*
 
-**Custom PHP Modules**
+#### Custom PHP Modules
 
 You can also copy any custom modules into `mod/(php-fpm|hhvm)-<VERSION>` and add a custom `*.ini` file to load them. See [Custom PHP Modules](docs/Configure.md#425-custom-php-modules) in the Configuration documentation for how to do that in two simple steps.
 
@@ -237,48 +317,19 @@ You can also copy any custom modules into `mod/(php-fpm|hhvm)-<VERSION>` and add
 
 As far as tested there are no limitations and you can use any Framework or CMS just as you would on your live environment. Below are a few examples of extensively tested Frameworks and CMS:
 
-[![CakePHP](docs/img/logos/cake.png)](https://cakephp.org)
-[![Drupal](docs/img/logos/drupal.png)](https://www.drupal.org)
-[![Joomla](docs/img/logos/joomla.png)](https://www.joomla.org)
-[![Laravel](docs/img/logos/laravel.png)](https://laravel.com)
-[![Phalcon](docs/img/logos/phalcon.png)](https://phalconphp.com)
-[![Symfony](docs/img/logos/symfony.png)](https://symfony.com)
-[![Wordpress](docs/img/logos/wordpress.png)](https://wordpress.org)
-[![Yii](docs/img/logos/yii.png)](http://www.yiiframework.com)
-[![Zend](docs/img/logos/zend.png)](https://framework.zend.com)
+[![CakePHP](docs/img/logo_fw/cake.png)](https://cakephp.org)
+[![Drupal](docs/img/logo_fw/drupal.png)](https://www.drupal.org)
+[![Joomla](docs/img/logo_fw/joomla.png)](https://www.joomla.org)
+[![Laravel](docs/img/logo_fw/laravel.png)](https://laravel.com)
+[![Phalcon](docs/img/logo_fw/phalcon.png)](https://phalconphp.com)
+[![Symfony](docs/img/logo_fw/symfony.png)](https://symfony.com)
+[![Wordpress](docs/img/logo_fw/wordpress.png)](https://wordpress.org)
+[![Yii](docs/img/logo_fw/yii.png)](http://www.yiiframework.com)
+[![Zend](docs/img/logo_fw/zend.png)](https://framework.zend.com)
 
 
 ## Documentation
 
-#### Video Tutorials
-
-To get you started quickly, lean back and watch the following videos on Youtube.
-
-[![Devilbox setup and workflow](docs/img/devilbox_01-setup-and-workflow.png "devilbox - setup and workflow")](https://www.youtube.com/watch?v=reyZMyt2Zzo) 
-[![Devilbox email catch-all](docs/img/devilbox_02-email-catch-all.png "devilbox - email catch-all")](https://www.youtube.com/watch?v=e-U-C5WhxGY)
-
-#### Documentation explained
-
-The devilbox documentation consists of the following main sections.
-
-| Documentaion                     | Description |
-|----------------------------------|-------------|
-| [Overview](docs/README.md)       | General overview |
-| [Quickstart](docs/Quickstart.md) | Everything needed to get you started in no time |
-| [Install](docs/Install.md)       | Installation information for different operating systems |
-| [Update](docs/Update.md)         | Update strategies |
-| [Configure](docs/Configure.md)   | How to configure the devilbox and its services |
-| [Run](docs/Run.md)               | Explanation of different required docker-compose run commands |
-| [Usage](docs/Usage.md)           | How to use the devilbox in detail |
-| [OS](docs/OS.md)                 | Operating system specific information |
-| [Backups](docs/Backups.md)       | How to backup and restore various databases |
-| [Examples](docs/Examples.md)     | How to setup different frameworks: drupal, Yii, Symfony, Phalcon, Wordpress... |
-| [Technical](docs/Technical.md)   | Technical background information |
-| [Hacking](docs/Hacking.md)       | Hack the devilbox and integrate custom stuff |
-| [FAQ](docs/FAQ.md)               | Frequently asked questions |
-
-#### Documentation
-
 1. **[Overview](docs/README.md)**
     1. [Main idea](docs/README.md#1-main-idea)
     2. [Features](docs/README.md#2-features)
@@ -374,73 +425,9 @@ The devilbox documentation consists of the following main sections.
 13. **[FAQ](docs/FAQ.md)**
 
 
-## Run-time Matrix
-
-The main idea of the devilbox is to selectively run and combine any version you require for your currently desired development stack. Services are grouped into different stacks, currently into **Base**, **SQL** and **NoSQL**. However there are many more to come. If you find yourself in need of a stack or service that is not yet inluded, just open up an issue or pull request.
-
-In order to make sure every combination works with each other, the devilbox integrates extensive CI tests for the Docker container itself and their combinations. The following tables show the available stacks including git repositories and travis-ci checks.
-
-<sub>**Note:** Entries without links or without build-status are planned, but not yet available. See [ROADMAP](https://github.com/cytopia/devilbox/issues/23) for tasks and upcoming features.</sub>
-
-#### Base stack (required)
-
-| DNS | Webserver | PHP |
-|-----|-----------|-----|
-| [![Build Status](https://travis-ci.org/cytopia/docker-bind.svg?branch=master)](https://travis-ci.org/cytopia/docker-bind) [Bind](https://github.com/cytopia/docker-bind)  | [![Build Status](https://travis-ci.org/devilbox/docker-apache-2.2.svg?branch=master)](https://travis-ci.org/devilbox/docker-apache-2.2) [Apache 2.2](https://github.com/devilbox/docker-apache-2.2) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.4) [PHP 5.4](https://github.com/cytopia/docker-php-fpm-5.4) |
-|     | [![Build Status](https://travis-ci.org/devilbox/docker-apache-2.4.svg?branch=master)](https://travis-ci.org/devilbox/docker-apache-2.4) [Apache 2.4](https://github.com/devilbox/docker-apache-2.4) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.5) [PHP 5.5](https://github.com/cytopia/docker-php-fpm-5.5) |
-|     | [![Build Status](https://travis-ci.org/devilbox/docker-nginx-stable.svg?branch=master)](https://travis-ci.org/devilbox/docker-nginx-stable) [Nginx stable](https://github.com/devilbox/docker-nginx-stable) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.6) [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
-|     | [![Build Status](https://travis-ci.org/devilbox/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/devilbox/docker-nginx-mainline) [Nginx mainline](https://github.com/devilbox/docker-nginx-mainline) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.0) [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
-|     | | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.1) [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
-|     | | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.2) [PHP 7.2](https://github.com/cytopia/docker-php-fpm-7.2)
-|     | | [![Build Status](https://travis-ci.org/cytopia/docker-hhvm-latest.svg?branch=master)](https://travis-ci.org/cytopia/docker-hhvm-latest) [HHVM latest](https://github.com/cytopia/docker-hhvm-latest)
-
-#### SQL stack (optional)
-
-| MySQL | PostgreSQL | MS SQL |
-|-------|------------|--------|
-| [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.5) [MySQL 5.5](https://github.com/cytopia/docker-mysql-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.1](https://hub.docker.com/_/postgres/) | MS SQL 2017 |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.6) [MySQL 5.6](https://github.com/cytopia/docker-mysql-5.6) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.2](https://hub.docker.com/_/postgres/) | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.7.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.7) [MySQL 5.7](https://github.com/cytopia/docker-mysql-5.7) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.3](https://hub.docker.com/_/postgres/) | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mysql-8.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-8.0) [MySQL 8.0](https://github.com/cytopia/docker-mysql-8.0)  | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.4](https://hub.docker.com/_/postgres/) | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-5.5) [MariaDB 5.5](https://github.com/cytopia/docker-mariadb-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.5](https://hub.docker.com/_/postgres/) | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.0) [MariaDB 10.0](https://github.com/cytopia/docker-mariadb-10.0) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.6](https://hub.docker.com/_/postgres/) | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.1) [MariaDB 10.1](https://github.com/cytopia/docker-mariadb-10.1) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 10.0](https://hub.docker.com/_/postgres/) | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.2) [MariaDB 10.2](https://github.com/cytopia/docker-mariadb-10.2) | | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.3.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.3) [MariaDB 10.3](https://github.com/cytopia/docker-mariadb-10.3) | | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-percona-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-percona-5.5) [PerconaDB 5.5](https://github.com/cytopia/docker-percona-5.5) | | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-percona-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-percona-5.6) [PerconaDB 5.6](https://github.com/cytopia/docker-percona-5.6) | | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-percona-5.7.svg?branch=master)](https://travis-ci.org/cytopia/docker-percona-5.7) [PerconaDB 5.7](https://github.com/cytopia/docker-percona-5.7) | | |
-
-#### NoSQL stack (optional)
-
-| Cassandra | CouchDB | Memcached | MongoDB | Redis |
-|-----------|---------|-----------|---------|-------|
-| Cassandra 2.1 | CouchDB 1.6 | [![Travis CI](https://travis-ci.org/docker-library/memcached.svg?branch=master)](https://travis-ci.org/docker-library/memcached) [latest](https://github.com/docker-library/memcached) | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [2.8](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [2.8](https://github.com/docker-library/redis) |
-| Cassandra 2.2 | CouchDB 2.0 |                  | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.0](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [3.0](https://github.com/docker-library/redis) |
-| Cassandra 3.0 |             |                  | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.2](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [3.2](https://github.com/docker-library/redis) |
-|               |             |                  | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.4](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [4.0](https://github.com/docker-library/redis) |
-| | | | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.5](https://github.com/docker-library/mongo) | |
-
-<!--
-#### Message stack (optional)
-**Optional search stack**
-
-| Apache Solr | Elasticsearch |
-|-------------|---------------|
-| todo        |               |
--->
-<!--
-**Optional cgi stack**
-
-| Go   | Perl | Python | Ruby |
-|------|------|--------|------|
-| todo | todo | todo   | todo |
--->
-
-
 ## Intranet overview
 
-The devilbox comes with a pre-configured intranet on `http://localhost`. It will not only show you, your chosen configuration, but also validate the status of your configuration, such as *Do DNS records exists (on host and container)*, *are directories properly set-up*. Additionally it provides external tools to let you interact with databases and emails.
+The devilbox comes with a pre-configured intranet on `http://localhost`. This can be explicitly disabled or password-protected. The intranet will not only show you, the chosen configuration, but also validate the status of the current configuration, such as if **DNS records** exists (on host and container), are directories properly set-up. Additionally it provides external tools to let you interact with databases and emails.
 
 * **Virtual Host overview** (validates directories and DNS)
 * **Database overview** (MySQL, PgSQL, Redis, Memcache, ...)
@@ -463,30 +450,24 @@ The homepage shows you the status of your current configured setup.
 * what other settings have been set
 * did any errors occur?
 
-![Intranet Home](docs/img/01_intranet_home.png "Intranet Home")
-
-#### Virtual Host overview
-
-This overview shows you all available virtual hosts and if they need additional configuration (on the host)
-
-Virtual Hosts are considered valid if the following requirements are met (on the host system):
-
-* `htdocs` folder/symlink exists in your project folder
-* `/etc/hosts` has a valid DNS config for your host: `127.0.0.1  <project-folder>.<TLD_SUFFIX>` (alternatively the bundle BIND server can be attached to your host-computer).
-
-![Intranet vHost](docs/img/02_intranet_vhosts.png "Intranet Home")
-
-#### Database overview
-
-Shows you all the databases that are loaded
-
-![Intranet DB](docs/img/03_intranet_databases.png "Intranet Home")
-
-#### Email overview
-
-Shows you all the emails that have been sent. No email will actually be sent outside, but they are all catched by one account and presented here.
-
-![Intranet Email](docs/img/04_intranet_emails.png "Intranet Home")
+<table>
+<tbody>
+ <tr>
+  <td rowspan="2">
+   <img style="width:250px;" width="250" src="docs/img/screenshots/01_intranet_home.png" />
+  </td>
+  <td>
+   <img style="width:250px" width="250" src="docs/img/screenshots/02_intranet_vhosts.png" />
+  </td>
+  <td>
+   <img style="width:250px;" width="250" src="docs/img/screenshots/03_intranet_databases.png" />
+  </td>
+ </tr>
+ <tr>
+  <td><img style="width:250px;" width="250" src="docs/img/screenshots/04_intranet_emails.png" /></td>
+  <td></td>
+ </tr>
+</table>
 
 
 ## Contributing
@@ -502,6 +483,14 @@ And last but not least, you can also get actively involved. **Do clone the proje
 Major contributors will be credited within the intranet and on the github page.
 
 
+## Logos
+
+Logos and banners can be found at **[devilbox/artwork](https://github.com/devilbox/artwork)**. Feel free to use or modify them by the terms of their license.
+
+<img style="width:64px; height:64px;" width="64" height="64" src="https://github.com/devilbox/artwork/blob/master/submissions_logo/cytopia/01/png/logo_128_trans.png?raw=true" /> <img style="width:64px; height:64px;" width="64" height="64" src="https://github.com/devilbox/artwork/blob/master/submissions_logo/cytopia/02/png/logo_128_trans.png?raw=true" /> <img style="height:64px;" height="64" src="https://github.com/devilbox/artwork/blob/master/submissions_banner/cytopia/01/png/banner_128_trans.png?raw=true" />
+
 ## License
 
 [MIT License](LICENSE.md)
+
+Copyright (c) 2016 [cytopia](https://github.com/cytopia)

docs/README.md

@@ -180,13 +180,13 @@ Apart from asking for new modules to be bundled with each Docker container, you
 
 As far as tested there are no limitations and you can use any Framework or CMS just as you would on your live environment. Below are a few examples of extensively tested Frameworks and CMS:
 
-[![CakePHP](img/logos/cake.png)](https://cakephp.org)
-[![Drupal](img/logos/drupal.png)](https://www.drupal.org)
-[![Laravel](img/logos/laravel.png)](https://laravel.com)
-[![Phalcon](img/logos/phalcon.png)](https://phalconphp.com)
-[![Symfony](img/logos/symfony.png)](https://symfony.com)
-[![Wordpress](img/logos/wordpress.png)](https://wordpress.org)
-[![Yii](img/logos/yii.png)](http://www.yiiframework.com)
-[![Zend](img/logos/zend.png)](https://framework.zend.com)
+[![CakePHP](img/logo_fw/cake.png)](https://cakephp.org)
+[![Drupal](img/logo_fw/drupal.png)](https://www.drupal.org)
+[![Laravel](img/logo_fw/laravel.png)](https://laravel.com)
+[![Phalcon](img/logo_fw/phalcon.png)](https://phalconphp.com)
+[![Symfony](img/logo_fw/symfony.png)](https://symfony.com)
+[![Wordpress](img/logo_fw/wordpress.png)](https://wordpress.org)
+[![Yii](img/logo_fw/yii.png)](http://www.yiiframework.com)
+[![Zend](img/logo_fw/zend.png)](https://framework.zend.com)
 
 Have a look at **[Examples](Examples.md)** for how to set them up on the devilbox.