From c05d4176e4ec38cb064a2c7d93471b4045b19f8a Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 20 Jul 2018 15:42:47 +0000
Subject: [PATCH] FEAT About us in V2
---
.../Views/about-us.component.html | 111 ++++++++++++++++
.../contact_purposes/contact_purposes_up.php | 6 +-
.../contact_types/contact_types_up.php | 6 +-
apps/maarch_entreprise/img/maarch_box.png | Bin 6507 -> 0 bytes
apps/maarch_entreprise/img/maarch_box.svg | 1 +
.../js/angular/app/about-us.component.ts | 66 ++++++++++
.../js/angular/app/app-routing.module.ts | 2 +
.../js/angular/app/app.module.ts | 2 +
.../js/angular/lang/lang-en.ts | 10 ++
.../js/angular/lang/lang-fr.ts | 10 ++
apps/maarch_entreprise/lang/en.php | 19 ---
apps/maarch_entreprise/lang/fr.php | 19 ---
apps/maarch_entreprise/maarch_credits.php | 122 ------------------
apps/maarch_entreprise/template/header.html | 2 +-
14 files changed, 207 insertions(+), 169 deletions(-)
create mode 100644 apps/maarch_entreprise/Views/about-us.component.html
delete mode 100755 apps/maarch_entreprise/img/maarch_box.png
create mode 100644 apps/maarch_entreprise/img/maarch_box.svg
create mode 100755 apps/maarch_entreprise/js/angular/app/about-us.component.ts
delete mode 100755 apps/maarch_entreprise/maarch_credits.php
diff --git a/apps/maarch_entreprise/Views/about-us.component.html b/apps/maarch_entreprise/Views/about-us.component.html
new file mode 100644
index 00000000000..b1356134f67
--- /dev/null
+++ b/apps/maarch_entreprise/Views/about-us.component.html
@@ -0,0 +1,111 @@
+<div class="admin-container" [class.admin-is-mobile]="mobileQuery.matches">
+ <mat-toolbar color="primary" class="admin-toolbar">
+ <button mat-icon-button (click)="snav.toggle()" *ngIf="mobileMode">
+ <mat-icon class="fa fa-bars fa-2x"></mat-icon>
+ </button>
+ <button mat-button (click)="snav.toggle()" *ngIf="!mobileMode">
+ <mat-icon class="maarchLogo" [svgIcon]="mobileQuery.matches ? 'maarchLogoOnly' : 'maarchLogo'"></mat-icon>
+ </button>
+ <h1 class="admin-toolbar-title">{{lang.aboutUs}}
+ <!-- <small [class.hide-for-mobile]="mobileQuery.matches">{{user.firstname}} {{user.lastname}}</small> -->
+ </h1>
+ <span style="flex: 1 1 auto;"></span>
+ <menu-top></menu-top>
+ <button mat-icon-button (click)="snav2.toggle()">
+ <mat-icon class="fa fa-2x" [ngClass]="[snav2.opened ? 'fa-chevron-right' : 'fa-chevron-left']"></mat-icon>
+ </button>
+ </mat-toolbar>
+ <mat-sidenav-container class="admin-sidenav-container" [style.marginTop.px]="mobileMode ? 56 : 0">
+ <mat-sidenav #snav [mode]="mobileMode ? 'over' : 'side'" [fixedInViewport]="mobileMode" fixedTopGap="56" [opened]="mobileMode ? false : true"
+ autoFocus="false">
+ <menu-nav></menu-nav>
+ <mat-divider></mat-divider>
+ <mat-divider></mat-divider>
+ <menu-shortcut></menu-shortcut>
+ </mat-sidenav>
+ <mat-sidenav-content>
+ <div *ngIf="loading" style="display:flex;height:100%;">
+ <mat-spinner style="margin:auto;"></mat-spinner>
+ </div>
+ <mat-card *ngIf="!loading" class="card-app-content">
+ <div class="col-sm-8">
+ <h3>{{lang.aboutUs}}</h3>
+ <hr/>
+ <p><em>Copyright © 2008-2018 Maarch SAS {{lang.groupeCompany}}</em></p>
+ <p>{{lang.maarchLicence}}
+ <a target="blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">licence GNU GPLv3</a>.</p>
+ <div>
+ <ul>
+ <li>{{lang.officialWebsite}} : <a target="blank" href="http://www.maarch.com">www.maarch.com</a></li>
+ <li>{{lang.community}} : <a target="blank" href="http://forum.maarch.org">forum.maarch.org</a></li>
+ <li>{{lang.documentation}} : <a target="blank" href="http://wiki.maarch.org/Accueil">wiki.maarch.org</a></li>
+ </ul>
+ </div>
+ <p> </p>
+ <h3>{{lang.externalComponents}}</h3>
+ <hr/>
+ <em>{{lang.thanksToExtDev}}</em>
+ <p> </p>
+ <ul>
+ <li><a target="blank" href="https://angular.io/">Angular</a></li>
+ <li><a target="blank" href="http://getbootstrap.com/">Bootstrap</a></li>
+ <li><a target="blank" href="http://www.chartjs.org/">Chart.js</a></li>
+ <li><a target="blank" href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a></li>
+ <li><a target="blank" href="http://www.fpdf.org/">Fpdf</a></li>
+ <li><a target="blank" href="http://www.setasign.de/products/pdf-php-solutions/fpdi/">fpdi</a></li>
+ <li><a target="blank" href="https://jquery.com/">Jquery</a></li>
+ <li><a target="blank" href="https://github.com/running-coder/jquery-typeahead">Jquery Typeahead</a></li>
+ <li><a target="blank" href="http://logging.apache.org/log4php/">log4php</a></li>
+ <li><a target="blank" href="http://chir.ag/tech/download/pdfb">Pdfb</a></li>
+ <li><a target="blank" href="http://www.foolabs.com/xpdf/">Pdftotext</a></li>
+ <li><a target="blank" href="http://www.prototypejs.org/">Prototype</a></li>
+ <li><a target="blank" href="http://script.aculo.us/">Script.aculo.us</a></li>
+ <li><a target="blank" href="http://tafel.developpez.com">Tafel Tree</a></li>
+ <li><a target="blank" href="http://www.tinybutstrong.com/">Tiny But Strong</a></li>
+ <li><a target="blank" href="http://www.tinymce.com/">TinyMCE</a></li>
+ <li><a target="blank" href="http://framework.zend.com/">Zend Lucene Search</a></li>
+ </ul>
+ </div>
+
+ <div class="col-sm-4">
+ <h3>Credits</h3>
+ <hr/>
+ <ul>
+ <li>Florian AZIZIAN</li>
+ <li>Damien BUREL</li>
+ <li>Bruno CARLIN</li>
+ <li>Carole COTIN</li>
+ <li>Driss DEMIRAY</li>
+ <li>Gaël DE VILLEBLANCHE</li>
+ <li>Mathieu DONZEL</li>
+ <li>Jean-Louis ERCOLANI</li>
+ <li>Claire FIGUERAS</li>
+ <li>Laurent GIOVANNONI</li>
+ <li>Henri QUENEAU</li>
+ <li>Kader KANE</li>
+ <li>Yves-Christian KPAKPO</li>
+ <li>Sébastien NANABONDJA</li>
+ <li>Fodé NDIAYE</li>
+ <li>Cédric NDOUMBA</li>
+ <li>Alex ORLUC</li>
+ <li>Thomas PENARUIZ</li>
+ <li>Alexandre STEFANOVIC</li>
+ <li>Serge THIERRY-MIEG</li>
+ <li>Cyril VAZQUEZ</li>
+ <li>Arnaud VEBER</li>
+ <li>Loic VINET</li>
+ <br>
+ <li><em>{{lang.thanksToCommunity}}</em></li>
+ </ul>
+ <p> </p>
+ <div class="img_credits_maarch_box">
+ <img src="static.php?filename=maarch_box.svg" />
+ </div>
+ </div>
+ </mat-card>
+ </mat-sidenav-content>
+ <mat-sidenav #snav2 [mode]="mobileQuery.matches ? 'over' : 'side'" [fixedInViewport]="mobileQuery.matches" fixedTopGap="56"
+ position='end' [opened]="mobileQuery.matches ? false : true" style="overflow-x:hidden;max-width:500px;">
+ </mat-sidenav>
+ </mat-sidenav-container>
+ </div>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
index 87609780a5c..69a93c2b6bf 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
@@ -243,10 +243,8 @@ if (isset($_REQUEST['valid'])) {
$core->build_menu($_SESSION['menu']);
?>
</ul>
- <?php
- echo '<div class="header_menu_blank"> </div>';
- echo '<div class="footer_menu"><a style="color:white;" href="'.$_SESSION['config']['businessappurl'].'index.php?page=maarch_credits">';
- echo ''._MAARCH_CREDITS.'</a></div>';?>
+ <div class="header_menu_blank"> </div>
+ <div class="footer_menu"><a onclick="triggerAngular('#/about-us')" style="cursor: pointer;color:white;float:right;"><?php echo _MAARCH_CREDITS ;?></a></div>
</div>
</div>
<div><p id="ariane"><?php
diff --git a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
index 52af192e344..9aa1d57fa5c 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
@@ -232,10 +232,8 @@ if (isset($_REQUEST['valid'])) {
$core->build_menu($_SESSION['menu']);
?>
</ul>
- <?php
- echo '<div class="header_menu_blank"> </div>';
- echo '<div class="footer_menu"><a style="color:white;" href="'.$_SESSION['config']['businessappurl'].'index.php?page=maarch_credits">';
- echo ''._MAARCH_CREDITS.'</a></div>';?>
+ <div class="header_menu_blank"> </div>
+ <div class="footer_menu"><a onclick="triggerAngular('#/about-us')" style="cursor: pointer;color:white;float:right;"><?php echo _MAARCH_CREDITS ;?></a></div>
</div>
</div>
<div><p id="ariane"><?php
diff --git a/apps/maarch_entreprise/img/maarch_box.png b/apps/maarch_entreprise/img/maarch_box.png
deleted file mode 100755
index 143de69a526ae4033ef7d1f2a15890965b3c0d10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6507
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
diff --git a/apps/maarch_entreprise/img/maarch_box.svg b/apps/maarch_entreprise/img/maarch_box.svg
new file mode 100644
index 00000000000..b8290c39b42
--- /dev/null
+++ b/apps/maarch_entreprise/img/maarch_box.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 520 130"> <defs> <style>.a,.c{fill:#24b0ed;}.b{fill:#f99830;}.c{stroke:#24b0ed;stroke-miterlimit:10;stroke-width:2px;}</style> </defs> <title>maarch-color</title> <path class="a" d="M241.73,83.58,216,37.9V95.68a4.06,4.06,0,0,1-8.12,0V22.52A4,4,0,0,1,212,18.64a4.08,4.08,0,0,1,3.69,2.23l29.77,53.2,29.89-53.2A4.07,4.07,0,0,1,279,18.64a4,4,0,0,1,4.06,3.88V95.68a4.06,4.06,0,0,1-8.12,0V37.9L249.11,83.58a4.17,4.17,0,0,1-7.38,0" transform="translate(-15 -15)"></path> <path class="a" d="M332.26,78.3V73.36H314.92c-8,0-13.53,3.17-13.53,10,0,6.1,4.43,10,14,10,8.61,0,16.85-5,16.85-15M303.48,56.69a4.07,4.07,0,0,1-3.2,1.64,3.49,3.49,0,0,1-3.57-3.4,3.54,3.54,0,0,1,.62-2c3.44-5.17,10.08-9.28,20.42-9.28,14.27,0,22.14,8,22.14,20V95.91a3.82,3.82,0,0,1-7.63,0V91.68c-3.07,5.52-10.21,8.46-17.59,8.46-13,0-21.28-6-21.28-16.79,0-10.34,8.24-16.56,21.53-16.56h17.34V63.62c0-8-5.53-12.92-14.51-12.92-6.52,0-10.46,1.88-14.27,6" transform="translate(-15 -15)"></path> <path class="a" d="M386,78.3V73.36H368.67c-8,0-13.53,3.17-13.53,10,0,6.1,4.43,10,14,10,8.61,0,16.85-5,16.85-15M357.23,56.69A4.07,4.07,0,0,1,354,58.33a3.49,3.49,0,0,1-3.57-3.4,3.54,3.54,0,0,1,.61-2c3.45-5.17,10.09-9.28,20.42-9.28,14.27,0,22.15,8,22.15,20V95.91a3.82,3.82,0,0,1-7.63,0V91.68c-3.08,5.52-10.21,8.46-17.59,8.46-13,0-21.28-6-21.28-16.79,0-10.34,8.24-16.56,21.52-16.56H386V63.62c0-8-5.54-12.92-14.52-12.92-6.52,0-10.45,1.88-14.27,6" transform="translate(-15 -15)"></path> <path class="a" d="M412.59,53.28c2.46-5.4,8.61-9.39,17.1-9.39a3.64,3.64,0,1,1,0,7.28c-11.32,0-17.1,7.51-17.1,18.32v26.3a3.94,3.94,0,0,1-7.87,0V48.12a3.94,3.94,0,0,1,7.87,0v5.16Z" transform="translate(-15 -15)"></path> <path class="a" d="M460.07,43.65c10.95,0,17,5.52,18.95,8.11a3.38,3.38,0,0,1-2.71,5.63A3.72,3.72,0,0,1,473.36,56c-1.85-2-5.17-5.52-13.29-5.52-11.31,0-17.34,6.93-17.34,21.38,0,14.68,6,21.49,17.34,21.49,7.14,0,11.44-3.06,14.27-5a3.79,3.79,0,0,1,2.34-.82,3.49,3.49,0,0,1,3.57,3.4,3.61,3.61,0,0,1-1.6,2.94,28.84,28.84,0,0,1-18.58,6.34c-15.86,0-25.34-9-25.34-28.3s9.48-28.19,25.34-28.19" transform="translate(-15 -15)"></path> <path class="a" d="M534.62,64.44V95.79a3.94,3.94,0,0,1-7.87,0V66c0-9.28-2.83-15.62-14.76-15.62-12.18,0-16.37,7-16.37,16.44v29a3.94,3.94,0,0,1-7.87,0v-77a3.94,3.94,0,0,1,7.87,0V51.87C498,47.41,504,43.65,512,43.65c18.94,0,22.63,10.81,22.63,20.79" transform="translate(-15 -15)"></path> <path class="a" d="M41.55,69.87l15.06,37.38L118.86,132l4.88-49.64-16.4,6.93L41.55,69.87Z" transform="translate(-15 -15)"></path> <path class="a" d="M125.07,82.09l-4.14,47.47,25.26-39.22,1.63-10-22.75,1.77Z" transform="translate(-15 -15)"></path> <path class="a" d="M15,59.82l21.72-.88,85.39,22-14.33,6.48L15,59.82Z" transform="translate(-15 -15)"></path> <path class="a" d="M16.63,44.49,73.36,25.33l15.22,8.25L37,57.76Z" transform="translate(-15 -15)"></path> <path class="a" d="M92.86,32.85l8.57-9.29,61.76,7.66L157.13,43.9l-64.27-11Z" transform="translate(-15 -15)"></path> <path class="a" d="M158.46,45.23,128,79.29l36.64-1.48,18.62-36.27-24.82,3.69Z" transform="translate(-15 -15)"></path> <path class="b" d="M91.66,35.31l63.1,9.92-29.4,34.06L95.08,71.91Z" transform="translate(-15 -15)"></path> <path class="b" d="M89.31,35.5l3.55,35.58L42.73,57.76,89.31,35.5Z" transform="translate(-15 -15)"></path> <path class="b" d="M248.87,136.17a9.12,9.12,0,0,1,14.71-7,1.41,1.41,0,0,1,.28,2,1.43,1.43,0,0,1-2,.22A6.42,6.42,0,0,0,258,130.1a6.12,6.12,0,0,0-4.44,1.79,5.82,5.82,0,0,0,0,8.51,6.13,6.13,0,0,0,4.44,1.8,6.73,6.73,0,0,0,3.37-.94v-3.37h-3.52a1.42,1.42,0,0,1-1.41-1.4,1.38,1.38,0,0,1,1.41-1.38h4.9a1.39,1.39,0,0,1,1.43,1.38v5.44a2.33,2.33,0,0,1-.07.41.69.69,0,0,0-.05.13v0a1.18,1.18,0,0,1-.47.59A9.07,9.07,0,0,1,258,145a9,9,0,0,1-9.1-8.83" transform="translate(-15 -15)"></path> <path class="b" d="M277.17,133.07a2.54,2.54,0,0,0-2.54-2.56h-3v5.07h3a2.53,2.53,0,0,0,2.54-2.51m3.45,9.89a1.36,1.36,0,0,1-.87,1.72,2.34,2.34,0,0,1-.54.07h0a1.78,1.78,0,0,1-1-.27,2.27,2.27,0,0,1-.79-.86,6.52,6.52,0,0,1-.52-3,2.05,2.05,0,0,0-.29-1.06,2.33,2.33,0,0,0-.75-.71,4.74,4.74,0,0,0-1.37-.59H271.6v5.34a1.38,1.38,0,0,1-1.38,1.35,1.35,1.35,0,0,1-1.36-1.35V129.14a1.34,1.34,0,0,1,1.36-1.36h4.41a5.27,5.27,0,0,1,5.27,5.29,5.21,5.21,0,0,1-1.92,4,3.79,3.79,0,0,1,.86.92,4.58,4.58,0,0,1,.82,2.65,6.54,6.54,0,0,0,.09,1.45,1.35,1.35,0,0,1,.87.84" transform="translate(-15 -15)"></path> <path class="b" d="M297,136.15a6.36,6.36,0,0,0-1.67-4.31,5.32,5.32,0,0,0-7.89,0,6.27,6.27,0,0,0-1.67,4.31,6.13,6.13,0,0,0,1.67,4.27,5.26,5.26,0,0,0,7.89,0,6.22,6.22,0,0,0,1.67-4.27m.32-6.23a9,9,0,0,1,0,12.45,8.06,8.06,0,0,1-5.89,2.63,8.31,8.31,0,0,1-6-2.63,9.16,9.16,0,0,1,0-12.45,8.23,8.23,0,0,1,6-2.63,8,8,0,0,1,5.89,2.63" transform="translate(-15 -15)"></path> <path class="b" d="M310.2,145a7.11,7.11,0,0,1-7.13-7.11v-8.75a1.34,1.34,0,0,1,1.36-1.36,1.37,1.37,0,0,1,1.38,1.36v8.75a4.39,4.39,0,0,0,8.77,0v-8.75a1.36,1.36,0,0,1,1.38-1.36,1.34,1.34,0,0,1,1.36,1.36v8.75A7.12,7.12,0,0,1,310.2,145" transform="translate(-15 -15)"></path> <path class="b" d="M325.36,135.58h3a2.54,2.54,0,1,0,0-5.07h-3Zm3,2.73h-3v5.34a1.37,1.37,0,0,1-2.74,0V129.14a1.35,1.35,0,0,1,1.36-1.36h4.41a5.27,5.27,0,1,1,0,10.53" transform="translate(-15 -15)"></path> <path class="b" d="M336.5,143.65V129.14a1.33,1.33,0,0,1,1.35-1.36h8.06a1.37,1.37,0,0,1,1.36,1.36,1.38,1.38,0,0,1-1.36,1.37h-6.68V135H345a1.39,1.39,0,0,1,1.35,1.36,1.37,1.37,0,0,1-1.35,1.37h-5.75v4.53h6.68a1.37,1.37,0,0,1,0,2.73h-8c-.05,0-.05,0-.05,0l0,0a1.34,1.34,0,0,1-1.35-1.35" transform="translate(-15 -15)"></path> <path class="b" d="M365.31,138.24l-2-5.29-2,5.29Zm1,2.7h-6l-1.21,3.2a1.37,1.37,0,0,1-1.28.86,1.78,1.78,0,0,1-.47-.07,1.4,1.4,0,0,1-.81-1.78L362,128.67a1.37,1.37,0,0,1,1.31-.86,1.35,1.35,0,0,1,1.3.86l5.45,14.48a1.41,1.41,0,0,1-.81,1.78,1.66,1.66,0,0,1-.47.07,1.33,1.33,0,0,1-1.26-.86l-1.21-3.2Z" transform="translate(-15 -15)"></path> <path class="b" d="M380.91,133.07a2.53,2.53,0,0,0-2.53-2.56h-3v5.07h3a2.52,2.52,0,0,0,2.53-2.51m3.45,9.89a1.35,1.35,0,0,1-.86,1.72,2.43,2.43,0,0,1-.54.07h0a1.84,1.84,0,0,1-1-.27,2.35,2.35,0,0,1-.79-.86,6.68,6.68,0,0,1-.51-3,2.15,2.15,0,0,0-.3-1.06,2.3,2.3,0,0,0-.74-.71,4.77,4.77,0,0,0-1.38-.59h-2.91v5.34A1.37,1.37,0,0,1,374,145a1.35,1.35,0,0,1-1.35-1.35V129.14a1.33,1.33,0,0,1,1.35-1.36h4.42a5.27,5.27,0,0,1,5.27,5.29,5.21,5.21,0,0,1-1.92,4,4,4,0,0,1,.86.92,4.65,4.65,0,0,1,.81,2.65,6.34,6.34,0,0,0,.1,1.45,1.31,1.31,0,0,1,.86.84" transform="translate(-15 -15)"></path> <path class="b" d="M387.1,136.15a9.06,9.06,0,0,1,9-8.86,9.19,9.19,0,0,1,5.69,1.92,1.41,1.41,0,0,1-1.72,2.24,6.14,6.14,0,0,0-4-1.36,6.52,6.52,0,0,0-4.44,1.78,6,6,0,0,0-1.8,4.28,6,6,0,0,0,1.8,4.27,6.52,6.52,0,0,0,4.44,1.78,6.18,6.18,0,0,0,4-1.36,1.49,1.49,0,0,1,2,.27,1.46,1.46,0,0,1-.25,2,9.19,9.19,0,0,1-5.69,1.92,9,9,0,0,1-9-8.85" transform="translate(-15 -15)"></path> <path class="b" d="M406.38,143.65V129.14a1.33,1.33,0,0,1,1.35-1.36,1.35,1.35,0,0,1,1.38,1.36V135h6.39v-5.9a1.33,1.33,0,0,1,1.35-1.36,1.35,1.35,0,0,1,1.38,1.36v14.51a1.35,1.35,0,0,1-1.38,1.35,1.33,1.33,0,0,1-1.35-1.35v-5.91h-6.39v5.91a1.35,1.35,0,0,1-1.38,1.35,1.33,1.33,0,0,1-1.35-1.35" transform="translate(-15 -15)"></path> <path class="b" d="M422.3,129.14a1.34,1.34,0,0,1,1.36-1.36,1.37,1.37,0,0,1,1.38,1.36v14.51a1.37,1.37,0,0,1-1.38,1.35,1.33,1.33,0,0,1-1.36-1.35Z" transform="translate(-15 -15)"></path> <path class="b" d="M434.77,144.75a1.25,1.25,0,0,0-.17-.12s0,0,0-.07a.87.87,0,0,1-.13-.15s0,0,0,0-.08-.14-.12-.19l-6-14.37a1.3,1.3,0,0,1,.74-1.74,1.33,1.33,0,0,1,1.75.71l4.8,11.39,4.81-11.39a1.36,1.36,0,0,1,2.51,1l-6.09,14.37a.66.66,0,0,1-.09.19s0,0,0,0-.1.1-.12.15l-.05.07c-.05.05-.1.07-.15.12l-.05,0c-.05,0-.12.1-.2.12s0,0,0,0a.65.65,0,0,0-.2,0h-.05a.77.77,0,0,1-.25,0,.66.66,0,0,1-.24,0h-.05a.71.71,0,0,0-.2,0,0,0,0,0,0,0,0h0a1.74,1.74,0,0,1-.22-.15Z" transform="translate(-15 -15)"></path> <path class="b" d="M446.41,143.65V129.14a1.33,1.33,0,0,1,1.35-1.36h8.06a1.37,1.37,0,0,1,1.36,1.36,1.38,1.38,0,0,1-1.36,1.37h-6.68V135h5.75a1.39,1.39,0,0,1,1.35,1.36,1.37,1.37,0,0,1-1.35,1.37h-5.75v4.53h6.68a1.37,1.37,0,0,1,0,2.73h-8s0,0,0,0l0,0a1.34,1.34,0,0,1-1.35-1.35" transform="translate(-15 -15)"></path> <path class="b" d="M459.77,136.15a9,9,0,0,1,9-8.86,9.24,9.24,0,0,1,5.7,1.92,1.42,1.42,0,0,1-1.73,2.24,6.12,6.12,0,0,0-4-1.36,6.49,6.49,0,0,0-4.43,1.78,6,6,0,0,0-1.8,4.28,6,6,0,0,0,1.8,4.27,6.49,6.49,0,0,0,4.43,1.78,6.18,6.18,0,0,0,4-1.36,1.49,1.49,0,0,1,2,.27,1.45,1.45,0,0,1-.24,2,9.24,9.24,0,0,1-5.7,1.92,9,9,0,0,1-9-8.85" transform="translate(-15 -15)"></path> <path class="b" d="M491.83,136.15a6.36,6.36,0,0,0-1.67-4.31,5.32,5.32,0,0,0-7.89,0,6.27,6.27,0,0,0-1.67,4.31,6.13,6.13,0,0,0,1.67,4.27,5.26,5.26,0,0,0,7.89,0,6.22,6.22,0,0,0,1.67-4.27m.33-6.23a9.05,9.05,0,0,1,0,12.45,8.1,8.1,0,0,1-5.9,2.63,8.31,8.31,0,0,1-6-2.63,9.16,9.16,0,0,1,0-12.45,8.23,8.23,0,0,1,6-2.63,8,8,0,0,1,5.9,2.63" transform="translate(-15 -15)"></path> <path class="c" d="M207.61,135.94h28.95" transform="translate(-15 -15)"></path> <path class="c" d="M506,135.94h29" transform="translate(-15 -15)"></path> </svg>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/js/angular/app/about-us.component.ts b/apps/maarch_entreprise/js/angular/app/about-us.component.ts
new file mode 100755
index 00000000000..1513901a8fb
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/about-us.component.ts
@@ -0,0 +1,66 @@
+import { ChangeDetectorRef, Component, OnInit, ViewChild, QueryList, ViewChildren } from '@angular/core';
+import { MediaMatcher } from '@angular/cdk/layout';
+import { HttpClient } from '@angular/common/http';
+import { LANG } from './translate.component';
+import { NotificationService } from './notification.service';
+import { MatDialog, MatSidenav, MatExpansionPanel } from '@angular/material';
+
+import { AutoCompletePlugin } from '../plugins/autocomplete.plugin';
+import { FormGroup } from '@angular/forms';
+
+declare function $j(selector: any): any;
+
+declare var angularGlobals: any;
+
+@Component({
+ templateUrl: "../../../Views/about-us.component.html",
+ styleUrls: ['../../../css/profile.component.css'],
+ providers: [NotificationService]
+})
+export class AboutUsComponent extends AutoCompletePlugin implements OnInit {
+
+ private _mobileQueryListener: () => void;
+ mobileQuery: MediaQueryList;
+ mobileMode : boolean = false;
+ coreUrl: string;
+ lang: any = LANG;
+
+ loading: boolean = false;
+
+ @ViewChild('snav2') sidenav: MatSidenav;
+
+ @ViewChildren(MatExpansionPanel) viewPanels: QueryList<MatExpansionPanel>;
+
+ constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient, public dialog: MatDialog) {
+ super(http, ['users']);
+ this.mobileMode = angularGlobals.mobileMode;
+ $j("link[href='merged_css.php']").remove();
+ this.mobileQuery = media.matchMedia('(max-width: 768px)');
+ this._mobileQueryListener = () => changeDetectorRef.detectChanges();
+ this.mobileQuery.addListener(this._mobileQueryListener);
+ }
+
+ prepareProfile() {
+ $j('#inner_content').remove();
+ $j('#inner_content_contact').parent('div').remove();
+ $j('#inner_content_contact').remove();
+ $j('#menunav').hide();
+ $j('#divList').remove();
+ $j('#magicContactsTable').remove();
+ $j('#manageBasketsOrderTable').remove();
+ $j('#controlParamTechnicTable').remove();
+ $j('#container').width("99%");
+ if ($j('#content h1')[0] && $j('#content h1')[0] != $j('my-app h1')[0]) {
+ $j('#content h1')[0].remove();
+ }
+ }
+
+ ngOnInit(): void {
+ this.prepareProfile();
+ this.coreUrl = angularGlobals.coreUrl;
+
+ this.loading = false;
+
+ }
+
+}
diff --git a/apps/maarch_entreprise/js/angular/app/app-routing.module.ts b/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
index edca9400eef..86208a79546 100755
--- a/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { ProfileComponent } from './profile.component';
+import { AboutUsComponent } from './about-us.component';
import { PasswordModificationComponent } from './password-modification.component';
import { SignatureBookComponent } from './signature-book.component';
import { SaveNumericPackageComponent } from './save-numeric-package.component';
@@ -11,6 +12,7 @@ import { SaveNumericPackageComponent } from './save-numeric-package.compone
imports: [
RouterModule.forRoot([
{ path: 'profile', component: ProfileComponent },
+ { path: 'about-us', component: AboutUsComponent },
{ path: 'password-modification', component: PasswordModificationComponent },
{ path: 'saveNumericPackage', component: SaveNumericPackageComponent },
{ path: 'groups/:groupId/baskets/:basketId/signatureBook/:resId', component: SignatureBookComponent },
diff --git a/apps/maarch_entreprise/js/angular/app/app.module.ts b/apps/maarch_entreprise/js/angular/app/app.module.ts
index 7bb854d16f1..60d9b39209a 100755
--- a/apps/maarch_entreprise/js/angular/app/app.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/app.module.ts
@@ -10,6 +10,7 @@ import { AppRoutingModule } from './app-routing.module';
import { AdministrationModule } from './administration/administration.module';
import { ProfileComponent } from './profile.component';
+import { AboutUsComponent } from './about-us.component';
import { PasswordModificationComponent, InfoChangePasswordModalComponent, } from './password-modification.component';
import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component';
import { SaveNumericPackageComponent } from './save-numeric-package.component';
@@ -23,6 +24,7 @@ import { SaveNumericPackageComponent } from './save-numeric-package.com
declarations: [
AppComponent,
ProfileComponent,
+ AboutUsComponent,
PasswordModificationComponent,
SignatureBookComponent,
SafeUrlPipe,
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
index 1c597546aea..63f56975d2f 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
@@ -590,4 +590,14 @@ export const LANG_EN = {
"chars" : "char(s)",
"minutes" : "minute(s)",
"password" : "Password",
+ "aboutUs" : "About Maarch",
+ "thanksToCommunity" : "And all the Maarch's community !",
+ "thanksToExtDev" : "Maarch depend upon some external components. A thank-you to their developers !",
+ "externalComponents" : "External components",
+ "documentation" : "Documentation",
+ "community" : "Community",
+ "officialWebsite" : "Official website",
+ "maarchLicence" : "Maarch is circulated under the terms of",
+ "groupeCompany" : ", Archiveco group company"
+
};
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
index a2cc39d5d94..50401840546 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
@@ -615,4 +615,14 @@ export const LANG_FR = {
"chars" : "caractère(s)",
"minutes" : "minute(s)",
"password" : "Mot de passe",
+ "aboutUs" : "A propos de Maarch",
+ "thanksToCommunity" : "Et toute la communauté Maarch !",
+ "thanksToExtDev" : "Maarch s'appuie sur quelques composants externes. Merci à leurs développeurs !",
+ "externalComponents" : "Composants externes",
+ "documentation" : "Documentation",
+ "community" : "Communauté",
+ "officialWebsite" : "Site officiel",
+ "maarchLicence" : "Maarch est diffusé sous les termes de la",
+ "groupeCompany" : "société du groupe Archiveco"
+
};
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index c6de16413ca..b1faf53d999 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -1839,28 +1839,9 @@ if (!defined('_NO_STRUCTURE_ATTACHED')) {
if (!defined('_MAARCH_CREDITS')) {
define('_MAARCH_CREDITS', 'About Maarch ');
}
-if (!defined('_MAARCH_LICENCE')) {
- define('_MAARCH_LICENCE', 'Maarch is circulated under the terms of');
-}
-if (!defined('_OFFICIAL_WEBSITE')) {
- define('_OFFICIAL_WEBSITE', 'Official website');
-}
-if (!defined('_COMMUNITY')) {
- define('_COMMUNITY', 'Community');
-}
-if (!defined('_DOCUMENTATION')) {
- define('_DOCUMENTATION', 'Documentation');
-}
if (!defined('_THANKS_TO_EXT_DEV')) {
define('_THANKS_TO_EXT_DEV', 'Maarch depend upon some external components. A thank-you to their developers !');
}
-if (!defined('_EXTERNAL_COMPONENTS')) {
- define('_EXTERNAL_COMPONENTS', 'External components');
-}
-if (!defined('_THANKS_TO_COMMUNITY')) {
- define('_THANKS_TO_COMMUNITY', "And all the Maarch's community !");
-}
-
if (!defined('_PROCESSING_DATE')) {
define('_PROCESSING_DATE', 'Processing deadline');
}
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index 753a55c22f9..4d0dc9fbbdb 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -1857,28 +1857,9 @@ if (!defined('_NO_STRUCTURE_ATTACHED')) {
if (!defined('_MAARCH_CREDITS')) {
define('_MAARCH_CREDITS', 'A propos de Maarch ');
}
-if (!defined('_MAARCH_LICENCE')) {
- define('_MAARCH_LICENCE', 'Maarch est diffusé sous les termes de la');
-}
-if (!defined('_OFFICIAL_WEBSITE')) {
- define('_OFFICIAL_WEBSITE', 'Site officiel');
-}
-if (!defined('_COMMUNITY')) {
- define('_COMMUNITY', 'Communauté');
-}
-if (!defined('_DOCUMENTATION')) {
- define('_DOCUMENTATION', 'Documentation');
-}
if (!defined('_THANKS_TO_EXT_DEV')) {
define('_THANKS_TO_EXT_DEV', "Maarch s'appuie sur quelques composants externes. Merci à leurs développeurs !");
}
-if (!defined('_EXTERNAL_COMPONENTS')) {
- define('_EXTERNAL_COMPONENTS', 'Composants externes');
-}
-if (!defined('_THANKS_TO_COMMUNITY')) {
- define('_THANKS_TO_COMMUNITY', 'Et toute la communauté Maarch !');
-}
-
if (!defined('_PROCESSING_DATE')) {
define('_PROCESSING_DATE', 'Date limite de traitement');
}
diff --git a/apps/maarch_entreprise/maarch_credits.php b/apps/maarch_entreprise/maarch_credits.php
deleted file mode 100755
index eb294ecf246..00000000000
--- a/apps/maarch_entreprise/maarch_credits.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
-* File : maarch_credits.php
-*
-* Show all contributors for Maarch.
-* Thanks a lot for your help!!
-*
-* @package Maarch FrameWork 3.0
-* @version 2.1
-* @since 10/2005
-* @license GPL
-* @author Loic Vinet <dev@maarch.org>
-*/
-
-require_once('core/class/class_security.php');
-$core_tools = new core_tools();
-
-/****************Management of the location bar ************/
-$init = false;
-if (isset($_REQUEST['reinit']) && $_REQUEST['reinit'] == "true") {
- $init = true;
-}
-$level = "";
-if (
- isset($_REQUEST['level'])
- && ($_REQUEST['level'] == 2
- || $_REQUEST['level'] == 3
- || $_REQUEST['level'] == 4
- || $_REQUEST['level'] == 1
- )
-) {
- $level = $_REQUEST['level'];
-}
-$page_path = $_SESSION['config']['businessappurl'] .
- 'index.php?page=boxes&module=maarch_credits';
-$page_label = _MAARCH_CREDITS;
-$page_id = "maarch_credits";
-$core_tools->manage_location_bar($page_path, $page_label, $page_id, $init, $level);
-/***********************************************************/
-?>
-
-<h1><i class="fa fa-info-circle fa-2x"></i> <?php echo _MAARCH_CREDITS;?>
-</h1>
-<div id="inner_content" class="clearfix">
- <div class="maarch_credits_left_box" style="height:520px;">
- <h3><?php echo _MAARCH_CREDITS;?></h3>
- <hr/>
- <p><em>Copyright © 2008-2017 Maarch SAS.</em></p>
- <p><?php echo _MAARCH_LICENCE;?>
- <a target="blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">licence GNU GPLv3</a>.</p>
- <div>
- <ul>
- <li><?php echo _OFFICIAL_WEBSITE;?> : <a target="blank" href="http://www.maarch.com">www.maarch.com</a></li>
- <li><?php echo _COMMUNITY;?> : <a target="blank" href="http://forum.maarch.org">forum.maarch.org</a></li>
- <li><?php echo _DOCUMENTATION;?> : <a target="blank" href="http://wiki.maarch.org/Accueil">wiki.maarch.org</a></li>
- </ul>
- </div>
- <p> </p>
- <h3><?php echo _EXTERNAL_COMPONENTS;?></h3>
- <hr/>
- <em><?php echo _THANKS_TO_EXT_DEV;?></em>
- <p> </p>
- <ul>
- <li><a target="blank" href="https://angular.io/">Angular</a></li>
- <li><a target="blank" href="http://getbootstrap.com/">Bootstrap</a></li>
- <li><a target="blank" href="http://www.chartjs.org/">Chart.js</a></li>
- <li><a target="blank" href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a></li>
- <li><a target="blank" href="http://www.fpdf.org/">Fpdf</a></li>
- <li><a target="blank" href="http://www.setasign.de/products/pdf-php-solutions/fpdi/">fpdi</a></li>
- <li><a target="blank" href="https://jquery.com/">Jquery</a></li>
- <li><a target="blank" href="https://github.com/running-coder/jquery-typeahead">Jquery Typeahead</a></li>
- <li><a target="blank" href="http://logging.apache.org/log4php/">log4php</a></li>
- <li><a target="blank" href="http://chir.ag/tech/download/pdfb">Pdfb</a></li>
- <li><a target="blank" href="http://www.foolabs.com/xpdf/">Pdftotext</a></li>
- <li><a target="blank" href="http://www.prototypejs.org/">Prototype</a></li>
- <li><a target="blank" href="http://script.aculo.us/">Script.aculo.us</a></li>
- <li><a target="blank" href="http://tafel.developpez.com">Tafel Tree</a></li>
- <li><a target="blank" href="http://www.tinybutstrong.com/">Tiny But Strong</a></li>
- <li><a target="blank" href="http://www.tinymce.com/">TinyMCE</a></li>
- <li><a target="blank" href="http://framework.zend.com/">Zend Lucene Search</a></li>
- </ul>
- </div>
-
- <div class="credits_list block" style="height:520px;">
- <h3>Credits</h3>
- <p> </p>
- <ul>
- <li>Florian AZIZIAN</li>
- <li>Damien BUREL</li>
- <li>Bruno CARLIN</li>
- <li>Carole COTIN</li>
- <li>Driss DEMIRAY</li>
- <li>Gaël DE VILLEBLANCHE</li>
- <li>Mathieu DONZEL</li>
- <li>Jean-Louis ERCOLANI</li>
- <li>Claire FIGUERAS</li>
- <li>Laurent GIOVANNONI</li>
- <li>Henri QUENEAU</li>
- <li>Kader KANE</li>
- <li>Yves-Christian KPAKPO</li>
- <li>Sébastien NANABONDJA</li>
- <li>Fodé NDIAYE</li>
- <li>Cédric NDOUMBA</li>
- <li>Alex ORLUC</li>
- <li>Thomas PENARUIZ</li>
- <li>Alexandre STEFANOVIC</li>
- <li>Serge THIERRY-MIEG</li>
- <li>Cyril VAZQUEZ</li>
- <li>Arnaud VEBER</li>
- <li>Loic VINET</li>
- <li> </li>
- <li><em><?php echo _THANKS_TO_COMMUNITY;?></em></li>
- </ul>
- <p> </p>
- <div class="img_credits_maarch_box">
- <img src="<?php
- echo $_SESSION['config']['businessappurl'];
- ?>static.php?filename=maarch_box.png" />
- </div>
- </div>
-</div>
-<p style="clear:both"></p>
diff --git a/apps/maarch_entreprise/template/header.html b/apps/maarch_entreprise/template/header.html
index 1c585f9cfb3..0d759ba9bf4 100755
--- a/apps/maarch_entreprise/template/header.html
+++ b/apps/maarch_entreprise/template/header.html
@@ -47,7 +47,7 @@
<span style="color:white;float:left;">
<?php echo $_SESSION['config']['applicationname']; ?>
</span>
- <?php echo "<a style='color:white;float:right;' href='{$_SESSION['config']['businessappurl']}index.php?page=maarch_credits'>"._MAARCH_CREDITS."</a>"; ?>
+ <a onclick="triggerAngular('#/about-us')" style="cursor: pointer;color:white;float:right;"><?php echo _MAARCH_CREDITS ;?></a>
<div style="clear:both;"></div>
</div>
</div>
--
GitLab