Kaynağa Gözat

Adaptations diverses avant déploiement

master
Guillaume 3 yıl önce
ebeveyn
işleme
3a6b1dcc59
9 değiştirilmiş dosya ile 47 ekleme ve 46 silme
  1. +0
    -4
      config/routes.yaml
  2. +1
    -1
      public/assets/sass/_home.scss
  3. +26
    -26
      public/assets/stylesheets/screen.css
  4. +7
    -10
      src/Controller/Admin/DashboardController.php
  5. +2
    -2
      src/Controller/Admin/PageCrudController.php
  6. +1
    -0
      templates/frontend/base.html.twig
  7. +9
    -2
      templates/frontend/home.html.twig
  8. +1
    -1
      templates/page/page.html.twig
  9. +0
    -0
      translations/admin.fr.yaml

+ 0
- 4
config/routes.yaml Dosyayı Görüntüle

@@ -8,10 +8,6 @@ admin_dashboard:

app_homepage:
path: /
defaults: { _controller: App\Controller\DefaultController::index , _locale: fr }

app_home:
path: /home
controller: App\Controller\Frontend\DefaultController:home

app_legal_mention:

+ 1
- 1
public/assets/sass/_home.scss Dosyayı Görüntüle

@@ -1,4 +1,4 @@
#app_home {
#app_homepage {
padding-bottom: 30px;
padding-top: 30px;


+ 26
- 26
public/assets/stylesheets/screen.css Dosyayı Görüntüle

@@ -2,7 +2,7 @@
* In this file you should write your main styles. (or centralize your imports)
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
/* line 5, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 5, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
@@ -24,66 +24,66 @@ time, mark, audio, video {
vertical-align: baseline;
}

/* line 22, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 22, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html {
line-height: 1;
}

/* line 24, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 24, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
ol, ul {
list-style: none;
}

/* line 26, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 26, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
table {
border-collapse: collapse;
border-spacing: 0;
}

/* line 28, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 28, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
caption, th, td {
text-align: left;
font-weight: normal;
vertical-align: middle;
}

/* line 30, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 30, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q, blockquote {
quotes: none;
}
/* line 103, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 103, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after {
content: "";
content: none;
}

/* line 32, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 32, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
a img {
border: none;
}

/* line 116, ../../../../../lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 116, ../../../../../../../var/lib/gems/2.7.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
display: block;
}

/* line 1, ../sass/_home.scss */
#app_home {
#app_homepage {
padding-bottom: 30px;
padding-top: 30px;
}
/* line 6, ../sass/_home.scss */
#app_home header .logo-aac {
#app_homepage header .logo-aac {
width: 80%;
}
/* line 10, ../sass/_home.scss */
#app_home header .personnages-acc {
#app_homepage header .personnages-acc {
width: 26%;
position: absolute;
bottom: 0;
}
/* line 16, ../sass/_home.scss */
#app_home header h1 {
#app_homepage header h1 {
color: #aab769;
font-size: 32px;
font-family: dinbold;
@@ -92,17 +92,17 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
width: 100%;
}
/* line 24, ../sass/_home.scss */
#app_home header h1 .main-title {
#app_homepage header h1 .main-title {
margin-left: 26%;
display: inline-block;
width: 70%;
}
/* line 30, ../sass/_home.scss */
#app_home header h1 .aac {
#app_homepage header h1 .aac {
color: #dc5b2f;
}
/* line 36, ../sass/_home.scss */
#app_home h2 {
#app_homepage h2 {
color: #568a73;
font-size: 30px;
margin-top: 80px;
@@ -110,11 +110,11 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
font-family: dinbold;
}
/* line 45, ../sass/_home.scss */
#app_home ul li {
#app_homepage ul li {
margin-top: 25px;
}
/* line 48, ../sass/_home.scss */
#app_home ul li button {
#app_homepage ul li button {
width: 70%;
font-size: 18px;
font-family: dinbold;
@@ -123,40 +123,40 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
border-radius: 15px / 15px;
}
/* line 54, ../sass/_home.scss */
#app_home ul li button a {
#app_homepage ul li button a {
color: #FFF;
}
/* line 59, ../sass/_home.scss */
#app_home ul li .yellow {
#app_homepage ul li .yellow {
background-color: #ffe680;
}
/* line 63, ../sass/_home.scss */
#app_home ul li .green {
#app_homepage ul li .green {
background-color: #aab769;
}
/* line 67, ../sass/_home.scss */
#app_home ul li .orange {
#app_homepage ul li .orange {
background-color: #dc5b2f;
}
/* line 73, ../sass/_home.scss */
#app_home .logo-coop {
#app_homepage .logo-coop {
width: 60%;
margin-top: 50px;
}
/* line 78, ../sass/_home.scss */
#app_home footer {
#app_homepage footer {
margin-top: 50px;
font-family: dinregular;
color: #568a73;
text-align: center;
}
/* line 84, ../sass/_home.scss */
#app_home footer a {
#app_homepage footer a {
color: #568a73;
font-family: dinbold;
}
/* line 88, ../sass/_home.scss */
#app_home footer a:hover {
#app_homepage footer a:hover {
text-decoration: underline;
}


+ 7
- 10
src/Controller/Admin/DashboardController.php Dosyayı Görüntüle

@@ -17,20 +17,17 @@ class DashboardController extends SovDashboardController

public function configureMenuItems(): iterable
{
yield MenuItem::linkToDashboard('Tableau de bord', 'circle');
yield MenuItem::subMenu('Utilisateurs', 'user')->setSubItems(
yield MenuItem::linkToDashboard('dashboard', 'circle');
yield MenuItem::linkToCrud('page', 'copy', Page::class);
yield MenuItem::subMenu('user', 'user')->setSubItems(
[
MenuItem::linkToCrud('Utilisateurs', '', User::class),
MenuItem::linkToCrud('user_index', '', User::class),
]
);

yield MenuItem::linkToCrud('Pages', 'copy', Page::class);

yield MenuItem::subMenu('Mon compte', 'user')->setSubItems(
yield MenuItem::subMenu('account', 'user')->setSubItems(
[
MenuItem::linkToRoute('Informations personnelles', '', 'sov_admin_account_profile'),
MenuItem::linkToRoute('Mot de passe', '', 'sov_admin_account_password'),
MenuItem::linkToRoute('account_profile', '', 'sov_admin_account_profile'),
MenuItem::linkToRoute('account_password', '', 'sov_admin_account_password'),
]
);
}

+ 2
- 2
src/Controller/Admin/PageCrudController.php Dosyayı Görüntüle

@@ -27,13 +27,13 @@ class PageCrudController extends AbstractCrudController

return array_merge(
[
FormField::addPanel('Général'),
FormField::addPanel('general'),
TextField::new('title'),
NumberField::new('position')->hideOnForm(),
CKEditorField::new('description'),
FileManagerField::new('file'),
StatusField::new('status'),
FormField::addPanel('Galerie'),
FormField::addPanel('gallery'),
GalleryManagerField::new('gallery')
],
$panel

+ 1
- 0
templates/frontend/base.html.twig Dosyayı Görüntüle

@@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<title>{% block title %}Aux Actes Citoyens{% endblock %}</title>
{% block meta %}{% endblock %}
<link rel="stylesheet" href="{{ asset('assets/semantic/semantic.min.css') }}">
<link rel="stylesheet" href="{{ asset('assets/stylesheets/screen.css') }}">
{% block stylesheets %}{% endblock %}

+ 9
- 2
templates/frontend/home.html.twig Dosyayı Görüntüle

@@ -1,6 +1,13 @@
{% extends 'frontend/base.html.twig' %}
{% import 'frontend/macro.html.twig' as macro %}

{% block title %}Aux Actes Citoyens - Imaginer et construire ensemble le futur du Nord Franche-Comté{% endblock %}

{% block meta %}
<meta name="title" content="Aux Actes Citoyens - Imaginer et construire ensemble le futur du Nord Franche-Comté" />
<meta name="description" content="La plateforme numérique « Aux actes Citoyens » arrive bientôt. En attendant, rejoignez-nous !" />
{% endblock %}

{% block body %}
<div class="ui container">
<header class="ui stackable grid">
@@ -63,8 +70,8 @@
<footer>
<div class="ui grid">
<div class="column sixteen wide">
<a href="{{ path('app_legal_mention') }}" title="Mentions légales">Mentions légales</a>
- création <a href="https://www.laclic.fr/" title="La Clic !" target="_blank">LA CLIC !</a>
<!--<a href="{{ path('app_legal_mention') }}" title="Mentions légales">Mentions légales</a> - -->
Création <a href="https://www.laclic.fr/" title="La Clic !" target="_blank">LA CLIC !</a>
</div>
</div>
</footer>

+ 1
- 1
templates/page/page.html.twig Dosyayı Görüntüle

@@ -3,7 +3,7 @@
{% block body %}
<div class="ui container">
<div class="logo-acc">
<a href="{{ path('app_home') }}" title="Accueil">
<a href="{{ path('app_homepage') }}" title="Accueil">
<img src="{{ 'assets/img/Logo-Aux-Actes-Citoyens.jpg' }}" alt="Logo le panier de daphne">
</a>
</div>

+ 0
- 0
translations/admin.fr.yaml Dosyayı Görüntüle


Yükleniyor…
İptal
Kaydet