Préparation à la PR

eoxia-jimmy · eoxia-jimmy · commit a9c2e2ce3e0a · 2018-06-18T14:25:21.000+02:00
diff --git a/core/action/digirisk.action.php b/core/action/digirisk.action.php
@@ -2,11 +2,11 @@
 /**
  * Classe gérant les actions principales de l'application.
  *
- * @author Jimmy Latour <jimmy@evarisk.com>
- * @since 6.0.0
- * @version 6.4.0
- * @copyright 2015-2017 Evarisk
- * @package DigiRisk
+ * @author    Evarisk <dev@evarisk.com>
+ * @since     6.0.0
+ * @version   6.6.0
+ * @copyright 2018 Evarisk.
+ * @package   DigiRisk
  */
 
 namespace digi;
@@ -72,13 +72,13 @@ public function callback_before_admin_enqueue_scripts_js() {
 	/**
 	 * Initialise le fichier style.min.css et backend.min.js du plugin DigiRisk.
 	 *
-	 * @return void nothing
+	 * @since   6.0.0
+	 * @version 6.6.0
 	 *
-	 * @since 6.0.0
-	 * @version 6.4.0
+	 * @return void nothing
 	 */
 	public function callback_admin_enqueue_scripts_js() {
-		wp_enqueue_script( 'signature-pad', 'https://cdn.jsdelivr.net/npm/signature_pad@2.3.2/dist/signature_pad.min.js', array( 'jquery' ), \eoxia\Config_Util::$init['digirisk']->version, false );
+		wp_enqueue_script( 'signature-pad', PLUGIN_DIGIRISK_URL . 'core/assets/js/signature-pad.min.js', array( 'jquery' ), \eoxia\Config_Util::$init['digirisk']->version, false );
 		wp_enqueue_script( 'digi-script-datetimepicker-script', PLUGIN_DIGIRISK_URL . 'core/assets/js/jquery.datetimepicker.full.js', array(), \eoxia\Config_Util::$init['digirisk']->version );
 		wp_enqueue_script( 'digi-script', PLUGIN_DIGIRISK_URL . 'core/assets/js/backend.min.js', array(), \eoxia\Config_Util::$init['digirisk']->version, false );
 		wp_enqueue_script( 'digi-script-owl-carousel', PLUGIN_DIGIRISK_URL . 'core/assets/js/owl.carousel.min.js', array(), \eoxia\Config_Util::$init['digirisk']->version, false );
@@ -88,13 +88,13 @@ public function callback_admin_enqueue_scripts_js() {
 	/**
 	 * Initialise en php le fichier permettant la traduction des variables string JavaScript.
 	 *
-	 * @return void nothing
+	 * @since   6.0.0
+	 * @version 6.6.0
 	 *
-	 * @since 6.0.0
-	 * @version 6.2.5.0
+	 * @return void nothing
 	 */
 	public function callback_admin_print_scripts_js() {
-		require( PLUGIN_DIGIRISK_PATH . '/core/assets/js/define-string.js.php' );
+		require PLUGIN_DIGIRISK_PATH . '/core/assets/js/define-string.js.php';
 	}
 
 	/**
@@ -133,8 +133,7 @@ public function callback_admin_enqueue_scripts_css() {
 	 * @since 6.0.0
 	 * @version 6.2.5.0
 	 */
-	public function callback_admin_print_scripts_css() {
-	}
+	public function callback_admin_print_scripts_css() {}
 
 	/**
 	 * Initialise le fichier MO
@@ -150,6 +149,36 @@ public function callback_plugins_loaded() {
 		if ( ! $administrator_role->has_cap( 'manage_digirisk' ) ) {
 			$administrator_role->add_cap( 'manage_digirisk' );
 		}
+
+		/** Set capability to administrator by default */
+		$administrator_role = get_role( 'administrator' );
+		if ( ! $administrator_role->has_cap( 'manage_causerie' ) ) {
+			$administrator_role->add_cap( 'manage_causerie' );
+		}
+
+		/** Set capability to administrator by default */
+		$administrator_role = get_role( 'administrator' );
+		if ( ! $administrator_role->has_cap( 'create_causerie' ) ) {
+			$administrator_role->add_cap( 'create_causerie' );
+		}
+
+		/** Set capability to editor by default */
+		$editor_role = get_role( 'editor' );
+		if ( ! $editor_role->has_cap( 'manage_causerie' ) ) {
+			$editor_role->add_cap( 'manage_causerie' );
+		}
+
+		/** Set capability to editor by default */
+		$editor_role = get_role( 'editor' );
+		if ( ! $editor_role->has_cap( 'create_causerie' ) ) {
+			$editor_role->add_cap( 'create_causerie' );
+		}
+
+		/** Set capability to author by default */
+		$author_role = get_role( 'author' );
+		if ( ! $author_role->has_cap( 'manage_causerie' ) ) {
+			$author_role->add_cap( 'manage_causerie' );
+		}
 	}
 
 	/**
diff --git a/core/assets/js/signature-pad.min.js b/core/assets/js/signature-pad.min.js
diff --git a/core/view/ie-no-supported.view.php b/core/view/ie-no-supported.view.php
@@ -2,14 +2,14 @@
 /**
  * La vue affichant à l'utilisateur que IE n'est pas compatible avec DigiRisk.
  *
- * @author Eoxia <dev@eoxia.com>
- * @since 6.6.0
- * @version 6.6.0
- * @copyright 2015-2018 Eoxia
- * @package DigiRisk
+ * @author    Evarisk <dev@evarisk.com>
+ * @since     6.6.0
+ * @version   6.6.0
+ * @copyright 2018 Evarisk.
+ * @package   DigiRisk
  */
 
-namespace task_manager;
+namespace digi;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -23,7 +23,7 @@
 		<div class="modal-content">
 			<p style="font-size: 1.4em; margin-bottom: 10px;"><?php esc_html_e( 'IE n\'est pas compatible avec DigiRisk', 'digirisk' ); ?></p>
 
-			<img src="https://media3.giphy.com/media/3o85xwSzDvuE1b2tW0/giphy.gif" alt="IE" />
+			<p><a href="https://www.evarisk.com/document-unique-logiciel/documentation/introduction/pre-requis-digirisk/" target="_blank"><?php esc_html_e( 'Voir les navigateurs compatibles', 'digirisk' ); ?></a></p>
 		</div>
 
 		<div class="modal-footer">
diff --git a/digirisk.php b/digirisk.php
@@ -6,11 +6,12 @@
  */
 
 namespace digi;
+
 /**
  * Plugin Name: Digirisk
  * Plugin URI:  http://www.evarisk.com/document-unique-logiciel
  * Description: Avec le plugin Digirisk vous pourrez réaliser, de façon simple et intuitive, le ou les documents uniques de vos entreprises et gérer toutes les données liées à la sécurité de votre personnel.
- * Version:     6.5.0
+ * Version:     6.6.0
  * Author:      Evarisk
  * Author URI:  http://www.evarisk.com
  * License:     GPL2
diff --git a/modules/accident/view/document/list-item.view.php b/modules/accident/view/document/list-item.view.php
@@ -2,11 +2,11 @@
 /**
  * Gestion de l'affichage d'un accident bénin
  *
- * @author Jimmy Latour <jimmy@evarisk.com>
- * @since 6.3.0
- * @version 6.4.4
- * @copyright 2015-2017 Evarisk
- * @package DigiRisk
+ * @author    Evarisk <dev@evarisk.com>
+ * @since     6.3.0
+ * @version   6.6.0
+ * @copyright 2018 Evarisk.
+ * @package   DigiRisk
  */
 
 namespace digi;
@@ -20,12 +20,12 @@
 	<td class="padding"><?php echo esc_html( $element->title ); ?></td>
 	<td>
 		<div class="action">
-			<?php if ( ! empty( Document_Class::g()->get_document_path( $element ) ) ) : ?>
-			<a class="button purple h50" href="<?php echo esc_attr( Document_Class::g()->get_document_path( $element ) ); ?>">
+			<?php if ( ! empty( Document_Class::g()->get_document_path( $element, 'digi-society' ) ) ) : ?>
+			<a class="button purple h50" href="<?php echo esc_attr( Document_Class::g()->get_document_path( $element, 'digi-society' ) ); ?>">
 				<i class="fa fa-download icon" aria-hidden="true"></i>
 			</a>
 			<?php else : ?>
-				<span class="button grey h50 tooltip hover red" aria-label="<?php echo esc_attr_e( 'Corrompu', 'digirisk' ); ?>" href="<?php echo esc_attr( Document_Class::g()->get_document_path( $element ) ); ?>">
+				<span class="button grey h50 tooltip hover red" aria-label="<?php echo esc_attr_e( 'Corrompu', 'digirisk' ); ?>">
 					<i class="fa fa-times icon" aria-hidden="true"></i>
 				</span>
 			<?php endif; ?>
diff --git a/modules/accident/view/list-item.view.php b/modules/accident/view/list-item.view.php
@@ -2,11 +2,11 @@
 /**
  * Affichage d'un accident
  *
- * @author Jimmy Latour <jimmy@evarisk.com>
- * @since 6.3.0
- * @version 6.4.4
- * @copyright 2015-2017 Evarisk
- * @package DigiRisk
+ * @author    Evarisk <dev@evarisk.com>
+ * @since     6.3.0
+ * @version   6.4.4
+ * @copyright 2018 Evarisk.
+ * @package   DigiRisk
  */
 
 namespace digi;
@@ -29,8 +29,8 @@
 	<div data-title="<?php esc_attr_e( 'Indicateurs', 'digirisk' ); ?>" class="cell padding w70"><span class="number-field"><?php echo esc_attr( $accident->number_field_completed ); ?></span>/13</div>
 	<div data-title="<?php esc_attr_e( 'Actions', 'digirisk' ); ?>" class="cell w150">
 		<div class="action grid-layout w3">
-			<?php if ( ! empty( Document_Class::g()->get_document_path( $accident->document ) ) ) : ?>
-				<a class="button purple h50" href="<?php echo esc_attr( Document_Class::g()->get_document_path( $accident->document ) ); ?>">
+			<?php if ( ! empty( Document_Class::g()->get_document_path( $accident->document, 'digi-society' ) ) ) : ?>
+				<a class="button purple h50" href="<?php echo esc_attr( Document_Class::g()->get_document_path( $accident->document, 'digi-society' ) ); ?>">
 					<i class="icon fa fa-download" aria-hidden="true"></i>
 					<?php echo esc_html( strtoupper( substr( $accident->document->type, 16, 2 ) ) ); ?>
 				</a>
diff --git a/modules/causerie/view/main.view.php b/modules/causerie/view/main.view.php
@@ -20,8 +20,20 @@
 
 	<ul class="tab" data-nonce="<?php echo esc_attr( wp_create_nonce( 'causerie_load_tab' ) ); ?>">
 		<li class="tab-element active" data-tab="dashboard"><?php esc_html_e( 'Dashboard', 'digirisk' ); ?></li>
-		<li class="tab-element" data-tab="start"><?php esc_html_e( 'Démarrer une causerie', 'digirisk' ); ?></li>
-		<li class="tab-element" data-tab="form"><?php esc_html_e( 'Bibliothèque des causeries', 'digirisk' ); ?></li>
+
+		<?php
+		if ( user_can( get_current_user_id(), 'manage_causerie' ) ) :
+			?>
+			<li class="tab-element" data-tab="start"><?php esc_html_e( 'Démarrer une causerie', 'digirisk' ); ?></li>
+			<?php
+		endif;
+
+		if ( user_can( get_current_user_id(), 'create_causerie' ) ) :
+			?>
+			<li class="tab-element" data-tab="form"><?php esc_html_e( 'Bibliothèque des causeries', 'digirisk' ); ?></li>
+			<?php
+		endif;
+		?>
 	</ul>
 
 	<div class="ajax-content main-content">
diff --git a/modules/diffusion_informations/view/list-item.view.php b/modules/diffusion_informations/view/list-item.view.php
@@ -25,7 +25,7 @@
 				<i class="icon fa fa-download" aria-hidden="true"></i>
 			</a>
 			<?php else : ?>
-				<span class="button grey h50 tooltip hover red" aria-label="<?php echo esc_attr_e( 'Corrompu', 'digirisk' ); ?>" href="<?php echo esc_attr( Document_Class::g()->get_document_path( $element ) ); ?>">
+				<span class="button grey h50 tooltip hover red" aria-label="<?php echo esc_attr_e( 'Corrompu', 'digirisk' ); ?>">
 					<i class="fa fa-times icon" aria-hidden="true"></i>
 				</span>
 			<?php endif; ?>
diff --git a/modules/duer/view/list-item.view.php b/modules/duer/view/list-item.view.php
@@ -2,11 +2,11 @@
 /**
  * Affichage d'un DUER
  *
- * @author Jimmy Latour <jimmy@evarisk.com>
- * @since 6.1.9
- * @version 6.4.4
- * @copyright 2015-2017 Evarisk
- * @package DigiRisk
+ * @author    Evarisk <dev@evarisk.com>
+ * @since     6.1.9
+ * @version   6.6.0
+ * @copyright 2018 Evarisk.
+ * @package   DigiRisk
  */
 
 namespace digi;
@@ -84,14 +84,14 @@ class="open-popup button grey radius w30"><i class="float-icon fa fa-eye animate
 
 	<td>
 		<div class="action grid-layout w2">
-			<?php if ( ! empty( Document_Class::g()->get_document_path( $element ) ) ) : ?>
+			<?php if ( ! empty( Document_Class::g()->get_document_path( $element, 'digi-society' ) ) ) : ?>
 				<a class="button purple h50 tooltip hover"
 					aria-label="<?php echo esc_attr_e( 'DUER', 'digirisk' ); ?>"
-					href="<?php echo esc_attr( Document_Class::g()->get_document_path( $element ) ); ?>">
+					href="<?php echo esc_attr( Document_Class::g()->get_document_path( $element, 'digi-society' ) ); ?>">
 					<i class="fa fa-file-text-o" aria-hidden="true"></i>
 				</a>
 			<?php else : ?>
-				<span class="button grey h50 tooltip hover red" aria-label="<?php echo esc_attr_e( 'Corrompu', 'digirisk' ); ?>" href="<?php echo esc_attr( Document_Class::g()->get_document_path( $element ) ); ?>">
+				<span class="button grey h50 tooltip hover red" aria-label="<?php echo esc_attr_e( 'Corrompu', 'digirisk' ); ?>">
 					<i class="fa fa-times icon" aria-hidden="true"></i>
 				</span>
 			<?php endif; ?>
diff --git a/modules/legal_display/view/list-item.view.php b/modules/legal_display/view/list-item.view.php
diff --git a/readme.txt b/readme.txt
