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 6b956f03..46a04359 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 @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}wTxgoh4oDctfUvQYMDCurI6uofNO2oRA +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}euZCgZjWhBu0xUZI9lPK2ncV9oaB+Jqo ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/loadpoint.gif b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/loadpoint.gif new file mode 100644 index 00000000..d7597f8d Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/loadpoint.gif differ diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig index 30e16935..63e535fb 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig @@ -4,7 +4,7 @@ {% set header = "transnum-header.jpg" %} {% set heightheader = "" %} -{% set colormain = "22a7f0" %} +{% set colormain = "2176ad" %} {% set fontcolorhover = "" %} {% set colorbody = "" %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css index a99f50ae..59d5baf6 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css @@ -1,21 +1,11 @@ -#appmenu { - background-image: linear-gradient(90deg,rgba(34,167,240,1),rgba(34,167,240,0.1)),url(/ninegate/bundles/cadolescore/themes/transnum/transnum-header.jpg); - background-position-y: -100px; - background-size: cover; -} - .widgetheader .title { font-size: 25px; } -.widget-bordered { - border: none !important; -} -.widget-bordered .widgetbody { - margin-top: 5px; -} + + .grid .grid-small, .grid .grid-small .item-link { height: 130px; @@ -23,13 +13,69 @@ .widgetheader, .widgetbody, .grid-item-content, .widgetbody .list-item, .grid-item, .cat-list-feed { - border-radius: 6px; + border-radius: 10px; } .grid-preview .caption { - border-radius: 0px 0px 6px 6px; + border-radius: 0px 0px 10px 10px; } .grid-preview img { - border-radius: 6px 6px 0px 0px; + border-radius: 10px 10px 0px 0px; } + +.widget-bordered .grid-item-content { + background-color: transparent ! important; +} + +.widget-bordered { + border: none !important; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); + background-color: transparent; + border-radius: 10px; +} + +.widget-bordered .widgetheader { + border-radius: 10px 10px 0px 0px; + +} + +.widget-bordered .widgetbody { + border-radius: 0px 0px 10px 10px; + +} + +.widget-bordered .grid-list { + border-radius: 0px; +} + + +.grid .grid-preview { + width: 15%; + min-width: 160px; +} + +.grid .grid-preview .grid-item-title { + font-size:14px; + line-height: 8px; +} + +.grid .grid-preview .grid-item-title small { + font-size:9px; +} + +.widget-bordered .grid-preview img { + border-radius: 0px; +} + +.widget-bordered .widget-event { + background-color: #fff !important; + padding:5px 10px 5px 10px !important; + border-radius: 10px; + color: #000 !important; + margin-top: 5px; +} + +.mychat .message { + border-radius: 10px; +} \ No newline at end of file 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 c0421f63..e00573b0 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php @@ -646,7 +646,7 @@ class InitDataCommand extends ContainerAwareCommand $entityWidget->setOpened(true); $entityWidget->setAccess(["config","user","group"]); - $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "2", "mandatory": "true"},{"id": "Applications", "loc": "col1", "type": "appexternal", "label": "Applications à affichier", "value": "", "mandatory": "false"}]}'); + $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "2", "mandatory": "true"},{"id": "appexternal", "loc": "col1", "type": "appexternal", "label": "Applications à affichier", "value": "", "mandatory": "false"}]}'); $entityWidget->setParameter($parameter); $em->persist($entityWidget); } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig index 3c1a3710..38c2938c 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig @@ -55,8 +55,9 @@ {% if loop.index ==1 %} {% set haveitem=true %} + {% if itemcategorys|length > 1 %}

{{ itemcategory.label }}

- + {% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig index 82bc2b97..35c2620e 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig @@ -65,10 +65,10 @@ {% if not fgaffday %} {% set fgaffday=true %} {% set libday = constants.libday(dateeventstart|date("N")) %} -
{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}
+
{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}
{% endif %} -
+
{% if not event.allDay %} {{ event.start | date("H:i") }} - {%endif%} @@ -79,6 +79,8 @@ {% endfor %} {% endfor %} + +
Voir mes Agendas
{% endif %}