WordPress.org
Get WordPress

Plugin Directory

Changeset 733407


Ignore:
Timestamp:
06/28/2013 09:25:36 AM (13 years ago)
Author:
karevn
Message:

Integration bug fixed.

Location:
usernoise/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • usernoise/trunk/inc/form.php

    r731399 r733407  
    1212                    <?php $tags = get_terms(FEEDBACK_TYPE, array('un_orderby_meta' => 'position', 'hide_empty' => false)) ?>
    1313                    <?php foreach($tags as $tag): ?>
    14                         <a href="#" class="un-feedback-type" data-type="<?php echo $tag->slug ?>"><i class="<?php echo un_get_term_meta($tag->term_id, 'icon') ?>"></i><?php echo esc_html(__($tag->name, 'usernoise'))?></a>
     14                        <a href="#" class="un-feedback-type" data-type="<?php echo $tag->slug ?>"><?php if (!un_get_option(UN_DISABLE_ICONS)): ?><i class="<?php echo un_get_term_meta($tag->term_id, 'icon') ?>"></i><?php endif ?><?php echo esc_html(__($tag->name, 'usernoise'))?></a>
    1515                    <?php endforeach ?>
    1616                    <?php if (isset($tags[0])): ?>

  • usernoise/trunk/inc/integration.php

    r731399 r733407  
    1313            wp_enqueue_style('usernoise-adminbar', usernoise_url('/css/admin-bar.css'), null, UN_VERSION);
    1414        }
    15         if (!un_get_option(UN_ENABLED) || ($this->is_mobile() && un_get_option(UN_DISABLE_ON_MOBILES)))
    16             return;
     15        if (!un_get_option(UN_ENABLED)) return;
    1716        wp_enqueue_script('usernoise', usernoise_url('/js/usernoise.js'), array('jquery'),
    1817            UN_VERSION);
    … …  
    2120        wp_enqueue_style('usernoise-button', usernoise_url('/css/button.css'), null, UN_VERSION);
    2221        wp_enqueue_style('usernoise-form', usernoise_url('/css/form.css'), null, UN_VERSION);
    23         if (un_get_option(UN_FEEDBACK_BUTTON_ICON) && !un_get_option(UN_DISABLE_ICONS))
     22        if (!un_get_option(UN_DISABLE_ICONS))
    2423            wp_enqueue_style('font-awesome', usernoise_url('/vendor/font-awesome/css/font-awesome.css'), null, UN_VERSION);
    2524        wp_localize_script('usernoise', 'usernoiseButton', un_get_localization_array());

  • usernoise/trunk/inc/template.php

    r703235 r733407  
    88
    99function usernoise_path($path){
    10     return WP_PLUGIN_DIR . '/' . USERNOISE_DIR . $path;
     10    return dirname(USERNOISE_MAIN) . $path;
    1111}
    1212

  • usernoise/trunk/readme.txt

    r731427 r733407  
    104104== Changelog ==
    105105
     106= 3.7.6 =
     107* Bug fixed that disabled embedded Usernoise if "disable on mobiles" was enabled.
     108* Removed the padding left at feedback tabs when icons are disabled
     109
    106110= 3.7.5 =
    107111* RTL-related CSS fixes

  • usernoise/trunk/usernoise.php

    r731427 r733407  
    5252require(dirname(USERNOISE_MAIN) .'/inc/template.php');
    5353
    54 require(usernoise_path('/inc/termmeta-api.php'));
     54require(dirname(USERNOISE_MAIN) . '/inc/termmeta-api.php');
    5555if (is_admin()) require(usernoise_path('/admin/upgrade.php'));
    5656require(usernoise_path('/admin/settings.php'));
Note: See TracChangeset for help on using the changeset viewer.