diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig index def1f202..1fcf1279 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig @@ -133,10 +133,9 @@ -
+
- {% block pagewrapper %} {% endblock %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index e88f73fa..5b134a13 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -1860,7 +1860,8 @@ class PagewidgetController extends Controller $group=$em->getRepository("CadolesCoreBundle:Group")->find($group); if($group) { $title=$group->getLabel(); - $description="Description
".$group->getDescription(); + if($group->getDescription()) + $description="Description
".$group->getDescription(); if($group->getIcon()) $icon="/".$group->getIcon()->getLabel(); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig index 76b650b7..daa15c5a 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig @@ -167,7 +167,7 @@ {% if canupdate %} // Mettre une taille mini de colonne sinon on ne pourra pas déplacer le widget dans la colonne - $(".colcontainer .col").css("min-height","100px"); + $(".colcontainer .col").css("min-height","80px"); // Cursor move sur les widgets header $(".widgetheader").css("cursor","move"); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig index b2ce5478..77db3873 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig @@ -46,28 +46,30 @@ {{ entity.name }}
- diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig index b701b79c..32083649 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig @@ -47,8 +47,8 @@ {{ entity.name }}
-
- {% if bookmarks is not empty %} + {% if bookmarks is not empty %} +
@@ -88,16 +88,8 @@ {% endfor %}
- {% else %} - - {% endif %} -
+
+ {% 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 5413908c..82bc2b97 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 @@ -45,40 +45,42 @@ {% set firstflux="" %} -
- {% set monthsel = "" %} - {% for i in 0..(nbday-1) %} - {% set dateeventstart = 'now'|date_modify("+"~i~" day midnight") %} - {% set dateeventend = 'now'|date_modify("+"~(i+1)~" day midnight") %} - - {% set fgaffday=false %} - {% for event in events %} - {% if event.start< dateeventend and event.end>=dateeventstart %} - - {% if monthsel == "" or dateeventstart|date("Y-m")!=monthsel %} - {% set monthsel = dateeventstart|date("Y-m") %} - {% set libmonth = constants.libmonth(dateeventstart|date("m")) %} -

{{ libmonth ~ " " ~ dateeventstart|date("Y") }}

- {% endif %} - - {% if not fgaffday %} - {% set fgaffday=true %} - {% set libday = constants.libday(dateeventstart|date("N")) %} -
{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}
- {% endif %} - -
- {% if not event.allDay %} - {{ event.start | date("H:i") }} - - {%endif%} - {{ event.title }} -
- {% endif %} + {% if events|length >= 1 %} +
+ {% set monthsel = "" %} + {% for i in 0..(nbday-1) %} + {% set dateeventstart = 'now'|date_modify("+"~i~" day midnight") %} + {% set dateeventend = 'now'|date_modify("+"~(i+1)~" day midnight") %} - {% endfor %} + {% set fgaffday=false %} + {% for event in events %} + {% if event.start< dateeventend and event.end>=dateeventstart %} - {% endfor %} -
+ {% if monthsel == "" or dateeventstart|date("Y-m")!=monthsel %} + {% set monthsel = dateeventstart|date("Y-m") %} + {% set libmonth = constants.libmonth(dateeventstart|date("m")) %} +

{{ libmonth ~ " " ~ dateeventstart|date("Y") }}

+ {% endif %} + + {% if not fgaffday %} + {% set fgaffday=true %} + {% set libday = constants.libday(dateeventstart|date("N")) %} +
{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}
+ {% endif %} + +
+ {% if not event.allDay %} + {{ event.start | date("H:i") }} - + {%endif%} + {{ event.title }} +
+ {% endif %} + + {% endfor %} + + {% endfor %} +
+ {% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig index 4debb361..a784591b 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig @@ -10,6 +10,7 @@ {% set stylewidgetheader = constants.mystylewidgetheader(entity) %} {% set stylewidgetbody = constants.mystylewidgetbody(entity) %} {% set stylewidgetbodyimage = constants.mystylewidgetbodyimage(entity) %} +{% set stylewidgetbodyreverse = constants.mystylewidgetbodyreverse(entity) %} {% set color = app.session.get('color') %} @@ -43,16 +44,15 @@ {{ description | raw }} {%if usage=="group" %} -


{% for member in members %} -
- - +
- +
{%if member.fgmanager%}{%endif%}
diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig index d1c39096..f2689063 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig @@ -3,14 +3,14 @@ {% block localstyle %} {% if framed %} {% if border %} - #page-wrapper { - padding: 5px 25px 10px 15px; - background: transparent; + #page-wrapper:last-of-type { + //padding: 5px 25px 10px 15px; + //background: transparent; } {% else %} #page-wrapper { - padding: 5px 25px 0px 15px; - background: transparent; + //padding: 5px 25px 0px 15px; + //background: transparent; } {% endif %} {% else %}