Update icons

Preprocess functions aren't called from icons.inc because that file is loaded only when needed with the Icon API. This is to help not bloat the memory footprint, so putting the preprocess function in template.php is required, yes.

A few minor issues:

1. +++ b/includes/icons.inc
   @@ -32,146 +32,206 @@ function bootstrap_icon_bundles() {
          'tag' => 'i',
        ),
        'icons' => array(
   

   I know that the glypicons are now font based. They should remain "sprite" (which just means CSS). I'm not sure though if maybe we need to also figure out a way to disable them if the "font" directory is not detected. Maybe wrap the entire hook_icon_bundles() in an if?

2. +++ b/template.php
   @@ -307,3 +307,19 @@ function bootstrap_bootstrap_search_form_wrapper(&$variables) {
   +  ¶
   

   All the icons and this line have whitespace at the end of the line. Please remove them. Also I would recommend downloading and installing Dreditor and view the above patch for yourself to see how quickly these are discovered :)

+++ b/includes/icons.inc
@@ -20,159 +20,227 @@ function bootstrap_icon_providers() {
+  global $theme_path;
+  $cnd = theme_get_setting('cdn_bootstrap');
+  // TODO: check if font folder exists, don't know how exactly do that, should be something like this (uncomment):
+  if( $cnd == 1
+     // || ($cnd == 0 && is_dir(getcwd().'/sites/all/'.$theme_path.'/bootstrap/fonts'))
+    ) {

A sub-theme may actually have their own fonts, we need to specifically check whether glyphicons exists (with using Drupal to find the theme path, this assumes we know it's in sites/all/themes). Here is what I'm thinking (not tested, just wrote here. PS: the variable should be named $cdn):

global $theme;
$cdn = (bool) theme_get_setting('cdn_bootstrap');
if ($cdn || (!$cdn && file_exists(drupal_get_path('theme', $theme) . '/fonts/glyphicons-halflings-regular.ttf')) {

Any chance to work on this?

is now a way to use font icons with cdn enabled by default ?

Thanks @kslonka!

Committed 33a1d6e to 7.x-3.x.

Committed 9425e4f to 7.x-3.x.