diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css index 025a599e..b4a31abe 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css @@ -18,6 +18,10 @@ body { margin-top:100px; } +.imageshadow { + filter: drop-shadow(1px 1px 1px #222); +} + /*== HEADER =============================================================================================================================================*/ .header { @@ -401,6 +405,37 @@ a.item-heart { .grid .grid-small .grid-item-title span { display: none } +.grid .grid-verysmall { + width:80px; + height:105px; +} + +.grid .grid-verysmall .item-link { + height:105px; +} + +.grid .grid-verysmall .grid-item-logo { + display: block; + height:40px; + width:auto; +} +.grid .grid-verysmall .grid-item-logo img { + height: 40px; + width: auto; + margin: 10px auto; +} +.grid .grid-verysmall .grid-item-title { + display: block; + vertical-align: top; + font-size: 12px; + line-height: 1; + text-align:center; + width: 100%; +} +.grid .grid-verysmall .grid-item-title h2 { font-size:10px; border-bottom: none; } +.grid .grid-verysmall .grid-item-title span { display: none } + + .grid .grid-list { width:100%; height:auto; diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/view.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/view.html.twig index ee27aa83..09c38fff 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/view.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/view.html.twig @@ -34,7 +34,6 @@ {% endif %} {% endif %} - {% endblock %} {% block localjavascript %} 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 a4e56586..3097e8dd 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php @@ -1092,15 +1092,15 @@ class InitDataCommand extends ContainerAwareCommand $entityWidget->setId(-1810); $entityWidget->setRoworder(2); $entityWidget->setIcon($entityicon); - $entityWidget->setName('Documents Onlyoffice'); + $entityWidget->setName('Onlyoffice'); $entityWidget->setDescription("Les documents associés à votre groupe"); $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_onlydoc"); $entityWidget->setHeight("630"); $entityWidget->setAutoajust(true); - $entityWidget->setBorder(false); + $entityWidget->setBorder(true); $entityWidget->setOpened(true); $entityWidget->setAccess(["config","group"]); - $parameter = json_decode('{"fields": []}'); + $parameter = json_decode('{"fields": [{"id": "apponly", "loc": "col1", "type": "apponly", "label": "Afficher", "value": "0", "mandatory": "true"}]}'); $entityWidget->setParameter($parameter); $em->persist($entityWidget); } 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 bdbb6e3f..18f21707 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -2121,6 +2121,7 @@ class PagewidgetController extends Controller // Permissions if($access=="config") { $canupdate = true; + $cansee = true; } else { // On s'assure que l'utilisateur à la permission de voir @@ -2130,7 +2131,19 @@ class PagewidgetController extends Controller } $onlyservice = $this->container->get('cadoles.portal.service.only'); $files=$onlyservice->getDocument($group, $folders, $firstfolder, $tasks); - $idonly=$em->getRepository("CadolesCoreBundle:Group")->find($group)->getIdOnlyoffice(); + $grp=$em->getRepository("CadolesCoreBundle:Group")->find($group); + if($grp) $idonly= $grp->getIdOnlyoffice(); + else $idonly=0; + + // Récupération des paramétres du widget + $apponly=0; + foreach($entity->getParameter()["fields"] as $parameter) { + switch($parameter["id"]) { + case "apponly": + $apponly=$parameter["value"]; + break; + } + } // Render return $this->render($this->labelentity.':viewonlydoc.html.twig', [ @@ -2141,6 +2154,7 @@ class PagewidgetController extends Controller 'folders' => $folders, 'tasks' => $tasks, 'urlonly' => $this->getParameter("widonlyoffice_url")."/products/projects/projects.aspx?prjID=".$idonly, + 'apponly' => $apponly, 'files' => $files, 'access' => $access, ]); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php index 1bbd1d6e..ecc1a06d 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php @@ -207,6 +207,18 @@ class PagewidgetType extends AbstractType ]) ; } + elseif($field->type=="apponly") { + $builder + ->add($field->id, ChoiceType::class, [ + 'label' => $field->label, + 'mapped'=> false, + 'label_attr' => ['loc' => $field->loc], + 'data' => $field->value, + 'required' => ($field->mandatory=="true"), + 'choices' => array("Documents + Tâches" => "0","Documents uniquement" => "1", "Tâches uniquement" => "2") + ]) ; + } + elseif($field->type=="target") { $builder ->add($field->id, ChoiceType::class, [ 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 ce19d241..0f84ad40 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 @@ -101,7 +101,7 @@

Ajouter

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig index a49bc642..6568bc52 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig @@ -99,7 +99,7 @@

Ajouter un fichier

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig index 6db2b05f..dc2d73e6 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig @@ -86,7 +86,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig index 27080920..0029d291 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig @@ -80,7 +80,7 @@
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 c8a245c7..c6559304 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 @@ -48,16 +48,16 @@ {%if usage=="group" %}
-
+
{% if canadd==true %} -
+
@@ -71,7 +71,7 @@ {% endif %} {% for member in members %} -
+
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig index 6d2c7e25..da978f30 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig @@ -179,7 +179,7 @@

Ajouter

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig index 7875d81c..049fc9ad 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig @@ -198,7 +198,7 @@

Ajouter

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig index ca26c873..b6697dae 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig @@ -50,63 +50,76 @@ {% if files|length >= 1 or canupdate %}
-
-
-
- - {% for file in files %} -
-
- -
- - -
-

{{ file.title }}

-
-
- -
-
- {% endfor %} - - {% if canadd %} -
-
- -
- -
-

Plus

-
-
- -
-
- {% endif %} + {% if apponly==0 %} +
+

Documents

+ {% endif %} + + {% if apponly==0 or apponly==1 %} +
+
+
+ + {% for file in files %} +
+
+ +
+ + +
+

{{ file.title }}

+
+
+ +
+
+ {% endfor %} + + {% if canadd %} +
+
+ +
+ +
+

Plus

+
+
+ +
+
+ {% endif %} +
+ {%endif%} {% if not tasks is empty %}
+ {% if apponly==0 %}

Tâches

- {% for task in tasks %} -
  • {{ task.title }}
    • - {% if not task.subtasks is empty %} -
      - {% for subtask in task.subtasks %} -
    • {{ subtask.title }}
      • - {% endfor %} -
    - {% endif %} - {% endfor %} + {%endif%} + + {% if apponly==0 or apponly==2 %} + {% for task in tasks %} +
  • {{ task.title }}
    • + {% if not task.subtasks is empty %} +
      + {% for subtask in task.subtasks %} +
    • {{ subtask.title }}
      • + {% endfor %} +
    + {% endif %} + {% endfor %} + {%endif%}
    {% endif %}