Skip to content

Commit

Permalink
fix(wizard): compatibility accross versions od font awesome
Browse files Browse the repository at this point in the history
GLPI 9.3 and GLPI 9.4 use different versions and some icons broke

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
btry committed Feb 18, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 7f840df commit 2462ca4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions inc/wizard.class.php
Original file line number Diff line number Diff line change
@@ -96,7 +96,7 @@ public static function header($title) {
echo '<ul class="plugin_formcreator_services">';
echo '<li class="' . ($activeMenuItem == self::MENU_CATALOG ? 'plugin_formcreator_selectedMenuItem' : '') . '">';
echo '<a href="' . $CFG_GLPI["root_doc"].'/plugins/formcreator/front/wizard.php' . '">';
echo '<span class="fa fa-paper-plane-o fc_list_icon" title="'.__('Seek assistance', 'formcreator').'"></span>';
echo '<span class="fa fa-paper-plane fc_list_icon" title="'.__('Seek assistance', 'formcreator').'"></span>';
echo '<span class="label">'.__('Seek assistance', 'formcreator').'</span>';
echo '</a></li>';

@@ -115,7 +115,7 @@ public static function header($title) {
if ($found_available_res['cpt'] > 0) {
echo '<li class="' . ($activeMenuItem == self::MENU_RESERVATIONS ? 'plugin_formcreator_selectedMenuItem' : '') . '">';
echo '<a href="' . $CFG_GLPI["root_doc"].'/plugins/formcreator/front/reservationitem.php' . '">';
echo '<span class="fa fa-calendar-check-o fc_list_icon" title="'.__('Book an asset', 'formcreator').'"></span>';
echo '<span class="fa fa-calendar-check fa-calendar-check-o fc_list_icon" title="'.__('Book an asset', 'formcreator').'"></span>';
echo '<span class="label">'.__('Book an asset', 'formcreator').'</span>';
echo '</a></li>';
}

3 comments on commit 2462ca4

@jvergacas
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In GLPI 9.4 the FONT of the menu gets too big causing line break, to solve, I added the code below in the file styles.css:

.label {
display: inline;
padding: .2em .6em .3em;
font-size: 75%;
font-weight: bold;
line-height: 1;
color: #fff;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: .25em;
}

@btry
Copy link
Collaborator Author

@btry btry commented on 2462ca4 Feb 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @jvergacas

can you show me a screenshot of the issue to let me locate where this happens ? Is it repated to the fix #972 ?

@jvergacas
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @btry

This is without the modification:
2019-02-19 10_34_44-window

This is with the modification:
2019-02-19 10_35_49-window

Please sign in to comment.