Clean JS (anciens scripts via require) (a06c1412) · Commits · open-source / oscar

module/Oscar/view/layout/layout.phtml

+31 −72

Original line number	Diff line number	Diff line
		@@ -113,34 +113,20 @@ echo getenv('APPLICATION_ENV') ?: 'development' ?>">
		<?= $this->oscarText('Mes jalons') ?>
		</a>
		</li>

		<?php if ($this->grant()->isBoss()): ?>
		<li>
		<hr class="dropdown-divider">
		</li>
		<li>
		<a class="dropdown-item" href="<?= $this->url('project/structure') ?>">
		<i class="icon-building-filled"></i>
		<?= $this->oscarText('Mes structures') ?>
		</a>
		</li>
		<?php endif; ?>
		<?php if ($this->grant()->hasPersonnelAccess()): ?>
		<li>
		<a class="dropdown-item" href="<?= $this->url('person/personnel') ?>">
		<i class="icon-group"></i>
		<?= $this->oscarText('Personnel') ?>
		</a>
		</li>
		<?php endif; ?>

		<?php
		if ($this->grant()->hasPrivilegeInOrganizations(
		Privileges::ACTIVITY_CREATE
		) \|\| $this->grant()->hasPrivilegeInOrganizations(
		Privileges::PROJECT_CREATE
		)) : ?>
		<li>
		<hr class="dropdown-divider">
		</li>
		<?php
		if ($this->grant()->hasPrivilegeInOrganizations(Privileges::ACTIVITY_CREATE)) : ?>
		<?php if ($this->grant()->hasPrivilegeInOrganizations(Privileges::ACTIVITY_CREATE) \|\| $this->grant()->hasPrivilegeInOrganizations(Privileges::PROJECT_CREATE)) : ?>
		<?php if ($this->grant()->hasPrivilegeInOrganizations(Privileges::ACTIVITY_CREATE)) : ?>
		<li>
		<a class="dropdown-item" href="<?= $this->url('contract/new') ?>">
		<i class="icon-cube"></i>
		@@ -155,8 +141,19 @@ echo getenv('APPLICATION_ENV') ?: 'development' ?>">
		<?= $this->oscarText("Nouveau projet") ?>
		</a>
		</li>
		<?php
		endif; ?>
		<?php endif; ?>
		<?php endif; ?>


		<?php if ($this->grant()->hasPersonnelAccess()): ?>
		<li>
		<a class="dropdown-item" href="<?= $this->url('person/personnel') ?>">
		<i class="icon-group"></i>
		<?= $this->oscarText('Personnel') ?>
		</a>
		</li>
		<?php endif; ?>

		<?php endif; ?>


		@@ -253,6 +250,14 @@ echo getenv('APPLICATION_ENV') ?: 'development' ?>">
		</a>
		</li>
		<?php endif; ?>

		<?php if ($this->grant()->privilege(\Oscar\Provider\Privileges::ACTIVITY_PAYMENT_SHOW)): ?>
		<li role="presentation" class="dropdown-header"><i class="icon-bank"></i> <?= $this->translate("Finance") ?></li>
		<li><a class="dropdown-item" href="<?= $this->url('payment/income') ?>"><?= $this->translate("Prochains versements") ?></a></li>
		<li><a class="dropdown-item" href="<?= $this->url('payment/late') ?>"><?= $this->translate("Versements en retard") ?></a></li>
		<li><a class="dropdown-item" href="<?= $this->url('payment/difference') ?>"><?= $this->translate("Écarts de paiement") ?></a></li>
		<li><a class="dropdown-item" href="<?= $this->url('payment') ?>"><?= $this->translate("Tous les versements") ?></a></li>
		<?php endif; ?>
		<?php endif; ?>

		</ul>
		@@ -260,54 +265,6 @@ echo getenv('APPLICATION_ENV') ?: 'development' ?>">

		<?php endif; ?>

		<?php /****
		*
		* <li class="dropdown">
		* <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
		* <i class="icon-wristwatch"></i>
		* <?= $this->oscarText('Accueil') ?>
		* <span class="caret"></span>
		* </a>
		* <ul class="dropdown-menu" role="menu">
		*
		*
		* <?php if ($this->grant()->privilege(Privileges::ACTIVITY_REQUEST) \|\| $this->grant()->hasPrivilegeInOrganizations(Privileges::ACTIVITY_REQUEST)): ?>
		* <li>
		* <a href="<?= $this->url('requestactivity') ?>">
		* <i class="icon-cube"></i>
		* <?= $this->oscarText("Demande d'activité") ?>
		* </a>
		* </li>
		* <?php
		* endif; ?>
		*
		*
		* </ul>
		* </li>
		* <?php endif; **/ ?>

		<?php if ($this->grant()->connected()): ?>
		<li class="nav-item dropdown">
		<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
		aria-expanded="false">
		<?= $this->oscarText("Mes projets/activités") ?>
		</a>
		<ul class="dropdown-menu">
		<li>
		<a class="dropdown-item" href="<?= $this->url('project/mine') ?>">
		<i class="icon-cubes"></i>
		<?= $this->oscarText('Mes projets') ?>
		</a>
		</li>
		<li><a class="dropdown-item" href="#">Action</a></li>
		<li><a class="dropdown-item" href="#">Another action</a></li>
		<li>
		<hr class="dropdown-divider">
		</li>
		<li><a class="dropdown-item" href="#">Something else here</a></li>
		</ul>
		</li>
		<?php endif; ?>

		<?php
		if (
		@@ -433,7 +390,9 @@ echo getenv('APPLICATION_ENV') ?: 'development' ?>">

		<?php
		if ($this->grant()->connected()): ?>
		<p class="navbar-text navbar-right" id="notifications-area"></p>
		<p class="navbar-text navbar-right" id="notifications-area">
		Notifications
		</p>
		<?php
		endif; ?>
		<p class="navbar-text navbar-right">
		@@ -584,7 +543,7 @@ if ($this->grant()->getCurrentPerson()): ?>
		}
		}).$mount('#notifications-area');
		});
		***/
		/***/
		</script>
		<?php
		endif; ?>

module/Oscar/view/oscar/organization/show.phtml

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@
		<?php endif;?>
		</h1>
		<div class="details row">
		<dl class="col-xs-8">
		<dl class="col-md-8">

		<dt>Code interne</dt>
		<dd><?= $organization->getCode() ? $organization->getCode() : '<i class="missing-data">Aucun</i>' ?></dd>
		@@ -94,7 +94,7 @@
		</address>
		</dd>
		</dl>
		<div class="col-xs-4">
		<div class="col-md-4">
		<h5>Description</h5>
		<?= $organization->getDescription() ? $organization->getDescription() : '<i class="missing-data">Aucun</i>' ?>

module/Oscar/view/oscar/person/item-list.phtml

+34 −12

Original line number	Diff line number	Diff line
		<?php
		/** @var \Oscar\Entity\Person $person */
		?>
		<article class="card xs openable selectable person <?= $person->isLeader() ? "leader" : "" ?> <?= $person->isLdapActive() ? "" : "inactive" ?>"
		<article class="card xs openable selectable person
		<?= $person->isLeader() ? "leader" : "" ?> <?= $person->isLdapActive() ? "" : "inactive" ?>"
		data-id="<?= $person->getId() ?>">
		<h2 class="card-title" style="display: flex">
		<h2 class="card-title">
		<?php if($person->getEmail()): ?>
		<img class="thumb32"
		src="//www.gravatar.com/avatar/<?= md5($person->getEmail()) ?>?s=30"
		alt="">
		<?php endif; ?>

		<span class="fn">

		<span class="family-name">
		<?= $markText($person->getLastName(), $search) ?>
		</span>

		<span class="given-name">
		<?= $markText($person->getFirstname(), $search) ?>
		</span>
		<span class="counter <?= count($person->getProjectAffectations()) ? ' filled' : 'empty' ?>">

		<span class="usage <?= count($person->getProjectAffectations()) ? ' primary' : 'empty' ?>">
		<?= count($person->getProjectAffectations()) ?>
		</span>

		<a href="<?= $this->url('person/show', ['id'=>$person->getId()]) ?>" class="btn btn-primary btn-sm">Fiche</a>
		<a href="<?= $this->url('person/show', ['id'=>$person->getId()]) ?>"
		class="btn btn-primary btn-sm">Fiche</a>

		<?php if($this->privilege(\Oscar\Provider\Privileges::PERSON_EDIT)):?>
		<a href="<?= $this->url('person/edit', ['id'=>$person->getId()]) ?>"
		class="btn btn-light">
		Modifier
		</a>
		<?php endif; ?>


		<?php /* if( $this->grant()->privilege(\Oscar\Provider\Privileges::MAINTENANCE_NOTIFICATION_PERSON) ): ?>
		<a href="<?= $this->url('notification/person', ['idperson'=>$person->getId()]) ?>" class="more"><i class="icon-bell"></i> Notifier</a>
		<?php endif;*/ ?>

		<?php if( !$person->isLdapActive() ): ?>
		<span class="text-danger" style="position: absolute; right: 1em; line-height: 1em">
		<span class="account-off">
		<i class="icon-calendar"></i>
		Compte désactivé <br>
		<span style="font-weight: 100; font-size: .8em">
		<small>
		depuis le <?= $this->moment($person->getLdapFinInscription()) ?>
		(<?= $this->moment($person->getLdapFinInscription())->since() ?>)
		</span>
		</small>
		</span>
		<?php elseif( $person->getLdapFinInscription() ): ?>
		<span class="text-danger" style="position: absolute; right: 1em; font-size: .8em">
		<span class="account-off" style="position: absolute; right: 1em; font-size: .8em">
		<span style="font-weight: 100">
		<i class="icon-calendar"></i>
		Désactivation à venir :
		@@ -47,12 +57,24 @@
		(<?= $this->moment($person->getLdapFinInscription())->since() ?>)
		</span>
		<?php endif; ?>
		</span>
		</h2>
		<div class="card-content text-highlight">
		<i class="icon-phone-outline"></i><strong class="addon"><?= $person->getPhone() ?></strong> \|
		<?php if($person->getPhone()): ?>
		<span class="key-value">
		<span class="key">
		<i class=" icon icon-phone-outline"></i>
		</span>
		<strong class="value"><?= $person->getPhone() ?></strong>
		</span>
		<?php endif; ?>

		<?php if($person->getLdapSiteLocation() \|\| $person->getLdapAffectation()): ?>
		Affectation LDAP : <strong class="addon"><?= $person->getLdapSiteLocation() ?> > <?= $person->getLdapAffectation() ?></strong> \|
		<?php endif; ?>

		<?php if($person->getEmail()): ?>
		<i class="icon-mail"></i><strong class="addon"><?= $person->getEmail() ?></strong>
		<?php endif; ?>
		</div>

		<?php if( count($person->getOrganizations()) ): ?>

module/Oscar/view/partials/person-enrolled-card.phtml

+3 −6

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@
		/** @var Person $person */
		$person = $enroll->getPerson();
		?>
		<article class="card person-card" style="<?= $enroll->isOutOfDate() ? 'opacity: .5' : '' ?>">
		<span class="intitule">
		<article class="card card-list-item person-card" style="<?= $enroll->isOutOfDate() ? 'opacity: .5' : '' ?>">
		<h5 class="car-title">
		<?php if($person->getEmail()): ?>
		<img class="portrait"
		src="//www.gravatar.com/avatar/<?= md5($person->getEmail()) ?>?s=75"
		@@ -35,11 +35,8 @@ $person = $enroll->getPerson();
		<?php if( $enroll->getDateStart() ): ?>
		<small>Depuis le <?= $this->moment($enroll->getDateStart()) ?></small>
		<?php endif; ?>


		</span>

		</span>
		</h5>
		<span class="email"><?= $person->getEmail() ?></span>
		<nav>
		<a href="<?= $this->url('person/show', ['id' => $person->getId()]) ?>" class="link-show"><i class="icon-zoom-in-outline"></i> Fiche</a>

public/css/_common.scss

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@
		}
		}
		}

		.privileges {
		.tab-content {
		background: #eee;