From 3e9161efb0c956ab68ef460d6b7d69af3d67fc2f Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 2 May 2016 17:17:11 +0200 Subject: [PATCH] Updated templates --- templates/app/home-page.html.twig | 113 ----------------------------- templates/error/404.html.twig | 17 +++-- templates/error/error.html.twig | 15 ++-- templates/layout/default.html.twig | 11 ++- 4 files changed, 26 insertions(+), 130 deletions(-) delete mode 100644 templates/app/home-page.html.twig diff --git a/templates/app/home-page.html.twig b/templates/app/home-page.html.twig deleted file mode 100644 index b048b139..00000000 --- a/templates/app/home-page.html.twig +++ /dev/null @@ -1,113 +0,0 @@ -{% extends 'layout/default.html.twig' %} - -{% block title %}Home{% endblock %} - -{% block content %} -
-

Welcome to zend-expressive

-

- Congratulations! You have successfully installed the - zend-expressive skeleton application. - This skeleton can serve as a simple starting point for you to begin building your application. -

-

- Expressive builds on zend-stratigility to provide a minimalist PSR-7 middleware framework for PHP. -

-
- -
-
-

- - Agile & Lean - -

-

- Expressive is fast, small and perfect for rapid application development, prototyping and api's. You decide how you - extend it and choose the best packages from major framework or standalone projects. -

-
- -
-

- - HTTP Messages - -

-

- HTTP messages are the foundation of web development. Web browsers and HTTP clients such as cURL create - HTTP request messages that are sent to a web server, which provides an HTTP response message. - Server-side code receives an HTTP request message, and returns an HTTP response message. -

-
- -
-

- - Middleware - -

-

- Middleware is code that exists between the request and response, and which can take the incoming - request, perform actions based on it, and either complete the response or pass delegation on to the - next middleware in the queue. Your application is easily extended with custom middleware created by - yourself or others. -

-
-
- -
-
-

- - Containers - -

-

- Expressive promotes and advocates the usage of Dependency Injection/Inversion of Control containers - when writing your applications. Expressive supports multiple containers which typehints against - container-interop. -

-
- -
-

- - Routers - -

-

- One fundamental feature of zend-expressive is that it provides mechanisms for implementing dynamic - routing, a feature required in most modern web applications. Expressive ships with multiple adapters. -

- {% if routerName is defined %} -

- - Get started with {{ routerName }}. - -

- {% endif %} -
- -
-

- - Templating - -

-

- By default, no middleware in Expressive is templated. We do not even provide a default templating - engine, as the choice of templating engine is often very specific to the project and/or organization. - However, Expressive does provide abstraction for templating, which allows you to write middleware that - is engine-agnostic. -

- {% if templateName is defined %} -

- - Get started with {{ templateName }}. - -

- {% endif %} -
-
-{% endblock %} diff --git a/templates/error/404.html.twig b/templates/error/404.html.twig index 8e3f3a7a..0e591e2a 100644 --- a/templates/error/404.html.twig +++ b/templates/error/404.html.twig @@ -1,12 +1,17 @@ {% extends 'layout/default.html.twig' %} -{% block title %}404 Not Found{% endblock %} +{% block title %}URL Not Found{% endblock %} + +{% block stylesheets %} + +{% endblock %} {% block content %}

Oops!

-

This is awkward.

-

We encountered a 404 Not Found error.

-

- You are looking for something that doesn't exist or may have moved. -

+
+

This short URL doesn't seem to be valid.

+

Make sure you included all the characters, with no extra punctuation.

{% endblock %} diff --git a/templates/error/error.html.twig b/templates/error/error.html.twig index c9b66893..cd54354e 100644 --- a/templates/error/error.html.twig +++ b/templates/error/error.html.twig @@ -2,14 +2,19 @@ {% block title %}{{ status }} {{ reason }}{% endblock %} +{% block stylesheets %} + +{% endblock %} + {% block content %}

Oops!

-

This is awkward.

+

We encountered a {{ status }} {{ reason }} error.

{% if status == 404 %} -

- You are looking for something that doesn't exist or may have moved. Check out one of the links on this page - or head back to Home. -

+

This short URL doesn't seem to be valid.

+

Make sure you included all the characters, with no extra punctuation.

{% endif %} {% endblock %} diff --git a/templates/layout/default.html.twig b/templates/layout/default.html.twig index ac34990a..7c29df7a 100644 --- a/templates/layout/default.html.twig +++ b/templates/layout/default.html.twig @@ -3,16 +3,15 @@ - {% block title %}{% endblock %} - zend-expressive + {% block title %}{% endblock %} | URL shortener {% block stylesheets %}{% endblock %}