diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index bdd8a602..850ded2f 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -47,7 +47,7 @@ INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type ('002', 1, 0, 1, 'string', 'version', '1.0.0', '', 'Version de l\'application'), ('003', 1, 1, 0, 'string', 'subappname', 'Portail', '', 'Le sous titre de votre site'), ('004', 1, 1, 1, 'logo', 'logo', 'uploads/logo/logo.png', '', 'Le logo de votre site'), -('005', 1, 0, 0, 'theme', 'theme', '', '', 'Le theme de votre site'), +('005', 0, 1, 0, 'theme', 'theme', '', '', 'Le theme de votre site'), ('040', 1, 1, 1, 'boolean', 'fgheader', '1', '', 'Utiliser une image en bannière du site'), diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php index c52a0ad5..83124917 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php @@ -92,6 +92,7 @@ class ConfigType extends AbstractType "Righteous-Regular" => "Righteous-Regular", "Signika-Regular" => "Signika-Regular", "Teko-Bold" => "Teko-Bold", + "LuckiestGuy-Regular" => "LuckiestGuy-Regular", ); $builder->add("value", ChoiceType::class, diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css index bcae5f1d..250017a5 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css @@ -116,4 +116,10 @@ font-style: normal; } + @font-face { + font-family: 'LuckiestGuy-Regular'; + src: url('../fonts/typo/LuckiestGuy-Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } \ No newline at end of file diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/LuckiestGuy-Regular.ttf b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/LuckiestGuy-Regular.ttf new file mode 100644 index 00000000..8bc3f11d Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/LuckiestGuy-Regular.ttf differ diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig index ecadf378..45fe9a1e 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig @@ -46,7 +46,9 @@
{% if bookmarks is not empty %}
-

Favoris

+ {% if items is not empty %} +

Favoris

+ {% endif %}
@@ -93,15 +95,29 @@
{% endif %} - + {% set mycategs = [] %} {% for itemcategory in itemcategorys %} {% set haveitem=false %} + {% for item in items if item.itemcategory==itemcategory %} + + {% if loop.index ==1 %} + {% set mycategs = mycategs|merge({ (loop.index) : itemcategory}) %} + {% endif %} + {% endfor %} + {% endfor %} + + {% for itemcategory in mycategs %} + {% set haveitem=false %} + {% for item in items if item.itemcategory==itemcategory %} {% if loop.index ==1 %} {% set haveitem=true %} -

{{ itemcategory.label }}

+ + {% if mycategs|length > 1 %} +

{{ itemcategory.label }}

+ {% endif %}