Skip to content

Commit

Permalink
Merge pull request #187 from gerMdz/add-gentella-admin
Browse files Browse the repository at this point in the history
Add gentella admin
  • Loading branch information
gerMdz authored Sep 10, 2023
2 parents 292b768 + 2d603fd commit e64b0a4
Show file tree
Hide file tree
Showing 17 changed files with 5,756 additions and 2,766 deletions.
6,581 changes: 3,869 additions & 2,712 deletions public/vendors_admin/build/css/custom.css

Large diffs are not rendered by default.

33 changes: 32 additions & 1 deletion src/Controller/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
class AdminController extends AbstractController
{
/**
* @Route("/admin", name="admin")
* @Route("/admin/general", name="admin")
* @param PrincipalRepository $principalRepository
* @param MetaBaseRepository $metaBaseRepository
* @param PaginatorInterface $paginator
Expand Down Expand Up @@ -51,6 +51,37 @@ public function index(
]);
// }

// return $this->render('admin/index_escritor.html.twig', [
// 'principals' => $principales,
// ]);
}


/**
* @Route("/admin", name="app_admin_main")
* @param MetaBaseRepository $metaBaseRepository
* @param PaginatorInterface $paginator
* @param Request $request
* @return Response
*/
public function main(
MetaBaseRepository $metaBaseRepository,
PaginatorInterface $paginator,
Request $request
): Response {
$bus = $request->get('busq');





// if ($this->isGranted('ROLE_ADMIN')) {
return $this->render('admin/main.html.twig', [

'meta_bases' => $metaBaseRepository->findAll(),
]);
// }

// return $this->render('admin/index_escritor.html.twig', [
// 'principals' => $principales,
// ]);
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/AdminExportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

class AdminExportController extends AbstractController
{
const FILENAME = 'IglesiaAlameda';
const FILENAME = 'AlamedaCMS';

/**
* @Route("/invitado/{id}", name="admin_export_invitado", methods={"GET", "POST"})
Expand Down
267 changes: 221 additions & 46 deletions templates/admin/bars.html.twig

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion templates/admin/main.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "admin/bars.html.twig" %}

{% block contenpage %}
<h1>Main</h1>
<div class="flex justify-content-center align-content-center center-element">
<h1>{{ "backend.global.welcome"|trans }} {{ app.user.primerNombre }}</h1>
</div>
{% endblock %}
6 changes: 4 additions & 2 deletions templates/adminbase.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<link href="{{ asset('vendors_admin/vendors/jqvmap/dist/jqvmap.min.css') }}" rel="stylesheet"/>

<!-- Custom Theme Style -->
<link href="{{ asset('vendors_admin/build/css/custom.min.css') }}" rel="stylesheet">
<link href="{{ asset('vendors_admin/build/css/custom.css') }}" rel="stylesheet">
<!-- Datatables -->
<link href="{{ asset('vendors_admin/vendors/datatables.net-bs/css/dataTables.bootstrap.min.css') }}"
rel="stylesheet">
Expand All @@ -43,6 +43,8 @@
{% endblock %}

{% block bodyclass %} class="nav-md" {% endblock %}
{% block nav %}
{% endblock %}
{% block body %}
<div class="container body">
<div class="main_container">
Expand Down Expand Up @@ -91,7 +93,7 @@
<script src="{{ asset('vendors_admin/vendors/bootstrap-daterangepicker/daterangepicker.js') }}"></script>

<!-- Custom Theme Scripts -->
<script src="{{ asset('build/js/custom.min.js') }}"></script>
<script src="{{ asset('vendors_admin/build/js/custom.min.js') }}"></script>
<!-- Custom Theme Scripts -->
<script src="{{ asset('vendors_admin/vendors/datatables.net/js/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('vendors_admin/vendors/datatables.net-bs/js/dataTables.bootstrap.min.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion templates/base.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

{% endblock %}
</head>
<body>
<body {% block bodyclass %}class="" {% endblock %}>

{% block nav %}
{% include('inicio/_nav.html.twig') %}
Expand Down
4 changes: 2 additions & 2 deletions templates/inicio/_nav.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<a class="navbar-brand" href="{{ path('index') }}" data-placement="bottom">
<!-- <img class="rounded-circle" src="/images/logo_n1.png" style="width: 30px;" alt="Logo Iglesia Alameda">-->
<img class="rounded d-none d-lg-block" src="{{ asset('images/logo-con-nombre.png') }}"
style="width: 130px;" alt="Logo Iglesia Alameda">
style="width: 130px;" alt="AlamedaCMS">
<img class="rounded d-lg-none" src="{{ asset('/images/logo-solo-2020.png') }}" style="width: 35px;"
alt="Logo Iglesia Alameda">
alt="AlamedaCMS">
</a>
<button class="navbar-toggler shadow-none me-0" type="button" data-bs-toggle="collapse"
data-bs-target="#navigation" aria-controls="navigation" aria-expanded="false"
Expand Down
22 changes: 22 additions & 0 deletions translations/KnpPaginatorBundle.es.xlf
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="es" target-language="es" datatype="plaintext" original="file.ext">
<header>
<tool tool-id="symfony" tool-name="Symfony"/>
</header>
<body>
<trans-unit id="ZjmD79F" resname="label_previous">
<source>label_previous</source>
<target>Ant.</target>
</trans-unit>
<trans-unit id="FAwb90d" resname="label_next">
<source>label_next</source>
<target>Sig.</target>
</trans-unit>
<trans-unit id="o8nRv4N" resname="filter_searchword">
<source>filter_searchword</source>
<target>Buscar...</target>
</trans-unit>
</body>
</file>
</xliff>
62 changes: 62 additions & 0 deletions translations/admin.es.xlf
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="es" target-language="es" datatype="plaintext" original="file.ext">
<header>
<tool tool-id="symfony" tool-name="Symfony"/>
</header>
<body>
<trans-unit id="LsvRHdR" resname="backend.global.welcome">
<source>backend.global.welcome</source>
<target>Hola</target>
</trans-unit>
<trans-unit id="QlOaaz7" resname="diff.ago.month">
<source>diff.ago.month</source>
<target>hace 1 mes|hace %count% meses</target>
</trans-unit>
<trans-unit id="0icjxey" resname="diff.ago.day">
<source>diff.ago.day</source>
<target>hace 1 día|hace %count% días</target>
</trans-unit>
<trans-unit id="Qb4ReOq" resname="diff.ago.hour">
<source>diff.ago.hour</source>
<target>hace 1 hora|hace %count% horas</target>
</trans-unit>
<trans-unit id="ildUKt_" resname="diff.ago.minute">
<source>diff.ago.minute</source>
<target>hace 1 minuto|hace %count% minutos</target>
</trans-unit>
<trans-unit id="UQtErIZ" resname="diff.ago.second">
<source>diff.ago.second</source>
<target>hace 1 segundo|hace %count% segundos</target>
</trans-unit>
<trans-unit id="M4RAXb_" resname="diff.empty">
<source>diff.empty</source>
<target>ahora</target>
</trans-unit>
<trans-unit id="VgQkGkv" resname="diff.in.second">
<source>diff.in.second</source>
<target>en 1 segundo|en %count% segundos</target>
</trans-unit>
<trans-unit id="dJQGobP" resname="diff.in.hour">
<source>diff.in.hour</source>
<target>en 1 hora|en %count% horas</target>
</trans-unit>
<trans-unit id="AFqulYH" resname="diff.in.minute">
<source>diff.in.minute</source>
<target>en 1 minuto|en %count% minutos</target>
</trans-unit>
<trans-unit id="vKk2WhV" resname="diff.in.day">
<source>diff.in.day</source>
<target>en 1 día|en %count% días</target>
</trans-unit>
<trans-unit id="INy1OSI" resname="diff.in.month">
<source>diff.in.month</source>
<target>en 1 mes|en %count% meses</target>
</trans-unit>
<trans-unit id="Zy1_IlC" resname="diff.in.year">
<source>diff.in.year</source>
<target>en 1 año|en %count% años</target>
</trans-unit>
</body>
</file>
</xliff>
59 changes: 59 additions & 0 deletions translations/admin.es.xliff
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="file.ext">
<body>
<trans-unit id="1">
<source>backend.global.welcome</source>
<target>Hola</target>
</trans-unit>
<trans-unit id="2">
<source>diff.ago.month</source>
<target>hace 1 mes|hace %count% meses</target>
</trans-unit>
<trans-unit id="3">
<source>diff.ago.day</source>
<target>hace 1 día|hace %count% días</target>
</trans-unit>
<trans-unit id="4">
<source>diff.ago.hour</source>
<target>hace 1 hora|hace %count% horas</target>
</trans-unit>
<trans-unit id="5">
<source>diff.ago.minute</source>
<target>hace 1 minuto|hace %count% minutos</target>
</trans-unit>
<trans-unit id="6">
<source>diff.ago.second</source>
<target>hace 1 segundo|hace %count% segundos</target>
</trans-unit>
<trans-unit id="7">
<source>diff.empty</source>
<target>ahora</target>
</trans-unit>
<trans-unit id="8">
<source>diff.in.second</source>
<target>en 1 segundo|en %count% segundos</target>
</trans-unit>
<trans-unit id="9">
<source>diff.in.hour</source>
<target>en 1 hora|en %count% horas</target>
</trans-unit>
<trans-unit id="10">
<source>diff.in.minute</source>
<target>en 1 minuto|en %count% minutos</target>
</trans-unit>
<trans-unit id="11">
<source>diff.in.day</source>
<target>en 1 día|en %count% días</target>
</trans-unit>
<trans-unit id="12">
<source>diff.in.month</source>
<target>en 1 mes|en %count% meses</target>
</trans-unit>
<trans-unit id="13">
<source>diff.in.year</source>
<target>en 1 año|en %count% años</target>
</trans-unit>
</body>
</file>
</xliff>
Loading

0 comments on commit e64b0a4

Please sign in to comment.