Skip to content

Commit 1a37f45

Browse files
nicolas-eoxianicolas-eoxia
authored
Merge pull request #189 from Evarisk/7.6.0
7.6.0
2 parents 0a97740 + bb8850b commit 1a37f45

File tree

64 files changed

+6541
-6713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+6541
-6713
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ npm-debug.log
33
test
44
phpunit.xml
55
.idea
6-
vendor
6+
vendor

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ DigiRisk peut être associé à d'autres plugins :
3232
* Le plan d'actions, utilisez [Task Manager](https://taskmanager.fr/ "Task Manager"), la symbiose est juste parfaite
3333

3434
# Open Source
35-
Vous souhaitez participez au projet faites un tour sur [opensource.guide](https://opensource.guide/ "OpenSource.Guide")
35+
* Vous souhaitez participez au projet faites un tour sur [opensource.guide](https://opensource.guide/ "OpenSource.Guide")
36+
* Vous souhaitez partipez et proposer des commits nous suivons : [Commits Conventionnels](https://www.conventionalcommits.org/ "Commits Conventionnels")

‎core/action/class-digirisk-action.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function __construct() {
6767
public function callback_before_admin_enqueue_scripts_js() {
6868
wp_enqueue_script( 'jquery');
6969
wp_enqueue_script( 'jquery-form' );
70+
//wp_enqueue_script( 'jquery-ui-datepicker' );
7071
wp_enqueue_script( 'jquery-ui-sortable' );
7172
wp_enqueue_script( 'jquery-ui-accordion' );
7273
wp_enqueue_script( 'jquery-ui-autocomplete' );
@@ -83,6 +84,7 @@ public function callback_before_admin_enqueue_scripts_js() {
8384
8485
*/
8586
public function callback_admin_enqueue_scripts_js() {
87+
//wp_enqueue_script( 'digi-datetimepicker-script', PLUGIN_DIGIRISK_URL . 'core/assets/js/jquery.datetimepicker.full.js', array(), \eoxia\Config_Util::$init['digirisk']->version, false );
8688
wp_enqueue_script( 'signature-pad', PLUGIN_DIGIRISK_URL . 'core/assets/js/signature-pad.min.js', array( 'jquery' ), \eoxia\Config_Util::$init['digirisk']->version, false );
8789
wp_enqueue_script( 'digi-autosize-script', PLUGIN_DIGIRISK_URL . 'core/assets/js/autosize.min.js', array(), \eoxia\Config_Util::$init['digirisk']->version, false );
8890
wp_enqueue_script( 'digi-script', PLUGIN_DIGIRISK_URL . 'core/assets/js/backend.min.js', array(), \eoxia\Config_Util::$init['digirisk']->version, false );
@@ -113,6 +115,7 @@ public function callback_before_admin_enqueue_scripts_css() {}
113115
*/
114116
public function callback_admin_enqueue_scripts_css() {
115117
wp_enqueue_style( 'digi-style', PLUGIN_DIGIRISK_URL . 'core/assets/css/style.css', array(), \eoxia\Config_Util::$init['digirisk']->version );
118+
//wp_enqueue_style( 'digi-datepicker', PLUGIN_DIGIRISK_URL . 'core/assets/css/jquery.datetimepicker.css', array(), \eoxia\Config_Util::$init['digirisk']->version );
116119
wp_enqueue_style( 'digi-treetable', PLUGIN_DIGIRISK_URL . 'core/assets/css/jquery.treetable.css', array(), \eoxia\Config_Util::$init['digirisk']->version );
117120
wp_enqueue_style( 'digi-treetable-default', PLUGIN_DIGIRISK_URL . 'core/assets/css/jquery.treetable.theme.default.css', array(), \eoxia\Config_Util::$init['digirisk']->version );
118121
wp_enqueue_style( 'digi-owl-carousel', PLUGIN_DIGIRISK_URL . 'core/assets/css/owl.carousel.min.css', array(), \eoxia\Config_Util::$init['digirisk']->version );
@@ -169,10 +172,13 @@ public function callback_admin_menu() {
169172

170173

171174
if ( ! empty( $digirisk_core['installed'] ) ) {
172-
CMH::register_container( 'DigiRisk', 'DigiRisk', 'read', 'digirisk' );
175+
CMH::register_container( 'DigiRisk', 'DigiRisk', 'read', 'digirisk', '', PLUGIN_DIGIRISK_URL . '/core/assets/images/favicon2.png', null );
173176
CMH::add_logo( 'digirisk', PLUGIN_DIGIRISK_URL . '/core/assets/images/favicon_hd.png', admin_url( 'admin.php?page=digirisk' ) );
174177
CMH::register_menu( 'digirisk', __( 'Bienvenue sur DigiRisk', 'digirisk' ), __( 'DigiRisk', 'digirisk' ), 'read', 'digirisk', array( Digirisk::g(), 'display' ), 'fa fa-home', 'bottom' );
175178
CMH::register_others_menu( 'others', 'digirisk-dashboard', __( 'DigiRisk', 'digirisk' ), __( 'DigiRisk', 'digirisk' ), 'read', 'digirisk', array( Digirisk::g(), 'display' ), PLUGIN_DIGIRISK_URL . '/core/assets/images/favicon_hd.png', 'bottom' );
179+
if( isset( \eoxia\Config_Util::$init['task-manager'] ) ){
180+
CMH::register_others_menu( 'others', 'digirisk', __( 'Task Manager', 'task-manager' ), __( 'Task Manager', 'task-manager' ), 'manage_task_manager', 'wpeomtm-dashboard', array( \task_manager\Task_Manager_Class::g(), 'display' ), PLUGIN_TASK_MANAGER_URL . '/core/assets/images/icone-16-16-couleur.png', '' );
181+
}
176182
}
177183
}
178184

‎core/assets/css/scss/element/installer/_installer.scss‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,28 @@
139139
}
140140
.owl-prev {
141141
left: -40px;
142-
@extend .far;
142+
@extend .fas;
143143
&:hover:before {
144144
left: 12px;
145145
}
146146
}
147147
.owl-next {
148148
right: -40px;
149-
@extend .far;
149+
@extend .fas;
150150
&:hover:before {
151151
right: 12px;
152152
}
153153
}
154154
.owl-prev:before {
155155
left: 16px;
156156
font-family: $font__icon;
157+
font-weight: 900;
157158
content: fa-content($fa-var-angle-left);
158159
}
159160
.owl-next:before {
160161
right: 16px;
161162
font-family: $font__icon;
163+
font-weight: 900;
162164
content: fa-content($fa-var-angle-right);
163165
}
164166
}

‎core/assets/css/style.css‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
@charset "UTF-8";
2-
/*!
3-
DIGIRISK
4-
Created by Eoxia
5-
6-
version: 7.0.0
2+
/*!
3+
DIGIRISK
4+
Created by Eoxia
5+
6+
version: 7.0.0
77
*/
8-
/*--------------------------------------------------------------
9-
>>> TABLE OF CONTENTS:
10-
----------------------------------------------------------------
11-
# fonticons
12-
# Normalize
13-
# Modules
8+
/*--------------------------------------------------------------
9+
>>> TABLE OF CONTENTS:
10+
----------------------------------------------------------------
11+
# fonticons
12+
# Normalize
13+
# Modules
1414
--------------------------------------------------------------*/
1515
/* Bleu ciel, couleur principale */
1616
/* Bleu fonce, couleur de l'interface */
1717
/* Autres couleurs */
18-
/*--------------------------------------------------------------
19-
# Normalize
18+
/*--------------------------------------------------------------
19+
# Normalize
2020
--------------------------------------------------------------*/
2121
.wpeo-wrap {
2222
padding-right: 20px;
@@ -152,15 +152,15 @@
152152
}
153153

154154
.wpeo-wrap {
155-
/*--------------------------------------------------------------
156-
# Fonticons
155+
/*--------------------------------------------------------------
156+
# Fonticons
157157
--------------------------------------------------------------*/
158158
/*!
159159
* Font Awesome Pro 5.0.10 by @fontawesome - https://fontawesome.com
160160
* License - https://fontawesome.com/license (Commercial License)
161161
*/
162-
/*--------------------------------------------------------------
163-
# Modules
162+
/*--------------------------------------------------------------
163+
# Modules
164164
--------------------------------------------------------------*/
165165
/**
166166
* Structure de la page
@@ -190,9 +190,9 @@
190190
* Header de la navigation UT/GP
191191
* @since 7.0.0
192192
*/
193-
/**
194-
* Toolbar de la navigation UT/GP
195-
* @since 7.0.0
193+
/**
194+
* Toolbar de la navigation UT/GP
195+
* @since 7.0.0
196196
*/
197197
/**
198198
* Liste de la navigation UT/GP
@@ -246,11 +246,11 @@
246246
*/
247247
/** Autocompelte */
248248
/** Responsive Table Causeries */
249-
/**
250-
* Installer de digirisk avec slider
251-
* .bloc-create-society -> premier bloc
252-
* .w^dogo-components -> Installation des composant, avec slider
253-
*
249+
/**
250+
* Installer de digirisk avec slider
251+
* .bloc-create-society -> premier bloc
252+
* .w^dogo-components -> Installation des composant, avec slider
253+
*
254254
*/
255255
/** Classe parente .wpeo-wrap */
256256
/**
@@ -275,9 +275,9 @@ le responsive sera activé manuellement.
275275
.wpeo-wrap .fa,
276276
.wpeo-wrap .fas,
277277
.wpeo-wrap .navigation-container .unit > .unit-container .toggle-unit .icon,
278-
.wpeo-wrap .far,
279278
.wpeo-wrap.wpdigi-installer .wpdigi-components .owl-nav .owl-prev,
280279
.wpeo-wrap.wpdigi-installer .wpdigi-components .owl-nav .owl-next,
280+
.wpeo-wrap .far,
281281
.wpeo-wrap .fal,
282282
.wpeo-wrap .unit.toggled > .unit-container .toggle-unit .icon,
283283
.wpeo-wrap .fab {
@@ -2700,12 +2700,14 @@ le responsive sera activé manuellement.
27002700
.wpeo-wrap.wpdigi-installer .wpdigi-components .owl-nav .owl-prev:before {
27012701
left: 16px;
27022702
font-family: "Font Awesome 5 Free", "Font Awesome 5 Pro";
2703+
font-weight: 900;
27032704
content: "\f104";
27042705
}
27052706

27062707
.wpeo-wrap.wpdigi-installer .wpdigi-components .owl-nav .owl-next:before {
27072708
right: 16px;
27082709
font-family: "Font Awesome 5 Free", "Font Awesome 5 Pro";
2710+
font-weight: 900;
27092711
content: "\f105";
27102712
}
27112713

@@ -3859,8 +3861,8 @@ input[type="radio"] {
38593861
padding: 0 1.5em;
38603862
}
38613863

3862-
/*--------------------------------------------------------------
3863-
# Import Main Menu
3864+
/*--------------------------------------------------------------
3865+
# Import Main Menu
38643866
--------------------------------------------------------------*/
38653867
.toplevel_page_digi-setup #adminmenuwrap, .toplevel_page_digi-setup #wpadminbar, .toplevel_page_digi-setup #adminmenumain, .toplevel_page_digi-setup #screen-meta-links, .toplevel_page_digi-setup #wpfooter,
38663868
.admin_page_digirisk-du #adminmenuwrap,
@@ -5047,8 +5049,8 @@ input[type="radio"] {
50475049
padding-left: 20px;
50485050
}
50495051

5050-
/*--------------------------------------------------------------
5051-
# Temporaire à ranger
5052+
/*--------------------------------------------------------------
5053+
# Temporaire à ranger
50525054
--------------------------------------------------------------*/
50535055
.toplevel_page_digirisk .top-content > div {
50545056
text-align: center;
@@ -5199,6 +5201,6 @@ canvas {
51995201
padding: 1em;
52005202
}
52015203

5202-
/*--------------------------------------------------------------
5203-
# Fin temporaire à ranger
5204+
/*--------------------------------------------------------------
5205+
# Fin temporaire à ranger
52045206
--------------------------------------------------------------*/

‎core/assets/css/style.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/assets/document_template/document_unique.odt‎

-1.68 KB
Binary file not shown.

0 commit comments

Comments
 (0)