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 f41444b0..31acbdd3 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php @@ -76,32 +76,33 @@ class ConfigType extends AbstractType case "font": $choices=array( - "Helvetica" => "Helvetica", - "Peacesans" => "Peacesans", - "Acme-Regular" => "Acme-Regular", - "Redressed" => "Redressed", - "Roboto-Regular" => "Roboto-Regular", - "Justanotherhand-Regular" => "Justanotherhand-Regular", - "Lato-Regular" => "Lato-Regular", - "ABeeZee-Regular" => "ABeeZee-Regular", + "Acme-Regular" => "Acme-Regular", "AlfaSlabOne-Regular" => "AlfaSlabOne-Regular", "Anton-Regular" => "Anton-Regular", - "FredokaOne-Regular" => "FredokaOne-Regular", - "Overpass-Black" => "Overpass-Black", - "Righteous-Regular" => "Righteous-Regular", - "Signika-Regular" => "Signika-Regular", - "Teko-Bold" => "Teko-Bold", - "LuckiestGuy-Regular" => "LuckiestGuy-Regular", - "Baloo-Regular" => "Baloo-Regular", "CarterOne-Regular" => "CarterOne-Regular", "Chewy-Regular" => "Chewy-Regular", "Courgette-Regular" => "Courgette-Regular", + "FredokaOne-Regular" => "FredokaOne-Regular", + "Grandstander" => "Grandstander", + "Helvetica" => "Helvetica", + "Justanotherhand-Regular" => "Justanotherhand-Regular", + "Lato-Regular" => "Lato-Regular", "LexendDeca-Regular" => "LexendDeca-Regular", + "LuckiestGuy-Regular" => "LuckiestGuy-Regular", + "Overpass-Black" => "Overpass-Black", + "PassionOne" => "PassionOne", + "Peacesans" => "Peacesans", + "Redressed" => "Redressed", + "Righteous-Regular" => "Righteous-Regular", + "Roboto-Regular" => "Roboto-Regular", "RubikMonoOne-Regular" => "RubikMonoOne-Regular", "SigmarOne-Regular" => "SigmarOne-Regular", + "Signika-Regular" => "Signika-Regular", + "Teko-Bold" => "Teko-Bold", "Viga-Regular" => "Viga-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 130007ac..abc4516c 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 @@ -178,4 +178,17 @@ font-weight: normal; font-style: normal; } - \ No newline at end of file + + @font-face { + font-family: 'Grandstander'; + src: url('../fonts/typo/Grandstander-Black.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + + @font-face { + font-family: 'PassionOne'; + src: url('../fonts/typo/PassionOne-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/Grandstander-Black.ttf b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Grandstander-Black.ttf new file mode 100644 index 00000000..d101c105 Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Grandstander-Black.ttf differ diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/PassionOne-Regular.ttf b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/PassionOne-Regular.ttf new file mode 100644 index 00000000..ab39d264 Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/PassionOne-Regular.ttf differ diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig index b506b8c1..9ded50ff 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig @@ -115,14 +115,18 @@ .nav-pills>li.active>a, .nav-pills>li.active>a:hover, .nav-pills>li.active>a:focus, - .btn-primary:hover + .btn-primary:hover, + .btn-primary:active, + .btn-primary:focus { - background-color: #{{ color['dark'] }} + background-color: #{{ color['dark'] }} !important; } - .btn-primary:hover + .btn-primary:hover, + .btn-primary:active, + .btn-primary:focus { - border-color: #{{ color['dark'] }} + border-color: #{{ color['dark'] }} !important; } .form-control:focus diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php index 55f717c9..e4f60cd2 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php @@ -883,7 +883,7 @@ class InitDataCommand extends ContainerAwareCommand $entityItem->setId(-398); $entityItem->setRowOrder(0); $entityItem->setTitle('Roundcube'); - $entityItem->SetSubtitle("Application de Statistique de Visite"); + $entityItem->SetSubtitle("Webmail"); $entityItem->setIcon($entityicon); $entityItem->setTarget("_blank"); $entityItem->setItemcategory($entityItemcategoryapp); @@ -1377,6 +1377,29 @@ class InitDataCommand extends ContainerAwareCommand $entityWidget->setParameter($parameter); $em->persist($entityWidget); + // Onlyoffice document + $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1790); + if($activate_widroundcube) { + if(!$entityWidget) $entityWidget = new Widget(); + $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_roundcube.png"]); + $entityWidget->setId(-1790); + $entityWidget->setRoworder(0); + $entityWidget->setIcon($entityicon); + $entityWidget->setName('Roundcube'); + $entityWidget->setDescription("Webmail"); + $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_url"); + $entityWidget->setHeight("630"); + $entityWidget->setAutoajust(false); + $entityWidget->setBorder(true); + $entityWidget->setOpened(true); + $entityWidget->setAccess(["config","user","group"]); + $parameter = json_decode('{"fields": [{"id": "url", "loc": "col1", "type": "string", "label": "URL", "value": "'.$widroundcube_url.'", "mandatory": "true"}]}'); + $entityWidget->setParameter($parameter); + $em->persist($entityWidget); + } + elseif($entityWidget) { + $em->remove($entityWidget); + } // Widget Séparateur $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1600);