New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webui: Final Font Awesome conversion #5652

Merged
merged 4 commits into from Jan 28, 2017

Conversation

Projects
None yet
5 participants
@InsaneSplash
Contributor

InsaneSplash commented Jan 28, 2017

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

  • [x ] Have you signed the Contributors agreement - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
  • [ x] Have you followed our code guidelines?
@mention-bot

This comment has been minimized.

mention-bot commented Jan 28, 2017

Thank you for submitting a PR @InsaneSplash! We have found the following @laf, @murrant and @benwa based on the history of these files to review this PR.

@LibreNMS-CI

This comment has been minimized.

LibreNMS-CI commented Jan 28, 2017

Auto-Deploy finished, Test PR at http://5652.ci.librenms.org or https://5652.ci.librenms.org

}
if (isset($icon)) {
return $icon;
return array($icon,$icon_colour);

This comment has been minimized.

@laf

laf Jan 28, 2017

Member

Would it not make more sense to do array('icon' => $icon, 'colour' => $icon_colour) here then you can refernce $icon_type = $icon_returned['icon'] later?

This comment has been minimized.

@InsaneSplash

InsaneSplash Jan 28, 2017

Contributor

Cool, either would work, but I'll update to use the same format used in other parts of LibreNMS.

@@ -422,8 +422,8 @@
foreach ($app_list as $app) {
if (isset($app['app_type'])) {
$app_i_list = dbFetchRows("SELECT DISTINCT(`app_instance`) FROM `applications` WHERE `app_type` = ? ORDER BY `app_instance`", array($app['app_type']));
$image = $config['html_dir']."/images/icons/".$app['app_type'].".png";
$icon = (file_exists($image) ? $app['app_type'] : "apps");
//$image = $config['html_dir']."/images/icons/".$app['app_type'].".png";

This comment has been minimized.

@laf

laf Jan 28, 2017

Member

No point in commenting these out. Just delete them.

@LibreNMS-CI

This comment has been minimized.

LibreNMS-CI commented Jan 28, 2017

Auto-Deploy finished, Test PR at http://5652.ci.librenms.org or https://5652.ci.librenms.org

@LibreNMS-CI

This comment has been minimized.

LibreNMS-CI commented Jan 28, 2017

Auto-Deploy finished, Test PR at http://5652.ci.librenms.org or https://5652.ci.librenms.org

@scrutinizer-notifier

This comment has been minimized.

scrutinizer-notifier commented Jan 28, 2017

The inspection completed: 639 Issues, 18 Patches

@laf laf merged commit 5be1ea9 into librenms:master Jan 28, 2017

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@InsaneSplash InsaneSplash deleted the InsaneSplash:font-awesome-3 branch Feb 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment