Merge branch 'master' into dist/envole/6/master

src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php

@@ -105,7 +105,7 @@ class SecurityController extends Controller
                 $em->flush();
 
                 // On calcule les groupes de l'utilisateur
-                $user=$groups=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);                
+                $groups=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);                
             }
         }
         else {

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}kiCU5m1uSvZhdgI1Ga9gdq/8HUBjSIpX
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}M+3m6aLkROJycqRqpYLqd0X6BOfvLMZm
 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
 
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css

@@ -39,7 +39,7 @@ body.simple {
 
 .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);
+/*    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;
 }
@@ -59,7 +59,7 @@ body.simple {
 }
 
 
-
+/*
 .widget-notbordered .widgetheader {
     box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
 }
@@ -67,12 +67,12 @@ body.simple {
 .widget-notbordered .widgetbody .list-item, .widget-notbordered .widgetbody .grid-item-content {
     box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
 }
-
+*/
 
 
 .grid .grid-preview {
     width: 15%;
-    min-width: 160px;
+    min-width: 142px;
 }
 
 .grid .grid-preview .grid-item-title {

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig

@@ -92,7 +92,7 @@
                         <a href="{{ path('cadoles_portal_'~access~'_blogarticle_view',{'id':blogarticle.id})  }}">
                             {% if blogarticle.image is not empty %}
                             <div class="grid-item-logo">
-                                <img class="grid-item-img" src="/{{alias}}/{{blogarticle.image|replace({"/blogarticle/":"/blogarticle/thumb-"})}}" width="100%">
+                                <img class="grid-item-vignette" src="/{{alias}}/{{blogarticle.image|replace({"/blogarticle/":"/blogarticle/thumb-"})}}" width="100%">
                             </div>                                
 
                             {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig

@@ -60,7 +60,7 @@
                             <a href onClick="showFrameitem('blog','{{ path('cadoles_portal_'~access~'_blogarticle_view',{'id':blogarticle.id}) }}',true)">
                                 {% if blogarticle.image is not empty %}
                                 <div class="grid-item-logo">
-                                    <img class="grid-item-img" src="/{{alias}}/{{blogarticle.image|replace({"/blogarticle/":"/blogarticle/thumb-"})}}" width="100%">
+                                    <img class="grid-item-vignette" src="/{{alias}}/{{blogarticle.image|replace({"/blogarticle/":"/blogarticle/thumb-"})}}" width="100%">
                                 </div>                                
 
                                 {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig

@@ -42,7 +42,7 @@
     <div class="widgetbody" style="{{ stylewidgetbody }}">
 
             
-        <div style="text-align: center; margin-top:40px;">
+        <div style="text-align: center; margin-top:50px;">
             {%if usage=="group" %}<small>Groupe<br></small>{% endif %}
             <span style="font-size:120%">{{ title }}</span><br><br>
             {{ description | raw }}
@@ -75,7 +75,7 @@
                     {% endfor %}
 
                     {% if canadd==true %}
-                        <div class="grid-item grid-small" style="{{ stylewidgetbodyreverse }};">
+                        <div class="grid-item grid-small" style="{{ stylewidgetbodyreverse }}; height:150px">
                             <a href="{{path('cadoles_core_user_group_users',{'id':id})}}" target="_top" style="{{ stylewidgetbodyreverse }};">
                             <div class="grid-item-content">      
                                 <div class="grid-item-logo">