diff options
| author | marcinzelent <zelent.marcin@gmail.com> | 2017-11-30 12:58:21 +0100 |
|---|---|---|
| committer | marcinzelent <zelent.marcin@gmail.com> | 2017-11-30 12:58:21 +0100 |
| commit | 4246f15d64d9ec460b3cb5acc2e838978bc2c91c (patch) | |
| tree | 1a7087c1870dff4dedd57b4e893a710785cebe32 /app | |
| parent | 1a572a61f0bc6fe58a7270fca57a4b97066eeac2 (diff) | |
| parent | 1e5946aba89293d1a3103adb885bff4a69c6f769 (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
Diffstat (limited to 'app')
| -rw-r--r-- | app/Resources/views/default/index.html.twig | 2 | ||||
| -rw-r--r-- | app/config/services.yml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index 1ec4bd6..2fc12a2 100644 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -17,7 +17,7 @@ </tr> </table> </div> - <p id="aq"></p> + <p id="aq">{{ Aqi }}</p> <img src="https://www.ourair.org/wp-content/uploads/AQItable.gif"> {% endblock %} {% block javascripts %} diff --git a/app/config/services.yml b/app/config/services.yml index cdb1c65..7ddee7c 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -29,6 +29,9 @@ services: public: true tags: ['controller.service_arguments'] + AppBundle\Utils\Aqi: + public: false + # add more services, or override services that need manual wiring # AppBundle\Service\ExampleService: # arguments: |