diff --git a/site/templates/blogue.php b/site/templates/blogue.php index 83562bc..193c839 100644 --- a/site/templates/blogue.php +++ b/site/templates/blogue.php @@ -2,14 +2,16 @@ $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { - $session->redirect('/praiadeseselle'); + $menu = renderMenu($inicio->and($pages->get('/noticias')), 0, 'paxinas'); } else { $menu = renderMenu($inicio->and($inicio->children), 0, 'paxinas'); - $contido = ''; +} + +$contido = ''; $categorias = pages()->get('/noticias/categorias/')->children(); $etiquetas = pages()->get('/noticias/etiquetas/')->children(); @@ -39,5 +41,4 @@ else } $contido .= '' . "\n"; $contido .= '' . "\n"; - $contido .= '' . "\n"; -} \ No newline at end of file + $contido .= '' . "\n"; \ No newline at end of file diff --git a/site/templates/categoria.php b/site/templates/categoria.php index e252ce5..e0ee0e0 100644 --- a/site/templates/categoria.php +++ b/site/templates/categoria.php @@ -2,30 +2,31 @@ $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { - $session->redirect($inicio->url); + $menu = renderMenu($inicio->and($pages->get('/noticias')), 0, 'paxinas'); } else { $menu = renderMenu($inicio->and($inicio->children), 0, 'paxinas'); - $contido = ''; - - $publicacions = pages()->get('/noticias/publicaciones/')->children("template='publicacion',categorias=$page,sort=-fecha_publicacion,limit=10"); - - $contido .= renderMigasPan($page) . "\n"; - $contido .= '
' . "\n"; - $contido .= '
' . "\n"; - $contido .= '

' . ucfirst($page->title) . '

' . "\n"; - $contido .= '
' . "\n"; - $contido .= renderPaxinacion($publicacions, 'superior'); - - foreach($publicacions as $publicacion) - { - $contido .= renderArtigos($publicacion, $languages->getLocale()); - } - $contido .= renderPaxinacion($publicacions, 'inferior'); - $contido .= '
' . "\n"; - $contido .= '
' . "\n"; - $contido .= '
' . "\n"; } + +$contido = ''; + +$publicacions = pages()->get('/noticias/publicaciones/')->children("template='publicacion',categorias=$page,sort=-fecha_publicacion,limit=10"); + +$contido .= renderMigasPan($page) . "\n"; +$contido .= '
' . "\n"; +$contido .= '
' . "\n"; +$contido .= '

' . ucfirst($page->title) . '

' . "\n"; +$contido .= '
' . "\n"; +$contido .= renderPaxinacion($publicacions, 'superior'); + +foreach($publicacions as $publicacion) +{ + $contido .= renderArtigos($publicacion, $languages->getLocale()); +} +$contido .= renderPaxinacion($publicacions, 'inferior'); +$contido .= '
' . "\n"; +$contido .= '
' . "\n"; +$contido .= '
' . "\n"; \ No newline at end of file diff --git a/site/templates/contacto.php b/site/templates/contacto.php index 9f7c44e..99abfe4 100644 --- a/site/templates/contacto.php +++ b/site/templates/contacto.php @@ -2,7 +2,7 @@ $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { $session->redirect('/praiadeseselle'); } diff --git a/site/templates/css/style.css b/site/templates/css/style.css index 8b98820..ac1c0b5 100644 --- a/site/templates/css/style.css +++ b/site/templates/css/style.css @@ -101,11 +101,6 @@ dd padding: 0; } -img -{ - width: 100%; -} - figure { margin: 0; @@ -503,6 +498,14 @@ footer#pe background-color: rgb(var(--cor_30)); } +footer#pe div.contedor +{ + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; +} + footer#pe p { font-size: .83rem; @@ -708,6 +711,18 @@ form#inicio-sesion div.elemento > * margin: 0 auto 20px; } +.fila +{ + align-items: center; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + gap: 0.625rem; + justify-content: center; + + margin-bottom: 1rem; +} + .columna { align-items: center; diff --git a/site/templates/etiqueta.php b/site/templates/etiqueta.php index 86add1a..f12b0cd 100644 --- a/site/templates/etiqueta.php +++ b/site/templates/etiqueta.php @@ -2,30 +2,31 @@ $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { - $session->redirect($inicio->url); + $menu = renderMenu($inicio->and($pages->get('/noticias')), 0, 'paxinas'); } else { $menu = renderMenu($inicio->and($inicio->children), 0, 'paxinas'); - $contido = ''; - - $publicacions = pages()->get('/noticias/publicaciones/')->children("template='publicacion',etiquetas=$page,sort=-fecha_publicacion,limit=10"); - - $contido .= renderMigasPan($page) . "\n"; - $contido .= '
' . "\n"; - $contido .= '
' . "\n"; - $contido .= '

' . ucfirst($page->title) . '

' . "\n"; - $contido .= '
' . "\n"; - $contido .= renderPaxinacion($publicacions, 'superior'); - - foreach($publicacions as $publicacion) - { - $contido .= renderArtigos($publicacion, $languages->getLocale()); - } - $contido .= renderPaxinacion($publicacions, 'inferior'); - $contido .= '
' . "\n"; - $contido .= '
' . "\n"; - $contido .= '
' . "\n"; } + +$contido = ''; + +$publicacions = pages()->get('/noticias/publicaciones/')->children("template='publicacion',etiquetas=$page,sort=-fecha_publicacion,limit=10"); + +$contido .= renderMigasPan($page) . "\n"; +$contido .= '
' . "\n"; +$contido .= '
' . "\n"; +$contido .= '

' . ucfirst($page->title) . '

' . "\n"; +$contido .= '
' . "\n"; +$contido .= renderPaxinacion($publicacions, 'superior'); + +foreach($publicacions as $publicacion) +{ + $contido .= renderArtigos($publicacion, $languages->getLocale()); +} +$contido .= renderPaxinacion($publicacions, 'inferior'); +$contido .= '
' . "\n"; +$contido .= '
' . "\n"; +$contido .= '
' . "\n"; \ No newline at end of file diff --git a/site/templates/habitacion.php b/site/templates/habitacion.php index 90ba360..197aa21 100644 --- a/site/templates/habitacion.php +++ b/site/templates/habitacion.php @@ -5,7 +5,7 @@ $contido = ''; $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { $session->redirect($inicio->url); } diff --git a/site/templates/habitacions.php b/site/templates/habitacions.php index 9723e60..2a4d0a7 100644 --- a/site/templates/habitacions.php +++ b/site/templates/habitacions.php @@ -5,7 +5,7 @@ $contido = ''; $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { $session->redirect($inicio->url); } diff --git a/site/templates/images/logo-mini.png b/site/templates/images/logo-mini.png new file mode 100644 index 0000000..a18105c Binary files /dev/null and b/site/templates/images/logo-mini.png differ diff --git a/site/templates/images/logo_golfo_artabro.png b/site/templates/images/logo_golfo_artabro.png new file mode 100644 index 0000000..1cf0453 Binary files /dev/null and b/site/templates/images/logo_golfo_artabro.png differ diff --git a/site/templates/images/logo_unioneuropea.png b/site/templates/images/logo_unioneuropea.png new file mode 100644 index 0000000..5ec7d1e Binary files /dev/null and b/site/templates/images/logo_unioneuropea.png differ diff --git a/site/templates/images/logo_xuntafalicia.png b/site/templates/images/logo_xuntafalicia.png new file mode 100644 index 0000000..acdf4c4 Binary files /dev/null and b/site/templates/images/logo_xuntafalicia.png differ diff --git a/site/templates/inicio.php b/site/templates/inicio.php index 49caf44..d1ececb 100644 --- a/site/templates/inicio.php +++ b/site/templates/inicio.php @@ -10,7 +10,7 @@ $contido .= '

' . ucfirst($inicio->title) . '

' . if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { - $menu = renderMenu($inicio, 0, 'paxinas'); + $menu = renderMenu($inicio->and($pages->get('/noticias')), 0, 'paxinas'); $contido .= renderTextoMantemento($configuracion['mantemento']['titular'], $configuracion['mantemento']['artigo'], $configuracion['mantemento']['imaxe']) . "\n"; } else diff --git a/site/templates/layout/func.php b/site/templates/layout/func.php index 9c1adcf..459dc88 100644 --- a/site/templates/layout/func.php +++ b/site/templates/layout/func.php @@ -417,8 +417,6 @@ function renderArtigos($publicacion, $locale, $resumen = true) $saida .= ' ' . $publicacion->title . '' . "\n"; $saida .= '' . "\n"; $saida .= '
' . "\n"; - $saida .= '
' . _x('Author', 'Post author') . '
' . "\n"; - $saida .= '
' . ucfirst($publicacion->createdUser->name) . '
' . "\n"; $saida .= '
' . pages()->get('/noticias/categorias/')->title . '
' . "\n"; $saida .= '
' . $publicacion->categorias->title . '
' . "\n"; $saida .= '
' . pages()->get('/noticias/etiquetas/')->title . '
' . "\n"; diff --git a/site/templates/layout/partial/main_foot.php b/site/templates/layout/partial/main_foot.php index 56af9cc..bccb5c2 100644 --- a/site/templates/layout/partial/main_foot.php +++ b/site/templates/layout/partial/main_foot.php @@ -2,13 +2,27 @@ diff --git a/site/templates/paxina.php b/site/templates/paxina.php index 90ba360..197aa21 100644 --- a/site/templates/paxina.php +++ b/site/templates/paxina.php @@ -5,7 +5,7 @@ $contido = ''; $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { $session->redirect($inicio->url); } diff --git a/site/templates/publicacion.php b/site/templates/publicacion.php index fdaf18b..b0e926c 100644 --- a/site/templates/publicacion.php +++ b/site/templates/publicacion.php @@ -2,17 +2,18 @@ $mantemento = $inicio->mantemento; -if($mantemento && !$user->isLoggedin()) +if($configuracion['mantemento']['activo'] && !$user->isLoggedin()) { - $session->redirect($inicio->url); + $menu = renderMenu($inicio->and($pages->get('/noticias')), 0, 'paxinas'); } else { $menu = renderMenu($inicio->and($inicio->children), 0, 'paxinas'); - $contido = ''; +} - $contido .= renderMigasPan($page) . "\n"; - $contido .= '
' . "\n"; - $contido .= renderArtigos($page, $languages->getLocale(), false); - $contido .= '
' . "\n"; -} \ No newline at end of file +$contido = ''; + +$contido .= renderMigasPan($page) . "\n"; +$contido .= '
' . "\n"; +$contido .= renderArtigos($page, $languages->getLocale(), false); +$contido .= '
' . "\n"; \ No newline at end of file