Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

adaptation de look

This commit is contained in:
afornerot 2019-08-22 16:05:37 +02:00
parent e847cc1373
commit 8b023adc7d
8 changed files with 74 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig
View File

@ -133,10 +133,9 @@
<div id="page-wrapper" class="{% if maxwidth is defined and maxwidth %} page-maxed {% endif %}" style="min-height:1200px; {% if not usesidebar %} margin:0px; {% endif %}"> <div id="page-wrapper" class="{% if maxwidth is defined and maxwidth %} page-maxed {% endif %}" style="min-height:1200px; {% if not usesidebar %} margin:0px; {% endif %}{% if not useheader %} background-color:transparent; padding: 5px 25px 10px 15px; {% endif %} ">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
{% block pagewrapper %} {% block pagewrapper %}
{% endblock %} {% endblock %}

3
src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
View File

@ -1860,7 +1860,8 @@ class PagewidgetController extends Controller
$group=$em->getRepository("CadolesCoreBundle:Group")->find($group); $group=$em->getRepository("CadolesCoreBundle:Group")->find($group);
if($group) { if($group) {
$title=$group->getLabel(); $title=$group->getLabel();
$description="<strong>Description</strong><br>".$group->getDescription(); if($group->getDescription())
$description="<strong>Description</strong><br>".$group->getDescription();
if($group->getIcon()) if($group->getIcon())
$icon="/".$group->getIcon()->getLabel(); $icon="/".$group->getIcon()->getLabel();

2
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
View File

@ -167,7 +167,7 @@
{% if canupdate %} {% if canupdate %}
// Mettre une taille mini de colonne sinon on ne pourra pas déplacer le widget dans la colonne // 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 // Cursor move sur les widgets header
$(".widgetheader").css("cursor","move"); $(".widgetheader").css("cursor","move");

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

@ -46,28 +46,30 @@
<span class="title">{{ entity.name }}</span> <span class="title">{{ entity.name }}</span>
</div> </div>
<div class="widgetbody" style="{{ stylewidgetbody }}"> {% if blogarticles|length >= 1 %}
<div class="grid clearfix"> <div class="widgetbody" style="{{ stylewidgetbody }}">
{% for blogarticle in blogarticles %} <div class="grid clearfix">
{% if loop.index==1 %} {% for blogarticle in blogarticles %}
<div class="grid-sizer grid-preview"></div> {% if loop.index==1 %}
<div class="grid-gutter-sizer grid-gutter-sizer-preview"></div> <div class="grid-sizer grid-preview"></div>
{% endif %} <div class="grid-gutter-sizer grid-gutter-sizer-preview"></div>
{% endif %}
<div class="grid-item grid-preview" style="{{ stylewidgetbodyreverse }};"> <div class="grid-item grid-preview" style="{{ stylewidgetbodyreverse }};">
<a href onClick="showFrameitem('blog','{{ path('cadoles_portal_'~access~'_blogarticle_view',{'id':blogarticle.id}) }}',true)"> <a href onClick="showFrameitem('blog','{{ path('cadoles_portal_'~access~'_blogarticle_view',{'id':blogarticle.id}) }}',true)">
{% if blogarticle.image is not empty %} {% if blogarticle.image is not empty %}
<img src="/{{alias}}/{{blogarticle.image|replace({"/blogarticle/":"/blogarticle/thumb-"})}}" width="100%"> <img src="/{{alias}}/{{blogarticle.image|replace({"/blogarticle/":"/blogarticle/thumb-"})}}" width="100%">
{% endif %} {% endif %}
<div class="caption"> <div class="caption">
<h1 class="grid-preview-title" style="{{ stylewidgetbodyreverse }};">{{ blogarticle.name}}</h1> <h1 class="grid-preview-title" style="{{ stylewidgetbodyreverse }};">{{ blogarticle.name}}</h1>
<small>publié par {{ blogarticle.user.username }} le {{ blogarticle.submit|date("d/m/Y à H:i") }}<br>dans le blog {{blogarticle.blog.name }}</small> <small>publié par {{ blogarticle.user.username }} le {{ blogarticle.submit|date("d/m/Y à H:i") }}<br>dans le blog {{blogarticle.blog.name }}</small>
</div> </div>
</a> </a>
</div> </div>
{% endfor %} {% endfor %}
</div>
</div> </div>
</div> {% endif %}
</div> </div>

16
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig
View File

@ -47,8 +47,8 @@
<span class="title">{{ entity.name }}</span> <span class="title">{{ entity.name }}</span>
</div> </div>
<div class="widgetbody" style="{{ stylewidgetbody }} {% if not entity.border %} padding-top:10px; {% endif %}"> {% if bookmarks is not empty %}
{% if bookmarks is not empty %} <div class="widgetbody" style="{{ stylewidgetbody }} {% if not entity.border %} padding-top:10px; {% endif %}">
<div class="bookmark-container"> <div class="bookmark-container">
<div class="grid clearfix"> <div class="grid clearfix">
<div class="grid-sizer {{ stylegrid }}"></div> <div class="grid-sizer {{ stylegrid }}"></div>
@ -88,16 +88,8 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% else %} </div>
<div class="bookmark-container" style="display:none"> {% endif %}
<h3 class="grid-title" data-idcategory="bookmark" style="{{ colorbodyfont }}">Favoris</h3>
<div class="grid clearfix">
<div class="grid-sizer {{ stylegrid }}"></div>
<div class="grid-gutter-sizer"></div>
</div>
</div>
{% endif %}
</div>
</div> </div>

58
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig
View File

@ -45,40 +45,42 @@
{% set firstflux="" %} {% set firstflux="" %}
<div class="widgetbody" style="{{ stylewidgetbody }}"> {% if events|length >= 1 %}
{% set monthsel = "" %} <div class="widgetbody" style="{{ stylewidgetbody }}">
{% for i in 0..(nbday-1) %} {% set monthsel = "" %}
{% set dateeventstart = 'now'|date_modify("+"~i~" day midnight") %} {% for i in 0..(nbday-1) %}
{% set dateeventend = 'now'|date_modify("+"~(i+1)~" day midnight") %} {% set dateeventstart = 'now'|date_modify("+"~i~" day midnight") %}
{% set dateeventend = 'now'|date_modify("+"~(i+1)~" day midnight") %}
{% set fgaffday=false %} {% set fgaffday=false %}
{% for event in events %} {% for event in events %}
{% if event.start< dateeventend and event.end>=dateeventstart %} {% if event.start< dateeventend and event.end>=dateeventstart %}
{% if monthsel == "" or dateeventstart|date("Y-m")!=monthsel %} {% if monthsel == "" or dateeventstart|date("Y-m")!=monthsel %}
{% set monthsel = dateeventstart|date("Y-m") %} {% set monthsel = dateeventstart|date("Y-m") %}
{% set libmonth = constants.libmonth(dateeventstart|date("m")) %} {% set libmonth = constants.libmonth(dateeventstart|date("m")) %}
<h3>{{ libmonth ~ " " ~ dateeventstart|date("Y") }}</h3> <h3>{{ libmonth ~ " " ~ dateeventstart|date("Y") }}</h3>
{% endif %}
{% if not fgaffday %}
{% set fgaffday=true %}
{% set libday = constants.libday(dateeventstart|date("N")) %}
<div style="margin-top:15px; font-weight:bold; font-size:18px;">{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}</div>
{% endif %}
<div style="background-color:{{ event.color }}; color: #FFF; padding:2px;">
{% if not event.allDay %}
{{ event.start | date("H:i") }} -
{%endif%}
{{ event.title }}
</div>
{% endif %} {% endif %}
{% if not fgaffday %} {% endfor %}
{% set fgaffday=true %}
{% set libday = constants.libday(dateeventstart|date("N")) %}
<div style="margin-top:15px; font-weight:bold; font-size:18px;">{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}</div>
{% endif %}
<div style="background-color:{{ event.color }}; color: #FFF; padding:2px;">
{% if not event.allDay %}
{{ event.start | date("H:i") }} -
{%endif%}
{{ event.title }}
</div>
{% endif %}
{% endfor %} {% endfor %}
</div>
{% endfor %} {% endif %}
</div>
</div> </div>

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

@ -10,6 +10,7 @@
{% set stylewidgetheader = constants.mystylewidgetheader(entity) %} {% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
{% set stylewidgetbody = constants.mystylewidgetbody(entity) %} {% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
{% set stylewidgetbodyimage = constants.mystylewidgetbodyimage(entity) %} {% set stylewidgetbodyimage = constants.mystylewidgetbodyimage(entity) %}
{% set stylewidgetbodyreverse = constants.mystylewidgetbodyreverse(entity) %}
{% set color = app.session.get('color') %} {% set color = app.session.get('color') %}
@ -43,16 +44,15 @@
{{ description | raw }} {{ description | raw }}
{%if usage=="group" %} {%if usage=="group" %}
<br><br><br>
<div class="grid clearfix"> <div class="grid clearfix">
<div class="grid-sizer grid-small"></div> <div class="grid-sizer grid-small"></div>
<div class="grid-gutter-sizer"></div> <div class="grid-gutter-sizer"></div>
{% for member in members %} {% for member in members %}
<div class="grid-item grid-small"> <div class="grid-item grid-small" style="{{ stylewidgetbodyreverse }};">
<div class="grid-item-content"> <div class="grid-item-content">
<img src="/{{ alias }}/uploads/avatar/{{ member.user.avatar}}" class="avatar"> <div class="grid-item-logo">
<img src="/{{ alias }}/uploads/avatar/{{ member.user.avatar}}" class="grid-item-img avatar" height="110" >
</div>
<div class="grid-item-title"> <div class="grid-item-title">
{%if member.fgmanager%}<i style="color: #FFF" class="fa fa-star" title="Manager"></i>{%endif%}<br> {%if member.fgmanager%}<i style="color: #FFF" class="fa fa-star" title="Manager"></i>{%endif%}<br>

10
src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
View File

@ -3,14 +3,14 @@
{% block localstyle %} {% block localstyle %}
{% if framed %} {% if framed %}
{% if border %} {% if border %}
#page-wrapper { #page-wrapper:last-of-type {
padding: 5px 25px 10px 15px; //padding: 5px 25px 10px 15px;
background: transparent; //background: transparent;
} }
{% else %} {% else %}
#page-wrapper { #page-wrapper {
padding: 5px 25px 0px 15px; //padding: 5px 25px 0px 15px;
background: transparent; //background: transparent;
} }
{% endif %} {% endif %}
{% else %} {% else %}