From bee2bed2edf7568c6f31b722f288a44c48f1078e Mon Sep 17 00:00:00 2001 From: J-P Stacey Date: Sat, 6 Feb 2016 16:07:16 +0000 Subject: [PATCH] Final templates --- src/Controllers/All.php | 2 +- views/base.twig | 8 ++++++ views/location-ar.twig | 4 +-- views/need-ar-money.twig | 33 ++++++++++++++++++++++ views/need-en-money.twig | 33 ++++++++++++++++++++++ views/result-ar-postoffice.twig | 6 ---- views/result-en-postoffice.twig | 6 ---- views/results-ar-postoffice.twig | 47 ++++++++++++++++++++++++++++++++ views/results-en-postoffice.twig | 47 ++++++++++++++++++++++++++++++++ views/start.twig | 34 ++++++++++++----------- 10 files changed, 189 insertions(+), 31 deletions(-) create mode 100644 views/need-ar-money.twig create mode 100644 views/need-en-money.twig delete mode 100644 views/result-ar-postoffice.twig delete mode 100644 views/result-en-postoffice.twig create mode 100644 views/results-ar-postoffice.twig create mode 100644 views/results-en-postoffice.twig diff --git a/src/Controllers/All.php b/src/Controllers/All.php index 558f535..cb74fe4 100644 --- a/src/Controllers/All.php +++ b/src/Controllers/All.php @@ -74,7 +74,7 @@ public function results(Request $request, Application $app, $lang, $find) return $app->redirect('/'); } - if (!preg_match("/^[a-z]+\$/", $need)) { + if (!preg_match("/^[a-z]+\$/", $find)) { return $app->redirect('/'); } diff --git a/views/base.twig b/views/base.twig index 90aaaa7..39bc727 100644 --- a/views/base.twig +++ b/views/base.twig @@ -8,6 +8,14 @@ +
+
+ {% block languages %} + English|العربية + {% endblock %} +
+
+

{% block title %}{% endblock %}

diff --git a/views/location-ar.twig b/views/location-ar.twig index 4727350..dafea13 100644 --- a/views/location-ar.twig +++ b/views/location-ar.twig @@ -4,14 +4,14 @@ {% block content %}
- +

I'm at home now: set my location.
- +

I'm not at home: add my address.

 diff --git a/views/need-ar-money.twig b/views/need-ar-money.twig new file mode 100644 index 0000000..81666e3 --- /dev/null +++ b/views/need-ar-money.twig @@ -0,0 +1,33 @@ +{% extends "base.twig" %} + +{% block title %}Money (in Arabic){% endblock %} + +{% block standfirst %} +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum maximus tincidunt sagittis. Pellentesque justo neque, tincidunt non viverra nec, auctor eget nisl.

+{% endblock %} + +{% block content %} +
+
+ +

Post office

+

If you have your identification card you can get money form the Post Office.

+ + +

Find a Post Office

+ +
+
+ +
+
+ +

Western Union

+

You can receive money from your family using Western Union

+ + +

Find Western Union

+ +
+
+{% endblock %} diff --git a/views/need-en-money.twig b/views/need-en-money.twig new file mode 100644 index 0000000..299d073 --- /dev/null +++ b/views/need-en-money.twig @@ -0,0 +1,33 @@ +{% extends "base.twig" %} + +{% block title %}Money{% endblock %} + +{% block standfirst %} +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum maximus tincidunt sagittis. Pellentesque justo neque, tincidunt non viverra nec, auctor eget nisl.

+{% endblock %} + +{% block content %} +
+
+ +

Post office

+

If you have your identification card you can get money form the Post Office.

+ + +

Find a Post Office

+ +
+
+ +
+
+ +

Western Union

+

You can receive money from your family using Western Union

+ + +

Find Western Union

+ +
+
+{% endblock %} diff --git a/views/result-ar-postoffice.twig b/views/result-ar-postoffice.twig deleted file mode 100644 index 9614022..0000000 --- a/views/result-ar-postoffice.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.twig" %} - -{% block title %}{% endblock %} - -{% block content %} -{% endblock %} diff --git a/views/result-en-postoffice.twig b/views/result-en-postoffice.twig deleted file mode 100644 index 9614022..0000000 --- a/views/result-en-postoffice.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.twig" %} - -{% block title %}{% endblock %} - -{% block content %} -{% endblock %} diff --git a/views/results-ar-postoffice.twig b/views/results-ar-postoffice.twig new file mode 100644 index 0000000..267e1ac --- /dev/null +++ b/views/results-ar-postoffice.twig @@ -0,0 +1,47 @@ +{% extends "base.twig" %} + +{% block title %}Post offices near you (in Arabic){% endblock %} + +{% block content %} +
+
+ +

228 Shoreham St, Sheffield, England

+
+
+ + +

Navigate using Street View

+ +
+
+ + +

Navigate on a map

+ +
+
+
+
+ +
+
+ +

43 Charles St, Sheffield, England

+
+
+ + +

Navigate using Street View

+ +
+
+ + +

Navigate on a map

+ +
+
+
+
+{% endblock %} diff --git a/views/results-en-postoffice.twig b/views/results-en-postoffice.twig new file mode 100644 index 0000000..8e39a92 --- /dev/null +++ b/views/results-en-postoffice.twig @@ -0,0 +1,47 @@ +{% extends "base.twig" %} + +{% block title %}Post offices near you{% endblock %} + +{% block content %} +
+
+ +

228 Shoreham St, Sheffield, England

+
+
+ + +

Navigate using Street View

+ +
+
+ + +

Navigate on a map

+ +
+
+
+
+ +
+
+ +

43 Charles St, Sheffield, England

+
+
+ + +

Navigate using Street View

+ +
+
+ + +

Navigate on a map

+ +
+
+
+
+{% endblock %} diff --git a/views/start.twig b/views/start.twig index 539ced8..b0a7031 100644 --- a/views/start.twig +++ b/views/start.twig @@ -1,16 +1,18 @@ -{% extends "base.twig" %} - -{% block title %}Welcome to Sheffield!{% endblock %} - -{% block content %} -
-
-
- English -
-
- العربية -
-
-
-{% endblock %} +{% extends "base.twig" %} + +{% block languages %}{% endblock %} + +{% block title %}Welcome to Sheffield!{% endblock %} + +{% block content %} +
+
+
+ English +
+
+ العربية +
+
+
+{% endblock %}