diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index d183717b..56dd6982 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -16,6 +16,7 @@ TRUNCATE TABLE sidebar; INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `fonticon`, `permission`, `appactivate`) VALUES (1000, NULL, 1000, 'CONFIGURATION', '', 'fa-gear', 'ROLE_ADMIN', ''), (1010, 1000, 1010, 'Générale', 'cadoles_core_config_commun', 'fa-table', 'ROLE_ADMIN', ''), +(1020, 1000, 1020, 'Thème', 'cadoles_core_config_theme', 'fa-paint-brush', 'ROLE_ADMIN,ROLE_MODO', ''), (1200, NULL, 1200, 'ORGANISATION', NULL, 'fa-sitemap', 'ROLE_ADMIN,ROLE_MODO', ''), (1210, 1200, 1210, 'Listes Blanche', 'cadoles_core_config_whitelist', 'fa-tasks', 'ROLE_ADMIN', ''), (1220, 1200, 1220, 'Niveau 01', 'cadoles_core_config_niveau01', 'fa-building', 'ROLE_ADMIN', ''), @@ -28,8 +29,9 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f (1520, 1500, 1520, 'Items', 'cadoles_portal_config_item', 'fa-desktop', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), (1530, 1500, 1530, 'Annonces', 'cadoles_portal_config_alert', 'fa-bell', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), (1540, 1500, 1540, 'Calendriers', 'cadoles_portal_config_calendar', 'fa-calendar', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), -(1550, 1500, 1550, 'Chartes', 'cadoles_portal_config_notice', 'fa-info', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), -(1560, 1500, 1560, 'Icônes', 'cadoles_portal_config_icon', 'fa-bug', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), +(1550, 1500, 1550, 'Blogs', 'cadoles_portal_config_blog', 'fa-paper-plane', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), +(1560, 1500, 1560, 'Chartes', 'cadoles_portal_config_notice', 'fa-info', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), +(1570, 1500, 1570, 'Icônes', 'cadoles_portal_config_icon', 'fa-bug', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), (7000, NULL, 7000, 'CRON', NULL, 'fa-bolt', 'ROLE_ADMIN', 'cron_activate'), @@ -44,6 +46,8 @@ 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'), + ('040', 1, 1, 1, 'boolean', 'fgheader', '1', '', 'Utiliser une image en bannière du site'), ('041', 1, 1, 1, 'header', 'header', 'uploads/header/header.png', 'fgheader', 'Image en bannière du site'), diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig index 491b8299..0d75e20d 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig @@ -1,7 +1,7 @@ {% set logo = "" %} {% set fgheader = "" %} -{% set header = "header.png" %} +{% set header = "" %} {% set heightheader = "" %} {% set colormain = "2e3131" %} diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/info.yml b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/info.yml index 3d45bcff..b3edbd0a 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/info.yml +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/info.yml @@ -1,6 +1,3 @@ name: Black author: Arnaud Fornerot -version: 1.0 -forcelogo: false -forceheader: true -color: 1e824c \ No newline at end of file +version: 1.0 \ No newline at end of file diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/look.png b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/look.png index 6baedc3b..43cde64f 100644 Binary files a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/look.png and b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/look.png differ diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig index b1f87f57..1647759e 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig @@ -1,7 +1,7 @@ {% set logo = "" %} {% set fgheader = "" %} -{% set header = "header.jpg" %} +{% set header = "" %} {% set heightheader = "" %} {% set colormain = "6c7a89" %} diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/info.yml b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/info.yml index da74341e..2ba9ba4d 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/info.yml +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/info.yml @@ -1,6 +1,3 @@ name: Gray author: Arnaud Fornerot -version: 1.0 -forcelogo: false -forceheader: true -color: 6c7a89 \ No newline at end of file +version: 1.0 \ No newline at end of file diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/look.png b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/look.png index f9cbd8f6..d887c531 100644 Binary files a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/look.png and b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/look.png differ diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig index e51ec4d8..5e7b86cb 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig @@ -1,7 +1,7 @@ {% set logo = "" %} {% set fgheader = "" %} -{% set header = "header.png" %} +{% set header = "" %} {% set heightheader = "" %} {% set colormain = "1e824c" %} diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/info.yml b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/info.yml index b2d0b607..3873f7a0 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/info.yml +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/info.yml @@ -1,6 +1,3 @@ name: Green author: Arnaud Fornerot -version: 1.0 -forcelogo: false -forceheader: true -color: 1e824c \ No newline at end of file +version: 1.0 \ No newline at end of file diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/look.png b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/look.png index f9cbd8f6..0cd75446 100644 Binary files a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/look.png and b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/look.png differ diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/look.png b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/look.png index cb230123..eef80f4d 100644 Binary files a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/look.png and b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/look.png differ diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig index b97980f1..c9f4abfa 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig @@ -1,7 +1,7 @@ {% set logo = "" %} {% set fgheader = "" %} -{% set header = "header.jpg" %} +{% set header = "" %} {% set heightheader = "" %} {% set colormain = "f15a22" %} diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/info.yml b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/info.yml index f409327a..94267847 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/info.yml +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/info.yml @@ -1,6 +1,3 @@ name: Orange author: Arnaud Fornerot -version: 1.0 -forcelogo: false -forceheader: true -color: 6c7a89 \ No newline at end of file +version: 1.0 \ No newline at end of file diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/look.png b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/look.png index f9cbd8f6..87369b81 100644 Binary files a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/look.png and b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/look.png differ diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig index f4099dc3..c6bdbed9 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig @@ -1,7 +1,7 @@ {% set logo = "" %} {% set fgheader = "" %} -{% set header = "header.jpg" %} +{% set header = "" %} {% set heightheader = "" %} {% set colormain = "f7ca18" %} diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/look.png b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/look.png index f9cbd8f6..da6409b6 100644 Binary files a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/look.png and b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/look.png differ diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig index ca5755d2..453dbfad 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig @@ -67,7 +67,9 @@ .herotitle img, .avatar, .pagemenu, - .grid .grid-preview .caption + .grid .grid-preview .caption, + .bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary, + .btn-primary { background-color: #{{ color['main'] }} } @@ -82,7 +84,9 @@ .pagination>.active>span:focus, .pagination>.active>span:hover, .page-header, - .sidebar ul li + .sidebar ul li, + .bootstrap-switch.bootstrap-switch-focused, + .btn-primary { border-color: #{{ color['main'] }} } @@ -101,16 +105,26 @@ .nav>li>a:hover, .nav .open>a, .nav .open>a:focus, .nav .open>a:hover, .sidebar ul li a.active, - .navbar-top-links li.active a + .navbar-top-links li.active a, + .nav-pills>li.active>a, + .nav-pills>li.active>a:hover, + .nav-pills>li.active>a:focus, + .btn-primary:hover { background-color: #{{ color['dark'] }} } + .btn-primary:hover + { + border-color: #{{ color['dark'] }} + } + .form-control:focus { border-color: #{{ color['light'] }} } - .form-control:focus { + .form-control:focus, + .bootstrap-switch.bootstrap-switch-focused { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba({{ color['lightrgb']['r'] }},{{ color['lightrgb']['g'] }},{{ color['lightrgb']['b'] }},.6) } diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig index ff7ce6c7..89d2b3a4 100644 --- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig @@ -85,7 +85,7 @@ - + {{ app.session.get('appname') }} diff --git a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php index 61305a7f..889d6bc7 100644 --- a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php +++ b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php @@ -30,9 +30,11 @@ class BlogController extends Controller public function ajaxlistAction(Request $request,$access="config") { // S'assurer que c'est un appel ajax + /* if (!$request->isXmlHttpRequest()) { return new JsonResponse(array('message' => 'Interdit'), 400); } + */ $em = $this->getDoctrine()->getManager(); @@ -41,17 +43,30 @@ class BlogController extends Controller $search= $request->query->get('search'); $draw= $request->query->get('draw'); $order= $request->query->get('order'); - - // Query de base - $qbase=$em->createQueryBuilder() - ->from($this->labelentity,'table') - ->leftJoin('CadolesCoreBundle:User','user','WITH','table.user=user') - ->addSelect('user'); + $alluser= $request->query->get('alluser'); - $qsearch=$qbase->where('table.id LIKE :value') - ->orWhere('table.name LIKE :value') - ->orWhere('user.username LIKE :value') - ->setParameter("value", "%".$search["value"]."%"); + // Query de base + $qbase=$em->createQueryBuilder()->from($this->labelentity,'table'); + $qsearch=$em->createQueryBuilder()->from($this->labelentity,'table'); + + if($alluser=="false") { + $qbase->where("table.user is null"); + $qsearch->where("table.user is null"); + } + else { + $qbase->from('CadolesCoreBundle:User','user') + ->where("table.user=user"); + + $qsearch->from('CadolesCoreBundle:User','user') + ->where("table.user=user"); + } + + if($alluser=="false") + $qsearch->andwhere('table.id LIKE :value OR table.name LIKE :value'); + else + $qsearch->andWhere('table.id LIKE :value OR table.name LIKE :value OR user.username LIKE :value') ; + + $qsearch->setParameter("value", "%".$search["value"]."%"); // Nombre total d'enregistrement $total = $qbase->select('COUNT(table)')->getQuery()->getSingleScalarResult(); @@ -75,12 +90,13 @@ class BlogController extends Controller $qb->orderBy('table.name',$order[0]["dir"]); break; case 2 : - $qb->orderBy('user.username',$order[0]["dir"]); + if($alluser=="true") $qb->orderBy('user.username',$order[0]["dir"]); break; } // Execution de la requete d'affichage $datas=$qb->setFirstResult($start)->setMaxResults($length)->getQuery()->getResult(); + //dump($qsearch->getQuery()->getSql()); // Construction du tableau de retour $output = array( diff --git a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php index 49115ac0..7675ac3f 100644 --- a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php +++ b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php @@ -40,17 +40,30 @@ class CalendarController extends Controller $search= $request->query->get('search'); $draw= $request->query->get('draw'); $order= $request->query->get('order'); - - // Query de base - $qbase=$em->createQueryBuilder() - ->from($this->labelentity,'table') - ->leftJoin('CadolesCoreBundle:User','user','WITH','table.user=user') - ->addSelect('user'); + $alluser= $request->query->get('alluser'); - $qsearch=$qbase->where('table.id LIKE :value') - ->orWhere('table.name LIKE :value') - ->orWhere('user.username LIKE :value') - ->setParameter("value", "%".$search["value"]."%"); + // Query de base + $qbase=$em->createQueryBuilder()->from($this->labelentity,'table'); + $qsearch=$em->createQueryBuilder()->from($this->labelentity,'table'); + + if($alluser=="false") { + $qbase->where("table.user is null"); + $qsearch->where("table.user is null"); + } + else { + $qbase->from('CadolesCoreBundle:User','user') + ->where("table.user=user"); + + $qsearch->from('CadolesCoreBundle:User','user') + ->where("table.user=user"); + } + + if($alluser=="false") + $qsearch->andwhere('table.id LIKE :value OR table.name LIKE :value'); + else + $qsearch->andWhere('table.id LIKE :value OR table.name LIKE :value OR user.username LIKE :value') ; + + $qsearch->setParameter("value", "%".$search["value"]."%"); // Nombre total d'enregistrement $total = $qbase->select('COUNT(table)')->getQuery()->getSingleScalarResult(); @@ -74,7 +87,7 @@ class CalendarController extends Controller $qb->orderBy('table.name',$order[0]["dir"]); break; case 2 : - $qb->orderBy('user.username',$order[0]["dir"]); + if($alluser=="true") $qb->orderBy('user.username',$order[0]["dir"]); break; } diff --git a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/PageController.php b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/PageController.php index 3fb58630..b465fde4 100644 --- a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/PageController.php +++ b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Controller/PageController.php @@ -49,20 +49,26 @@ class PageController extends Controller // Query de base $qbase=$em->createQueryBuilder()->from($this->labelentity,'table'); - + $qsearch=$em->createQueryBuilder()->from($this->labelentity,'table'); + if($alluser=="false") { - dump("pouet"); - $qbase->where('table.user IS NOT NULL'); + $qbase->where("table.user is null"); + $qsearch->where("table.user is null"); } - else + else { $qbase->from('CadolesCoreBundle:User','user') ->where("table.user=user"); - $qsearch=$qbase->where('table.id LIKE :value') - ->orWhere('table.name LIKE :value') - ->setParameter("value", "%".$search["value"]."%"); - - if($alluser=="true") $qsearch->orWhere('user.username LIKE :value') ; + $qsearch->from('CadolesCoreBundle:User','user') + ->where("table.user=user"); + } + + if($alluser=="false") + $qsearch->andwhere('table.id LIKE :value OR table.name LIKE :value'); + else + $qsearch->andWhere('table.id LIKE :value OR table.name LIKE :value OR user.username LIKE :value') ; + + $qsearch->setParameter("value", "%".$search["value"]."%"); // Nombre total d'enregistrement $total = $qbase->select('COUNT(table)')->getQuery()->getSingleScalarResult(); @@ -71,9 +77,9 @@ class PageController extends Controller // Nombre d'enregistrement filtré if($search["value"]=="") $totalf = $total; - else { + else $totalf= $qsearch->select('COUNT(table)')->getQuery()->getSingleScalarResult(); - } + // Parcours des Enregistrement if($search["value"]=="") @@ -90,13 +96,12 @@ class PageController extends Controller $qb->orderBy('table.name',$order[0]["dir"]); break; case 4 : - //$qb->orderBy('user.username',$order[0]["dir"]); + if($alluser=="true") $qb->orderBy('user.username',$order[0]["dir"]); break; } // Execution de la requete d'affichage $datas=$qb->setFirstResult($start)->setMaxResults($length)->getQuery()->getResult(); - dump($datas); // Construction du tableau de retour $output = array( diff --git a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig index 141b457e..e79c9c21 100644 --- a/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig +++ b/src/cadolesuser-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig @@ -8,6 +8,10 @@
Ajouter un Blog + + + +
Ajouter un Calendrier + + + + +