From 945561a5ff2e06fe300ae5f87b335829b6296b5c Mon Sep 17 00:00:00 2001 From: Eduardo Santos Date: Thu, 20 Feb 2014 16:27:32 -0300 Subject: [PATCH] Correções no layout e visualização das impressões --- Form/PrinterType.php | 0 Resources/config/routing.yml | 4 ++-- Resources/public/images/circuitos.png | Bin 4734 -> 0 bytes Resources/public/images/cocar-logo-24.png | Bin 0 -> 1678 bytes Resources/public/images/entidades.png | Bin 4596 -> 0 bytes Resources/public/images/help.png | Bin 1542 -> 0 bytes Resources/public/images/home.png | Bin 4357 -> 0 bytes Resources/public/images/ico1.png | Bin 4795 -> 0 bytes Resources/public/images/ico2.png | Bin 4230 -> 0 bytes Resources/public/images/impressoras.png | Bin 3271 -> 0 bytes Resources/public/images/relatorios.png | Bin 4562 -> 0 bytes Resources/public/images/table.png | Bin 886 -> 0 bytes Resources/views/Printer/reports.html.twig | 0 Resources/views/base.html.twig | 8 +++++++- Resources/views/layout.html.twig | 2 +- Tests/Controller/PrinterControllerTest.php | 0 16 files changed, 10 insertions(+), 4 deletions(-) mode change 100644 => 100755 Form/PrinterType.php mode change 100644 => 100755 Resources/public/images/circuitos.png create mode 100644 Resources/public/images/cocar-logo-24.png mode change 100644 => 100755 Resources/public/images/entidades.png mode change 100644 => 100755 Resources/public/images/help.png mode change 100644 => 100755 Resources/public/images/home.png mode change 100644 => 100755 Resources/public/images/ico1.png mode change 100644 => 100755 Resources/public/images/ico2.png mode change 100644 => 100755 Resources/public/images/impressoras.png mode change 100644 => 100755 Resources/public/images/relatorios.png mode change 100644 => 100755 Resources/public/images/table.png mode change 100644 => 100755 Resources/views/Printer/reports.html.twig mode change 100644 => 100755 Tests/Controller/PrinterControllerTest.php diff --git a/Form/PrinterType.php b/Form/PrinterType.php old mode 100644 new mode 100755 index af4662d..af4662d --- a/Form/PrinterType.php +++ b/Form/PrinterType.php diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 4fbf865..72709b7 100755 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -1,4 +1,4 @@ CocarBundle_cocar_annotation: resource: "@CocarBundle/Controller" - prefix: /cocar - type: annotation \ No newline at end of file + prefix: / + type: annotation diff --git a/Resources/public/images/circuitos.png b/Resources/public/images/circuitos.png old mode 100644 new mode 100755 index f6f52da..f6f52da Binary files a/Resources/public/images/circuitos.png and b/Resources/public/images/circuitos.png differ diff --git a/Resources/public/images/cocar-logo-24.png b/Resources/public/images/cocar-logo-24.png new file mode 100644 index 0000000..96ef18f Binary files /dev/null and b/Resources/public/images/cocar-logo-24.png differ diff --git a/Resources/public/images/entidades.png b/Resources/public/images/entidades.png old mode 100644 new mode 100755 index cf6a282..cf6a282 Binary files a/Resources/public/images/entidades.png and b/Resources/public/images/entidades.png differ diff --git a/Resources/public/images/help.png b/Resources/public/images/help.png old mode 100644 new mode 100755 index e1a4d92..e1a4d92 Binary files a/Resources/public/images/help.png and b/Resources/public/images/help.png differ diff --git a/Resources/public/images/home.png b/Resources/public/images/home.png old mode 100644 new mode 100755 index e494996..e494996 Binary files a/Resources/public/images/home.png and b/Resources/public/images/home.png differ diff --git a/Resources/public/images/ico1.png b/Resources/public/images/ico1.png old mode 100644 new mode 100755 index 9721ea8..9721ea8 Binary files a/Resources/public/images/ico1.png and b/Resources/public/images/ico1.png differ diff --git a/Resources/public/images/ico2.png b/Resources/public/images/ico2.png old mode 100644 new mode 100755 index 6413d7d..6413d7d Binary files a/Resources/public/images/ico2.png and b/Resources/public/images/ico2.png differ diff --git a/Resources/public/images/impressoras.png b/Resources/public/images/impressoras.png old mode 100644 new mode 100755 index f26e843..f26e843 Binary files a/Resources/public/images/impressoras.png and b/Resources/public/images/impressoras.png differ diff --git a/Resources/public/images/relatorios.png b/Resources/public/images/relatorios.png old mode 100644 new mode 100755 index 58759b8..58759b8 Binary files a/Resources/public/images/relatorios.png and b/Resources/public/images/relatorios.png differ diff --git a/Resources/public/images/table.png b/Resources/public/images/table.png old mode 100644 new mode 100755 index 1c19cb4..1c19cb4 Binary files a/Resources/public/images/table.png and b/Resources/public/images/table.png differ diff --git a/Resources/views/Printer/reports.html.twig b/Resources/views/Printer/reports.html.twig old mode 100644 new mode 100755 index d5a1261..d5a1261 --- a/Resources/views/Printer/reports.html.twig +++ b/Resources/views/Printer/reports.html.twig diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig index 1cefcb4..97698c8 100755 --- a/Resources/views/base.html.twig +++ b/Resources/views/base.html.twig @@ -1,6 +1,12 @@ {% extends '::base.html.twig' %} -{% block title 'Cocar' %} +{% block meta %} + + {{ "COCAR"|trans }} + + + +{% endblock %} {% block stylesheets %} {{ parent() }} diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index 856ef32..c0d8f5d 100755 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -124,4 +124,4 @@
{% block main %}{% endblock %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/Tests/Controller/PrinterControllerTest.php b/Tests/Controller/PrinterControllerTest.php old mode 100644 new mode 100755 index f29dbab..f29dbab --- a/Tests/Controller/PrinterControllerTest.php +++ b/Tests/Controller/PrinterControllerTest.php -- libgit2 0.21.2