Skip to content

Commit

Permalink
feat(question): use font awesome
Browse files Browse the repository at this point in the history
Signed-off-by: Thierry Bugier <tbugier@teclib.com>
  • Loading branch information
btry committed Dec 4, 2019
1 parent 1f63bcb commit bf7b274
Show file tree
Hide file tree
Showing 29 changed files with 20 additions and 40 deletions.
4 changes: 1 addition & 3 deletions inc/fields/actorfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-actor-field.png" title="" />';
return '<i class="fa fa-user" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/checkboxesfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-checkboxes-field.png" title="" />';
return '<i class="fa fa-check-square" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/datefield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-date-field.png" title="" />';
return '<i class="fa fa-calendar" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/datetimefield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-datetime-field.png" title="" />';
return '<i class="fa fa-calendar" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/dropdownfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,6 @@ public function parseObjectProperties(
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-dropdown-field.png" title="" />';
return '<i class="fa fa-caret-down" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/emailfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-email-field.png" title="" />';
return '<i class="fa fa-envelope" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/filefield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-file-field.png" title="" />';
return '<i class="fa fa-file" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/hiddenfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-hidden-field.png" title="" />';
return '<i class="fa fa-eye-slash" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/hostnamefield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-actor-field.png" title="" />';
return '<i class="fa fa-desktop" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/ipfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-hostname-field.png" title="" />';
return '<i class="fa fa-desktop" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/ldapselectfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-ldapselect-field.png" title="" />';
return '<i class="fa fa-sitemap" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/radiosfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-radios-field.png" title="" />';
return '<i class="fa fa-check-circle" aria-hidden="true"></i>';
}
}
4 changes: 1 addition & 3 deletions inc/fields/urgencyfield.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,6 @@ public function isAnonymousFormCompatible() {
}

public function getHtmlIcon() {
global $CFG_GLPI;

return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-urgency-field.png" title="" />';
return '<i class="fa fa-exclamation" aria-hidden="true"></i>';
}
}
4 changes: 3 additions & 1 deletion inc/question.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ public static function showForForm(CommonDBTM $item, $withtemplate = '') {
$i = 0;
foreach ($found_questions as $question) {
$fieldType = 'PluginFormcreator' . ucfirst($question['fieldtype']) . 'Field';
$field = new $fieldType($question);
$questionInstance = new PluginFormcreatorQuestion();
$questionInstance->getFromDB($question['id']);
$field = new $fieldType($questionInstance);
$i++;
echo '<tr class="line' . ($i % 2) . '" id="question_row_' . $question['id'] . '">';
echo '<td onclick="plugin_formcreator_editQuestion(' . $item->getId() . ', \'' . $token . '\', ' . $question['id'] . ', ' . $section['id'] . ')">';
Expand Down
Binary file removed pics/ui-actor-field.png
Binary file not shown.
Binary file removed pics/ui-checkbox-field.png
Binary file not shown.
Binary file removed pics/ui-checkboxes-field.png
Binary file not shown.
Binary file removed pics/ui-date-field.png
Binary file not shown.
Binary file removed pics/ui-datetime-field.png
Binary file not shown.
Binary file removed pics/ui-dropdown-field.png
Binary file not shown.
Binary file removed pics/ui-email-field.png
Binary file not shown.
Binary file removed pics/ui-file-field.png
Binary file not shown.
Binary file removed pics/ui-hidden-field.png
Binary file not shown.
Binary file removed pics/ui-hostname-field.png
Binary file not shown.
Binary file removed pics/ui-ip-field.png
Binary file not shown.
Binary file removed pics/ui-ldapselect-field.png
Binary file not shown.
Binary file removed pics/ui-radios-field.png
Binary file not shown.
Binary file removed pics/ui-urgency-field.png
Binary file not shown.
4 changes: 4 additions & 0 deletions tests/fixture/PluginFormcreatorDependentField.php
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,8 @@ public function lessThan($value) {
public function isAnonymousFormCompatible() {
return true;
}

public function getHtmlIcon() {
return '';
}
}

0 comments on commit bf7b274

Please sign in to comment.