clean update of master branch

This commit is contained in:
Emmanuel ROY 2020-12-09 09:22:10 +01:00
parent ba5f4a6fb2
commit 30493683b2
4 changed files with 11 additions and 20 deletions

15
.gitignore vendored
View file

@ -1,18 +1,3 @@
composer.lock
vendor
_relicats
.idea
# Avoid directory tests install of third party application module
application/modules/phplist
application/modules/symfony
application/modules/wordpress
application/modules/prestashop
public/prestashop/install-dev/theme/*
public/prestashop/js/*
public/prestashop/themes/*
public/wordpress/wp-admin/css/*
public/wordpress/wp-admin/js/*
public/wordpress/wp-content/themes/*
public/wordpress/wp-includes/css/*
public/wordpress/wp-includes/js/*

4
.idea/.gitignore vendored
View file

@ -1,2 +1,4 @@
# Default ignored files
/workspace.xml
/workspace.xml
# Default ignored files
/shelf/

View file

@ -34,6 +34,11 @@
<path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php70" />
<path value="$PROJECT_DIR$/vendor/michelf/php-markdown" />
<path value="$PROJECT_DIR$/vendor/johnpbloch/wordpress-core-installer" />
<path value="$PROJECT_DIR$/vendor/johnpbloch/wordpress" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
<path value="$PROJECT_DIR$/vendor/firebase/php-jwt" />
<path value="$PROJECT_DIR$/vendor/phpseclib/phpseclib" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.1" />

View file

@ -12,7 +12,6 @@
<ul class="top-menu">
<li><a href="{{ \MVC\Classe\Url::link_rewrite( false, 'Admin', []) }}">Admin</a></li>
<li><a href="{{ \MVC\Classe\Url::link_rewrite( false, 'Create', []) }}">Create</a></li>
<li><a href="{{ \MVC\Classe\Url::link_rewrite( false, 'Beers', []) }}">Pricing</a></li>
<li><a href="{{ \MVC\Classe\Url::link_rewrite( false, 'Policy', []) }}">Policy</a></li>
<li><a href="{{ \MVC\Classe\Url::link_rewrite( false, 'CGU', []) }}"> CGU Terms</a></li>
</ul>
@ -28,9 +27,9 @@
<div class="container">
<!--Logo-->
<div id="logo">
<a href="{{ \MVC\Classe\Url::link_rewrite( false, 'accueil', []) }}">
<span class="logo-default">Heberges APP</span>
<span class="logo-dark">Heberges APP</span>
<a href="{{ \MVC\Classe\Url::link_rewrite( false, 'index', []) }}">
<span class="logo-default">APP</span>
<span class="logo-dark">APP</span>
</a>
</div>
<!--End: Logo-->