Changeset 144713

Timestamp:

03/15/2021 07:00:53 PM (5 years ago)

Author:

themedropbox

Message:

New version of Fluida - 1.8.6

Location:

fluida/1.8.6

Files:

• . (copied) (copied from fluida/1.8.5)
• admin/css/admin.css (modified) (1 diff)
• admin/css/meta.css (modified) (1 diff)
• admin/main.php (modified) (5 diffs)
• admin/options.php (modified) (16 diffs)
• archive.php (modified) (1 diff)
• comments.php (modified) (2 diffs)
• content/user-bio.php (modified) (2 diffs)
• cryout/back-compat-php.php (deleted)
• cryout/back-compat.php (deleted)
• cryout/controls.php (modified) (31 diffs)
• cryout/css/customizer.css (modified) (4 diffs)
• cryout/css/select2.css (modified) (3 diffs)
• cryout/css/select2.min.css (modified) (1 diff)
• cryout/customizer.php (modified) (1 diff)
• cryout/demo.php (deleted)
• cryout/framework.php (modified) (2 diffs)
• cryout/js/customizer-controls.js (modified) (7 diffs)
• cryout/js/customizer.js (modified) (4 diffs)
• cryout/js/select2.js (modified) (79 diffs)
• cryout/js/select2.min.js (modified) (1 diff)
• cryout/languages/cryout.pot (modified) (4 diffs)
• cryout/prototypes.php (modified) (8 diffs)
• footer.php (modified) (2 diffs)
• front-page.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• header.php (modified) (2 diffs)
• image.php (modified) (2 diffs)
• includes/comments.php (modified) (1 diff)
• includes/core.php (modified) (8 diffs)
• includes/custom-styles.php (modified) (10 diffs)
• includes/landing-page.php (modified) (12 diffs)
• includes/loop.php (modified) (7 diffs)
• includes/meta.php (modified) (2 diffs)
• includes/setup.php (modified) (5 diffs)
• includes/styles.php (modified) (3 diffs)
• includes/tgmpa.php (modified) (4 diffs)
• index.php (modified) (1 diff)
• languages/fluida.pot (modified) (20 diffs)
• page.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• resources/fonts/fontfaces.css (modified) (5 diffs)
• resources/images/demo (deleted)
• resources/images/headers/mountain-lake.jpg (added)
• resources/images/slider/reservoir.jpg (added)
• resources/js/ajax.js (modified) (4 diffs)
• resources/js/frontend.js (modified) (25 diffs)
• search.php (modified) (1 diff)
• sidebar-left.php (modified) (2 diffs)
• sidebar-right.php (modified) (3 diffs)
• single.php (modified) (1 diff)
• style.css (modified) (21 diffs)

fluida/1.8.6/admin/css/admin.css

@@ -4 +4 @@
  * @package Fluida
  */
-
-@import url("../../resources/fonts/fontfaces.css");
 
 .wrap,

fluida/1.8.6/admin/css/meta.css

@@ -1 +1 @@
 /**
- * Styling for the meta boxes
+ * Styling for the page templates meta
  *
  * @package Fluida

fluida/1.8.6/admin/main.php

@@ -61 +61 @@
     wp_enqueue_style( 'wp-jquery-ui-dialog' );
     wp_enqueue_style( 'fluida-admin-style', get_template_directory_uri() . '/admin/css/admin.css', NULL, _CRYOUT_THEME_VERSION );
-    wp_enqueue_script( 'fluida-admin-js',get_template_directory_uri() . '/admin/js/admin.js', array('jquery-ui-dialog'), _CRYOUT_THEME_VERSION );
+    wp_enqueue_script( 'fluida-admin-js', get_template_directory_uri() . '/admin/js/admin.js', array('jquery-ui-dialog'), _CRYOUT_THEME_VERSION );
     $js_admin_options = array(
         'reset_confirmation' => esc_html( __( 'Reset Fluida Settings to Defaults?', 'fluida' ) ),
@@ -78 +78 @@
 
 function fluida_page_fn() {
-
-    $options = cryout_get_option();
 
     if (!current_user_can('edit_theme_options'))  {
@@ -99 +97 @@
 
         <div id="admin_header">
-            <img src="<?php echo esc_url( get_template_directory_uri() ) . '/admin/images/logo-about-top.png' ?>" />
+            <img src="<?php echo esc_url( get_template_directory_uri() . '/admin/images/logo-about-top.png' ) ?>" />
             <span class="version">
-                <?php echo apply_filters( 'cryout_admin_version', sprintf( __( 'Fluida Theme v%1$s by %2$s', 'fluida' ),
+                <?php echo wp_kses_post( apply_filters( 'cryout_admin_version', sprintf( __( 'Fluida Theme v%1$s by %2$s', 'fluida' ),
                     _CRYOUT_THEME_VERSION,
                     '<a href="https://www.cryoutcreations.eu" target="_blank">Cryout Creations</a>'
-                ) ); ?><br>
+                ) ) ); ?><br>
                 <?php do_action( 'cryout_admin_version' ); ?>
             </span>
@@ -119 +117 @@
             <?php
                 $theme = wp_get_theme();
-                echo apply_filters( 'cryout_theme_description', esc_html( $theme->get( 'Description' ) ) );
+                echo wp_kses_post( apply_filters( 'cryout_theme_description', esc_html( $theme->get( 'Description' ) ) ) );
             ?>
         </div>
@@ -133 +131 @@
             <h3 class="hndle"><?php _e( 'Upgrade to Plus', 'fluida' ); ?></h3>
             <div class="inside">
-                <p><?php printf( __('Find out what features you\'re missing out on and how the Plus version of %1$s can improve your site.', 'fluida'), cryout_sanitize_tnl(_CRYOUT_THEME_NAME) ); ?></p>
-                <img src="<?php echo esc_url( get_template_directory_uri() ) . '/admin/images/features.png' ?>" />
+                <p><?php _e('Find out what features you\'re missing out on and how the Plus version of Fluida can improve your site.', 'fluida'); ?></p>
+                <img src="<?php echo esc_url( get_template_directory_uri() . '/admin/images/features.png' ) ?>" />
                 <a class="button" href="https://www.cryoutcreations.eu/wordpress-themes/fluida" target="_blank" style="display: block;"><?php _e( 'Upgrade to Plus', 'fluida' ); ?></a>
 

fluida/1.8.6/admin/options.php

@@ -93 +93 @@
 
     foreach ($conditionals as $elem) {
-        if ( $control->id == sprintf( '%1$s_settings[%2$s]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), $elem['id'] ) && $control->manager->get_setting( sprintf( '%1$s_settings[%2$s]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), $elem['parent'] ) )->value() == $elem['value'] ) return true;
+        if ( $control->id == sprintf( '%1$s_settings[%2$s]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), $elem['id'] ) && 
+            $control->manager->get_setting( sprintf( '%1$s_settings[%2$s]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), $elem['parent'] ) )->value() == $elem['value'] 
+        ) return true;
     };
 
-    if ( ($control->id == sprintf( '%1$s_settings[%2$s_landingpage_notice]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), _CRYOUT_THEME_PREFIX ) ) && ('posts' == get_option('show_on_front')) ) return true;
+    // handle landing page hint
+    if ( ( $control->id == sprintf( '%1$s_settings[%2$s_landingpage_notice]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), _CRYOUT_THEME_PREFIX ) ) && 
+        ('posts' == get_option('show_on_front')) 
+    ) return true;
+    
+    // handle landing page slider banner hint
+    if ( ( $control->id == sprintf( '%1$s_settings[%2$s_headerorbannerhint]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), _CRYOUT_THEME_PREFIX ) ) && 
+            ( $control->manager->get_setting( sprintf( '%1$s_settings[%2$s_landingpage]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), _CRYOUT_THEME_PREFIX ) )->value() == 1 ) && 
+            ( $control->manager->get_setting( sprintf( '%1$s_settings[%2$s_lpslider]', cryout_sanitize_tn(_CRYOUT_THEME_NAME), _CRYOUT_THEME_PREFIX ) )->value() == 1 ) 
+    ) return true;
 
     return false;
@@ -405 +416 @@
         'type' => 'notice',
         'label' => '',
-        'desc' => __('Fine tune the visibility of these elements in the theme\'s Header options', 'fluida'),
+        'desc' => sprintf( __( 'Fine tune the visibility of these elements from the theme\'s %s','fluida' ), '<a data-type="section" data-id="cryout-theme_headercontent" class="cryout-customizer-focus"><strong>' . __('Header options', 'fluida') . ' &raquo;</strong></a>' ),
         'input_attrs' => array( 'class' => '' ),
         'priority' => 55,
         'addon' => TRUE, // this option gets added to built-in WordPress section
     'section' => 'title_tagline' ),
+    array(
+    'id' => 'fluida_headerorbannerhint',
+        'type' => 'notice',
+        'label' => '',
+        'desc' => sprintf( __( 'Configure the image currently visible on the homepage from the theme\'s options under %s','fluida' ), '<a data-type="section" data-id="cryout-theme_lpslider" class="cryout-customizer-focus"><strong>' . __('Landing Page > Slider > Banner Image', 'fluida') . ' &raquo;</strong></a>' ),
+        'input_attrs' => array( 'class' => '' ),
+        'priority' => 9,
+        'active_callback' => 'fluida_conditionals',
+        'addon' => TRUE, // this option gets added to built-in WordPress section
+    'section' => 'header_image' ),
 
     // Header
@@ -441 +462 @@
         'type' => 'select',
         'label' => __('Site Header Content','fluida'),
-        'values' => array( 'title' , 'logo' , 'both' , 'empty' ),
+        'values' => array( 'title', 'logo' , 'both' , 'empty' ),
         'labels' => array( __("Site Title","fluida"), __("Logo","fluida"), __("Logo & Site Title","fluida"), __("Empty","fluida") ),
         'desc' => '',
@@ -463 +484 @@
         'input_attrs' => array( 'class' => '' ),
         'label' => '',
-        'desc' => __('Edit the site\'s title, tagline and logo from WordPress\' Site Identity panel.', 'fluida'),
+        'desc' => sprintf( __( 'Edit the site\'s title, tagline and logo from the %s panel','fluida' ), '<a data-type="section" data-id="title_tagline" class="cryout-customizer-focus"><strong>' . __('Site Identity', 'fluida') . ' </strong></a>' ),
     'section' => 'fluida_headercontent' ),
     array(
@@ -565 +586 @@
             __("Serious Slider", "fluida"),
             __("Use Shortcode","fluida"),
-            __("Static Image","fluida"),
+            __("Banner Image","fluida"),
             __("Header Image","fluida"),
             __("Disabled","fluida")
@@ -574 +595 @@
     'id' => 'fluida_lpsliderimage',
         'type' => 'media-image',
-        'label' => __('Slider Image','fluida'),
-        'desc' => __('The default image can be replaced by setting a new static image.', 'fluida'),
+        'label' => __('Banner Image','fluida'),
+        'desc' => __('The default image can be replaced by setting a new banner image.', 'fluida'),
         'active_callback' => 'fluida_conditionals',
     'section' => 'fluida_lpslider' ),
@@ -604 +625 @@
     'id' => 'fluida_lpslidertitle',
         'type' => 'text',
-        'label' => __('Slider Caption','fluida'),
+        'label' => __('Caption','fluida'),
         'desc' => '',
         'input_attrs' => array( 'placeholder' => __('Title', 'fluida') ),
@@ -1057 +1078 @@
         'label' => '',
         'desc' => '',
+        'no_inherit' => TRUE,
     'section' => 'fluida_fontfamily' ),
     array(
@@ -1630 +1652 @@
         'type' => 'checkbox',
         'label' => __( 'Display in Right Sidebar', 'fluida' ),
-        'desc' => sprintf( __( 'Select where social icons should be visible in.<br><br><strong>Social Icons are defined using the <a href="%1$s" target="_blank">social icons menu</a></strong>. Read the <a href="%2$s" target="_blank">theme documentation</a> on how to create a social menu.', 'fluida' ), 'nav-menus.php?action=locations', 'http://www.cryoutcreations.eu/wordpress-tutorials/use-new-social-menu' ),
+        'desc' => sprintf( __( 'Select where social icons should be displayed.<br><br><strong>Social Icons are defined using the <a href="%1$s" target="_blank">socials menu</a></strong>. Read the <a href="%2$s" target="_blank">theme documentation</a> for detailed information.', 'fluida' ), 'nav-menus.php?action=locations', 'http://www.cryoutcreations.eu/wordpress-tutorials/use-new-social-menu' ),
     'section' => 'fluida_socials' ),
 
@@ -1735 +1757 @@
 'fonts' => array(
 
+    'Inherit' => array( // capitalization matters
+        'Inherit General Font',
+    ),
     'Preferred Theme Fonts'=> array(
                     "Source Sans Pro/gfont",
@@ -1789 +1814 @@
                     ),
     'Advanced' => array(
-                    "* Custom Font *",
+                    "* Local Font *",
                     ),
     ), // fonts
@@ -2208 +2233 @@
         'before_widget' => '<section id="%1$s" class="widget-container %2$s">',
         'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title"><span>',
-        'after_title' => '</span></h3>',
+        'before_title' => '<h2 class="widget-title"><span>',
+        'after_title' => '</span></h2>',
     ),
     'sidebar-1' => array(
@@ -2215 +2240 @@
         'before_widget' => '<section id="%1$s" class="widget-container %2$s">',
         'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title"><span>',
-        'after_title' => '</span></h3>',
+        'before_title' => '<h2 class="widget-title"><span>',
+        'after_title' => '</span></h2>',
     ),
     'footer-widget-area' => array(
@@ -2223 +2248 @@
         'before_widget' => '<section id="%1$s" class="widget-container %2$s"><div class="footer-widget-inside">',
         'after_widget' => '</div></section>',
-        'before_title' => '<h3 class="widget-title"><span>',
-        'after_title' => '</span></h3>',
+        'before_title' => '<h2 class="widget-title"><span>',
+        'after_title' => '</span></h2>',
     ),
     'content-widget-area-before' => array(
@@ -2230 +2255 @@
         'before_widget' => '<section id="%1$s" class="widget-container %2$s">',
         'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title"><span>',
-        'after_title' => '</span></h3>',
+        'before_title' => '<h2 class="widget-title"><span>',
+        'after_title' => '</span></h2>',
     ),
     'content-widget-area-after' => array(
@@ -2237 +2262 @@
         'before_widget' => '<section id="%1$s" class="widget-container %2$s">',
         'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title"><span>',
-        'after_title' => '</span></h3>',
+        'before_title' => '<h2 class="widget-title"><span>',
+        'after_title' => '</span></h2>',
     ),
     'widget-area-header' => array(
         'name' => __( 'Header', 'fluida' ),
+        'description'   => __('This widget area is displayed over the header image and requires an image to be set.', 'fluida'),
         'before_widget' => '<section id="%1$s" class="widget-container %2$s">',
         'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title"><span>',
-        'after_title' => '</span></h3>',
+        'before_title' => '<h2 class="widget-title"><span>',
+        'after_title' => '</span></h2>',
     ),
 ), // widget-areas

fluida/1.8.6/archive.php

@@ -18 +18 @@
 get_header(); ?>
 
-    <div id="container" class="<?php echo fluida_get_layout_class(); ?>">
+    <div id="container" class="<?php fluida_get_layout_class(); ?>">
         <main id="main" role="main" class="main">
             <?php cryout_before_content_hook(); ?>

fluida/1.8.6/comments.php

@@ -18 +18 @@
     <?php if ( have_comments() ) : ?>
 
-        <h3 id="comments-title">
+        <h2 id="comments-title">
             <span>
                 <?php if ( 1 === absint( get_comments_number() ) ) {
@@ -27 +27 @@
                 } ?>
             </span>
-        </h3>
+        </h2>
 
         <ol class="commentlist">

fluida/1.8.6/content/user-bio.php

@@ -9 +9 @@
  */
 
-$fluida_heading_tag = ( is_single() ) ? 'h4' : 'h1';
+$fluida_heading_tag = ( is_single() ) ? 'h2' : 'h1';
 ?>
-<div id="author-info" <?php cryout_schema_microdata( 'author' ); ?>>
+<div class="author-info" <?php cryout_schema_microdata( 'author' ); ?>>
 
     <<?php echo $fluida_heading_tag ?> class="page-title">
@@ -18 +18 @@
 
     <?php if ( get_the_author_meta( 'description' ) ) : ?>
-        <div id="author-avatar" <?php cryout_schema_microdata( 'image' );?>>
+        <div class="author-avatar" <?php cryout_schema_microdata( 'image' );?>>
             <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'fluida_author_bio_avatar_size', 80 ), '', '', array( 'extra_attr' => cryout_schema_microdata( 'url', 0) ) ); ?>
-        </div><!-- #author-avatar -->
+        </div><!-- .author-avatar -->
 
-        <div id="author-description"  <?php cryout_schema_microdata( 'author-description' ); ?>>
+        <div class="author-description"  <?php cryout_schema_microdata( 'author-description' ); ?>>
 
             <span><?php the_author_meta( 'description' ); ?></span>
             <?php if ( is_single() ) { ?>
-                <div id="author-link">
+                <div class="author-link">
                     <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>"  <?php cryout_schema_microdata( 'author-url' ); ?>>
                         <?php printf( __( 'View all posts by ', 'fluida' ) . '%s <span class="meta-nav">&rarr;</span>', get_the_author() ); ?>
                     </a>
-                </div><!-- #author-link -->
+                </div><!-- .author-link -->
             <?php } ?>
 
-        </div><!-- #author-description -->
+        </div><!-- .author-description -->
     <?php endif; ?>
 
-</div><!-- #entry-author-info -->
+</div><!-- .author-info -->

fluida/1.8.6/cryout/controls.php

@@ -5 +5 @@
 
 class Cryout_Customize_Link_Control extends WP_Customize_Control {
-            public $type = 'link';
+            public $type = 'cryout-link';
             public function render_content() {
                 if ( !empty( $this->description ) ) { ?>
@@ -20 +20 @@
 
     class Cryout_Customize_About_Section extends WP_Customize_Section {
-        public $type = 'about';
+        public $type = 'cryout-about-section';
         public $button = FALSE;
         public $button_label = '';
@@ -70 +70 @@
 
     class Cryout_Customize_About_Control extends WP_Customize_Control {
-            public $type = 'about';
+            public $type = 'cryout-about';
             public function render_content() {
                     if ( ! empty( $this->label ) ) { ?>
@@ -84 +84 @@
 
     class Cryout_Customize_Spacer_Control extends WP_Customize_Control {
-            public $type = 'spacer';
+            public $type = 'cryout-spacer';
             public function render_content() { ?>
                     <div class="customize-control-content customize-cryoutcontrol-spacer">
@@ -94 +94 @@
 
     class Cryout_Customize_Description_Control extends WP_Customize_Control {
-            public $type = 'description';
+            public $type = 'cryout-description';
             public function render_content() {
                     if ( ! empty( $this->label ) ) { ?>
@@ -100 +100 @@
                     <?php }
                     if ( ! empty( $this->description ) ) { ?>
-                        <span class="description customize-control-description cryout-nomove customize-cryoutcontrol-description-desc"><?php echo $this->description ?></span>
+                        <span class="description customize-control-description cryout-nomove customize-cryoutcontrol-description-desc"><?php echo wp_kses_post( $this->description ) ?></span>
                     <?php } ?>
                     <span class="customize-control-content customize-cryoutcontrol-description-value"><?php echo wp_kses_post( $this->value() ) ?></span>
@@ -114 +114 @@
                     <?php }
                     if ( ! empty( $this->description ) ) { ?>
-                        <span class="description customize-control-description cryout-nomove customize-cryoutcontrol-hint-desc"><?php echo $this->description ?></span>
+                        <span class="description customize-control-description cryout-nomove customize-cryoutcontrol-hint-desc"><?php echo wp_kses_post( $this->description ) ?></span>
                     <?php } ?>
                     <span class="customize-control-content customize-cryoutcontrol-hint-value"><?php echo wp_kses_post( $this->value() ) ?></span>
@@ -126 +126 @@
                     if (empty($this->input_attrs['class'])) $this->input_attrs['class'] = '';
                     if ( ! empty( $this->label ) ) { ?>
-                        <span class="customize-control-title customize-cryoutcontrol-notice customize-cryoutcontrol-notice-<?php echo $this->input_attrs['class'] ?>"><?php echo esc_html( $this->label ) ?></span>
+                        <span class="customize-control-title customize-cryoutcontrol-notice customize-cryoutcontrol-notice-<?php echo esc_attr( $this->input_attrs['class'] ) ?>"><?php echo esc_html( $this->label ) ?></span>
                     <?php }
                     if ( ! empty( $this->description ) ) { ?>
-                        <span class="description customize-control-description cryout-nomove customize-cryoutcontrol-notice-desc customize-cryoutcontrol-notice-<?php echo $this->input_attrs['class'] ?>-desc"><?php echo $this->description ?></span>
+                        <span class="description customize-control-description cryout-nomove customize-cryoutcontrol-notice-desc customize-cryoutcontrol-notice-<?php echo esc_attr( $this->input_attrs['class'] ) ?>-desc"><?php echo wp_kses_post( $this->description ) ?></span>
                     <?php } ?>
-                    <span class="customize-control-content customize-cryoutcontrol-notice-value customize-cryoutcontrol-notice-<?php echo $this->input_attrs['class'] ?>-value"><?php echo wp_kses_post( $this->value() ) ?></span>
+                    <span class="customize-control-content customize-cryoutcontrol-notice-value customize-cryoutcontrol-notice-<?php echo esc_attr( $this->input_attrs['class'] ) ?>-value"><?php echo wp_kses_post( $this->value() ) ?></span>
             <?php
             }
@@ -137 +137 @@
 
     class Cryout_Customize_Blank_Control extends WP_Customize_Control {
-            public $type = 'blank';
+            public $type = 'cryout-blank';
             public function render_content() {
                 echo '&nbsp;';
@@ -152 +152 @@
 
     class Cryout_Customize_Font_Control extends WP_Customize_Control {
-            public $type = 'font';
+            public $type = 'cryout-font';
             private $fonts = array();
             public function render_content() {
@@ -169 +169 @@
                         <?php
                         foreach ( $this->fonts as $fgroup => $fsubs ): ?>
-                            <optgroup label='<?php echo $fgroup; ?>'>
+                            <optgroup label='<?php echo esc_attr( $fgroup ); ?>'>
                             <?php foreach($fsubs as $item):
                                 $item_show = explode(',',$item); ?>
-                                <option style='font-family:<?php echo cryout_clean_gfont($item); ?>;' value='<?php echo $item; ?>' <?php selected( $this->value(), $item ); ?>>
+                                <option style='font-family:<?php echo cryout_clean_gfont($item); ?>;' value='<?php echo esc_attr( $item ); ?>' <?php selected( $this->value(), $item ); ?>>
                                     <?php echo cryout_clean_gfont( $item_show[0] ); ?>
                                 </option>
@@ -184 +184 @@
 
             public function enqueue() {
+                // font control requires select2 library
+                wp_enqueue_script( 'cryout-select2-js', get_template_directory_uri() . '/cryout/js/select2.min.js', array('jquery'), _CRYOUT_THEME_VERSION );
+                wp_enqueue_style( 'cryout-select2-css', get_template_directory_uri() . '/cryout/css/select2.min.css', NULL, _CRYOUT_THEME_VERSION );
                 // google fonts enqueues for the font selectors preview
                 $gfonts = array();
@@ -201 +204 @@
     class Cryout_Customize_Slider_Control extends WP_Customize_Control {
 
-    public $type = 'slider';
+            public $type = 'cryout-slider';
             public function __construct($manager, $id, $args = array(), $options = array()) {
                 parent::__construct( $manager, $id, $args );
@@ -209 +212 @@
                 <label>
                     <span class="customize-control-title"><?php echo esc_html( $this->label ); ?>:
-                        <strong class="value"><?php echo esc_html( $this->value() ) ?></strong><?php echo $this->input_attrs['um']; ?>
+                        <strong class="value"><?php echo esc_html( $this->value() ) ?></strong><?php echo wp_kses_post( $this->input_attrs['um'] ); ?>
                     </span>
                 </label>
-                <input name="<?php echo $this->id; ?>" type="number" <?php $this->link(); ?> value="<?php echo esc_attr( $this->value() ) ?>" class="slider"
-                    step="<?php echo $this->input_attrs['step'] ?>" min="<?php echo $this->input_attrs['min'] ?>" max="<?php echo $this->input_attrs['max'] ?>" />
+                <input name="<?php echo esc_attr( $this->id ); ?>" type="number" <?php $this->link(); ?> value="<?php echo esc_attr( $this->value() ) ?>" class="slider"
+                    step="<?php echo esc_attr( $this->input_attrs['step'] ) ?>" min="<?php echo esc_attr( $this->input_attrs['min'] ) ?>" max="<?php echo esc_attr( $this->input_attrs['max'] ) ?>" />
                 <div class="slider"></div>
                 <?php if ( ! empty( $this->description ) ) : ?>
@@ -233 +236 @@
 
     class Cryout_Customize_SliderTwo_Control extends WP_Customize_Control {
-            public $type = 'slidertwo';
+            public $type = 'cryout-slidertwo';
             public function __construct($manager, $id, $args = array(), $options = array()) {
                 parent::__construct( $manager, $id, $args );
@@ -240 +243 @@
             public function render_content() { ?>
                 <label><span class="customize-control-title"><?php echo esc_html( $this->label ); ?>:
-                    <strong class="value"><?php echo esc_html( $this->value() ) ?></strong><?php echo $this->input_attrs['um']; ?> /
-                    <strong class="value2"><?php echo ( intval($this->input_attrs['total']) - intval($this->value()) ); ?></strong><?php echo $this->input_attrs['um']; ?>
+                    <strong class="value"><?php echo esc_html( $this->value() ) ?></strong><?php echo wp_kses_post( $this->input_attrs['um'] ); ?> /
+                    <strong class="value2"><?php echo ( intval($this->input_attrs['total']) - intval($this->value()) ); ?></strong><?php echo wp_kses_post( $this->input_attrs['um'] ); ?>
                 </span></label>
-                <input name="<?php echo $this->id; ?>" type="number" <?php $this->link(); ?> value="<?php echo esc_attr( $this->value() ) ?>" class="slidertwo"
-                    step="<?php echo $this->input_attrs['step'] ?>" min="<?php echo $this->input_attrs['min'] ?>"
-                    max="<?php echo $this->input_attrs['max'] ?>" size="<?php echo $this->input_attrs['total'] ?>"/>
+                <input name="<?php echo esc_attr( $this->id ); ?>" type="number" <?php $this->link(); ?> value="<?php echo esc_attr( $this->value() ) ?>" class="slidertwo"
+                    step="<?php echo esc_attr( $this->input_attrs['step'] ) ?>" min="<?php echo esc_attr( $this->input_attrs['min'] ) ?>"
+                    max="<?php echo esc_attr( $this->input_attrs['max'] ) ?>" size="<?php echo esc_attr( $this->input_attrs['total'] ) ?>"/>
                 <div class="slidertwo"></div>
                 <?php if ( ! empty( $this->description ) ) : ?>
@@ -266 +269 @@
     class Cryout_Customize_NumberSlider_Control extends WP_Customize_Control {
 
-    public $type = 'numberslider';
+            public $type = 'cryout-numberslider';
             public function __construct($manager, $id, $args = array(), $options = array()) {
                 parent::__construct( $manager, $id, $args );
@@ -276 +279 @@
                 </label>
                 <div class="inputcontainer">
-                    <input name="<?php echo $this->id; ?>" type="number" <?php $this->link(); ?> value="<?php echo esc_attr( $this->value() ) ?>" class="numberslider"
-                    step="<?php echo $this->input_attrs['step'] ?>" min="<?php echo $this->input_attrs['min'] ?>" max="<?php echo $this->input_attrs['max'] ?>" <?php if (!empty($this->input_attrs['readonly'])) { ?>readonly="readonly"<?php } ?> />
-                    <?php echo $this->input_attrs['um']; ?>
+                    <input name="<?php echo esc_attr( $this->id ); ?>" type="number" <?php $this->link(); ?> value="<?php echo esc_attr( $this->value() ) ?>" class="numberslider"
+                    step="<?php echo esc_attr( $this->input_attrs['step'] ) ?>" min="<?php echo esc_attr( $this->input_attrs['min'] )?>" max="<?php echo esc_attr( $this->input_attrs['max'] ) ?>" <?php if (!empty($this->input_attrs['readonly'])) { ?>readonly="readonly"<?php } ?> />
+                    <?php echo wp_kses_post( $this->input_attrs['um'] ); ?>
                 </div>
                 <div class="slider"></div>
@@ -299 +302 @@
 
     class Cryout_Customize_RadioImage_Control extends WP_Customize_Control {
-            public $type = 'radioimage';
+            public $type = 'cryout-radioimage';
             public function __construct($manager, $id, $args = array(), $options = array()) {
                 parent::__construct( $manager, $id, $args );
@@ -317 +320 @@
                             $data['url'] = esc_url( sprintf( $data['url'], get_template_directory_uri(), get_stylesheet_directory_uri() ) );
                             ?>
-                            <input type="radio" value="<?php echo esc_attr( $value ); ?>" name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $name ) . "-" . $value; ?>" <?php $this->link(); checked( $this->value(), $value ); ?> />
-                            <label for="<?php echo esc_attr( $name ) . "-" . $value; ?>">
-                                    <img src="<?php echo $data['url'] ?>" alt="<?php echo esc_html( $data['label'] ) ?>" title="<?php echo esc_html( $data['label'] ) ?>"/>
+                            <input type="radio" value="<?php echo esc_attr( $value ); ?>" name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $name ) . "-" . esc_attr( $value ); ?>" <?php $this->link(); checked( $this->value(), $value ); ?> />
+                            <label for="<?php echo esc_attr( $name ) . "-" . esc_attr( $value ); ?>">
+                                    <img src="<?php echo esc_url( $data['url'] )?>" alt="<?php echo esc_html( $data['label'] ) ?>" title="<?php echo esc_html( $data['label'] ) ?>"/>
                                     <span class="screen-reader-text"><?php echo esc_html( $data['label'] ); ?></span>
                             </label>
@@ -338 +341 @@
 
     class Cryout_Customize_SelectShort_Control extends WP_Customize_Control {
-            public $type = 'selectshort';
+            public $type = 'cryout-selectshort';
             public function render_content() {
                 if ( empty( $this->choices ) )
@@ -347 +350 @@
                 <?php endif; ?>
                 <?php if ( ! empty( $this->description ) ) : ?>
-                    <span class="description customize-control-description"><?php echo $this->description; ?></span>
-                <?php endif; ?>
-
-                <select id="<?php echo esc_attr( $this->id ); ?>" <?php $this->link(); ?> class="<?php echo $this->type ?>">
+                    <span class="description customize-control-description"><?php echo wp_kses_post( $this->description ); ?></span>
+                <?php endif; ?>
+
+                <select id="<?php echo esc_attr( $this->id ); ?>" <?php $this->link(); ?> class="<?php echo esc_attr( $this->type ) ?>">
                     <?php
                     foreach ( $this->choices as $value => $label ) {
-                        echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+                        echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . wp_kses_post( $label ) . '</option>';
                     }
                     ?>
@@ -362 +365 @@
 
     class Cryout_Customize_Select2_Control extends WP_Customize_Control {
-            public $type = 'select2';
+            public $type = 'cryout-select2';
             public function render_content() {
                 if ( empty( $this->choices ) )
@@ -371 +374 @@
                 <?php endif; ?>
                 <?php if ( ! empty( $this->description ) ) : ?>
-                    <span class="description customize-control-description"><?php echo $this->description; ?></span>
-                <?php endif; ?>
-
-                <select id="<?php echo esc_attr( $this->id ); ?>" <?php $this->link(); ?> class="<?php echo $this->type ?>" class="select2">
+                    <span class="description customize-control-description"><?php echo wp_kses_post( $this->description ); ?></span>
+                <?php endif; ?>
+
+                <select id="<?php echo esc_attr( $this->id ); ?>" <?php $this->link(); ?> class="<?php echo esc_attr( $this->type ) ?>">
                     <?php
                     foreach ( $this->choices as $value => $label ) {
-                        echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+                        echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . wp_kses_post( $label ) . '</option>';
                     }
                     ?>
@@ -392 +395 @@
 
     class Cryout_Customize_OptSelect_Control extends WP_Customize_Control {
-            public $type = 'optselect';
+            public $type = 'cryout-optselect';
             public function render_content() {
                 if ( empty( $this->choices ) )
@@ -402 +405 @@
                     <?php endif;
                     if ( ! empty( $this->description ) ) : ?>
-                        <span class="description customize-control-description"><?php echo $this->description; ?></span>
+                        <span class="description customize-control-description"><?php echo wp_kses_post( $this->description ); ?></span>
                     <?php endif; ?>
 
@@ -409 +412 @@
                         <?php
                         foreach ( $this->choices as $optgroup_id => $optgroup ) {
-                            echo '<optgroup label="' . $optgroup_id . '">';
+                            echo '<optgroup label="' . esc_attr( $optgroup_id ) . '">';
                             foreach ( $optgroup as $value => $label )
-                                echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+                                echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . wp_kses_post( $label ) . '</option>';
                             echo '</optgroup>';
                         } ?>
@@ -421 +424 @@
 
     class Cryout_Customize_IconSelect_Control extends WP_Customize_Control {
-            public $type = 'iconselect';
+            public $type = 'cryout-iconselect';
             public function render_content() {
                 $this->icons = cryout_get_theme_structure('block-icons');
@@ -436 +439 @@
                         <?php
                         foreach ( $this->icons as $id => $icon ): ?>
-                            <option value='<?php echo $id; ?>' <?php selected( $this->value(), $id ); ?> class="blicon-<?php echo $id ?>"> <?php echo ( $id!='no-icon' ? "&#x$icon;" : '&nbsp;' ) ?> <?php echo $id ?> </option>
+                            <option value='<?php echo esc_attr( $id ); ?>' <?php selected( $this->value(), $id ); ?> class="blicon-<?php echo esc_attr( $id ) ?>"> <?php echo ( $id!='no-icon' ? "&#x" . esc_html( $icon ) . ";" : '&nbsp;' ); ?> <?php echo esc_html( $id )?> </option>
                         <?php endforeach; // $this->icons ?>
                     </select>
@@ -454 +457 @@
 
     class Cryout_Customize_Toggle_Control extends WP_Customize_Control {
-            public $type = 'toggle';
+            public $type = 'cryout-toggle';
             public function render_content() { ?>
                 <?php if ( ! empty( $this->label ) ) : ?>
@@ -472 +475 @@
 
                 <?php if ( ! empty( $this->description ) ) : ?>
-                    <span class="description customize-control-description"><?php echo $this->description; ?></span>
+                    <span class="description customize-control-description"><?php echo wp_kses_post( $this->description ); ?></span>
                 <?php endif; ?>
 

fluida/1.8.6/cryout/css/customizer.css

@@ -148 +148 @@
 }
 
-#customize-theme-controls [id*="accordion-section-about"] .customize-control,
+#customize-theme-controls [id*="accordion-section-cryout-about"] .customize-control,
 #customize-theme-controls [id*="accordion-section-cryoutspecial-about-theme"] .customize-control {
     margin: 0 auto -1px;
 }
 
-#customize-theme-controls [id*="accordion-section-about"] .accordion-section-content,
+#customize-theme-controls [id*="accordion-section-cryout-about"] .accordion-section-content,
 #customize-theme-controls [id*="accordion-section-cryoutspecial-about-theme"] .accordion-section-content {
     display: block;
@@ -265 +265 @@
 .customize-control-sortable .sortable-edit:hover {
     opacity: 1;
+}
+
+.customize-control-cryout-sortable .sortable li.status-disabled {
+    opacity: .5;
 }
 
@@ -360 +364 @@
 }
 
-#customize-theme-controls [id*="cryout-"] .customize-control-cryout-notice .customize-cryoutcontrol-notice-desc {
+#customize-theme-controls [id*="cryout-"] .customize-control-cryout-notice .customize-cryoutcontrol-notice-desc,
+.customize-control-cryout-notice .customize-cryoutcontrol-notice-desc {
     background: #fff;
     border: 1px solid #ddd;
@@ -371 +376 @@
 }
 
-#customize-theme-controls [id*="cryout-"] .customize-control-cryout-notice .customize-cryoutcontrol-notice-desc a {
+#customize-theme-controls [id*="cryout-"] .customize-control-cryout-notice .customize-cryoutcontrol-notice-desc a,
+.customize-control-cryout-notice .customize-cryoutcontrol-notice-desc a {
     cursor: pointer;
 }
 
-#customize-theme-controls [id*="cryout-"] .customize-control-cryout-notice .customize-cryoutcontrol-notice-warning-desc {
+#customize-theme-controls [id*="cryout-"] .customize-control-cryout-notice .customize-cryoutcontrol-notice-warning-desc,
+.customize-control-cryout-notice .customize-cryoutcontrol-notice-warning-desc {
     color: #900;
-}
-
-.customize-control-sortable .sortable li.status-disabled {
-    opacity: 0.5;
 }
 

fluida/1.8.6/cryout/css/select2.css

@@ -189 +189 @@
     .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
       list-style: none; }
-  .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
-    color: #999;
-    margin-top: 5px;
-    float: left; }
   .select2-container--default .select2-selection--multiple .select2-selection__clear {
     cursor: pointer;
@@ -198 +194 @@
     font-weight: bold;
     margin-top: 5px;
-    margin-right: 10px; }
+    margin-right: 10px;
+    padding: 1px; }
   .select2-container--default .select2-selection--multiple .select2-selection__choice {
     background-color: #e4e4e4;
@@ -217 +214 @@
       color: #333; }
 
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
   float: right; }
 

fluida/1.8.6/cryout/css/select2.min.css

@@ -1 @@
-.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}

fluida/1.8.6/cryout/customizer.php

@@ -272 +272 @@
                             'section'   => $opt['section'],
                             'settings'  => $opid,
+                            'type'      => $opt['type'],
                             'input_attrs'   => (isset($opt['disabled'])?array('disabled'=>$opt['disabled']):array('disabled'=>false)),
                             'priority'  => (isset($opt['priority'])?$opt['priority']:$priority),
-                            'choices'   => (isset($opt['choices'])?$opt['choices']:$opt['values']),
+                            'choices'   => (isset($opt['choices'])?$opt['choices']:(isset($opt['values'])?$opt['values']:array(0,1))),
                             'disabled'  => (isset($opt['disabled'])?$opt['disabled']:''),
                             'active_callback' => ( (isset($opt['active_callback'])) ? $opt['active_callback'] : NULL),

fluida/1.8.6/cryout/framework.php

@@ -2 +2 @@
 /**
  * @package Cryout Framework
- * @version 0.8.5.1
- * @revision 20200714
+ * @version 0.8.5.7
+ * @revision 20210226
  * @author Cryout Creations - www.cryoutcreations.eu
  */
 
-define('_CRYOUT_FRAMEWORK_VERSION', '0.8.5.1');
-
-// requirements
-if (!defined('_CRYOUT_THEME_REQUIRED_PHP')) define('_CRYOUT_THEME_REQUIRED_PHP', '5.3');
-if (!defined('_CRYOUT_THEME_REQUIRED_WP')) define('_CRYOUT_THEME_REQUIRED_WP', '4.1');
-
-// Check if minimum supported PHP version is used
-if ( FALSE !== phpversion() && version_compare( phpversion(), _CRYOUT_THEME_REQUIRED_PHP, '<' ) ) {
-    require get_template_directory() . '/cryout/back-compat-php.php';
-}
-
-// Check if minimum supported WordPress version is used
-elseif ( version_compare( $GLOBALS['wp_version'], _CRYOUT_THEME_REQUIRED_WP, '<' ) ) {
-    require get_template_directory() . '/cryout/back-compat.php';
-} 
+define('_CRYOUT_FRAMEWORK_VERSION', '0.8.5.7');
 
 // Load everything
@@ -28 +14 @@
 require_once(get_template_directory() . "/cryout/customizer.php");
 require_once(get_template_directory() . "/cryout/ajax.php");
-require_once(get_template_directory() . "/cryout/demo.php");
 
 if( is_admin() ) {

fluida/1.8.6/cryout/js/customizer-controls.js

@@ -5 +5 @@
  */
 
-jQuery(window).load(function(){
-
-    var settings = [];
+jQuery(document).ready(function(){
 
     setTimeout(function() {
@@ -30 +28 @@
                 step: parseInt( settings[4] ),
                 slide: function( event, ui){
-                    jQuery(the_input).val( ui.value ).change();
+                    jQuery(the_input).val( ui.value ).trigger('change');
                     jQuery(this).parent().find('.value').text( ui.value );
                 }
@@ -36 +34 @@
 
         }); // each
-        
+
         // NumberSlider Control
         jQuery('input[type="number"].numberslider').each(function() {
@@ -54 +52 @@
                 step: settings[4],
                 slide: function( event, ui){
-                    jQuery(the_input).val( ui.value ).change();
+                    jQuery(the_input).val( ui.value ).trigger('change');
                 }
             });
 
             // update slider on input change
-            jQuery(this).change( function(){
+            jQuery(this).on('change', function(){
                 jQuery(this).closest('.customize-control').find('div.slider').slider( 'option', 'value', jQuery(this).val() );
             } );
@@ -84 +82 @@
                 step: parseInt( settings[4] ),
                 slide: function( event, ui){
-                    jQuery(the_input).val( ui.value ).change();
+                    jQuery(the_input).val( ui.value ).trigger('change');
                     jQuery(this).parent().find('.value').text( ui.value );
                     jQuery(this).parent().find('.value2').text( settings[5] - parseInt(ui.value) );
@@ -91 +89 @@
 
         }); // each
-        
+
         // Sortable control
         jQuery('.customize-control-sortable .sortable-row').sortable({
@@ -99 +97 @@
                     order.push(jQuery(this).attr("id"));
                 });
-                jQuery(this).parent().children('.the_sorted').val(order.join()).change();
+                jQuery(this).parent().children('.the_sorted').val(order.join()).trigger('change');
             }
         }); // sortable
 
-    }); // setTimeout
+        // RadioImage Control
+        jQuery( '.customize-control-radio-image .buttonset' ).buttonset();
+        
+        // Icon Select2 Control
+        var cryoutSelect2Texts = {
+            errorLoading: function(){ return "The results could not be loaded" },
+            inputTooLong: function(){ return "Please delete some characters" },
+            inputTooShort:function(){ return "Please enter more characters" },
+            loadingMore:  function(){ return "Loading more results..." },
+            noResults:    function(){ return "No results found" },
+            searching:    function(){ return "Searching…" },
+            maximumSelected:function(){ return "You have selected too many items"}
+        }
 
+        // init select2 control on font selectors
+        if ( jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd ) jQuery('select.fontselect.select2').select2({
+            width: "element",
+            theme: 'default cryout-select2',
+            language: cryoutSelect2Texts
+        }).addClass( 'cryout-select2' );
+        // init select2 control for icon selectors (needs extra class for custom font)
+        if ( jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd ) jQuery('select.iconselect.select2').select2({
+            width: "element",
+            theme: 'default cryout-select2 cryout-iconselect',
+            language: cryoutSelect2Texts
+        }).addClass( 'cryout-select2 cryout-iconselect' );
 
-    // RadioImage Control
-    jQuery( '.customize-control-radio-image .buttonset' ).buttonset();
-    
-    // Icon Select2 Control
-    (function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;return e.define("select2/i18n/en",[],function(){}),{define:e.define,require:e.require}})();
-    
-    var cryoutSelect2Texts = {
-        errorLoading: function(){ return "The results could not be loaded" },
-        inputTooLong: function(){ return "Please delete some characters" },
-        inputTooShort:function(){ return "Please enter more characters" },
-        loadingMore:  function(){ return "Loading more results..." },
-        noResults:    function(){ return "No results found" },
-        searching:    function(){ return "Searching…" },
-        maximumSelected:function(){ return "You have selected too many items"}
-    }
-    
-    // init select2 control on font selectors
-    if ( jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) jQuery('select.fontselect.select2').select2({ 
-        width: "element",
-        theme: 'default cryout-select2',
-        language: cryoutSelect2Texts
-    });
-    // init select2 control for icon selectors (needs extra class for custom font)
-    if ( jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) jQuery('select.iconselect.select2').select2({ 
-        width: "element",
-        theme: 'default cryout-select2 cryout-iconselect',
-        language: cryoutSelect2Texts
-    }); 
+    }); // setTimeout       
 
 }); // load
+/* FIN */

fluida/1.8.6/cryout/js/customizer.js

@@ -5 +5 @@
  */
 
-var _label_max = 'Maximize';
-var _label_min = 'Restore';
+var _cryout_label_max = 'Maximize';
+var _cryout_label_min = 'Restore';
 
-var innerHTML = '<button class="button cryout-expand-sidebar button-secondary" aria-expanded="true" aria-label="' + _label_max + '" title="' + _label_max + '" href="#">\
-        <span class="collapse-sidebar-label">' + _label_max + '</span>\
-        <span class="collapse-sidebar-arrow" title="' + _label_max + '"></span>\
+var _cryout_innerHTML = '<button class="button cryout-expand-sidebar button-secondary" aria-expanded="true" aria-label="' + _cryout_label_max + '" title="' + _cryout_label_max + '" href="#">\
+        <span class="collapse-sidebar-label">' + _cryout_label_max + '</span>\
+        <span class="collapse-sidebar-arrow" title="' + _cryout_label_max + '"></span>\
 </button> ';
 
@@ -22 +22 @@
     if (jQuery('#customize-footer-actions .devices').length>0) {
     /* wp 4.5 or newer */
-        jQuery('#customize-footer-actions .devices').prepend(innerHTML);
+        jQuery('#customize-footer-actions .devices').prepend(_cryout_innerHTML);
     } else {
-        jQuery('#customize-footer-actions').append(innerHTML);
+        jQuery('#customize-footer-actions').append(_cryout_innerHTML);
     }
 
@@ -31 +31 @@
             if ( jQuery('.wp-full-overlay').hasClass('cryout-maximized') ) {
                 jQuery('.wp-full-overlay').removeClass( 'cryout-maximized' );
-                jQuery('a.cryout-expand-sidebar span.collapse-sidebar-label').html(_label_max);
-                jQuery('a.cryout-expand-sidebar').attr('title',_label_max);
+                jQuery('a.cryout-expand-sidebar span.collapse-sidebar-label').html(_cryout_label_max);
+                jQuery('a.cryout-expand-sidebar').attr('title',_cryout_label_max);
             }
 
@@ -41 +41 @@
             var label = jQuery('.cryout-expand-sidebar span.collapse-sidebar-label');
             var lebutton = jQuery('.cryout-expand-sidebar');
-            if (jQuery(label).html() == _label_max) {
-                    jQuery(label).html(_label_min);
-                    jQuery(lebutton).attr('title',_label_min);
+            if (jQuery(label).html() == _cryout_label_max) {
+                    jQuery(label).html(_cryout_label_min);
+                    jQuery(lebutton).attr('title',_cryout_label_min);
                     jQuery('.wp-full-overlay').removeClass( 'collapsed' ).addClass( 'expanded' ).addClass( 'cryout-maximized' );
             } else {
-                    jQuery(label).html(_label_max);
-                    jQuery(lebutton).attr('title',_label_max);
+                    jQuery(label).html(_cryout_label_max);
+                    jQuery(lebutton).attr('title',_cryout_label_max);
                     jQuery('.wp-full-overlay').removeClass( 'collapsed' ).addClass( 'expanded' ).removeClass( 'cryout-maximized' );
             }

fluida/1.8.6/cryout/js/select2.js

@@ -1 +1 @@
 /*!
- * Select2 4.0.6-rc.1
+ * Select2 4.0.13
  * https://select2.github.io
  *
@@ -778 +778 @@
   var id = 0;
   Utils.GetUniqueElementId = function (element) {
-    // Get a unique element Id. If element has no id, 
-    // creates a new unique number, stores it in the id 
-    // attribute and returns the new id. 
+    // Get a unique element Id. If element has no id,
+    // creates a new unique number, stores it in the id
+    // attribute and returns the new id.
     // If an id already exists, it simply returns it.
 
@@ -799 +799 @@
   Utils.StoreData = function (element, name, value) {
     // Stores an item in the cache for a specified element.
-    // name is the cache key.    
+    // name is the cache key.
     var id = Utils.GetUniqueElementId(element);
     if (!Utils.__cache[id]) {
@@ -810 +810 @@
   Utils.GetData = function (element, name) {
     // Retrieves a value from the cache by its key (name)
-    // name is optional. If no name specified, return 
+    // name is optional. If no name specified, return
     // all cache items for the specified element.
     // and for a specified element.
@@ -816 +816 @@
     if (name) {
       if (Utils.__cache[id]) {
-        return Utils.__cache[id][name] != null ? 
-          Utils.__cache[id][name]:
-          $(element).data(name); // Fallback to HTML5 data attribs.
+        if (Utils.__cache[id][name] != null) {
+          return Utils.__cache[id][name];
+        }
+        return $(element).data(name); // Fallback to HTML5 data attribs.
       }
       return $(element).data(name); // Fallback to HTML5 data attribs.
     } else {
-      return Utils.__cache[id];            
+      return Utils.__cache[id];
     }
   };
@@ -832 +833 @@
       delete Utils.__cache[id];
     }
+
+    element.removeAttribute('data-select2-id');
   };
 
@@ -853 +856 @@
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="tree"></ul>'
+      '<ul class="select2-results__options" role="listbox"></ul>'
     );
 
@@ -876 +879 @@
 
     var $message = $(
-      '<li role="treeitem" aria-live="assertive"' +
+      '<li role="alert" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
@@ -1010 +1013 @@
 
     var attrs = {
-      'role': 'treeitem',
+      'role': 'option',
       'aria-selected': 'false'
     };
 
-    if (data.disabled) {
+    var matches = window.Element.prototype.matches ||
+      window.Element.prototype.msMatchesSelector ||
+      window.Element.prototype.webkitMatchesSelector;
+
+    if ((data.element != null && matches.call(data.element, ':disabled')) ||
+        (data.element == null && data.disabled)) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
@@ -1115 +1123 @@
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
@@ -1124 +1135 @@
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
@@ -1178 +1192 @@
       var currentIndex = $options.index($highlighted);
 
-      // If we are already at te top, don't move further
+      // If we are already at the top, don't move further
       // If no options, currentIndex will be -1
       if (currentIndex <= 0) {
@@ -1419 +1433 @@
     $selection.attr('title', this.$element.attr('title'));
     $selection.attr('tabindex', this._tabindex);
+    $selection.attr('aria-disabled', 'false');
 
     this.$selection = $selection;
@@ -1428 +1443 @@
     var self = this;
 
-    var id = container.id + '-container';
     var resultsId = container.id + '-results';
 
@@ -1471 +1485 @@
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
-      window.setTimeout(function () {
-        self.$selection.focus();
-      }, 0);
+      self.$selection.trigger('focus');
 
       self._detachCloseHandler(container);
@@ -1481 +1492 @@
     container.on('enable', function () {
       self.$selection.attr('tabindex', self._tabindex);
+      self.$selection.attr('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
       self.$selection.attr('tabindex', '-1');
+      self.$selection.attr('aria-disabled', 'true');
     });
   };
@@ -1507 +1520 @@
 
   BaseSelection.prototype._attachCloseHandler = function (container) {
-    var self = this;
 
     $(document.body).on('mousedown.select2.' + container.id, function (e) {
@@ -1517 +1529 @@
 
       $all.each(function () {
-        var $this = $(this);
-
         if (this == $select[0]) {
           return;
@@ -1545 +1555 @@
   BaseSelection.prototype.update = function (data) {
     throw new Error('The `update` method must be defined in child classes.');
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
@@ -1611 +1642 @@
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger('focus');
       }
     });
@@ -1645 +1676 @@
 
     $rendered.empty().append(formatted);
-    $rendered.attr('title', selection.title || selection.text);
+
+    var title = selection.title || selection.text;
+
+    if (title) {
+      $rendered.attr('title', title);
+    } else {
+      $rendered.removeAttr('title');
+    }
   };
 
@@ -1690 +1728 @@
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
@@ -1748 +1786 @@
 
       $selection.append(formatted);
-      $selection.attr('title', selection.title || selection.text);
+
+      var title = selection.title || selection.text;
+
+      if (title) {
+        $selection.attr('title', title);
+      }
 
       Utils.StoreData($selection[0], 'data', selection);
@@ -1846 +1889 @@
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
@@ -1889 +1932 @@
     }
 
-    this.$element.trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
@@ -1912 +1955 @@
     }
 
+    var removeAll = this.options.get('translations').get('removeAllItems');
+
     var $remove = $(
-      '<span class="select2-selection__clear">' +
+      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
         '&times;' +
       '</span>'
@@ -1939 +1984 @@
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</li>'
     );
@@ -1956 +2001 @@
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     container.on('open', function () {
+      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
@@ -1964 +2012 @@
     container.on('close', function () {
       self.$search.val('');
+      self.$search.removeAttr('aria-controls');
       self.$search.removeAttr('aria-activedescendant');
       self.$search.trigger('focus');
@@ -1983 +2032 @@
 
     container.on('results:focus', function (params) {
-      self.$search.attr('aria-activedescendant', params.id);
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
     });
 
@@ -2014 +2067 @@
           evt.preventDefault();
         }
+      }
+    });
+
+    this.$selection.on('click', '.select2-search--inline', function (evt) {
+      if (self.$search.val()) {
+        evt.stopPropagation();
       }
     });
@@ -2102 +2161 @@
     this.resizeSearch();
     if (searchHadFocus) {
-      var isTagInput = this.$element.find('[data-select2-tag]').length;
-      if (isTagInput) {
-        // fix IE11 bug where tag input lost focus
-        this.$element.focus();
-      } else {
-        this.$search.focus();
-      }
+      this.$search.trigger('focus');
     }
   };
@@ -2141 +2194 @@
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').innerWidth();
+      width = this.$selection.find('.select2-selection__rendered').width();
     } else {
       var minimumWidth = this.$search.val().length + 1;
@@ -2504 +2557 @@
     '\uA74A': 'O',
     '\uA74C': 'O',
+    '\u0152': 'OE',
     '\u01A2': 'OI',
     '\uA74E': 'OO',
@@ -2913 +2967 @@
     '\uA74D': 'o',
     '\u0275': 'o',
+    '\u0153': 'oe',
     '\u01A3': 'oi',
     '\u0223': 'ou',
@@ -3081 +3136 @@
     '\u03CB': '\u03C5',
     '\u03B0': '\u03C5',
-    '\u03C9': '\u03C9',
-    '\u03C2': '\u03C3'
+    '\u03CE': '\u03C9',
+    '\u03C2': '\u03C3',
+    '\u2019': '\''
   };
 
@@ -3167 +3223 @@
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
@@ -3188 +3244 @@
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
@@ -3194 +3250 @@
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
@@ -3210 +3266 @@
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
@@ -3228 +3284 @@
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
@@ -3421 +3477 @@
 ], function (SelectAdapter, Utils, $) {
   function ArrayAdapter ($element, options) {
-    var data = options.get('data') || [];
+    this._dataToConvert = options.get('data') || [];
 
     ArrayAdapter.__super__.constructor.call(this, $element, options);
-
-    this.addOptions(this.convertToOptions(data));
   }
 
   Utils.Extend(ArrayAdapter, SelectAdapter);
+
+  ArrayAdapter.prototype.bind = function (container, $container) {
+    ArrayAdapter.__super__.bind.call(this, container, $container);
+
+    this.addOptions(this.convertToOptions(this._dataToConvert));
+  };
 
   ArrayAdapter.prototype.select = function (data) {
@@ -3719 +3779 @@
 
   Tags.prototype._removeOldTags = function (_) {
-    var tag = this._lastTag;
-
     var $options = this.$element.find('option[data-select2-tag]');
 
@@ -3795 +3853 @@
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger('focus');
       }
 
@@ -3924 +3982 @@
   }
 
+  MaximumSelectionLength.prototype.bind =
+    function (decorated, container, $container) {
+      var self = this;
+
+      decorated.call(this, container, $container);
+
+      container.on('select', function () {
+        self._checkIfMaximumSelected();
+      });
+  };
+
   MaximumSelectionLength.prototype.query =
     function (decorated, params, callback) {
+      var self = this;
+
+      this._checkIfMaximumSelected(function () {
+        decorated.call(self, params, callback);
+      });
+  };
+
+  MaximumSelectionLength.prototype._checkIfMaximumSelected =
+    function (_, successCallback) {
       var self = this;
 
@@ -3940 +4018 @@
           return;
         }
-        decorated.call(self, params, callback);
+
+        if (successCallback) {
+          successCallback();
+        }
       });
   };
@@ -3979 +4060 @@
 
   Dropdown.prototype.position = function ($dropdown, $container) {
-    // Should be implmented in subclasses
+    // Should be implemented in subclasses
   };
 
@@ -4003 +4084 @@
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</span>'
     );
@@ -4017 +4098 @@
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
+
+    var resultsId = container.id + '-results';
 
     decorated.call(this, container, $container);
@@ -4040 +4123 @@
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
-
-      self.$search.focus();
+      self.$search.attr('aria-controls', resultsId);
+
+      self.$search.trigger('focus');
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }, 0);
     });
@@ -4050 +4134 @@
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
+      self.$search.removeAttr('aria-controls');
+      self.$search.removeAttr('aria-activedescendant');
 
       self.$search.val('');
-      self.$search.blur();
+      self.$search.trigger('blur');
     });
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }
     });
@@ -4070 +4156 @@
           self.$searchContainer.addClass('select2-search--hide');
         }
+      }
+    });
+
+    container.on('results:focus', function (params) {
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
       }
     });
@@ -4156 +4250 @@
     if (this.showLoadingMore(data)) {
       this.$results.append(this.$loadingMore);
+      this.loadMoreIfNeeded();
     }
   };
@@ -4174 +4269 @@
     });
 
-    this.$results.on('scroll', function () {
-      var isLoadMoreVisible = $.contains(
-        document.documentElement,
-        self.$loadingMore[0]
-      );
-
-      if (self.loading || !isLoadMoreVisible) {
-        return;
-      }
-
-      var currentOffset = self.$results.offset().top +
-        self.$results.outerHeight(false);
-      var loadingMoreOffset = self.$loadingMore.offset().top +
-        self.$loadingMore.outerHeight(false);
-
-      if (currentOffset + 50 >= loadingMoreOffset) {
-        self.loadMore();
-      }
-    });
+    this.$results.on('scroll', this.loadMoreIfNeeded.bind(this));
+  };
+
+  InfiniteScroll.prototype.loadMoreIfNeeded = function () {
+    var isLoadMoreVisible = $.contains(
+      document.documentElement,
+      this.$loadingMore[0]
+    );
+
+    if (this.loading || !isLoadMoreVisible) {
+      return;
+    }
+
+    var currentOffset = this.$results.offset().top +
+      this.$results.outerHeight(false);
+    var loadingMoreOffset = this.$loadingMore.offset().top +
+      this.$loadingMore.outerHeight(false);
+
+    if (currentOffset + 50 >= loadingMoreOffset) {
+      this.loadMore();
+    }
   };
 
@@ -4213 +4310 @@
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="treeitem" aria-disabled="true"></li>'
+      'role="option" aria-disabled="true"></li>'
     );
 
@@ -4231 +4328 @@
 ], function ($, Utils) {
   function AttachBody (decorated, $element, options) {
-    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
+    this.$dropdownParent = $(options.get('dropdownParent') || document.body);
 
     decorated.call(this, $element, options);
@@ -4238 +4335 @@
   AttachBody.prototype.bind = function (decorated, container, $container) {
     var self = this;
-
-    var setupResultsEvents = false;
 
     decorated.call(this, container, $container);
@@ -4247 +4342 @@
       self._attachPositioningHandler(container);
 
-      if (!setupResultsEvents) {
-        setupResultsEvents = true;
-
-        container.on('results:all', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-
-        container.on('results:append', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-      }
+      // Must bind after the results handlers to ensure correct sizing
+      self._bindContainerResultHandlers(container);
     });
 
@@ -4306 +4390 @@
   AttachBody.prototype._hideDropdown = function (decorated) {
     this.$dropdownContainer.detach();
+  };
+
+  AttachBody.prototype._bindContainerResultHandlers =
+      function (decorated, container) {
+
+    // These should only be bound once
+    if (this._containerResultsHandlersBound) {
+      return;
+    }
+
+    var self = this;
+
+    container.on('results:all', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:append', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:message', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('select', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('unselect', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    this._containerResultsHandlersBound = true;
   };
 
@@ -4384 +4506 @@
     };
 
-    // Determine what the parent element is to use for calciulating the offset
+    // Determine what the parent element is to use for calculating the offset
     var $offsetParent = this.$dropdownParent;
 
-    // For statically positoned elements, we need to get the element
+    // For statically positioned elements, we need to get the element
     // that is determining the offset
     if ($offsetParent.css('position') === 'static') {
@@ -4393 +4515 @@
     }
 
-    var parentOffset = $offsetParent.offset();
+    var parentOffset = {
+      top: 0,
+      left: 0
+    };
+
+    if (
+      $.contains(document.body, $offsetParent[0]) ||
+      $offsetParent[0].isConnected
+      ) {
+      parentOffset = $offsetParent.offset();
+    }
 
     css.top -= parentOffset.top;
@@ -4563 +4695 @@
 
     // Don't close if the control key is being held
-    if (originalEvent && originalEvent.ctrlKey) {
+    if (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)) {
       return;
     }
@@ -4617 +4749 @@
     searching: function () {
       return 'Searching…';
+    },
+    removeAllItems: function () {
+      return 'Remove all items';
     }
   };
@@ -4855 +4990 @@
     }
 
-    if (typeof options.language === 'string') {
-      // Check if the language is specified with a region
-      if (options.language.indexOf('-') > 0) {
-        // Extract the region information if it is included
-        var languageParts = options.language.split('-');
-        var baseLanguage = languageParts[0];
-
-        options.language = [options.language, baseLanguage];
-      } else {
-        options.language = [options.language];
-      }
-    }
-
-    if ($.isArray(options.language)) {
-      var languages = new Translation();
-      options.language.push('en');
-
-      var languageNames = options.language;
-
-      for (var l = 0; l < languageNames.length; l++) {
-        var name = languageNames[l];
-        var language = {};
-
-        try {
-          // Try to load it with the original name
-          language = Translation.loadPath(name);
-        } catch (e) {
-          try {
-            // If we couldn't load it, check if it wasn't the full path
-            name = this.defaults.amdLanguageBase + name;
-            language = Translation.loadPath(name);
-          } catch (ex) {
-            // The translation could not be loaded at all. Sometimes this is
-            // because of a configuration problem, other times this can be
-            // because of how Select2 helps load all possible translation files.
-            if (options.debug && window.console && console.warn) {
-              console.warn(
-                'Select2: The language file for "' + name + '" could not be ' +
-                'automatically loaded. A fallback will be used instead.'
-              );
-            }
-
-            continue;
-          }
-        }
-
-        languages.extend(language);
-      }
-
-      options.translations = languages;
-    } else {
-      var baseTranslation = Translation.loadPath(
-        this.defaults.amdLanguageBase + 'en'
-      );
-      var customTranslation = new Translation(options.language);
-
-      customTranslation.extend(baseTranslation);
-
-      options.translations = customTranslation;
-    }
+    // If the defaults were not previously applied from an element, it is
+    // possible for the language option to have not been resolved
+    options.language = this._resolveLanguage(options.language);
+
+    // Always fall back to English since it will always be complete
+    options.language.push('en');
+
+    var uniqueLanguages = [];
+
+    for (var l = 0; l < options.language.length; l++) {
+      var language = options.language[l];
+
+      if (uniqueLanguages.indexOf(language) === -1) {
+        uniqueLanguages.push(language);
+      }
+    }
+
+    options.language = uniqueLanguages;
+
+    options.translations = this._processTranslations(
+      options.language,
+      options.debug
+    );
 
     return options;
@@ -4981 +5079 @@
       dropdownAutoWidth: false,
       escapeMarkup: Utils.escapeMarkup,
-      language: EnglishTranslation,
+      language: {},
       matcher: matcher,
       minimumInputLength: 0,
@@ -4988 +5086 @@
       minimumResultsForSearch: 0,
       selectOnClose: false,
+      scrollAfterSelect: false,
       sorter: function (data) {
         return data;
@@ -5002 +5101 @@
   };
 
+  Defaults.prototype.applyFromElement = function (options, $element) {
+    var optionLanguage = options.language;
+    var defaultLanguage = this.defaults.language;
+    var elementLanguage = $element.prop('lang');
+    var parentLanguage = $element.closest('[lang]').prop('lang');
+
+    var languages = Array.prototype.concat.call(
+      this._resolveLanguage(elementLanguage),
+      this._resolveLanguage(optionLanguage),
+      this._resolveLanguage(defaultLanguage),
+      this._resolveLanguage(parentLanguage)
+    );
+
+    options.language = languages;
+
+    return options;
+  };
+
+  Defaults.prototype._resolveLanguage = function (language) {
+    if (!language) {
+      return [];
+    }
+
+    if ($.isEmptyObject(language)) {
+      return [];
+    }
+
+    if ($.isPlainObject(language)) {
+      return [language];
+    }
+
+    var languages;
+
+    if (!$.isArray(language)) {
+      languages = [language];
+    } else {
+      languages = language;
+    }
+
+    var resolvedLanguages = [];
+
+    for (var l = 0; l < languages.length; l++) {
+      resolvedLanguages.push(languages[l]);
+
+      if (typeof languages[l] === 'string' && languages[l].indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = languages[l].split('-');
+        var baseLanguage = languageParts[0];
+
+        resolvedLanguages.push(baseLanguage);
+      }
+    }
+
+    return resolvedLanguages;
+  };
+
+  Defaults.prototype._processTranslations = function (languages, debug) {
+    var translations = new Translation();
+
+    for (var l = 0; l < languages.length; l++) {
+      var languageData = new Translation();
+
+      var language = languages[l];
+
+      if (typeof language === 'string') {
+        try {
+          // Try to load it with the original name
+          languageData = Translation.loadPath(language);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            language = this.defaults.amdLanguageBase + language;
+            languageData = Translation.loadPath(language);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files
+            if (debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + language + '" could ' +
+                'not be automatically loaded. A fallback will be used instead.'
+              );
+            }
+          }
+        }
+      } else if ($.isPlainObject(language)) {
+        languageData = new Translation(language);
+      } else {
+        languageData = language;
+      }
+
+      translations.extend(languageData);
+    }
+
+    return translations;
+  };
+
   Defaults.prototype.set = function (key, value) {
     var camelKey = $.camelCase(key);
@@ -5031 +5227 @@
     }
 
+    if ($element != null) {
+      this.options = Defaults.applyFromElement(this.options, $element);
+    }
+
     this.options = Defaults.apply(this.options);
 
@@ -5052 +5252 @@
     if (this.options.disabled == null) {
       this.options.disabled = $e.prop('disabled');
-    }
-
-    if (this.options.language == null) {
-      if ($e.prop('lang')) {
-        this.options.language = $e.prop('lang').toLowerCase();
-      } else if ($e.closest('[lang]').prop('lang')) {
-        this.options.language = $e.closest('[lang]').prop('lang');
-      }
     }
 
@@ -5099 +5291 @@
       $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
       Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
-      
     }
 
     var dataset = {};
+
+    function upperCaseLetter(_, letter) {
+      return letter.toUpperCase();
+    }
+
+    // Pre-load all of the attributes which are prefixed with `data-`
+    for (var attr = 0; attr < $e[0].attributes.length; attr++) {
+      var attributeName = $e[0].attributes[attr].name;
+      var prefix = 'data-';
+
+      if (attributeName.substr(0, prefix.length) == prefix) {
+        // Get the contents of the attribute after `data-`
+        var dataName = attributeName.substring(prefix.length);
+
+        // Get the data contents from the consistent source
+        // This is more than likely the jQuery data helper
+        var dataValue = Utils.GetData($e[0], dataName);
+
+        // camelCase the attribute name to match the spec
+        var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter);
+
+        // Store the data attribute contents into the dataset since
+        dataset[camelDataName] = dataValue;
+      }
+    }
 
     // Prefer the element's `dataset` attribute if it exists
     // jQuery 1.x does not correctly handle data attributes with multiple dashes
     if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
-      dataset = $.extend(true, {}, $e[0].dataset, Utils.GetData($e[0]));
-    } else {
-      dataset = Utils.GetData($e[0]);
-    }
-
-    var data = $.extend(true, {}, dataset);
+      dataset = $.extend(true, {}, $e[0].dataset, dataset);
+    }
+
+    // Prefer our internal data cache if it exists
+    var data = $.extend(true, {}, Utils.GetData($e[0]), dataset);
 
     data = Utils._convertData(data);
@@ -5306 +5521 @@
     }
 
+    if (method == 'computedstyle') {
+      var computedStyle = window.getComputedStyle($element[0]);
+
+      return computedStyle.width;
+    }
+
     return method;
   };
@@ -5346 +5567 @@
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
-        $.each(mutations, self._syncS);
+        self._syncA();
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
@@ -5469 +5690 @@
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
@@ -5503 +5724 @@
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
@@ -5514 +5735 @@
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
@@ -5542 +5763 @@
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
-    }
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
+    }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
@@ -5593 +5829 @@
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
@@ -5609 +5845 @@
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
@@ -5694 +5955 @@
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 

fluida/1.8.6/cryout/js/select2.min.js

@@ -1 @@
-/*! Select2 4.0.6-rc.1 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return v.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o=b&&b.split("/"),p=t.map,q=p&&p["*"]||{};if(a){for(a=a.split("/"),g=a.length-1,t.nodeIdCompat&&x.test(a[g])&&(a[g]=a[g].replace(x,"")),"."===a[0].charAt(0)&&o&&(n=o.slice(0,o.length-1),a=n.concat(a)),k=0;k<a.length;k++)if("."===(m=a[k]))a.splice(k,1),k-=1;else if(".."===m){if(0===k||1===k&&".."===a[2]||".."===a[k-1])continue;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((o||q)&&p){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),o)for(l=o.length;l>0;l-=1)if((e=p[o.slice(0,l).join("/")])&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&q&&q[d]&&(i=q[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=w.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),o.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){r[a]=b}}function j(a){if(e(s,a)){var c=s[a];delete s[a],u[a]=!0,n.apply(b,c)}if(!e(r,a)&&!e(u,a))throw new Error("No "+a);return r[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return a?k(a):[]}function m(a){return function(){return t&&t.config&&t.config[a]||{}}}var n,o,p,q,r={},s={},t={},u={},v=Object.prototype.hasOwnProperty,w=[].slice,x=/\.js$/;p=function(a,b){var c,d=k(a),e=d[0],g=b[1];return a=d[1],e&&(e=f(e,g),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(g)):f(a,g):(a=f(a,g),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},q={require:function(a){return g(a)},exports:function(a){var b=r[a];return void 0!==b?b:r[a]={}},module:function(a){return{id:a,uri:"",exports:r[a],config:m(a)}}},n=function(a,c,d,f){var h,k,m,n,o,t,v,w=[],x=typeof d;if(f=f||a,t=l(f),"undefined"===x||"function"===x){for(c=!c.length&&d.length?["require","exports","module"]:c,o=0;o<c.length;o+=1)if(n=p(c[o],t),"require"===(k=n.f))w[o]=q.require(a);else if("exports"===k)w[o]=q.exports(a),v=!0;else if("module"===k)h=w[o]=q.module(a);else if(e(r,k)||e(s,k)||e(u,k))w[o]=j(k);else{if(!n.p)throw new Error(a+" missing "+k);n.p.load(n.n,g(f,!0),i(k),{}),w[o]=r[k]}m=d?d.apply(r[a],w):void 0,a&&(h&&h.exports!==b&&h.exports!==r[a]?r[a]=h.exports:m===b&&v||(r[a]=m))}else a&&(r[a]=d)},a=c=o=function(a,c,d,e,f){if("string"==typeof a)return q[a]?q[a](c):j(p(a,l(c)).f);if(!a.splice){if(t=a,t.deps&&o(t.deps,t.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?n(b,a,c,d):setTimeout(function(){n(b,a,c,d)},4),o},o.config=function(a){return o(a)},a._defined=r,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(r,a)||e(s,a)||(s[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){"function"==typeof b[d]&&("constructor"!==d&&c.push(d))}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){return Array.prototype.unshift.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){b+=Math.floor(36*Math.random()).toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c.__cache={};var e=0;return c.GetUniqueElementId=function(a){var b=a.getAttribute("data-select2-id");return null==b&&(a.id?(b=a.id,a.setAttribute("data-select2-id",b)):(a.setAttribute("data-select2-id",++e),b=e.toString())),b},c.StoreData=function(a,b,d){var e=c.GetUniqueElementId(a);c.__cache[e]||(c.__cache[e]={}),c.__cache[e][b]=d},c.GetData=function(b,d){var e=c.GetUniqueElementId(b);return d?c.__cache[e]&&null!=c.__cache[e][d]?c.__cache[e][d]:a(b).data(d):c.__cache[e]},c.RemoveData=function(a){var b=c.GetUniqueElementId(a);null!=c.__cache[b]&&delete c.__cache[b]},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){b.find(".select2-results").append(a)},c.prototype.sort=function(a){return this.options.get("sorter")(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var c=this;this.data.current(function(d){var e=a.map(d,function(a){return a.id.toString()});c.$results.find(".select2-results__option[aria-selected]").each(function(){var c=a(this),d=b.GetData(this,"data"),f=""+d.id;null!=d.element&&d.element.selected||null==d.element&&a.inArray(f,e)>-1?c.attr("aria-selected","true"):c.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(c){var d=document.createElement("li");d.className="select2-results__option";var e={role:"treeitem","aria-selected":"false"};c.disabled&&(delete e["aria-selected"],e["aria-disabled"]="true"),null==c.id&&delete e["aria-selected"],null!=c._resultId&&(d.id=c._resultId),c.title&&(d.title=c.title),c.children&&(e.role="group",e["aria-label"]=c.text,delete e["aria-selected"]);for(var f in e){var g=e[f];d.setAttribute(f,g)}if(c.children){var h=a(d),i=document.createElement("strong");i.className="select2-results__group";a(i);this.template(c,i);for(var j=[],k=0;k<c.children.length;k++){var l=c.children[k],m=this.option(l);j.push(m)}var n=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});n.append(j),h.append(i),h.append(n)}else this.template(c,d);return b.StoreData(d,"data",c),d},c.prototype.bind=function(c,d){var e=this,f=c.id+"-results";this.$results.attr("id",f),c.on("results:all",function(a){e.clear(),e.append(a.data),c.isOpen()&&(e.setClasses(),e.highlightFirstItem())}),c.on("results:append",function(a){e.append(a.data),c.isOpen()&&e.setClasses()}),c.on("query",function(a){e.hideMessages(),e.showLoading(a)}),c.on("select",function(){c.isOpen()&&(e.setClasses(),e.highlightFirstItem())}),c.on("unselect",function(){c.isOpen()&&(e.setClasses(),e.highlightFirstItem())}),c.on("open",function(){e.$results.attr("aria-expanded","true"),e.$results.attr("aria-hidden","false"),e.setClasses(),e.ensureHighlightVisible()}),c.on("close",function(){e.$results.attr("aria-expanded","false"),e.$results.attr("aria-hidden","true"),e.$results.removeAttr("aria-activedescendant")}),c.on("results:toggle",function(){var a=e.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),c.on("results:select",function(){var a=e.getHighlightedResults();if(0!==a.length){var c=b.GetData(a[0],"data");"true"==a.attr("aria-selected")?e.trigger("close",{}):e.trigger("select",{data:c})}}),c.on("results:previous",function(){var a=e.getHighlightedResults(),b=e.$results.find("[aria-selected]"),c=b.index(a);if(!(c<=0)){var d=c-1;0===a.length&&(d=0);var f=b.eq(d);f.trigger("mouseenter");var g=e.$results.offset().top,h=f.offset().top,i=e.$results.scrollTop()+(h-g);0===d?e.$results.scrollTop(0):h-g<0&&e.$results.scrollTop(i)}}),c.on("results:next",function(){var a=e.getHighlightedResults(),b=e.$results.find("[aria-selected]"),c=b.index(a),d=c+1;if(!(d>=b.length)){var f=b.eq(d);f.trigger("mouseenter");var g=e.$results.offset().top+e.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=e.$results.scrollTop()+h-g;0===d?e.$results.scrollTop(0):h>g&&e.$results.scrollTop(i)}}),c.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),c.on("results:message",function(a){e.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=e.$results.scrollTop(),c=e.$results.get(0).scrollHeight-b+a.deltaY,d=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=e.$results.height();d?(e.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(e.$results.scrollTop(e.$results.get(0).scrollHeight-e.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(c){var d=a(this),f=b.GetData(this,"data");if("true"===d.attr("aria-selected"))return void(e.options.get("multiple")?e.trigger("unselect",{originalEvent:c,data:f}):e.trigger("close",{}));e.trigger("select",{originalEvent:c,data:f})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(c){var d=b.GetData(this,"data");e.getHighlightedResults().removeClass("select2-results__option--highlighted"),e.trigger("results:focus",{data:d,element:a(this)})})},c.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var c=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=b.GetData(this.$element[0],"old-tabindex")?this._tabindex=b.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),c.attr("title",this.$element.attr("title")),c.attr("tabindex",this._tabindex),this.$selection=c,c},d.prototype.bind=function(a,b){var d=this,e=(a.id,a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),window.setTimeout(function(){d.$selection.focus()},0),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(c){a(document.body).on("mousedown.select2."+c.id,function(c){var d=a(c.target),e=d.closest(".select2");a(".select2.select2-container--open").each(function(){a(this),this!=e[0]&&b.GetData(this,"element").select2("close")})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){b.find(".selection").append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()})},e.prototype.clear=function(){var a=this.$selection.find(".select2-selection__rendered");a.empty(),a.removeAttr("title")},e.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.attr("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,e){var f=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){f.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!f.options.get("disabled")){var d=a(this),e=d.parent(),g=c.GetData(e[0],"data");f.trigger("unselect",{originalEvent:b,data:g})}})},d.prototype.clear=function(){var a=this.$selection.find(".select2-selection__rendered");a.empty(),a.removeAttr("title")},d.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},d.prototype.selectionContainer=function(){return a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.attr("title",e.title||e.text),c.StoreData(f[0],"data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id;if(b.length>1||c)return a.call(this,b);this.clear();var d=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(d)},b}),b.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(a,b,c){function d(){}return d.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},d.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var d=this.$selection.find(".select2-selection__clear");if(0!==d.length){b.stopPropagation();var e=c.GetData(d[0],"data"),f=this.$element.val();this.$element.val(this.placeholder.id);var g={data:e};if(this.trigger("clear",g),g.prevented)return void this.$element.val(f);for(var h=0;h<e.length;h++)if(g={data:e[h]},this.trigger("unselect",g),g.prevented)return void this.$element.val(f);this.$element.trigger("change"),this.trigger("toggle",{})}}},d.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},d.prototype.update=function(b,d){if(b.call(this,d),!(this.$selection.find(".select2-selection__placeholder").length>0||0===d.length)){var e=a('<span class="select2-selection__clear">&times;</span>');c.StoreData(e[0],"data",d),this.$selection.find(".select2-selection__rendered").prepend(e)}},d}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,d,e){var f=this;a.call(this,d,e),d.on("open",function(){f.$search.trigger("focus")}),d.on("close",function(){f.$search.val(""),f.$search.removeAttr("aria-activedescendant"),f.$search.trigger("focus")}),d.on("enable",function(){f.$search.prop("disabled",!1),f._transferTabIndex()}),d.on("disable",function(){f.$search.prop("disabled",!0)}),d.on("focus",function(a){f.$search.trigger("focus")}),d.on("results:focus",function(a){f.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){f.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){f._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){if(a.stopPropagation(),f.trigger("keypress",a),f._keyUpPrevented=a.isDefaultPrevented(),a.which===c.BACKSPACE&&""===f.$search.val()){var d=f.$searchContainer.prev(".select2-selection__choice");if(d.length>0){var e=b.GetData(d[0],"data");f.searchRemoveChoice(e),a.preventDefault()}}});var g=document.documentMode,h=g&&g<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){if(h)return void f.$selection.off("input.search input.searchcheck");f.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(h&&"input"===a.type)return void f.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&f.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;if(this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c){this.$element.find("[data-select2-tag]").length?this.$element.focus():this.$search.focus()}},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{a=.75*(this.$search.val().length+1)+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],g=["opening","closing","selecting","unselecting","clearing"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"}}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),null!=c.id?d+="-"+c.id.toString():d+="-"+a.generateChars(4),d},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple")){if(a.selected=!1,c(a.element).is("option"))return a.element.selected=!1,void this.$element.trigger("change");this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})}},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){b.RemoveData(this)})},d.prototype.query=function(a,b){var d=[],e=this;this.$element.children().each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var d;a.children?(d=document.createElement("optgroup"),d.label=a.text):(d=document.createElement("option"),void 0!==d.textContent?d.textContent=a.text:d.innerText=a.text),void 0!==a.id&&(d.value=a.id),a.disabled&&(d.disabled=!0),a.selected&&(d.selected=!0),a.title&&(d.title=a.title);var e=c(d),f=this._normalizeItem(a);return f.element=d,b.StoreData(d,"data",f),e},d.prototype.item=function(a){var d={};if(null!=(d=b.GetData(a[0],"data")))return d;if(a.is("option"))d={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){d={text:a.prop("label"),children:[],title:a.prop("title")};for(var e=a.children("option"),f=[],g=0;g<e.length;g++){var h=c(e[g]),i=this.item(h);f.push(i)}d.children=f}return d=this._normalizeItem(d),d.element=a[0],b.StoreData(a[0],"data",d),d},d.prototype._normalizeItem=function(a){a!==Object(a)&&(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){return this.options.get("matcher")(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){"status"in d&&(0===d.status||"0"===d.status)||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0);if((i.text||"").toUpperCase()===(b.term||"").toUpperCase()||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var k=e.createTag(b);if(null!=k){var l=e.option(k);l.attr("data-select2-tag",!0),e.addOptions([l]),e.insertTag(g,k)}a.results=g,c(a)}var e=this;if(this._removeOldTags(),null==b.term||null!=b.page)return void a.call(this,b,c);a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){this._lastTag;this.$element.find("option[data-select2-tag]").each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b);if(!g.$element.find("option").filter(function(){return a(this).val()===c.id}).length){var d=g.option(c);d.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([d])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",b.term.length<this.minimumInputLength)return void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength)return void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;if(d.maximumSelectionLength>0&&f>=d.maximumSelectionLength)return void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}});a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val(""),e.$search.blur()}),c.on("focus",function(){c.isOpen()||e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){e.showSearch(a)?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){e.$results.offset().top+e.$results.outerHeight(!1)+50>=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1)&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){b.StoreData(this,"select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(c){var d=b.GetData(this,"select2-scroll-position");a(this).scrollTop(d.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id;this.$container.parents().filter(b.hasScroll).off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",["../utils"],function(a){function b(){}return b.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},b.prototype._handleSelectOnClose=function(b,c){if(c&&null!=c.originalSelect2Event){var d=c.originalSelect2Event;if("select"===d._type||"unselect"===d._type)return}var e=this.getHighlightedResults();if(!(e.length<1)){var f=a.GetData(e[0],"data");null!=f.element&&f.element.selected||null==f.element&&f.selected||this.trigger("select",{data:f})}},b}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){return"Please enter "+(a.minimum-a.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}return D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){null==c(d,e.children[g])&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var h=b(e.text).toUpperCase(),i=b(d.term).toUpperCase();return h.indexOf(i)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(!0,this.defaults,f)},new D}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),d.GetData(a[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),d.StoreData(a[0],"data",d.GetData(a[0],"select2Tags")),d.StoreData(a[0],"tags",!0)),d.GetData(a[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",d.GetData(a[0],"ajaxUrl")),d.StoreData(a[0],"ajax-Url",d.GetData(a[0],"ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,d.GetData(a[0])):d.GetData(a[0]);var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,d){null!=c.GetData(a[0],"select2")&&c.GetData(a[0],"select2").destroy(),this.$element=a,this.id=this._generateId(a),d=d||{},this.options=new b(d,a),e.__super__.constructor.call(this);var f=a.attr("tabindex")||0;c.StoreData(a[0],"old-tabindex",f),a.attr("tabindex","-1");var g=this.options.get("dataAdapter");this.dataAdapter=new g(a,this.options);var h=this.render();this._placeContainer(h);var i=this.options.get("selectionAdapter");this.selection=new i(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,h);var j=this.options.get("dropdownAdapter");this.dropdown=new j(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,h);var k=this.options.get("resultsAdapter");this.results=new k(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){l.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),c.StoreData(a[0],"select2",this),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",c.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),c.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),c.StoreData(b[0],"element",this.$element),b},e}),b.define("jquery-mousewheel",["jquery"],function(a){return a}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(a,b,c,d,e){if(null==a.fn.select2){var f=["open","close","destroy"];a.fn.select2=function(b){if("object"==typeof(b=b||{}))return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,g=Array.prototype.slice.call(arguments,1);return this.each(function(){var a=e.GetData(this,"select2");null==a&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=a[b].apply(a,g)}),a.inArray(b,f)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(u){var e=function(){if(u&&u.fn&&u.fn.select2&&u.fn.select2.amd)var e=u.fn.select2.amd;var t,n,r,h,o,s,f,g,m,v,y,_,i,a,b;function w(e,t){return i.call(e,t)}function l(e,t){var n,r,i,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&b.test(e[s])&&(e[s]=e[s].replace(b,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(r=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(i=(i=f[h.slice(0,d).join("/")])&&i[r]){o=i,a=u;break}if(o)break;!l&&g&&g[r]&&(l=g[r],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(w(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!w(m,e)&&!w(_,e))throw new Error("No "+e);return m[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?c(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},i=Object.prototype.hasOwnProperty,a=[].slice,b=/\.js$/,f=function(e,t){var n,r=c(e),i=r[0],o=t[1];return e=r[1],i&&(n=D(i=l(i,o))),i?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return l(e,t)}}(o)):l(e,o):(i=(r=c(e=l(e,o)))[0],e=r[1],i&&(n=D(i))),{f:i?i+"!"+e:e,n:e,pr:i,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,r){var i,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(r=r||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)i=d[l]=g.module(e);else if(w(m,o)||w(v,o)||w(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(r,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(i&&i.exports!==h&&i.exports!==m[e]?m[e]=i.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,r,i){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=r,r=i),r?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(r=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),w(m,e)||w(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=r),e.define("almond",function(){}),e.define("jquery",[],function(){var e=u||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var i={};function u(e){var t=e.prototype,n=[];for(var r in t){"function"==typeof t[r]&&"constructor"!==r&&n.push(r)}return n}i.Extend=function(e,t){var n={}.hasOwnProperty;function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},i.Decorate=function(r,i){var e=u(i),t=u(r);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=r.prototype.constructor;0<t&&(e.call(arguments,r.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=r.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=r.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,r=e.length;n<r;n++)e[n].apply(this,t)},i.Observable=e,i.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},i.bind=function(e,t){return function(){e.apply(t,arguments)}},i._convertData=function(e){for(var t in e){var n=t.split("-"),r=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in r||(r[o]={}),i==n.length-1&&(r[o]=e[t]),r=r[o]}delete e[t]}}return e},i.hasScroll=function(e,t){var n=o(t),r=t.style.overflowX,i=t.style.overflowY;return(r!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===r||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},i.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},i.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},i.__cache={};var n=0;return i.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},i.StoreData=function(e,t,n){var r=i.GetUniqueElementId(e);i.__cache[r]||(i.__cache[r]={}),i.__cache[r][t]=n},i.GetData=function(e,t){var n=i.GetUniqueElementId(e);return t?i.__cache[n]&&null!=i.__cache[n][t]?i.__cache[n][t]:o(e).data(t):i.__cache[n]},i.RemoveData=function(e){var t=i.GetUniqueElementId(e);null!=i.__cache[t]&&delete i.__cache[t],e.removeAttribute("data-select2-id")},i}),e.define("select2/results",["jquery","./utils"],function(h,f){function r(e,t,n){this.$element=e,this.data=n,this.options=t,r.__super__.constructor.call(this)}return f.Extend(r,f.Observable),r.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},r.prototype.clear=function(){this.$results.empty()},r.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),r=this.options.get("translations").get(e.message);n.append(t(r(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},r.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},r.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var r=e.results[n],i=this.option(r);t.push(i)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},r.prototype.position=function(e,t){t.find(".select2-results").append(e)},r.prototype.sort=function(e){return this.options.get("sorter")(e)},r.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},r.prototype.setClasses=function(){var t=this;this.data.current(function(e){var r=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,r)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},r.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},r.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},r.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},r=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var i in(null!=e.element&&r.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[i];t.setAttribute(i,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},r.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var r=n-1;0===e.length&&(r=0);var i=t.eq(r);i.trigger("mouseenter");var o=l.$results.offset().top,s=i.offset().top,a=l.$results.scrollTop()+(s-o);0===r?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var r=t.eq(n);r.trigger("mouseenter");var i=l.$results.offset().top+l.$results.outerHeight(!1),o=r.offset().top+r.outerHeight(!1),s=l.$results.scrollTop()+o-i;0===n?l.$results.scrollTop(0):i<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,r=0<e.deltaY&&t-e.deltaY<=0,i=e.deltaY<0&&n<=l.$results.height();r?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):i&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},r.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},r.prototype.destroy=function(){this.$results.remove()},r.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,r=e.offset().top,i=this.$results.scrollTop()+(r-n),o=r-n;i-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(i)}},r.prototype.template=function(e,t){var n=this.options.get("templateResult"),r=this.options.get("escapeMarkup"),i=n(e,t);null==i?t.style.display="none":"string"==typeof i?t.innerHTML=r(i):h(t).append(i)},r}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,r,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return r.Extend(o,r.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=r.GetData(this.$element[0],"old-tabindex")?this._tabindex=r.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,r=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",r),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&r.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,r){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var r=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",r).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",r),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),r=this.display(t,n);n.empty().append(r);var i=t.title||t.text;i?n.attr("title",i):n.removeAttr("title")}else this.clear()},i}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var r=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){r.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!r.isDisabled()){var t=i(this).parent(),n=l.GetData(t[0],"data");r.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var r=e[n],i=this.selectionContainer(),o=this.display(r,i);i.append(o);var s=r.title||r.text;s&&i.attr("title",s),l.StoreData(i[0],"data",r),t.push(i)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var r=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(r)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,r,a){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){r._handleClear(e)}),t.on("keypress",function(e){r._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var r=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:r};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var s=0;s<r.length;s++)if(o={data:r[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=r.DELETE&&t.which!=r.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),r=i('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(r[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(r)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(r,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=r('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),t.on("open",function(){r.$search.attr("aria-controls",i),r.$search.trigger("focus")}),t.on("close",function(){r.$search.val(""),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.trigger("focus")}),t.on("enable",function(){r.$search.prop("disabled",!1),r._transferTabIndex()}),t.on("disable",function(){r.$search.prop("disabled",!0)}),t.on("focus",function(e){r.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){r.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){r._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===r.$search.val()){var t=r.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");r.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){r.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?r.$selection.off("input.search input.searchcheck"):r.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)r.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&r.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var r=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,i)){t=t||{};var n=s.Event("select2:"+e,{params:t});r.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function r(e){this.dict=e||{}}return r.prototype.all=function(){return this.dict},r.prototype.get=function(e){return this.dict[e]},r.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},r._cache={},r.loadPath=function(e){if(!(e in r._cache)){var t=n(e);r._cache[e]=t}return new r(r._cache[e])},r}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(r){function n(e,t){n.__super__.constructor.call(this)}return r.Extend(n,r.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=r.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+r.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],r=this;this.$element.find(":selected").each(function(){var e=l(this),t=r.item(e);n.push(t)}),e(n)},n.prototype.select=function(i){var o=this;if(i.selected=!0,l(i.element).is("option"))return i.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var r=i[n].id;-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=i.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,l(i.element).is("option"))return i.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var r=e[n].id;r!==i.id&&-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(r,e){var i=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(r,t);null!==n&&i.push(n)}}),e({results:i})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),r=this._normalizeItem(e);return r.element=t,a.StoreData(t,"data",r),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),r=[],i=0;i<n.length;i++){var o=l(n[i]),s=this.item(o);r.push(s)}t.children=r}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function r(e,t){this._dataToConvert=t.get("data")||[],r.__super__.constructor.call(this,e,t)}return f.Extend(r,e),r.prototype.bind=function(e,t){r.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},r.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),r.__super__.select.call(this,n)},r.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),r=n.map(function(){return t.item(g(this)).id}).get(),i=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,r)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}i.push(p)}}return i},r}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var r=o.ajax(e);return r.then(t),r.fail(n),r}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,r){var i=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=i.processResults(e,n);i.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),r(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||i.trigger("results:message",{message:"errorLoading"})});i._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var r=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(r))for(var s=0;s<r.length;s++){var a=r[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var r=t.results,i=0;i<r.length;i++){var o=r[i],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=r,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(r,a)}t.results=r,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var r=n.get("tokenizer");void 0!==r&&(this.tokenizer=r),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var r=this;t.term=t.term||"";var i=this.tokenizer(t,this.options,function(e){var t=r._normalizeItem(e);if(!r.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=r.option(t);n.attr("data-select2-tag",!0),r._removeOldTags(),r.addOptions([n])}!function(e){r.trigger("select",{data:e})}(t)});i.term!==t.term&&(this.$search.length&&(this.$search.val(i.term),this.$search.trigger("focus")),t.term=i.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,r){for(var i=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,i)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(r(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(){r._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var r=this;this._checkIfMaximumSelected(function(){e.call(r,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var r=this;this.current(function(e){var t=null!=e?e.length:0;0<r.maximumSelectionLength&&t>=r.maximumSelectionLength?r.trigger("results:message",{message:"maximumSelected",args:{maximum:r.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){r.handleSearch(e)}),t.on("open",function(){r.$search.attr("tabindex",0),r.$search.attr("aria-controls",i),r.$search.trigger("focus"),window.setTimeout(function(){r.$search.trigger("focus")},0)}),t.on("close",function(){r.$search.attr("tabindex",-1),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.val(""),r.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||r.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(r.showSearch(e)?r.$searchContainer.removeClass("select2-search--hide"):r.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,r){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,r)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),r=t.length-1;0<=r;r--){var i=t[r];this.placeholder.id===i.id&&n.splice(r,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,r){this.lastParams={},e.call(this,t,n,r),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("query",function(e){r.lastParams=e,r.loading=!0}),t.on("query:append",function(e){r.lastParams=e,r.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("open",function(){r._showDropdown(),r._attachPositioningHandler(t),r._bindContainerResultHandlers(t)}),t.on("close",function(){r._hideDropdown(),r._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,r="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(r,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(r+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,r="resize.select2."+t.id,i="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+r+" "+i)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),r=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-s,u=l>i.bottom+s,d={left:i.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(r="below"),u||!c||t?!c&&u&&t&&(r="below"):r="above",("above"==r||t&&"below"!==r)&&(d.top=o.top-h.top-s),null!=r&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+r),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+r)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,r){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,r)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,r=0;r<t.length;r++){var i=t[r];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("close",function(e){r._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var r=this.getHighlightedResults();if(!(r.length<1)){var i=o.GetData(r[0],"data");null!=i.element&&i.element.selected||null==i.element&&i.selected||this.trigger("select",{data:i})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(e){r._selectTriggered(e)}),t.on("unselect",function(e){r._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,$,b,w,A,x,D,S,E,C,O,T,q,L,I,j,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=b:null!=e.data?e.dataAdapter=$:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,w)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=E;else{var r=y.Decorate(E,C);e.dropdownAdapter=r}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,L)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var i=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,i)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var r=c.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&r.children.splice(i,1);return 0<r.children.length?r:e(t,r)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,r=this.defaults.language,i=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(r),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],r=0;r<t.length;r++)if(n.push(t[r]),"string"==typeof t[r]&&0<t[r].indexOf("-")){var i=t[r].split("-")[0];n.push(i)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,r=0;r<e.length;r++){var i=new s,o=e[r];if("string"==typeof o)try{i=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=c.isPlainObject(o)?new s(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var r=y._convertData(n);c.extend(!0,this.defaults,r)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(r,d,i,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=i.applyFromElement(this.options,t)),this.options=i.apply(this.options),t&&t.is("input")){var n=r(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function r(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,r)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,r){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var r=this.options.get("dataAdapter");this.dataAdapter=new r(e,this.options);var i=this.render();this._placeContainer(i);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,i);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,i);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var r=this._resolveWidth(e,"style");return null!=r?r:this._resolveWidth(e,"element")}if("element"==t){var i=e.outerWidth(!1);return i<=0?"auto":i+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,r=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,r)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===r.ESC||t===r.TAB||t===r.UP&&e.altKey?(n.close(e),e.preventDefault()):t===r.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===r.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===r.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===r.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===r.ENTER||t===r.SPACE||t===r.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,r=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var i=0;i<t.addedNodes.length;i++){t.addedNodes[i].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(r._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),r=this;n&&this.dataAdapter.current(function(e){r.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,r={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in r){var i=r[e],o={prevented:!1,name:e,args:t};if(n.call(this,i,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("jquery-mousewheel",["jquery"],function(e){return e}),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,s){if(null==i.fn.select2){var a=["open","close","destroy"];i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,r=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,r)}),-1<i.inArray(t,a)?this:n}}return null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return u.fn.select2.amd=e,t});

fluida/1.8.6/cryout/languages/cryout.pot

@@ -4 +4 @@
 "Project-Id-Version: Framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-23 12:45+0000\n"
+"POT-Creation-Date: 2021-03-11 19:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -16 +16 @@
 "X-Loco-Version: 2.2.2; wp-5.2.1"
 
-#: cryout/prototypes.php:805
+#: cryout/prototypes.php:822
 msgid "Skip to content"
-msgstr ""
-
-#: cryout/back-compat.php:15
-#, php-format
-msgid ""
-"<strong>%1$s requires at least WordPress version %2$s. Your site is running "
-"version %3$s.</strong><br>The theme will not be able to function on the "
-"curent setup. Please upgrade."
-msgstr ""
-
-#: cryout/back-compat-php.php:15
-#, php-format
-msgid ""
-"<strong>%1$s requires at least PHP version %2$s. Your site is running "
-"version %3$s.</strong><br>The theme will not be able to function correctly "
-"on the curent setup. Please upgrade or change the hosting provider."
-msgstr ""
-
-#: cryout/admin-functions.php:25
-msgid "No update news."
-msgstr ""
-
-#: cryout/admin-functions.php:29
-msgid "Posted on"
-msgstr ""
-
-#: cryout/admin-functions.php:30
-msgid "Read the full post"
 msgstr ""
 
@@ -150 +122 @@
 
 #: cryout/tgmpa-class.php:388 cryout/tgmpa-class.php:2952
+#| msgid "The following plugin was activated successfully:"
 msgid "The following plugin was activated successfully:"
-msgstr ""
+msgid_plural "The following plugins were activated successfully:"
+msgstr[0] ""
+msgstr[1] ""
 
 #. 1: plugin name.
@@ -404 +379 @@
 
 #: cryout/tgmpa-class.php:2934
+#| msgid "No plugins are available to be activated at this time."
+#| msgid_plural "The following plugins were activated successfully:"
 msgid "No plugins are available to be activated at this time."
-msgid_plural "The following plugins were activated successfully:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: cryout/tgmpa-class.php:3158

fluida/1.8.6/cryout/prototypes.php

@@ -295 +295 @@
  *  based on the configured font identifier
  */
-function cryout_font_select( $font, $gfont ) {
+function cryout_font_select( $font, $gfont, $echo = 0 ) {
+    // replace with general font if option is set to inherit
+    if ( preg_match('/inherit/i', $font ) && empty($gfont) ) {
+        $general_fonts = cryout_get_option( array( _CRYOUT_THEME_PREFIX . '_fgeneral', _CRYOUT_THEME_PREFIX . '_fgeneralgoogle' ) );
+        $font = $general_fonts[ _CRYOUT_THEME_PREFIX . '_fgeneral' ];
+        $gfont = $general_fonts[ _CRYOUT_THEME_PREFIX . '_fgeneralgoogle' ];
+    };
     $font = cryout_clean_gfont( $font );
+    $output = '';
     if ( !empty($gfont) ):
-        $fontname = esc_attr( preg_replace( '/[:&].*/', '', preg_replace( '/\+/', ' ', $gfont ) ) );
+        $fontname = preg_replace( '/[:&].*/', '', preg_replace( '/\+/', ' ', $gfont ) );
         if (preg_match('/:(\d{1,4})/',$gfont,$ms)) $weight = $ms[1];
-        return "'$fontname'" . ( !empty($weight) ? ";font-weight:$weight" : "");
+        $output = sprintf( "'%s'", esc_attr( $fontname )) . ( !empty($weight) ? sprintf( "; font-weight: %s", esc_attr( $weight ) ) : "");
     else:
-        return "$font";
+        $output = sprintf( "%s", esc_attr( $font ) );
     endif;
+    if ($echo) {
+        echo $output;
+    } else {
+        return $output;
+    }
 } // cryout_font_select()
 
@@ -310 +322 @@
  */
 function cryout_gfontclean( $gfont, $weight = '' ) {
-    if (preg_match('/^([\w\s]+):?([\d,]+)?(&a?m?p?;?subset=.*)?$/i', $gfont, $bits)) {
+    if (preg_match('/^([\w\s]+):?([\d,]+)?(&a?m?p?;?(subset|display)=.*)?$/i', $gfont, $bits)) {
         // first part is the font name
         if (empty($bits[1])) $bits[1] = '';
         // second part is the font weight (optional)
         if (empty($bits[2])) $bits[2] = $weight; elseif (!empty($weight)) $bits[2] = $weight . ',' . $bits[2];
-        // third part is the font subset (optional)
+        // third part is the font subset or display mode (optional)
         if (empty($bits[3])) $bits[3] = '';
+        // clean up duplicate weights
+        $bits[2] = ':' . implode( ',', array_unique( explode( ',', str_replace(':','', $bits[2]) ) ) );
         return esc_attr( preg_replace( '/\s+/', '+', $bits[1] . $bits[2] . $bits[3]) );
     } else {
@@ -469 +483 @@
     if (!empty($classes)):
         if (is_array($classes)) $classes = implode( ' ', $classes );
-        echo ' class="' . $classes . '" ';
+        echo ' class="' . esc_attr( $classes ) . '" ';
     endif;
 }; // cryout_echo_bgimage()
@@ -495 +509 @@
                $images = get_posts( array(
                        'fields'         => 'ids',
-                       'numberposts'    => 999,
+                       'numberposts'    => 99,
                        'order'          => 'ASC',
                        'orderby'        => 'none',
@@ -765 +779 @@
 
     $output = ' ' . $output;
-    if ($echo) echo $output;
-        else return $output;
+    if ($echo) {
+        echo $output;
+    } else {
+        return $output;
+    }
 
 } // cryout_schema_microdata
@@ -815 +832 @@
 function cryout_breadcrumbs(
             $separator = '<i class="icon-angle-right"></i>',                        // separator between crumbs
-            $home = '<i class="icon-homebread"></i>',                               // text for the 'Home' item
-            $showCurrent = 1,                                                       // whether to show current post/page title in breadcrumbs
-            $before = '<span class="current">',                                     // tag before the current crumb
-            $after = '</span>',                                                     // tag after the current crumb
+            $home = '<i class="icon-homebread"></i>',                           // text for the 'Home' item
+            $showCurrent = 1,                                       // whether to show current post/page title in breadcrumbs
+            $before = '<span class="current">',                                 // tag before the current crumb
+            $after = '</span>',                                         // tag after the current crumb
             $wrapper_pre = '<div id="breadcrumbs"> <nav id="breadcrumbs-nav" %2$s>',
             $wrapper_post = '</nav></div><!-- breadcrumbs -->',
@@ -860 +877 @@
 
     // let's begin
-    echo $wrapper_pre;
-    echo $homeLink;
-    echo $separator . ' ';
-
-    if ( is_category() ) {
+    $output = $wrapper_pre . $homeLink . $separator . ' ';
+
+    if ( is_category() ) {
         // category section
         $queried_object = get_queried_object();
         $cat_parents = $queried_object->category_parent;
-        if ( !empty( $cat_parents ) ) echo get_category_parents( $cat_parents, TRUE, ' ' . $separator . ' ');
-        echo $before . $text_archive .' "' . single_cat_title('', false) . '"' . $after;
-    } elseif ( is_search() ) {
+        if ( !empty( $cat_parents ) ) $output .= get_category_parents( $cat_parents, TRUE, ' ' . $separator . ' ');
+        $output .= $before . sprintf( $text_archive, single_cat_title('', false) ) . $after;
+    } elseif ( is_search() ) {
         // search section
-        echo $before . $text_search .' "' . get_search_query() . '"' . $after;
-    } elseif ( is_day() ) {
+        $output .= $before . sprintf( $text_search, get_search_query() ) . $after;
+    } elseif ( is_day() ) {
         // daily archive
-        echo '<a href="' . esc_url( get_year_link( get_the_time( 'Y' ) ) ) . '">' . esc_html( get_the_time( 'Y' ) ) . '</a> ' . $separator . ' ';
-        echo '<a href="' . esc_url( get_month_link( get_the_time( 'Y' ), get_the_time( 'm' ) ) ) . '">' . esc_html( get_the_time( 'F' ) ) . '</a> ' . $separator . ' ';
-        echo $before . esc_html( get_the_time( 'd' ) ) . $after;
-    } elseif ( is_month() ) {
+        $output .= '<a href="' . esc_url( get_year_link( get_the_time( 'Y' ) ) ) . '">' . esc_html( get_the_time( 'Y' ) ) . '</a> ' . $separator . ' ';
+        $output .= '<a href="' . esc_url( get_month_link( get_the_time( 'Y' ), get_the_time( 'm' ) ) ) . '">' . esc_html( get_the_time( 'F' ) ) . '</a> ' . $separator . ' ';
+        $output .= $before . esc_html( get_the_time( 'd' ) ) . $after;
+    } elseif ( is_month() ) {
         // monthly archive
-        echo '<a href="' . esc_url( get_year_link( get_the_time( 'Y' ) ) ) . '">' . esc_html( get_the_time( 'Y' ) ) . '</a> ' . $separator . ' ';
-        echo $before . esc_html( get_the_time( 'F' ) ) . $after;
-    } elseif ( is_year() ) {
+        $output .= '<a href="' . esc_url( get_year_link( get_the_time( 'Y' ) ) ) . '">' . esc_html( get_the_time( 'Y' ) ) . '</a> ' . $separator . ' ';
+        $output .= $before . esc_html( get_the_time( 'F' ) ) . $after;
+    } elseif ( is_year() ) {
         // yearly archive
-        echo $before . esc_html( get_the_time( 'Y' ) ) . $after;
-    } elseif ( is_single() && ! is_attachment() ) {
+        $output .= $before . esc_html( get_the_time( 'Y' ) ) . $after;
+    } elseif ( is_single() && ! is_attachment() ) {
         // single post
         if ( get_post_type() != 'post' ) {
             $post_type = get_post_type_object( get_post_type() );
             $slug = $post_type->rewrite;
-            echo '<a href="' . $homeUrl . '/' . $slug['slug'] . '/">' . $post_type->labels->singular_name . '</a>';
-            if ( $showCurrent ) echo ' ' . $separator . ' ' . $before . esc_html( get_the_title() ) . $after;
+            $output .= '<a href="' . $homeUrl . '/' . $slug['slug'] . '/">' . $post_type->labels->singular_name . '</a>';
+            if ( $showCurrent ) $output .= ' ' . $separator . ' ' . $before . esc_html( the_title_attribute( 'echo=0' ) ) . $after;
         } else {
             $cat = get_the_category(); if ( isset( $cat[0] ) ) { $cat = $cat[0]; } else { $cat = false; }
             if ( $cat ) { $cats = get_category_parents( $cat, TRUE, ' ' . $separator . ' '); } else { $cats = false; }
             if ( ! $showCurrent && $cats ) $cats = preg_replace( "#^(.+)\s$separator\s$#", "$1", $cats );
-            echo $cats;
-            if ( $showCurrent ) echo $before . esc_html( get_the_title() ) . $after;
-        }
-    } elseif ( ! is_single() && ! is_page() && get_post_type() != 'post' && ! is_404() ) {
+            $output .= $cats;
+            if ( $showCurrent ) $output .= $before . esc_html( the_title_attribute( 'echo=0' ) ) . $after;
+        }
+    } elseif ( ! is_single() && ! is_page() && get_post_type() != 'post' && ! is_404() ) {
         // some other single item
         $post_type = get_post_type_object( get_post_type() );
-        if (!empty($post_type->labels->singular_name)) echo $before . $post_type->labels->singular_name . $after;
+        if (!empty($post_type->labels->name)) $output .= $before . $post_type->labels->name . $after;
     } elseif ( is_attachment() ) {
         // attachment section
         $parent = get_post( $post->post_parent );
         $cat = get_the_category( $parent->ID ); if ( isset( $cat[0] ) ) { $cat = $cat[0]; } else { $cat = false; }
-        if ( $cat ) echo get_category_parents( $cat, TRUE, ' ' . $separator . ' ');
-        echo '<a href="' . esc_url( get_permalink( $parent ) ). '">' . $parent->post_title . '</a>';
-        if ( $showCurrent ) echo ' ' . $separator . ' ' . $before . esc_html( get_the_title() ) . $after;
-    } elseif ( is_page() && ! $post->post_parent ) {
+        if ( $cat ) $output .= get_category_parents( $cat, TRUE, ' ' . $separator . ' ');
+        $output .= '<a href="' . esc_url( get_permalink( $parent ) ). '">' . $parent->post_title . '</a>';
+        if ( $showCurrent ) $output .= ' ' . $separator . ' ' . $before . esc_html( the_title_attribute( 'echo=0' ) ) . $after;
+    } elseif ( is_page() && ! $post->post_parent ) {
         // parent page
-        if ( $showCurrent ) echo $before . esc_html( get_the_title() ) . $after;
-    } elseif ( is_page() && $post->post_parent ) {
+        if ( $showCurrent ) $output .= $before . esc_html( the_title_attribute( 'echo=0' ) ) . $after;
+    } elseif ( is_page() && $post->post_parent ) {
         // child page
         $parent_id  = $post->post_parent;
@@ -919 +934 @@
         while ( $parent_id ) {
             $page = get_page( $parent_id );
-            $breadcrumbs[] = '<a href="' . esc_url( get_permalink( $page->ID ) ) . '">' . esc_html( get_the_title( $page->ID ) ) . '</a>';
+            $breadcrumbs[] = '<a href="' . esc_url( get_permalink( $page->ID ) ) . '">' . esc_html( the_title_attribute( array( 'echo' => 0, 'post' => get_post( $parent_id ) ) ) ) . '</a>';
             $parent_id  = $page->post_parent;
         }
         $breadcrumbs = array_reverse( $breadcrumbs );
         for ( $i = 0; $i < count( $breadcrumbs ); $i++ ) {
-            echo $breadcrumbs[$i];
-            if ( $i != count( $breadcrumbs ) - 1 ) echo ' ' . $separator . ' ';
-        }
-        if ( $showCurrent ) echo ' ' . $separator . ' ' . $before . esc_html( get_the_title() ) . $after;
-    } elseif ( is_tag() ) {
+            $output .= $breadcrumbs[$i];
+            if ( $i != count( $breadcrumbs ) - 1 ) $output .= ' ' . $separator . ' ';
+        }
+        if ( $showCurrent ) $output .= ' ' . $separator . ' ' . $before . esc_html( the_title_attribute( 'echo=0' ) ) . $after;
+    } elseif ( is_tag() ) {
         // tags archive
-        echo $before . $text_tag .' "' . single_tag_title( '', false ) . '"' . $after;
-    } elseif ( is_author() ) {
+        $output .= $before . $text_tag .' "' . single_tag_title( '', false ) . '"' . $after;
+    } elseif ( is_author() ) {
         // author archive
         global $author;
         $userdata = get_userdata( $author );
-        echo $before . $text_author . ' ' . $userdata->display_name . $after;
-    } elseif ( is_404() ) {
+        $output .= $before . $text_author . ' ' . $userdata->display_name . $after;
+    } elseif ( is_404() ) {
         // 404
-        echo $before . $text_404 . $after;
-    } elseif ( get_post_format() ) {
+        $output .= $before . $text_404 . $after;
+    } elseif ( get_post_format() ) {
         // post format
-        echo $before . '"' . ucwords( get_post_format() ) . '" ' . $text_format . $after;
-    }
-
-    if ( get_query_var( 'paged' ) ) {
-      if ( is_category() || is_day() || is_month() || is_year() || is_search() || is_tag() || is_author() ) echo ' (';
-      echo $text_page . ' ' . get_query_var( 'paged' );
-      if ( is_category() || is_day() || is_month() || is_year() || is_search() || is_tag() || is_author() ) echo ')';
-    }
-
-    echo $wrapper_post;
+        $output .= $before . '"' . ucwords( get_post_format() ) . '" ' . $text_format . $after;
+    }
+
+    if ( get_query_var( 'paged' ) ) {
+        if ( is_category() || is_day() || is_month() || is_year() || is_search() || is_tag() || is_author() ) $output .= ' (';
+        $output .= $text_page . ' ' . get_query_var( 'paged' );
+        if ( is_category() || is_day() || is_month() || is_year() || is_search() || is_tag() || is_author() ) $output .= ')';
+    }
+
+    $output .= $wrapper_post;
+    echo wp_kses_post( $output );
 } // cryout_breadcrumbs()
 endif;

fluida/1.8.6/footer.php

@@ -12 +12 @@
         <?php cryout_absolute_bottom_hook(); ?>
 
-        <aside id="colophon" role="complementary" <?php cryout_schema_microdata( 'sidebar' );?>>
+        <aside id="colophon" <?php cryout_schema_microdata( 'sidebar' );?>>
             <div id="colophon-inside" <?php fluida_footer_colophon_class();?>>
                 <?php get_sidebar( 'footer' );?>
@@ -20 +20 @@
     </div><!-- #main -->
 
-    <footer id="footer" class="cryout" role="contentinfo" <?php cryout_schema_microdata( 'footer' );?>>
+    <footer id="footer" class="cryout" <?php cryout_schema_microdata( 'footer' );?>>
         <?php cryout_master_footer_hook(); ?>
     </footer>

fluida/1.8.6/front-page.php

@@ -22 +22 @@
 
     <div id="container" class="fluida-landing-page one-column">
-        <main id="main" role="main" class="main">
+        <main id="main" class="main">
         <?php
         //cryout_before_content_hook();

fluida/1.8.6/functions.php

@@ -11 +11 @@
 // theme identification and options management - do NOT edit unless you know what you are doing
 define ( "_CRYOUT_THEME_NAME", "fluida" );
-define ( "_CRYOUT_THEME_VERSION", "1.8.5" );
+define ( "_CRYOUT_THEME_VERSION", "1.8.6" );
 
 // prefixes for theme options and functions

fluida/1.8.6/header.php

@@ -13 +13 @@
 <meta charset="<?php bloginfo( 'charset' ); ?>">
 <link rel="profile" href="http://gmpg.org/xfn/11">
-<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
+<?php if ( is_singular() && pings_open( get_queried_object() ) ) : ?>
+<link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
+<?php endif; ?>
 <?php
     cryout_header_hook();
@@ -25 +27 @@
     <div id="site-wrapper">
 
-    <header id="masthead" class="cryout" <?php cryout_schema_microdata( 'header' ) ?> role="banner">
+    <header id="masthead" class="cryout" <?php cryout_schema_microdata( 'header' ) ?>>
 
         <div id="site-header-main">

fluida/1.8.6/image.php

@@ -8 +8 @@
 get_header(); ?>
 
-<div id="container" class="single-attachment <?php echo fluida_get_layout_class(); ?>">
-    <main id="main" role="main" class="main">
+<div id="container" class="single-attachment <?php fluida_get_layout_class(); ?>">
+    <main id="main" class="main">
 
         <?php while ( have_posts() ) : the_post(); ?>
@@ -38 +38 @@
                                         <i class="icon-edit-alt icon-metas" title="<?php esc_attr_e( 'Published in', 'fluida' ); ?>"></i>
                                         <a href="<?php echo esc_url( get_permalink( $post->post_parent ) ) ?>">
-                                            <?php echo esc_html( get_the_title( $post->post_parent ) );?>
+                                            <?php echo esc_html( get_the_title( $post->post_parent ) )?>
                                         </a>
                                     </span>

fluida/1.8.6/includes/comments.php

@@ -145 +145 @@
 function fluida_comments_form_textarea( $arg ) {
     $arg = '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun', 'fluida' ) .
-            '</label><textarea placeholder="'. _x( 'Comment', 'noun', 'fluida' ) .'" id="comment" name="comment" cols="45" rows="8" aria-required="true">' .
+            '</label><textarea placeholder="'. esc_attr_x( 'Comment', 'noun', 'fluida' ) .'" id="comment" name="comment" cols="45" rows="8" aria-required="true">' .
             '</textarea></p>';
 

fluida/1.8.6/includes/core.php

@@ -150 +150 @@
         the_custom_header_markup();
     } elseif ( ! empty( $header_image ) ) { ?>
-            <div class="header-image" <?php echo cryout_echo_bgimage( esc_url( $header_image ) ) ?>></div>
+            <div class="header-image" <?php cryout_echo_bgimage( esc_url( $header_image ) ) ?>></div>
             <img class="header-image" alt="<?php if ( is_single() ) the_title_attribute(); elseif ( is_archive() ) echo esc_attr( get_the_archive_title() ); else echo esc_attr( get_bloginfo( 'name' ) ) ?>" src="<?php echo esc_url( $header_image ) ?>" />
             <?php cryout_header_widget_hook(); ?>
@@ -168 +168 @@
 
     if ( in_array( $options['fluida_siteheader'], array( 'logo', 'both' ) ) ) {
-        echo fluida_logo_helper( $options['fluida_logoupload'] );
+        fluida_logo_helper( $options['fluida_logoupload'] );
     }
     if ( in_array( $options['fluida_siteheader'], array( 'title', 'both', 'logo', 'empty' ) ) ) {
-        $heading_tag = ( is_home() || is_front_page() ) ? 'h1' : 'div';
+        $heading_tag = ( is_front_page() || is_home() ) ? 'h1' : 'div';
         echo '<div id="site-text">';
         echo '<' . $heading_tag . cryout_schema_microdata( 'site-title', 0 ) . ' id="site-title">';
@@ -187 +187 @@
         // WP 4.5+
         $wp_logo = str_replace( 'class="custom-logo-link"', 'id="logo" class="custom-logo-link" title="' . esc_attr( get_bloginfo( 'name', 'display' ) ) . '"', get_custom_logo() );
-        if ( ! empty( $wp_logo ) ) return '<div class="identity">' . $wp_logo . '</div>';
+        if ( ! empty( $wp_logo ) ) echo '<div class="identity">' . $wp_logo . '</div>';
     } else {
         // older WP
         if ( ! empty( $fluida_logo ) ) :
             $img = wp_get_attachment_image_src( $fluida_logo, 'full' );
-            return '<div class="identity">
+            echo '<div class="identity">
                         <a id="logo" href="' . esc_url( home_url( '/' ) ) . '" >
                             <img title="' . esc_attr( get_bloginfo( 'name', 'display' ) ) . '" alt="' . esc_attr( get_bloginfo( 'name', 'display' ) ) . '" src="' . esc_url( $img[0] ) . '" />
@@ -199 +199 @@
         endif;
     }
-    return '';
+    echo '';
 } // fluida_logo_helper()
 
@@ -269 +269 @@
         '<a target="_blank" href="' . esc_html( $the_theme->get( 'ThemeURI' ) ) . '" title="';
     echo 'Fluida WordPress Theme by ' . 'Cryout Creations"> ' . 'Fluida' .'</a> &amp; <a target="_blank" href="' . "http://wordpress.org/";
-    echo '" title="' . __( "Semantic Personal Publishing Platform", "fluida") . '"> ' . sprintf( " %s.", "WordPress" ) . '</a></div>';
+    echo '" title="' . esc_attr__( "Semantic Personal Publishing Platform", "fluida") . '"> ' . sprintf( " %s.", "WordPress" ) . '</a></div>';
 }
 
@@ -304 +304 @@
  */
 if ( ! function_exists( 'fluida_get_layout_class' ) ) :
-function fluida_get_layout_class() {
+function fluida_get_layout_class( $echo = true ) {
 
     $layout = cryout_get_layout();
@@ -316 +316 @@
         case '3cSs' : $class = "three-columns-sided"; break;
         case '1c':
-        default: return "one-column"; break;
+        default: $class = "one-column"; break;
     }
 
     // allow the generated layout class to be filtered
-    return apply_filters( 'fluida_general_layout_class', $class, $layout );
+    $output = esc_attr( apply_filters( 'fluida_general_layout_class', $class, $layout ) );
+
+    if ( $echo ) {
+        echo $output;
+    } else {
+        return $output;
+    }
 } // fluida_get_layout_class()
 endif;
@@ -344 +350 @@
         '<div id="breadcrumbs-container" class="cryout %1$s"><div id="breadcrumbs-container-inside"><div id="breadcrumbs"> <nav id="breadcrumbs-nav" %2$s>', // $wrapper_pre
         '</nav></div></div></div><!-- breadcrumbs -->',         // $wrapper_post
-        fluida_get_layout_class(),                              // $layout_class
+        fluida_get_layout_class(false),                         // $layout_class
         __( 'Home', 'fluida' ),                                 // $text_home
-        __( 'Archive for category', 'fluida' ),                 // $text_archive
-        __( 'Search results for', 'fluida' ),                   // $text_search
+        __( 'Archive for category "%s"', 'fluida' ),                    // $text_archive
+        __( 'Search results for "%s"', 'fluida' ),                  // $text_search
         __( 'Posts tagged', 'fluida' ),                         // $text_tag
         __( 'Articles posted by', 'fluida' ),                   // $text_author

fluida/1.8.6/includes/custom-styles.php

@@ -111 +111 @@
 /////////// COLUMNS ///////////
 $colPadding = 2; // percent
-$sidebarP = absint($fluida_primarysidebar);
-$sidebarS = absint($fluida_secondarysidebar);
+$sidebarP = $fluida_primarysidebar;
+$sidebarS = $fluida_secondarysidebar;
 ?>
 
-#primary                                    { width: <?php echo $sidebarP; ?>px; }
-#secondary                                  { width: <?php echo $sidebarS; ?>px; }
-
-#container.one-column                       { }
+#primary                                    { width: <?php echo absint( $sidebarP ); ?>px; }
+#secondary                                  { width: <?php echo absint( $sidebarS ); ?>px; }
+
+#container.one-column                   { }
 #container.two-columns-right #secondary     { float: right; }
 #container.two-columns-right .main,
-.two-columns-right #breadcrumbs             { width: calc( <?php echo 100 - (int) $colPadding ?>% - <?php echo $sidebarS; ?>px ); float: left; }
+.two-columns-right #breadcrumbs             { width: calc( <?php echo 100 - (int) $colPadding ?>% - <?php echo absint( $sidebarS ); ?>px ); float: left; }
 #container.two-columns-left #primary        { float: left; }
 #container.two-columns-left .main,
-.two-columns-left #breadcrumbs              { width: calc( <?php echo 100 - (int) $colPadding ?>% - <?php echo $sidebarP; ?>px ); float: right; }
+.two-columns-left #breadcrumbs              { width: calc( <?php echo 100 - (int) $colPadding ?>% - <?php echo absint( $sidebarP ); ?>px ); float: right; }
 
 #container.three-columns-right #primary,
@@ -135 +135 @@
 
 #container.three-columns-right #primary,
-#container.three-columns-left #secondary    { margin-left: <?php echo esc_html( $colPadding ) ?>%; margin-right: <?php echo esc_html( $colPadding ) ?>%; }
+#container.three-columns-left #secondary    { margin-left: <?php echo absint( $colPadding ) ?>%; margin-right: <?php echo absint( $colPadding ) ?>%; }
 #container.three-columns-right .main,
 .three-columns-right #breadcrumbs           { width: calc( <?php echo 100 - absint( $colPadding ) * 2 ?>% - <?php echo absint( $sidebarS + $sidebarP ); ?>px ); float: left; }
 #container.three-columns-left .main,
-.three-columns-left #breadcrumbs                { width: calc( <?php echo 100 - absint( $colPadding ) * 2 ?>% - <?php echo absint( $sidebarS + $sidebarP ); ?>px ); float: right; }
+.three-columns-left #breadcrumbs            { width: calc( <?php echo 100 - absint( $colPadding ) * 2 ?>% - <?php echo absint( $sidebarS + $sidebarP ); ?>px ); float: right; }
 
 #container.three-columns-sided #secondary   { float: right; }
@@ -145 +145 @@
 #container.three-columns-sided .main,
 .three-columns-sided #breadcrumbs           { width: calc( <?php echo 100 - absint( $colPadding ) * 2 ?>% - <?php echo absint( $sidebarS + $sidebarP ); ?>px ); float: right;
-                                              margin: 0 calc( <?php echo absint( $colPadding ) ?>% + <?php echo absint($sidebarS) ?>px ) 0 -1920px; }
+                          margin: 0 calc( <?php echo absint( $colPadding ) ?>% + <?php echo absint($sidebarS) ?>px ) 0 -1920px; }
 
 <?php if ( in_array( $fluida_siteheader, array( 'logo', 'empty' ) ) ) { ?>
     #site-text {
-            clip: rect(1px, 1px, 1px, 1px);
-            height: 1px;
-            overflow: hidden;
-            position: absolute !important;
-            width: 1px;
-            word-wrap: normal !important;
+        clip: rect(1px, 1px, 1px, 1px);
+        height: 1px;
+        overflow: hidden;
+        position: absolute !important;
+        width: 1px;
+        word-wrap: normal !important;
     }
 <?php }
@@ -161 +161 @@
 ?>
 html
-                    { font-family: <?php echo cryout_font_select( $fluida_fgeneral, $fluida_fgeneralgoogle ) ?>;
+                    { font-family: <?php cryout_font_select( $fluida_fgeneral, $fluida_fgeneralgoogle, true ) ?>;
                       font-size: <?php echo esc_html( $fluida_fgeneralsize ) ?>; font-weight: <?php echo esc_html( $fluida_fgeneralweight ) ?>;
                       line-height: <?php echo esc_html( floatval($fluida_lineheight) ) ?>; }
 
-#site-title         { font-family: <?php echo cryout_font_select( $fluida_fsitetitle, $fluida_fsitetitlegoogle ) ?>;
+#site-title         { font-family: <?php cryout_font_select( $fluida_fsitetitle, $fluida_fsitetitlegoogle, true ) ?>;
                       font-size: <?php echo esc_html( $fluida_fsitetitlesize ) ?>; font-weight: <?php echo esc_html( $fluida_fsitetitleweight ) ?>; }
 
-#access ul li a     { font-family: <?php echo cryout_font_select( $fluida_fmenu, $fluida_fmenugoogle ) ?>;
+#access ul li a     { font-family: <?php cryout_font_select( $fluida_fmenu, $fluida_fmenugoogle, true ) ?>;
                       font-size: <?php echo esc_html( $fluida_fmenusize ) ?>; font-weight: <?php echo esc_html( $fluida_fmenuweight ) ?>; }
 
-#access i.search-icon { font-size: <?php echo esc_html( $fluida_fmenusize ) ?>; }
-
-.widget-title       { font-family: <?php echo cryout_font_select( $fluida_fwtitle, $fluida_fwtitlegoogle ) ?>;
+#access i.search-icon { font-size: <?php esc_html( $fluida_fmenusize, true ) ?>; }
+
+.widget-title       { font-family: <?php cryout_font_select( $fluida_fwtitle, $fluida_fwtitlegoogle, true ) ?>;
                       font-size: <?php echo esc_html( $fluida_fwtitlesize ) ?>; font-weight: <?php echo esc_html( $fluida_fwtitleweight ) ?>; }
-.widget-container   { font-family: <?php echo cryout_font_select( $fluida_fwcontent, $fluida_fwcontentgoogle ) ?>;
+.widget-container   { font-family: <?php cryout_font_select( $fluida_fwcontent, $fluida_fwcontentgoogle, true ) ?>;
                       font-size: <?php echo esc_html( $fluida_fwcontentsize ) ?>; font-weight: <?php echo esc_html( $fluida_fwcontentweight ) ?>; }
 .entry-title, #reply-title,
 .woocommerce .main .page-title,
 .woocommerce .main .entry-title
-                    { font-family: <?php echo cryout_font_select( $fluida_ftitles, $fluida_ftitlesgoogle ) ?>;
+                    { font-family: <?php cryout_font_select( $fluida_ftitles, $fluida_ftitlesgoogle, true ) ?>;
                       font-size: <?php echo esc_html( $fluida_ftitlessize ) ?>; font-weight: <?php echo esc_html( $fluida_ftitlesweight ) ?>; }
 .content-masonry .entry-title
-                    { font-size: <?php echo esc_html( (int)$fluida_ftitlessize * 0.75 ) ?>%; }
+                    { font-size: <?php echo esc_html( intval($fluida_ftitlessize) * 0.75 ) ?>%; }
 
 <?php
@@ -189 +189 @@
 for ( $i = 1; $i <= 6; $i++ ) {
         $size = round( ( $font_root - ( 0.27 * $i ) ) * ( preg_replace( "/[^\d]/", "", esc_html( $fluida_fheadingssize ) ) / 100), 5 ); ?>
-    h<?php echo $i ?> { font-size: <?php echo $size ?>em; } <?php
+    h<?php echo absint( $i ) ?> { font-size: <?php echo esc_html( $size ) ?>em; } <?php
 } //for ?>
-h1, h2, h3, h4, h5, h6 { font-family: <?php echo cryout_font_select( $fluida_fheadings, $fluida_fheadingsgoogle ) ?>;
+h1, h2, h3, h4, h5, h6 { font-family: <?php cryout_font_select( $fluida_fheadings, $fluida_fheadingsgoogle, true ) ?>;
                          font-weight: <?php echo esc_html( $fluida_fheadingsweight ) ?>; }
 .lp-staticslider .staticslider-caption-title,
 .seriousslider.seriousslider-theme .seriousslider-caption-title {
-    font-family: <?php echo cryout_font_select( $fluida_fheadings, $fluida_fheadingsgoogle ) ?>;
+    font-family: <?php cryout_font_select( $fluida_fheadings, $fluida_fheadingsgoogle, true ) ?>;
 }
 
@@ -317 +317 @@
 #nav-below .nav-previous a:before, #nav-below .nav-next a:before, .reply a:after
                                             { background-color: <?php echo esc_html( cryout_hexdiff( $fluida_contentbackground, 17 ) ) ?>; }
-pre, .entry-meta .author, nav.sidebarmenu, .page-link > span, article #author-info, .comment-author,
+pre, .entry-meta .author, nav.sidebarmenu, .page-link > span, article .author-info, .comment-author,
 .commentlist .comment-body, .commentlist .pingback, nav.sidebarmenu li a
                                             { border-color: <?php echo esc_html( cryout_hexdiff( $fluida_contentbackground, 17 ) ) ?>; }
@@ -429 +429 @@
 .main p, .main ul, .main ol, .main dd, .main pre, .main hr
                                             { margin-bottom: <?php echo floatval( $fluida_paragraphspace ) ?>em; }
-.main p                                     { text-indent: <?php echo floatval( $fluida_parindent ) ?>em; }
+.main .entry-content p                                  { text-indent: <?php echo floatval( $fluida_parindent ) ?>em; }
 .main a.post-featured-image                 { background-position: <?php echo esc_html( $fluida_falign ) ?>; }
 
@@ -560 +560 @@
 <?php
 for ($i=1; $i<=8; $i++) { ?>
-    .lpbox-rnd<?php echo $i ?> { background-color:  <?php echo esc_html( cryout_hexdiff( $fluida_contentbackground, 50+5*$i ) ) ?>; }
+    .lpbox-rnd<?php echo absint( $i ) ?> { background-color:  <?php echo esc_html( cryout_hexdiff( $fluida_contentbackground, 50+5*absint( $i ) ) ) ?>; }
 <?php }
 
@@ -608 +608 @@
 
 body.mce-content-body, .block-editor .edit-post-visual-editor {
-    background-color: <?php echo esc_html( $fluida_contentbackground ) ?>   }
+    background-color: <?php echo esc_html( $fluida_contentbackground ) ?>; }
 body.mce-content-body, .wp-block {
-    max-width: <?php echo esc_html( $content_body ); ?>px;
-    font-family: <?php echo cryout_font_select( $fluida_fgeneral, $fluida_fgeneralgoogle ) ?>;
+    max-width: <?php echo esc_html( $content_body ) ?>px;
+    font-family: <?php cryout_font_select( $fluida_fgeneral, $fluida_fgeneralgoogle, true ) ?>;
     font-size: <?php echo esc_html( $fluida_fgeneralsize ) ?>;
     line-height: <?php echo esc_html( floatval($fluida_lineheight) ) ?>;
-    color: <?php echo esc_html( $fluida_sitetext ); ?>; }
+    color: <?php echo esc_html( $fluida_sitetext ) ?>; }
 .block-editor .editor-post-title__block .editor-post-title__input {
     color: <?php echo esc_html( $fluida_accent2 ) ?>; }
@@ -621 +621 @@
 for ( $i = 1; $i <= 6; $i++ ) {
 $size = round( ( $font_root - ( 0.27 * $i ) ) * ( preg_replace( "/[^\d]/", "", esc_html( $fluida_fheadingssize ) ) / 100), 5 ); ?>
-h<?php echo $i ?> { font-size: <?php echo $size ?>em; } <?php
+h<?php echo absint( $i ) ?> { font-size: <?php echo esc_html( $size ) ?>em; } <?php
 } //for ?>
 %%scope%% h1, %%scope%% h2, %%scope%% h3, %%scope%% h4, %%scope%% h5, %%scope%% h6 {
-    font-family: <?php echo cryout_font_select( $fluida_fheadings, $fluida_fheadingsgoogle ) ?>;
+    font-family: <?php cryout_font_select( $fluida_fheadings, $fluida_fheadingsgoogle, true ) ?>;
     font-weight: <?php echo esc_html( $fluida_fheadingsweight ) ?>;
     color: <?php echo esc_html( $fluida_headingstext ) ?>; }
 
 %%scope%% blockquote::before, %%scope%% blockquote::after {
-    color: rgba(<?php echo cryout_hex2rgb( esc_html( $fluida_sitetext ) ) ?>,0.1); }
+    color: rgba(<?php echo esc_html( cryout_hex2rgb( $fluida_sitetext ) ) ?>,0.1);
+}
 
 %%scope%% a         { color: <?php echo esc_html( $fluida_accent1 ); ?>; }
 %%scope%% a:hover   { color: <?php echo esc_html( $fluida_accent2 ); ?>; }
 
-%%scope%% code  { background-color: <?php echo esc_html(cryout_hexdiff( $fluida_contentbackground, 17 ) ) ?>; }
+%%scope%% code      { background-color: <?php echo esc_html(cryout_hexdiff( $fluida_contentbackground, 17 ) ) ?>; }
 %%scope%% pre       { border-color: <?php echo esc_html(cryout_hexdiff( $fluida_contentbackground, 17 ) ) ?>; }
 
-%%scope%% select, %%scope%% input[type], %%scope%% textarea {
+%%scope%% select,
+%%scope%% input[type],
+%%scope%% textarea {
     color: <?php echo esc_html( $fluida_sitetext ); ?>;
     background-color: <?php echo esc_html( cryout_hexdiff( $fluida_contentbackground, 10 ) ) ?>;
-    border-color: <?php echo esc_html( cryout_hexdiff( $fluida_contentbackground, 17 ) ) ?> }
+    border-color: <?php echo esc_html( cryout_hexdiff( $fluida_contentbackground, 17 ) ) ?>
+}
 
 %%scope%% p, %%scope%% ul, %%scope%% ol, %%scope%% dd, %%scope%% pre, %%scope%% hr {

fluida/1.8.6/includes/landing-page.php

@@ -72 +72 @@
         <?php } ?>
         <div class="staticslider-caption">
-            <?php if ( ! empty( $title ) ) { ?> <h2 class="staticslider-caption-title"><?php echo do_shortcode( wp_kses_post( $title ) ) ?></h2><?php } ?>
+            <?php if ( ! empty( $title ) ) { ?> <h2 class="staticslider-caption-title"><?php echo do_shortcode( $title ) ?></h2><?php } ?>
             <?php if ( ! empty( $title ) && ! empty( $content ) )   { ?><span class="staticslider-sep"></span><?php } ?>
-            <?php if ( ! empty( $content ) ) { ?> <div class="staticslider-caption-text"><?php echo do_shortcode( wp_kses_post( $content ) ) ?></div><?php } ?>
+            <?php if ( ! empty( $content ) ) { ?> <div class="staticslider-caption-text"><?php echo do_shortcode( $content ) ?></div><?php } ?>
             <div class="staticslider-caption-buttons">
                 <?php if ( ! empty( $lpslidercta1text ) ) { echo '<a class="staticslider-button" href="' . esc_url( $lpslidercta1link ) . '">' . esc_html( $lpslidercta1text ) . '</a>'; } ?>
@@ -104 +104 @@
     if ( -1 == $blockscontent ) return;
     ?>
-    <section id="lp-blocks<?php echo $sid ?>" class="lp-blocks lp-blocks<?php echo $sid ?> lp-blocks-rows-<?php echo apply_filters('fluida_blocks_perrow', $pagecount, $sid) ?>">
+    <section id="lp-blocks<?php echo absint( $sid ) ?>" class="lp-blocks lp-blocks<?php echo absint( $sid ) ?> lp-blocks-rows-<?php echo esc_attr( apply_filters('fluida_blocks_perrow', $pagecount, $sid) ) ?>">
         <?php if(  ! empty( $maintitle ) || ! empty( $maindesc ) ) { ?>
             <header class="lp-section-header">
-                <?php if( ! empty( $maintitle ) ) { ?><h2 class="lp-section-title"> <?php echo do_shortcode( wp_kses_post( $maintitle ) ) ?></h2><?php } ?>
-                <?php if( ! empty( $maindesc ) ) { ?><div class="lp-section-desc"> <?php echo do_shortcode( wp_kses_post( $maindesc ) ) ?></div><?php } ?>
+                <?php if( ! empty( $maintitle ) ) { ?><h3 class="lp-section-title"> <?php echo do_shortcode( $maintitle ) ?></h3><?php } ?>
+                <?php if( ! empty( $maindesc ) ) { ?><div class="lp-section-desc"> <?php echo do_shortcode( $maindesc ) ?></div><?php } ?>
             </header>
         <?php } ?>
@@ -153 +153 @@
     <?php extract($data) ?>
             <div class="lp-block block<?php echo absint( $id ); ?>">
-                <?php if ( $click ) { ?><a href="<?php echo esc_url( $link ); ?>" aria-label="<?php echo esc_attr( $title ); ?>"<?php echo $target ?>><?php } ?>
+                <?php if ( $click ) { ?><a href="<?php echo esc_url( $link ); ?>" aria-label="<?php echo esc_attr( $title ); ?>"<?php echo wp_kses( $target, array() ) ?>><?php } ?>
                     <?php if ( ! empty ( $icon ) )  { ?> <i class="blicon-<?php echo esc_attr( $icon ); ?>"></i><?php } ?>
                 <?php if ( $click ) { ?></a> <?php } ?>
                     <div class="lp-block-content">
-                        <?php if ( ! empty ( $title ) ) { ?><h5 class="lp-block-title"><?php echo do_shortcode( $title ); ?></h5><?php } ?>
-                        <?php if ( ! empty ( $text ) ) { ?><div class="lp-block-text"><?php echo do_shortcode( $text ) ;?></div><?php } ?>
+                        <?php if ( ! empty ( $title ) ) { ?><h4 class="lp-block-title"><?php echo do_shortcode( $title ) ?></h4><?php } ?>
+                        <?php if ( ! empty ( $text ) ) { ?><div class="lp-block-text"><?php echo do_shortcode( $text ) ?></div><?php } ?>
                         <?php if ( ! empty ( $readmore ) ) { ?><a class="lp-block-readmore" href="<?php echo esc_url( $link ); ?>" <?php echo esc_attr( $target ); ?>> <?php echo do_shortcode( wp_kses_post( $readmore ) ); ?> <em class="screen-reader-text">"<?php echo esc_attr( $title ) ?>"</em> </a><?php } ?>
                     </div>
@@ -212 +212 @@
             <?php if( $options['fluida_lpboxmaintitle' . $sid] || $options['fluida_lpboxmaindesc' . $sid] ) { ?>
                 <header class="lp-section-header">
-                    <?php if ( ! empty( $options['fluida_lpboxmaintitle' . $sid] ) ) { ?> <h2 class="lp-section-title"> <?php echo do_shortcode( wp_kses_post( $options['fluida_lpboxmaintitle' . $sid] ) ) ?></h2><?php } ?>
-                    <?php if ( ! empty( $options['fluida_lpboxmaindesc' . $sid] ) ) { ?><div class="lp-section-desc"> <?php echo do_shortcode( wp_kses_post( $options['fluida_lpboxmaindesc' . $sid] ) ) ?></div><?php } ?>
+                    <?php if ( ! empty( $options['fluida_lpboxmaintitle' . $sid] ) ) { ?> <h3 class="lp-section-title"> <?php echo do_shortcode( $options['fluida_lpboxmaintitle' . $sid] ) ?></h3><?php } ?>
+                    <?php if ( ! empty( $options['fluida_lpboxmaindesc' . $sid] ) ) { ?><div class="lp-section-desc"> <?php echo do_shortcode( $options['fluida_lpboxmaindesc' . $sid] ) ?></div><?php } ?>
                 </header>
             <?php } ?>
@@ -220 +220 @@
                         <?php if ( $options['fluida_lpboxmargins' . $sid] == 1 ) { echo 'lp-boxes-padding'; }?>">
             <?php while ( $custom_query->have_posts() ) :
-                $custom_query->the_post();
-                if ( cryout_has_manual_excerpt( $custom_query->post ) ) {
-                    $excerpt = get_the_excerpt();
-                } elseif ( has_excerpt() ) {
-                    $excerpt = fluida_custom_excerpt( get_the_excerpt(), $options['fluida_lpboxlength' . $sid] );
-                } else {
-                    $excerpt = fluida_custom_excerpt( get_the_content(), $options['fluida_lpboxlength' . $sid] );
-                };
-                $box = array();
-                $box['colno'] = $box_counter++;
-                $box['counter'] = $options['fluida_lpboxcount' . $sid];
-                $box['title'] = apply_filters('fluida_box_title', get_the_title(), get_the_ID() );
-                $box['content'] = $excerpt;
-                list( $box['image'], ) = wp_get_attachment_image_src( get_post_thumbnail_id( get_the_ID() ), 'fluida-lpbox-' . $sid );
-                $box['link'] = apply_filters( 'fluida_box_url', get_permalink(), get_the_ID() );
-                $box['readmore'] = do_shortcode( wp_kses_post( $options['fluida_lpboxreadmore' . $sid] ) );
-                $box['target'] = apply_filters( 'fluida_box_target', '', get_the_ID() );
-                $box['image'] = apply_filters('fluida_preview_img_src', $box['image']);
+                    $custom_query->the_post();
+                    if ( cryout_has_manual_excerpt( $custom_query->post ) ) {
+                        $excerpt = get_the_excerpt();
+                    } elseif ( has_excerpt() ) {
+                        $excerpt = fluida_custom_excerpt( get_the_excerpt(), $options['fluida_lpboxlength' . $sid] );
+                    } else {
+                        $excerpt = fluida_custom_excerpt( get_the_content(), $options['fluida_lpboxlength' . $sid] );
+                    };
+                    $box = array();
+                    $box['colno'] = $box_counter++;
+                    $box['counter'] = $options['fluida_lpboxcount' . $sid];
+                    $box['title'] = apply_filters('fluida_box_title', get_the_title(), get_the_ID() );
+                    $box['content'] = $excerpt;
+                    $box['image'] = wp_get_attachment_image( get_post_thumbnail_id( get_the_ID() ), 'fluida-lpbox-' . $sid );
+                    $box['link'] = apply_filters( 'fluida_box_url', get_permalink(), get_the_ID() );
+                    $box['readmore'] = do_shortcode( $options['fluida_lpboxreadmore' . $sid] );
+                    $box['target'] = apply_filters( 'fluida_box_target', '', get_the_ID() );
+                    $box['image'] = apply_filters('fluida_preview_img_src', $box['image']);
 
             fluida_lpbox_output( $box );
@@ -243 +243 @@
             </div>
         </section><!-- .lp-boxes -->
-    <?php endif;
+<?php endif;
     wp_reset_postdata();
 } //  fluida_lpboxes()
@@ -256 +256 @@
     extract($data); ?>
             <div class="lp-box box<?php echo absint( $colno ); ?> ">
-                    <div class="lp-box-image lpbox-rnd<?php echo $randomness[$colno%8]; ?>">
-                        <?php if( ! empty( $image ) ) { ?><img alt="<?php echo esc_attr( $title ); ?>" src="<?php echo esc_url( $image ); ?>" /> <?php } ?>
+                    <div class="lp-box-image lpbox-rnd<?php echo absint( $randomness[$colno%8] ); ?>">
+                        <?php if( ! empty( $image ) ) { echo wp_kses_post( $image ); } ?>
                         <a class="lp-box-link" <?php if ( !empty( $link ) ) { ?> href="<?php echo esc_url( $link ); ?>" aria-label="<?php echo esc_attr( $title ); ?>" <?php echo esc_attr( $target ); ?><?php } ?>> <i class="blicon-plus2"></i> </a>
                         <div class="lp-box-overlay"></div>
                     </div>
                     <div class="lp-box-content">
-                        <?php if ( ! empty( $title ) ) { ?><h5 class="lp-box-title">
+                        <?php if ( ! empty( $title ) ) { ?><h4 class="lp-box-title">
                             <?php if ( !empty( $readmore ) && !empty( $link ) ) { ?> <a href="<?php echo esc_url( $link ); ?>" <?php echo esc_attr( $target ); ?>><?php } ?>
                                 <?php echo do_shortcode( $title ); ?>
                             <?php if ( !empty( $readmore ) && !empty( $link ) ) { ?> </a> <?php } ?>
-                        </h5><?php } ?>
+                        </h4><?php } ?>
                         <div class="lp-box-text">
                             <?php if ( ! empty( $content ) ) { ?>
@@ -272 +272 @@
                             <?php } ?>
                             <?php if( ! empty( $readmore ) ) { ?>
-                                <a class="lp-box-readmore" href="<?php if( ! empty( $link ) ) { echo esc_url( $link ); } ?>" <?php echo esc_attr( $target ); ?>> <?php echo do_shortcode( wp_kses_post( $readmore ) ); ?> <em class="screen-reader-text">"<?php echo esc_attr( $title ) ?>"</em> <i class="icon-angle-right"></i></a>
+                                <a class="lp-box-readmore" href="<?php if( ! empty( $link ) ) { echo esc_url( $link ); } ?>" <?php echo esc_attr( $target ); ?>> <?php echo do_shortcode( $readmore ) ?> <em class="screen-reader-text">"<?php echo esc_attr( $title ) ?>"</em> <i class="icon-angle-right"></i></a>
                             <?php } ?>
                         </div>
@@ -297 +297 @@
             'id'    => $what,
         );
-        list( $data['image'], ) = wp_get_attachment_image_src( get_post_thumbnail_id( $pageid ), 'full' );
+        $data['image'] = wp_get_attachment_image( get_post_thumbnail_id( $pageid ), 'full' );
         fluida_lptext_output( $data );
     }
@@ -308 +308 @@
 if ( ! function_exists( 'fluida_lptext_output' ) ):
 function fluida_lptext_output( $data ){ ?>
-    <section class="lp-text <?php echo $data['class'] ?>" id="lp-text-<?php echo esc_attr( $data['id'] ); ?>"<?php if( ! empty( $data['image'] ) ) { ?> style="background-image: url( <?php echo esc_url( $data['image'] ); ?>);" <?php } ?> >
-        <?php if( ! empty( $data['image'] ) ) { ?><div class="lp-text-overlay"></div><?php } ?>
-            <div class="lp-text-inside">
-                <?php if( ! empty( $data['title'] ) ) { ?><h2 class="lp-text-title"><?php echo do_shortcode( $data['title'] ) ?></h2><?php } ?>
-                <?php if( ! empty( $data['text'] ) ) { ?><div class="lp-text-content"><?php echo do_shortcode(  $data['text'] ) ?></div><?php } ?>
-            </div>
-
-    </section><!-- .lp-text-<?php echo esc_attr( $data['id'] ); ?> -->
+    <section class="lp-text <?php echo esc_attr( $data['class'] ); ?>" id="lp-text-<?php echo esc_attr( $data['id'] ); ?>"<?php if( ! empty( $data['image'] ) ) { ?> style="background-image: url( <?php echo esc_url( $data['image'] ); ?>);" <?php } ?> >
+    <?php if( ! empty( $data['image'] ) ) { ?><div class="lp-text-overlay"></div><?php } ?>
+    <div class="lp-text-inside">
+        <?php if( ! empty( $data['title'] ) ) { ?><h3 class="lp-text-title"><?php echo do_shortcode( $data['title'] ) ?></h3><?php } ?>
+        <?php if( ! empty( $data['text'] ) ) { ?><div class="lp-text-content"><?php echo do_shortcode( $data['text'] ) ?></div><?php } ?>
+    </div>
+
+    </section><!-- #lp-text-<?php echo esc_attr( $data['id'] ); ?> -->
 <?php
 } // fluida_lptext_output()
@@ -326 +326 @@
 function fluida_lpindex() {
 
-    $fluida_lpposts = cryout_get_option( 'fluida_lpposts' );
+    $fluida_lpposts = cryout_get_option('fluida_lpposts');
 
     switch ($fluida_lpposts) {
@@ -357 +357 @@
                 <?php fluida_pagination();
                 wp_reset_postdata();
-            /* else :
+            //else :
                 //get_template_part( 'content/content', 'notfound' );
-            */
             endif;
 

fluida/1.8.6/includes/loop.php

@@ -84 +84 @@
         echo '<div class="entry-meta">
                 <span class="bl_categ"' . cryout_schema_microdata( 'category', 0 ) . '>
-                    <i class="icon-folder-open icon-metas" title="' . __( "Categories", "fluida" ) . '"></i>'
+                    <i class="icon-folder-open icon-metas" title="' . esc_attr__( "Categories", "fluida" ) . '"></i>'
                     . get_the_category_list( ', ' ) .
                 '</span>
@@ -129 +129 @@
         $date = ''; $time = '';
         if ( $fluida_meta_date ) { $date = esc_html( get_the_date() ); }
-        if ( $fluida_meta_time ) { $time = esc_attr( get_the_time() ); }
+        if ( $fluida_meta_time ) { $time = esc_html( get_the_time() ); }
         ?>
 
         <span class="onDate date">
-            <i class="icon-time icon-metas" title="<?php _e( "Date", "fluida" ) ?>"></i>
+            <i class="icon-time icon-metas" title="<?php esc_attr_e( "Date", "fluida" ) ?>"></i>
             <time class="published" datetime="<?php echo esc_attr( get_the_time( 'c' ) ) ?>" <?php cryout_schema_microdata( 'time' ) ?>><?php echo $date . ( ( $fluida_meta_date && $fluida_meta_time ) ? ', ' : '' ) . $time ?></time>
-            <time class="updated" datetime="<?php echo esc_attr( get_the_modified_time( 'c' ) )  ?>" <?php cryout_schema_microdata( 'time-modified' ) ?>><?php echo esc_html( get_the_modified_date() );?></time>
+            <time class="updated" datetime="<?php echo esc_attr( get_the_modified_time( 'c' ) )  ?>" <?php cryout_schema_microdata( 'time-modified' ) ?>><?php echo esc_html( get_the_modified_date() ) ?></time>
         </span>
         <?php
     }
 
-}; // fluida_posted_date()
+} // fluida_posted_date()
 endif;
 
@@ -155 +155 @@
     if ( $fluida_meta_tag && $tag_list ) { ?>
         <span class="footer-tags" <?php cryout_schema_microdata( 'tags' ) ?>>
-                <i class="icon-tag icon-metas" title="<?php _e( 'Tagged', 'fluida' ) ?>"></i>&nbsp;<?php echo $tag_list ?>
+                <i class="icon-tag icon-metas" title="<?php esc_attr_e( 'Tagged', 'fluida' ) ?>"></i>&nbsp;<?php echo $tag_list ?>
         </span>
         <?php
     }
-}; // fluida_posted_tags()
+} // fluida_posted_tags()
 endif;
 
@@ -170 +170 @@
     cryout_post_footer_hook(); /* ?!? */
 
-}; // fluida_posted_edit()
+} // fluida_posted_edit()
 endif;
 
@@ -183 +183 @@
         printf( '<span class="entry-format"><a href="%1$s"><i class="icon-%2$s" title="%3$s"></i></a></span>',
             esc_url( get_post_format_link( $format ) ),
-            $format,
-            get_post_format_string( $format )
+            esc_attr( $format ),
+            esc_attr( get_post_format_string( $format ) )
         );
     }
@@ -226 +226 @@
     if ( $wp_query->max_num_pages > 1 ) : ?>
 
-        <nav id="<?php echo $nav_id; ?>" class="navigation">
+        <nav id="<?php echo esc_attr( $nav_id ); ?>" class="navigation">
 
             <span class="nav-previous">
@@ -289 +289 @@
             <a class="responsive-featured-image" href="<?php echo esc_url( get_permalink( $post->ID ) ) ?>" title="<?php echo esc_attr( get_post_field( 'post_title', $post->ID ) ) ?>" tabindex="-1">
                 <picture>
-                    <source media="(max-width: 1152px)" sizes="<?php echo cryout_gen_featured_sizes($featured_width, $options['fluida_magazinelayout'], $options['fluida_landingpage'] ) ?>" srcset="<?php echo cryout_get_picture_src( $fimage_id, 'fluida-featured-third' ); ?> 512w">
-                    <source media="(max-width: 800px)" sizes="<?php echo cryout_gen_featured_sizes($featured_width, $options['fluida_magazinelayout'], $options['fluida_landingpage'] ) ?>" srcset="<?php echo cryout_get_picture_src( $fimage_id, 'fluida-featured-half' ); ?> 800w">
-                    <?php if ( cryout_on_landingpage() ) { ?><source sizes="<?php echo cryout_gen_featured_sizes( $featured_width, $options['fluida_magazinelayout'], $options['fluida_landingpage'] ) ?>" srcset="<?php echo cryout_get_picture_src( $fimage_id, 'fluida-featured-lp' ); ?> <?php printf( '%sw', $featured_width ) ?>">
+                    <source media="(max-width: 1152px)" sizes="<?php echo esc_attr( cryout_gen_featured_sizes( $featured_width, $options['fluida_magazinelayout'], $options['fluida_landingpage'] ) ) ?>" srcset="<?php echo esc_url( cryout_get_picture_src( $fimage_id, 'fluida-featured-third' ) ); ?> 512w">
+                    <source media="(max-width: 800px)" sizes="<?php echo esc_attr( cryout_gen_featured_sizes( $featured_width, $options['fluida_magazinelayout'], $options['fluida_landingpage'] ) ) ?>" srcset="<?php echo esc_url( cryout_get_picture_src( $fimage_id, 'fluida-featured-half' ) ); ?> 800w">
+                    <?php if ( cryout_on_landingpage() ) { ?><source sizes="<?php echo esc_attr( cryout_gen_featured_sizes( $featured_width, $options['fluida_magazinelayout'], $options['fluida_landingpage'] ) ) ?>" srcset="<?php echo esc_url( cryout_get_picture_src( $fimage_id, 'fluida-featured-lp' ) ); ?> <?php printf( '%sw', absint( $featured_width ) ) ?>">
                     <?php } ?>
                     <img alt="<?php the_title_attribute();?>" <?php cryout_schema_microdata( 'url' ); ?> src="<?php echo cryout_get_picture_src( $fimage_id, 'fluida-featured' ); ?>" />
                 </picture>
             </a>
-            <meta itemprop="width" content="<?php echo $featured_image[1]; // width ?>">
-            <meta itemprop="height" content="<?php echo $featured_image[2]; // height ?>">
+            <meta itemprop="width" content="<?php echo absint( $featured_image[1] ); // width ?>">
+            <meta itemprop="height" content="<?php echo absint( $featured_image[2] ); // height ?>">
 
         </div>

fluida/1.8.6/includes/meta.php

@@ -38 +38 @@
     <p>
         <?php foreach ($options['choices'] as $value => $data ) {
-            $data['url'] = esc_url( sprintf( $data['url'], get_template_directory_uri() ) ); ?>
+            $data['url'] = sprintf( $data['url'], get_template_directory_uri() ); ?>
 
             <label>
                 <input type="radio" name="_cryout_layout" <?php checked( $value == $layout ); ?> value="<?php echo esc_attr( $value ); ?>" />
-                <span><img src="<?php echo $data['url'] ?>" alt="<?php echo esc_html(  $data['label'] ) ?>" title="<?php echo esc_html(  $data['label'] ) ?>"/></span>
+                <span><img src="<?php echo esc_url( $data['url'] ) ?>" alt="<?php echo esc_html(  $data['label'] ) ?>" title="<?php echo esc_html(  $data['label'] ) ?>"/></span>
             </label>
 
@@ -74 +74 @@
     }
 
-    global $fluida_big;
-    $valid_layouts = $fluida_big['options'][0]['choices'];
+        global $fluida_big;
+        $valid_layouts = $fluida_big['options'][0]['choices'];
     $layout = ( isset( $_POST['_cryout_layout'] ) && array_key_exists( sanitize_text_field( $_POST['_cryout_layout'] ), $valid_layouts ) ? sanitize_text_field( $_POST['_cryout_layout'] ) : '0' );
 

fluida/1.8.6/includes/setup.php

@@ -35 +35 @@
 
     // Add HTML5 support
-    add_theme_support( 'html5', array( 'comment-list', 'comment-form', 'search-form', 'gallery', 'caption' ) );
+    add_theme_support( 'html5', array( 'script', 'style', 'comment-list', 'comment-form', 'search-form', 'gallery', 'caption' ) );
 
     // Add post formats
@@ -120 +120 @@
     add_theme_support( 'custom-header', array(
         // for later: 'flex-height' => true,
+        'height'        => $fluida_headerheight,
         // for later: 'flex-width' => true,
-        'height'        => $fluida_headerheight,
         'width'         => $fluida_headerwidth,
         'default-image' => get_template_directory_uri() . '/resources/images/headers/glows.jpg',
@@ -266 +266 @@
 add_filter( 'wp_page_menu_args', 'fluida_page_menu_args' );
 
+/**
+ * Custom menu fallback, using wp_page_menu()
+ * Created to make the fallback menu have the same HTML structure as the default
+ */
+function fluida_default_menu() {
+    wp_page_menu($args = array(
+        'menu_class'    => '',
+        'before'        => '<ul id="prime_nav">',
+        'after'         => '</ul>'
+    ));
+}
 /** Main menu */
 function fluida_main_menu() { ?>
@@ -276 +287 @@
         'link_before'   => '<span>',
         'link_after'    => '</span>',
-        'items_wrap'    => '<div><ul id="%s" class="%s">%s</ul></div>'
+        'items_wrap'    => '<div><ul id="%s" class="%s">%s</ul></div>',
+        'fallback_cb'   => 'fluida_default_menu'
 
     ) );
@@ -382 +394 @@
         case '4':   $class = 'four';    break;
     }
-    if ( !empty($class) ) echo 'class="footer-' . $class . ' ' . ( $opts['fluida_footeralign'] ? 'footer-center' : '' ) . '"';
+    if ( !empty($class) ) echo 'class="footer-' . esc_attr( $class ) . ' ' . ( $opts['fluida_footeralign'] ? 'footer-center' : '' ) . '"';
 } // fluida_footer_colophon_class()
 

fluida/1.8.6/includes/styles.php

@@ -46 +46 @@
 
     // Enqueue google fonts with subsets separately
-    foreach( $gfonts as $i => $gfont ):
-        if ( strpos( $gfont, "&" ) !== false):
+    if ( !empty($gfonts) ) foreach( $gfonts as $i => $gfont ) {
+        if ( strpos( $gfont, "&" ) !== false ):
             wp_enqueue_style( 'fluida-googlefont' . $i, '//fonts.googleapis.com/css?family=' . $gfont, null, _CRYOUT_THEME_VERSION );
             unset( $gfonts[$i] );
             unset( $roots[$i] );
-        //else:
-            // do nothing
         endif;
-    endforeach;
+    };
 
     // Merged google fonts
-    if ( count( $gfonts ) > 0 ):
+    if ( !empty($gfonts) ){ 
         wp_enqueue_style( 'fluida-googlefonts', '//fonts.googleapis.com/css?family=' . implode( "|" , array_unique( array_merge( $roots, $gfonts ) ) ), null, _CRYOUT_THEME_VERSION );
-    endif;
+    };
     // Main theme style
     wp_enqueue_style( 'fluida-main', get_stylesheet_uri(), null, _CRYOUT_THEME_VERSION );
@@ -84 +82 @@
 add_action ( 'wp_head', 'fluida_author_link' );
 
-// Adds HTML5 tags for IEs
-function fluida_header_scripts() {
-?>
-<!--[if lt IE 9]>
-<script>
-document.createElement('header');
-document.createElement('nav');
-document.createElement('section');
-document.createElement('article');
-document.createElement('aside');
-document.createElement('footer');
-</script>
-<![endif]-->
-<?php
-} // fluida_header_scripts()
-//add_action('wp_head','fluida_header_scripts',100);
 
 /**
@@ -166 +148 @@
 
 /*
- * fluida_custom_editor_styles() is located in custom-styles.php
+ * fluida_editor_styles() is located in custom-styles.php
  */
 function fluida_add_editor_styles() {

fluida/1.8.6/includes/tgmpa.php

@@ -25 +25 @@
             'force_deactivation' => false, // If true, plugin is deactivated upon theme switch, useful for theme-specific plugins.
         ),
+        /* plugin is no longer maintained 
         array(
             'name'               => 'Force Regenerate Thumbnails', // The plugin name.
@@ -32 +33 @@
             'force_activation'   => false, // If true, plugin is activated upon theme activation and cannot be deactivated until theme switch.
             'force_deactivation' => false, // If true, plugin is deactivated upon theme switch, useful for theme-specific plugins.
-        ),
+        ), */
 
     );
@@ -59 +60 @@
             'notice_can_install_required'     => _n_noop(
                 /* translators: 1: plugin name(s). */
-                'This theme requires the following plugin: %1$s.',
-                'This theme requires the following plugins: %1$s.',
+                'This theme recommends the following plugin: %1$s.',
+                'This theme recommends the following plugins: %1$s.',
                 'cryout'
             ),
             'notice_can_install_recommended'  => _n_noop(
                 /* translators: 1: plugin name(s). */
-                'This theme recommends the following plugin: %1$s.',
-                'This theme recommends the following plugins: %1$s.',
+                'This theme suggests the following plugin: %1$s.',
+                'This theme suggests the following plugins: %1$s.',
                 'cryout'
             ),
@@ -83 +84 @@
             'notice_can_activate_required'    => _n_noop(
                 /* translators: 1: plugin name(s). */
-                'The following required plugin is currently inactive: %1$s.',
-                'The following required plugins are currently inactive: %1$s.',
+                'The following recommended plugin is currently inactive: %1$s.',
+                'The following recommended plugins are currently inactive: %1$s.',
                 'cryout'
             ),
             'notice_can_activate_recommended' => _n_noop(
                 /* translators: 1: plugin name(s). */
-                'The following recommended plugin is currently inactive: %1$s.',
-                'The following recommended plugins are currently inactive: %1$s.',
+                'The following suggested plugin is currently inactive: %1$s.',
+                'The following suggested plugins are currently inactive: %1$s.',
                 'cryout'
             ),

fluida/1.8.6/index.php

@@ -12 +12 @@
 get_header();
 ?>
-<div id="container" class="<?php echo fluida_get_layout_class(); ?>">
-    <main id="main" role="main" class="main">
+<div id="container" class="<?php fluida_get_layout_class(); ?>">
+    <main id="main" class="main">
         <?php cryout_before_content_hook(); ?>
 

fluida/1.8.6/languages/fluida.pot

@@ -3 +3 @@
 msgstr ""
 "Project-Id-Version: Fluida 1.1\n"
-"POT-Creation-Date: 2019-09-23 12:45+0000\n"
+"POT-Creation-Date: 2021-03-11 19:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cryout Creations\n"
@@ -17 +17 @@
 "Language: "
 
-#: 404.php:15 includes/core.php:352
+#. $text_author
+#: 404.php:15 includes/core.php:358
 msgid "Not Found"
 msgstr ""
@@ -54 +55 @@
 msgstr ""
 
-#: single.php:36 templates/template-page-with-intro.php:31
-#: content/content-page.php:30 content/content.php:41
+#: single.php:36 content/content-page.php:30 content/content.php:41
 msgid "Pages:"
 msgstr ""
@@ -63 +63 @@
 msgstr ""
 
-#: searchform.php:12 searchform.php:14 includes/core.php:370
+#: searchform.php:12 searchform.php:14 includes/core.php:376
 msgid "Search"
 msgstr ""
@@ -88 +88 @@
 msgstr ""
 
-#: comments.php:21 includes/comments.php:95 includes/comments.php:98
-#, php-format
-msgid "One Comment"
+#: comments.php:23
+msgid "One comment"
+msgstr ""
+
+#: comments.php:25 includes/comments.php:95
+#, php-format
+msgid "%1$s Comment"
 msgid_plural "%1$s Comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: comments.php:45
+#: comments.php:50
 msgid "Comments are closed."
 msgstr ""
 
-#. Name of the template
-msgid "Category page with intro"
-msgstr ""
-
-#: templates/template-page-with-intro.php:25 content/content-page.php:22
+#: content/content-page.php:22
 msgid "Edit"
 msgstr ""
 
-#: content/author-bio.php:16
+#: content/user-bio.php:16
 msgid "Author:"
 msgstr ""
 
-#: content/author-bio.php:30
+#: content/user-bio.php:30
 msgid "View all posts by "
 msgstr ""
@@ -136 +136 @@
 msgstr ""
 
-#: admin/main.php:84 admin/main.php:194
+#: admin/main.php:82
 msgid "Sorry, but you do not have sufficient permissions to access this page."
 msgstr ""
 
-#: admin/main.php:93
-msgid "Fluida settings loaded successfully."
+#: admin/main.php:94
+msgid "Fluida settings have been reset successfully."
 msgstr ""
 
 #: admin/main.php:101
-msgid "Fluida settings have been reset successfully."
-msgstr ""
-
-#: admin/main.php:108
 #, php-format
 msgid "Fluida Theme v%1$s by %2$s"
 msgstr ""
 
-#: admin/main.php:117
+#: admin/main.php:110
 msgid "Fluida Homepage"
 msgstr ""
 
-#: admin/main.php:118
+#: admin/main.php:111
 msgid "Theme Support"
 msgstr ""
 
-#: admin/main.php:119
+#: admin/main.php:112
 msgid "Upgrade to PLUS"
 msgstr ""
 
-#: admin/main.php:130
+#: admin/main.php:123
 msgid "Customize"
 msgstr ""
 
-#: admin/main.php:138 admin/main.php:142
+#: admin/main.php:131 admin/main.php:135
 msgid "Upgrade to Plus"
 msgstr ""
 
-#: admin/main.php:140
-#, php-format
+#: admin/main.php:133
 msgid ""
 "Find out what features you're missing out on and how the Plus version of "
-"%1$s can improve your site."
-msgstr ""
-
-#: admin/main.php:150
+"Fluida can improve your site."
+msgstr ""
+
+#: admin/main.php:143
 msgid "Settings Management"
 msgstr ""
 
-#: admin/main.php:154
-msgid "Save Theme Settings"
-msgstr ""
-
-#: admin/main.php:156
-msgid "Load Theme Settings"
-msgstr ""
-
-#: admin/main.php:160
+#: admin/main.php:148
 msgid "Reset to Defaults"
 msgstr ""
 
-#: admin/main.php:165
-msgid ""
-"Copy-paste all the information below to a file of your choosing and save it "
-"to a safe location."
-msgstr ""
-
-#: admin/main.php:166
-msgid ""
-"Paste your previously saved settings in the field below and press the Load "
-"button.<br><u>All your current settings will be overwritten!</u>"
-msgstr ""
-
-#: admin/main.php:186 admin/main.php:196
-msgid ""
-"Your server does not support the needed functionality to manage theme "
-"settings."
-msgstr ""
-
-#: admin/main.php:205
-msgid ""
-"Unable to load theme options. Try again or check that the saved options are "
-"valid."
-msgstr ""
-
-#: admin/main.php:208
-msgid ""
-"The supplied theme settings text appears invalid. Make sure you pasted it "
-"entirely and without errors."
-msgstr ""
-
-#: admin/main.php:210
-msgid ""
-"You did not enter any theme settings. Remember to paste saved theme settings."
-msgstr ""
-
-#: admin/options.php:193
+#: admin/options.php:204 admin/options.php:486
 msgid "Site Identity"
 msgstr ""
 
-#: admin/options.php:194 admin/options.php:536
+#: admin/options.php:205 admin/options.php:557
 msgid "Layout"
 msgstr ""
 
-#: admin/options.php:195 admin/options.php:237 admin/options.php:2259
+#: admin/options.php:206 admin/options.php:248 admin/options.php:2268
 msgid "Header"
 msgstr ""
 
-#: admin/options.php:196 admin/options.php:239 admin/options.php:520
+#: admin/options.php:207 admin/options.php:250 admin/options.php:541
 msgid "Landing Page"
 msgstr ""
 
-#: admin/options.php:197
+#: admin/options.php:208
 msgid "General"
 msgstr ""
 
-#: admin/options.php:198
+#: admin/options.php:209
 msgid "Colors"
 msgstr ""
 
-#: admin/options.php:199
+#: admin/options.php:210
 msgid "Typography"
 msgstr ""
 
-#: admin/options.php:200
+#: admin/options.php:211
 msgid "Post Information"
 msgstr ""
 
-#: admin/options.php:209
+#: admin/options.php:220
 msgid "General Layout"
 msgstr ""
 
-#: admin/options.php:210
+#: admin/options.php:221
 msgid "Other Layouts"
 msgstr ""
 
-#: admin/options.php:213
+#: admin/options.php:224
 msgid "Menu"
 msgstr ""
 
-#: admin/options.php:214 admin/options.php:236
+#: admin/options.php:225 admin/options.php:247
 msgid "Content"
 msgstr ""
 
-#: admin/options.php:216
+#: admin/options.php:227
 msgid "Settings"
 msgstr ""
 
-#: admin/options.php:217 admin/options.php:562
+#: admin/options.php:228 admin/options.php:583
 msgid "Slider"
 msgstr ""
 
-#: admin/options.php:218
+#: admin/options.php:229
 msgid "Featured Icon Blocks"
 msgstr ""
 
-#: admin/options.php:219
+#: admin/options.php:230
 msgid "Featured Boxes"
 msgstr ""
 
-#: admin/options.php:220
+#: admin/options.php:231
 msgid "Featured Boxes 2"
 msgstr ""
 
-#: admin/options.php:221 admin/options.php:1033
+#: admin/options.php:232 admin/options.php:1054
 msgid "Text Areas"
 msgstr ""
 
-#: admin/options.php:222 admin/options.php:544
+#: admin/options.php:233 admin/options.php:565
 msgid "Featured Content"
 msgstr ""
 
-#: admin/options.php:224 admin/options.php:1042
+#: admin/options.php:235 admin/options.php:1063
 msgid "General Font"
 msgstr ""
 
-#: admin/options.php:225
+#: admin/options.php:236
 msgid "Header Fonts"
 msgstr ""
 
-#: admin/options.php:226
+#: admin/options.php:237
 msgid "Content Fonts"
 msgstr ""
 
-#: admin/options.php:227
+#: admin/options.php:238
 msgid "Widget Fonts"
 msgstr ""
 
-#: admin/options.php:228
+#: admin/options.php:239
 msgid "Formatting"
 msgstr ""
 
-#: admin/options.php:230
+#: admin/options.php:241
 msgid "Structure"
 msgstr ""
 
-#: admin/options.php:231
+#: admin/options.php:242
 msgid "Decorations"
 msgstr ""
 
-#: admin/options.php:232
+#: admin/options.php:243
 msgid "Content Images"
 msgstr ""
 
-#: admin/options.php:233
+#: admin/options.php:244
 msgid "Search Box Locations"
 msgstr ""
 
-#: admin/options.php:234 includes/setup.php:59
+#: admin/options.php:245 includes/setup.php:59
 msgid "Social Icons"
 msgstr ""
 
-#: admin/options.php:238 admin/options.php:2237
+#: admin/options.php:249 admin/options.php:2246
 msgid "Footer"
 msgstr ""
 
-#: admin/options.php:241
+#: admin/options.php:252
 msgid "Featured Image"
 msgstr ""
 
-#: admin/options.php:242
+#: admin/options.php:253
 msgid "Meta Information"
 msgstr ""
 
-#: admin/options.php:243
+#: admin/options.php:254
 msgid "Excerpts"
 msgstr ""
 
-#: admin/options.php:244
+#: admin/options.php:255
 msgid "Comments"
 msgstr ""
 
-#: admin/options.php:246
+#: admin/options.php:257
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/options.php:266
+#: admin/options.php:277
 msgid "Main Layout"
 msgstr ""
 
-#: admin/options.php:269
+#: admin/options.php:280
 msgid "One column (no sidebars)"
 msgstr ""
 
-#: admin/options.php:273
+#: admin/options.php:284
 msgid "Two columns, sidebar on the right"
 msgstr ""
 
-#: admin/options.php:277
+#: admin/options.php:288
 msgid "Two columns, sidebar on the left"
 msgstr ""
 
-#: admin/options.php:281
+#: admin/options.php:292
 msgid "Three columns, sidebars on the right"
 msgstr ""
 
-#: admin/options.php:285
+#: admin/options.php:296
 msgid "Three columns, sidebars on the left"
 msgstr ""
 
-#: admin/options.php:289
+#: admin/options.php:300
 msgid "Three columns, one sidebar on each side"
 msgstr ""
 
-#: admin/options.php:298
+#: admin/options.php:309
 msgid "Site Width"
 msgstr ""
 
-#: admin/options.php:306
+#: admin/options.php:317
 msgid "Theme alignment"
 msgstr ""
 
-#: admin/options.php:308
+#: admin/options.php:319
 msgid "Left contained"
 msgstr ""
 
-#: admin/options.php:308 admin/options.php:435 admin/options.php:512
-#: admin/options.php:1258
+#: admin/options.php:319 admin/options.php:456 admin/options.php:533
+#: admin/options.php:1280
 msgid "Left"
 msgstr ""
 
-#: admin/options.php:308
+#: admin/options.php:319
 msgid "Center (default)"
 msgstr ""
 
-#: admin/options.php:308
+#: admin/options.php:319
 msgid "Center contained"
 msgstr ""
 
-#: admin/options.php:309
+#: admin/options.php:320
 msgid "Control how the entire theme content is aligned in the browser"
 msgstr ""
 
-#: admin/options.php:315
+#: admin/options.php:326
 msgid "Left Sidebar Width"
 msgstr ""
 
-#: admin/options.php:322
+#: admin/options.php:333
 msgid "Right Sidebar Width"
 msgstr ""
 
-#: admin/options.php:331
+#: admin/options.php:342
 msgid "Posts Layout"
 msgstr ""
 
-#: admin/options.php:334
+#: admin/options.php:345
 msgid "One column"
 msgstr ""
 
-#: admin/options.php:338
+#: admin/options.php:349
 msgid "Two columns"
 msgstr ""
 
-#: admin/options.php:342
+#: admin/options.php:353
 msgid "Three columns"
 msgstr ""
 
-#: admin/options.php:351
+#: admin/options.php:362
 msgid "Margin top"
 msgstr ""
 
-#: admin/options.php:361
+#: admin/options.php:372
 msgid "Site left/right padding"
 msgstr ""
 
-#: admin/options.php:371
+#: admin/options.php:382
 msgid "Post/page left/right padding"
 msgstr ""
 
-#: admin/options.php:382
+#: admin/options.php:393
 msgid "Footer Widgets Columns"
 msgstr ""
 
-#: admin/options.php:385
+#: admin/options.php:396
 msgid "All in a row"
 msgstr ""
 
-#: admin/options.php:386
+#: admin/options.php:397
 msgid "1 Column"
 msgstr ""
 
-#: admin/options.php:387
+#: admin/options.php:398
 msgid "2 Columns"
 msgstr ""
 
-#: admin/options.php:388
+#: admin/options.php:399
 msgid "3 Columns"
 msgstr ""
 
-#: admin/options.php:389
+#: admin/options.php:400
 msgid "4 Columns"
 msgstr ""
 
-#: admin/options.php:397 admin/options.php:1258
+#: admin/options.php:408 admin/options.php:1280
 msgid "Default"
 msgstr ""
 
-#: admin/options.php:397 admin/options.php:435 admin/options.php:512
-#: admin/options.php:1258
+#: admin/options.php:408 admin/options.php:456 admin/options.php:533
+#: admin/options.php:1280
 msgid "Center"
 msgstr ""
 
-#: admin/options.php:398
+#: admin/options.php:409
 msgid "Footer Widgets Alignment"
 msgstr ""
 
-#: admin/options.php:407
-msgid ""
-"Fine tune the visibility of these elements in the theme's Header options"
-msgstr ""
-
 #: admin/options.php:418
+#, php-format
+msgid "Fine tune the visibility of these elements from the theme's %s"
+msgstr ""
+
+#: admin/options.php:418
+msgid "Header options"
+msgstr ""
+
+#: admin/options.php:427
+#, php-format
+msgid ""
+"Configure the image currently visible on the homepage from the theme's "
+"options under %s"
+msgstr ""
+
+#: admin/options.php:427
+msgid "Landing Page > Slider > Banner Image"
+msgstr ""
+
+#: admin/options.php:439
 msgid "Fixed Menu"
 msgstr ""
 
-#: admin/options.php:428
+#: admin/options.php:449
 msgid "Header/Menu Height"
 msgstr ""
 
-#: admin/options.php:435 admin/options.php:512 admin/options.php:1258
+#: admin/options.php:456 admin/options.php:533 admin/options.php:1280
 msgid "Right"
 msgstr ""
 
-#: admin/options.php:436
+#: admin/options.php:457
 msgid "Menu Alignment"
 msgstr ""
 
-#: admin/options.php:442
+#: admin/options.php:463
 msgid "Site Header Content"
 msgstr ""
 
-#: admin/options.php:444 admin/options.php:1072
+#: admin/options.php:465 admin/options.php:1094
 msgid "Site Title"
 msgstr ""
 
-#: admin/options.php:444
+#: admin/options.php:465
 msgid "Logo"
 msgstr ""
 
-#: admin/options.php:444
+#: admin/options.php:465
 msgid "Logo & Site Title"
 msgstr ""
 
-#: admin/options.php:444
+#: admin/options.php:465
 msgid "Empty"
 msgstr ""
 
-#: admin/options.php:450
+#: admin/options.php:471
 msgid "Show Tagline"
 msgstr ""
 
-#: admin/options.php:456
+#: admin/options.php:477
 msgid "Logo Image"
 msgstr ""
 
-#: admin/options.php:465
-msgid ""
-"Edit the site's title, tagline and logo from WordPress' Site Identity panel."
-msgstr ""
-
-#: admin/options.php:473
+#: admin/options.php:486
+#, php-format
+msgid "Edit the site's title, tagline and logo from the %s panel"
+msgstr ""
+
+#: admin/options.php:494
 msgid "Header Image Height"
 msgstr ""
 
-#: admin/options.php:481 admin/options.php:1571 admin/options.php:1596
+#: admin/options.php:502 admin/options.php:1593 admin/options.php:1618
 msgid "Changing this value may require to recreate your thumbnails."
 msgstr ""
 
-#: admin/options.php:488 admin/options.php:1578
+#: admin/options.php:509 admin/options.php:1600
 msgid "Cropped"
 msgstr ""
 
-#: admin/options.php:488 admin/options.php:538 admin/options.php:1578
+#: admin/options.php:509 admin/options.php:559 admin/options.php:1600
 msgid "Contained"
 msgstr ""
 
-#: admin/options.php:489
+#: admin/options.php:510
 msgid "Header Image Behaviour"
 msgstr ""
 
-#: admin/options.php:495
+#: admin/options.php:516
 msgid "Title Accent"
 msgstr ""
 
-#: admin/options.php:497
+#: admin/options.php:518
 msgid ""
 "Letter index the accent should apply to. Set to zero to disable accent "
@@ -585 +552 @@
 msgstr ""
 
-#: admin/options.php:503
+#: admin/options.php:524
 msgid "Header Widget Width"
 msgstr ""
 
-#: admin/options.php:510
+#: admin/options.php:531
 msgid "Header Widget Alignment"
 msgstr ""
 
-#: admin/options.php:522
+#: admin/options.php:543
 msgid "Enabled"
 msgstr ""
 
-#: admin/options.php:522
+#: admin/options.php:543
 msgid "Disabled (use WordPress homepage)"
 msgstr ""
 
-#: admin/options.php:530
+#: admin/options.php:551
 #, php-format
 msgid ""
@@ -608 +575 @@
 msgstr ""
 
-#: admin/options.php:530
+#: admin/options.php:551
 msgid "use a static page"
 msgstr ""
 
-#: admin/options.php:538
+#: admin/options.php:559
 msgid "Wide"
 msgstr ""
 
-#: admin/options.php:546
+#: admin/options.php:567
 msgid "Static Page"
 msgstr ""
 
-#: admin/options.php:546
+#: admin/options.php:567
 msgid "Posts"
 msgstr ""
 
-#: admin/options.php:546 admin/options.php:569 admin/options.php:677
-#: admin/options.php:713 admin/options.php:714 admin/options.php:732
-#: admin/options.php:733 admin/options.php:751 admin/options.php:752
-#: admin/options.php:770 admin/options.php:771 admin/options.php:801
-#: admin/options.php:802 admin/options.php:903 admin/options.php:904
-#: admin/options.php:911 admin/options.php:912 admin/options.php:919
-#: admin/options.php:920 admin/options.php:927 admin/options.php:928
-#: admin/options.php:1305
+#: admin/options.php:567 admin/options.php:590 admin/options.php:698
+#: admin/options.php:734 admin/options.php:735 admin/options.php:753
+#: admin/options.php:754 admin/options.php:772 admin/options.php:773
+#: admin/options.php:791 admin/options.php:792 admin/options.php:822
+#: admin/options.php:823 admin/options.php:924 admin/options.php:925
+#: admin/options.php:932 admin/options.php:933 admin/options.php:940
+#: admin/options.php:941 admin/options.php:948 admin/options.php:949
+#: admin/options.php:1327
 msgid "Disabled"
 msgstr ""
 
-#: admin/options.php:553
+#: admin/options.php:574
 msgid "More Posts Label"
 msgstr ""
 
-#: admin/options.php:565 admin/options.php:597
+#: admin/options.php:586 admin/options.php:618
 msgid "Serious Slider"
 msgstr ""
 
-#: admin/options.php:566
+#: admin/options.php:587
 msgid "Use Shortcode"
 msgstr ""
 
-#: admin/options.php:567
-msgid "Static Image"
-msgstr ""
-
-#: admin/options.php:568
+#: admin/options.php:588 admin/options.php:597
+msgid "Banner Image"
+msgstr ""
+
+#: admin/options.php:589
 msgid "Header Image"
 msgstr ""
 
-#: admin/options.php:571
+#: admin/options.php:592
 #, php-format
 msgid ""
@@ -662 +629 @@
 msgstr ""
 
-#: admin/options.php:576
-msgid "Slider Image"
-msgstr ""
-
-#: admin/options.php:577
-msgid "The default image can be replaced by setting a new static image."
-msgstr ""
-
-#: admin/options.php:583
+#: admin/options.php:598
+msgid "The default image can be replaced by setting a new banner image."
+msgstr ""
+
+#: admin/options.php:604
 msgid "Slider Link"
 msgstr ""
 
-#: admin/options.php:590
+#: admin/options.php:611
 msgid "Shortcode"
 msgstr ""
 
-#: admin/options.php:591
+#: admin/options.php:612
 msgid ""
 "Enter shortcode provided by slider plugin. The plugin will be responsible "
@@ -684 +647 @@
 msgstr ""
 
-#: admin/options.php:599
+#: admin/options.php:620
 msgid " - Please install, activate or update Serious Slider plugin - "
 msgstr ""
 
-#: admin/options.php:599
+#: admin/options.php:620
 msgid " - No sliders defined - "
 msgstr ""
 
-#: admin/options.php:600
+#: admin/options.php:621
 msgid ""
 "Select the desired slider from the list. Sliders can be administered in the "
@@ -698 +661 @@
 msgstr ""
 
-#: admin/options.php:606
-msgid "Slider Caption"
-msgstr ""
-
-#: admin/options.php:608
+#: admin/options.php:627
+msgid "Caption"
+msgstr ""
+
+#: admin/options.php:629
 msgid "Title"
 msgstr ""
 
-#: admin/options.php:616 admin/options.php:624 admin/options.php:640
+#: admin/options.php:637 admin/options.php:645 admin/options.php:661
 msgid "Text"
 msgstr ""
 
-#: admin/options.php:622 admin/options.php:638
+#: admin/options.php:643 admin/options.php:659
 msgid "CTA Button"
 msgstr ""
 
-#: admin/options.php:632 admin/options.php:648
+#: admin/options.php:653 admin/options.php:669
 msgid "Link"
 msgstr ""
 
-#: admin/options.php:656 admin/options.php:781
+#: admin/options.php:677 admin/options.php:802
 msgid "Section Title"
 msgstr ""
 
-#: admin/options.php:663 admin/options.php:788
+#: admin/options.php:684 admin/options.php:809
 msgid "Section Description"
 msgstr ""
 
-#: admin/options.php:675
+#: admin/options.php:696
 msgid "Blocks Content"
 msgstr ""
 
-#: admin/options.php:677
+#: admin/options.php:698
 msgid "No Text"
 msgstr ""
 
-#: admin/options.php:677 admin/options.php:1464 admin/options.php:1480
+#: admin/options.php:698 admin/options.php:1486 admin/options.php:1502
 msgid "Excerpt"
 msgstr ""
 
-#: admin/options.php:677
+#: admin/options.php:698
 msgid "Full Content"
 msgstr ""
 
-#: admin/options.php:684 admin/options.php:883
+#: admin/options.php:705 admin/options.php:904
 msgid "Read More Button"
 msgstr ""
 
-#: admin/options.php:685
+#: admin/options.php:706
 msgid "Configure the 'Read More' link text."
 msgstr ""
 
-#: admin/options.php:691
+#: admin/options.php:712
 msgid "Make icons clickable (linking to their respective pages)."
 msgstr ""
 
-#: admin/options.php:703 admin/options.php:722 admin/options.php:741
-#: admin/options.php:760
+#: admin/options.php:724 admin/options.php:743 admin/options.php:762
+#: admin/options.php:781
 #, php-format
 msgid "Block %d"
 msgstr ""
 
-#: admin/options.php:800
+#: admin/options.php:821
 msgid "Boxes Content"
 msgstr ""
 
-#: admin/options.php:801 admin/options.php:802
+#: admin/options.php:822 admin/options.php:823
 msgid "All Categories"
 msgstr ""
 
-#: admin/options.php:816
+#: admin/options.php:837
 msgid "Number of Boxes"
 msgstr ""
 
-#: admin/options.php:823
+#: admin/options.php:844
 msgid "Boxes Per Row"
 msgstr ""
 
-#: admin/options.php:839
+#: admin/options.php:860
 msgid "Box Height"
 msgstr ""
 
-#: admin/options.php:840
+#: admin/options.php:861
 msgid ""
 "The width is a percentage dependent on total site width and number of "
@@ -786 +749 @@
 msgstr ""
 
-#: admin/options.php:851
+#: admin/options.php:872
 msgid "Box Layout"
 msgstr ""
 
-#: admin/options.php:853
+#: admin/options.php:874
 msgid "Full width"
 msgstr ""
 
-#: admin/options.php:853
+#: admin/options.php:874
 msgid "Boxed (content width)"
 msgstr ""
 
-#: admin/options.php:860
+#: admin/options.php:881
 msgid "Box Stacking"
 msgstr ""
 
-#: admin/options.php:862
+#: admin/options.php:883
 msgid "Joined"
 msgstr ""
 
-#: admin/options.php:862
+#: admin/options.php:883
 msgid "Apart"
 msgstr ""
 
-#: admin/options.php:869
+#: admin/options.php:890
 msgid "Box Appearance"
 msgstr ""
 
-#: admin/options.php:871
+#: admin/options.php:892
 msgid "Animated"
 msgstr ""
 
-#: admin/options.php:871
+#: admin/options.php:892
 msgid "Static"
 msgstr ""
 
-#: admin/options.php:893
+#: admin/options.php:914
 msgid "Content Length (words)"
 msgstr ""
 
-#: admin/options.php:902 admin/options.php:910 admin/options.php:918
-#: admin/options.php:926
+#: admin/options.php:923 admin/options.php:931 admin/options.php:939
+#: admin/options.php:947
 #, php-format
 msgid "Text Area %d"
 msgstr ""
 
-#: admin/options.php:935
+#: admin/options.php:956
 msgid ""
 "Page properties that will be used:<br>- page title as text title<br>- page "
@@ -839 +802 @@
 msgstr ""
 
-#: admin/options.php:944
+#: admin/options.php:965
 msgid "Site Background"
 msgstr ""
 
-#: admin/options.php:950 includes/setup.php:187
+#: admin/options.php:971 includes/setup.php:187
 msgid "Site Text"
 msgstr ""
 
-#: admin/options.php:956 includes/setup.php:182
+#: admin/options.php:977 includes/setup.php:182
 msgid "Content Headings"
 msgstr ""
 
-#: admin/options.php:962 includes/setup.php:192
+#: admin/options.php:983 includes/setup.php:192
 msgid "Content Background"
 msgstr ""
 
-#: admin/options.php:968
+#: admin/options.php:989
 msgid "Secondary Content Background"
 msgstr ""
 
-#: admin/options.php:969
+#: admin/options.php:990
 msgid "Secondary sidebar"
 msgstr ""
 
-#: admin/options.php:978
+#: admin/options.php:999
 msgid "Primary Accent"
 msgstr ""
 
-#: admin/options.php:984
+#: admin/options.php:1005
 msgid "Secondary Accent"
 msgstr ""
 
-#: admin/options.php:991
+#: admin/options.php:1012
 msgid "Header Background"
 msgstr ""
 
-#: admin/options.php:997
+#: admin/options.php:1018
 msgid "Menu Text"
 msgstr ""
 
-#: admin/options.php:1003
+#: admin/options.php:1024
 msgid "Submenu Text"
 msgstr ""
 
-#: admin/options.php:1009
+#: admin/options.php:1030
 msgid "Footer Background"
 msgstr ""
 
-#: admin/options.php:1015
+#: admin/options.php:1036
 msgid "Footer Text"
 msgstr ""
 
-#: admin/options.php:1021
+#: admin/options.php:1042
 msgid "Blocks"
 msgstr ""
 
-#: admin/options.php:1027
+#: admin/options.php:1048
 msgid "Boxes"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "100 thin"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "200 extra-light"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "300 ligher"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "400 regular"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "500 medium"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "600 semi-bold"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "700 bold"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "800 extra-bold"
 msgstr ""
 
-#: admin/options.php:1051 admin/options.php:1081 admin/options.php:1110
-#: admin/options.php:1140 admin/options.php:1169 admin/options.php:1199
-#: admin/options.php:1228
+#: admin/options.php:1072 admin/options.php:1103 admin/options.php:1132
+#: admin/options.php:1162 admin/options.php:1191 admin/options.php:1221
+#: admin/options.php:1250
 msgid "900 black"
 msgstr ""
 
-#: admin/options.php:1064
+#: admin/options.php:1086
 msgid ""
 "The fonts under the <em>Preferred Theme Fonts</em> list are recommended "
@@ -959 +922 @@
 msgstr ""
 
-#: admin/options.php:1065 admin/options.php:1095 admin/options.php:1124
-#: admin/options.php:1154 admin/options.php:1183 admin/options.php:1213
-#: admin/options.php:1242
+#: admin/options.php:1087 admin/options.php:1117 admin/options.php:1146
+#: admin/options.php:1176 admin/options.php:1205 admin/options.php:1235
+#: admin/options.php:1264
 msgid "or enter Google Font Identifier"
 msgstr ""
 
-#: admin/options.php:1101
+#: admin/options.php:1123
 msgid "Main Menu"
 msgstr ""
 
-#: admin/options.php:1131
+#: admin/options.php:1153
 msgid "Widget Title"
 msgstr ""
 
-#: admin/options.php:1160
+#: admin/options.php:1182
 msgid "Widget Content"
 msgstr ""
 
-#: admin/options.php:1190
+#: admin/options.php:1212
 msgid "Post/Page Titles"
 msgstr ""
 
-#: admin/options.php:1219
+#: admin/options.php:1241
 msgid "Headings"
 msgstr ""
 
-#: admin/options.php:1249
+#: admin/options.php:1271
 msgid "Line Height"
 msgstr ""
 
-#: admin/options.php:1256
+#: admin/options.php:1278
 msgid "Text Alignment"
 msgstr ""
 
-#: admin/options.php:1258
+#: admin/options.php:1280
 msgid "Justify"
 msgstr ""
 
-#: admin/options.php:1264
+#: admin/options.php:1286
 msgid "Paragraph Spacing"
 msgstr ""
 
-#: admin/options.php:1271
+#: admin/options.php:1293
 msgid "Paragraph Indentation"
 msgstr ""
 
-#: admin/options.php:1281
+#: admin/options.php:1303
 msgid "Breadcrumbs"
 msgstr ""
 
-#: admin/options.php:1288
+#: admin/options.php:1310
 msgid "Numbered Pagination"
 msgstr ""
 
-#: admin/options.php:1295
+#: admin/options.php:1317
 msgid "Page/Category Titles"
 msgstr ""
 
-#: admin/options.php:1297
+#: admin/options.php:1319
 msgid "Always Visible"
 msgstr ""
 
-#: admin/options.php:1297
+#: admin/options.php:1319
 msgid "Hide on Pages"
 msgstr ""
 
-#: admin/options.php:1297
+#: admin/options.php:1319
 msgid "Hide on Categories"
 msgstr ""
 
-#: admin/options.php:1297
+#: admin/options.php:1319
 msgid "Always Hidden"
 msgstr ""
 
-#: admin/options.php:1303
+#: admin/options.php:1325
 msgid "Back to Top Button"
 msgstr ""
 
-#: admin/options.php:1305
+#: admin/options.php:1327
 msgid "Bottom of page"
 msgstr ""
 
-#: admin/options.php:1305
+#: admin/options.php:1327
 msgid "In footer"
 msgstr ""
 
-#: admin/options.php:1311
+#: admin/options.php:1333
 msgid "Tables Style"
 msgstr ""
 
-#: admin/options.php:1313
+#: admin/options.php:1335
 msgid "No border"
 msgstr ""
 
-#: admin/options.php:1313
+#: admin/options.php:1335
 msgid "Clean"
 msgstr ""
 
-#: admin/options.php:1313
+#: admin/options.php:1335
 msgid "Stripped"
 msgstr ""
 
-#: admin/options.php:1313
+#: admin/options.php:1335
 msgid "Bordered"
 msgstr ""
 
-#: admin/options.php:1319
+#: admin/options.php:1341
 msgid "Tags Cloud Appearance"
 msgstr ""
 
-#: admin/options.php:1321
+#: admin/options.php:1343
 msgid "Size Emphasis"
 msgstr ""
 
-#: admin/options.php:1321
+#: admin/options.php:1343
 msgid "Uniform Boxes"
 msgstr ""
 
-#: admin/options.php:1327
+#: admin/options.php:1349
 msgid "Custom Footer Text"
 msgstr ""
 
-#: admin/options.php:1328
+#: admin/options.php:1350
 msgid ""
 "Insert custom text or basic HTML code that will appear in your footer. <br />"
@@ -1087 +1050 @@
 msgstr ""
 
-#: admin/options.php:1336
+#: admin/options.php:1358
 msgid "Border"
 msgstr ""
 
-#: admin/options.php:1342
+#: admin/options.php:1364
 msgid "Shadow"
 msgstr ""
 
-#: admin/options.php:1348
+#: admin/options.php:1370
 msgid "Rounded Corners"
 msgstr ""
 
-#: admin/options.php:1349
+#: admin/options.php:1371
 msgid "These decorations apply to certain theme elements."
 msgstr ""
 
-#: admin/options.php:1354
+#: admin/options.php:1376
 msgid "Article Animation on Scroll"
 msgstr ""
 
-#: admin/options.php:1356
+#: admin/options.php:1378
 msgid "None"
 msgstr ""
 
-#: admin/options.php:1356
+#: admin/options.php:1378
 msgid "Fade"
 msgstr ""
 
-#: admin/options.php:1356
+#: admin/options.php:1378
 msgid "Slide"
 msgstr ""
 
-#: admin/options.php:1356
+#: admin/options.php:1378
 msgid "Grow"
 msgstr ""
 
-#: admin/options.php:1365
+#: admin/options.php:1387
 msgid "Add Search to Main Menu"
 msgstr ""
 
-#: admin/options.php:1371
+#: admin/options.php:1393
 msgid "Add Search to Footer Menu"
 msgstr ""
 
-#: admin/options.php:1380
+#: admin/options.php:1402
 msgid "Post Images"
 msgstr ""
 
-#: admin/options.php:1383
+#: admin/options.php:1405
 msgid "No Styling"
 msgstr ""
 
-#: admin/options.php:1387 admin/options.php:1391 admin/options.php:1395
-#: admin/options.php:1399 admin/options.php:1403
+#: admin/options.php:1409 admin/options.php:1413 admin/options.php:1417
+#: admin/options.php:1421 admin/options.php:1425
 #, php-format
 msgid "Style %d"
 msgstr ""
 
-#: admin/options.php:1412
+#: admin/options.php:1434
 msgid "Post Captions"
 msgstr ""
 
-#: admin/options.php:1414
+#: admin/options.php:1436
 msgid "Plain"
 msgstr ""
 
-#: admin/options.php:1414
+#: admin/options.php:1436
 msgid "With Border"
 msgstr ""
 
-#: admin/options.php:1414
+#: admin/options.php:1436
 msgid "With Background"
 msgstr ""
 
-#: admin/options.php:1424
+#: admin/options.php:1446
 msgid "Display Author"
 msgstr ""
 
-#: admin/options.php:1430
+#: admin/options.php:1452
 msgid "Display Date"
 msgstr ""
 
-#: admin/options.php:1436
+#: admin/options.php:1458
 msgid "Display Time"
 msgstr ""
 
-#: admin/options.php:1442
+#: admin/options.php:1464
 msgid "Display Category"
 msgstr ""
 
-#: admin/options.php:1448
+#: admin/options.php:1470
 msgid "Display Tags"
 msgstr ""
 
-#: admin/options.php:1454
+#: admin/options.php:1476
 msgid "Display Comments"
 msgstr ""
 
-#: admin/options.php:1455
+#: admin/options.php:1477
 msgid "Choose meta information to show on posts."
 msgstr ""
 
-#: admin/options.php:1462
+#: admin/options.php:1484
 msgid "Standard Posts On Homepage"
 msgstr ""
 
-#: admin/options.php:1464 admin/options.php:1472 admin/options.php:1480
+#: admin/options.php:1486 admin/options.php:1494 admin/options.php:1502
 msgid "Full Post"
 msgstr ""
 
-#: admin/options.php:1465
+#: admin/options.php:1487
 msgid "Post formats always display full posts."
 msgstr ""
 
-#: admin/options.php:1470
+#: admin/options.php:1492
 msgid "Sticky Posts on Homepage"
 msgstr ""
 
-#: admin/options.php:1472
+#: admin/options.php:1494
 msgid "Inherit"
 msgstr ""
 
-#: admin/options.php:1478
+#: admin/options.php:1500
 msgid "Standard Posts in Categories/Archives"
 msgstr ""
 
-#: admin/options.php:1489
+#: admin/options.php:1511
 msgid "Excerpt Length (words)"
 msgstr ""
 
-#: admin/options.php:1495
+#: admin/options.php:1517
 msgid "Excerpt Suffix"
 msgstr ""
 
-#: admin/options.php:1501
+#: admin/options.php:1523
 msgid "Continue Reading Label"
 msgstr ""
 
-#: admin/options.php:1509
+#: admin/options.php:1531
 msgid "'Comments Are Closed' Text"
 msgstr ""
 
-#: admin/options.php:1511
+#: admin/options.php:1533
 msgid "Show"
 msgstr ""
 
-#: admin/options.php:1511
+#: admin/options.php:1533
 msgid "Hide in posts"
 msgstr ""
 
-#: admin/options.php:1511
+#: admin/options.php:1533
 msgid "Hide in pages"
 msgstr ""
 
-#: admin/options.php:1511
+#: admin/options.php:1533
 msgid "Hide everywhere"
 msgstr ""
 
-#: admin/options.php:1517
+#: admin/options.php:1539
 msgid "Comment Date Format"
 msgstr ""
 
-#: admin/options.php:1519
+#: admin/options.php:1541
 msgid "Specific"
 msgstr ""
 
-#: admin/options.php:1519
+#: admin/options.php:1541
 msgid "Relative"
 msgstr ""
 
-#: admin/options.php:1525
+#: admin/options.php:1547
 msgid "Comment Field Label"
 msgstr ""
 
-#: admin/options.php:1527
+#: admin/options.php:1549
 msgid "Placeholders"
 msgstr ""
 
-#: admin/options.php:1527
+#: admin/options.php:1549
 msgid "Labels"
 msgstr ""
 
-#: admin/options.php:1528
+#: admin/options.php:1550
 msgid "Change to labels for better compatibility with comment-related plugins."
 msgstr ""
 
-#: admin/options.php:1537
+#: admin/options.php:1559
 msgid "Comment Form Width"
 msgstr ""
 
-#: admin/options.php:1545
+#: admin/options.php:1567
 msgid "Featured Images"
 msgstr ""
 
-#: admin/options.php:1552
+#: admin/options.php:1574
 msgid "Auto Select Image From Content"
 msgstr ""
 
-#: admin/options.php:1563
+#: admin/options.php:1585
 msgid "Featured Image Height"
 msgstr ""
 
-#: admin/options.php:1564
+#: admin/options.php:1586
 msgid "Set to 0 to disable image processing"
 msgstr ""
 
-#: admin/options.php:1579
+#: admin/options.php:1601
 msgid "Featured Image Behaviour"
 msgstr ""
 
-#: admin/options.php:1580
+#: admin/options.php:1602
 msgid ""
 "<strong>Contained</strong> will scale depending on the viewed resolution<br>"
@@ -1303 +1266 @@
 msgstr ""
 
-#: admin/options.php:1585
+#: admin/options.php:1607
 msgid "Featured Image Crop Position"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "No Crop"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Left Top"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Left Center"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Left Bottom"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Right Top"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Right Center"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Right Bottom"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Center Top"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Center Center"
 msgstr ""
 
-#: admin/options.php:1587
+#: admin/options.php:1609
 msgid "Center Bottom"
 msgstr ""
 
-#: admin/options.php:1603
+#: admin/options.php:1625
 msgid "Use Featured Images in Header"
 msgstr ""
 
-#: admin/options.php:1613
+#: admin/options.php:1635
 msgid "Display in Header"
 msgstr ""
 
-#: admin/options.php:1619
+#: admin/options.php:1641
 msgid "Display in Footer"
 msgstr ""
 
-#: admin/options.php:1625
+#: admin/options.php:1647
 msgid "Display in Left Sidebar"
 msgstr ""
 
-#: admin/options.php:1631
+#: admin/options.php:1653
 msgid "Display in Right Sidebar"
 msgstr ""
 
-#: admin/options.php:1632
-#, php-format
-msgid ""
-"Select where social icons should be visible in.<br><br><strong>Social Icons "
-"are defined using the <a href=\"%1$s\" target=\"_blank\">social icons "
-"menu</a></strong>. Read the <a href=\"%2$s\" target=\"_blank\">theme "
-"documentation</a> on how to create a social menu."
-msgstr ""
-
-#: admin/options.php:1640
+#: admin/options.php:1654
+#, php-format
+msgid ""
+"Select where social icons should be displayed.<br><br><strong>Social Icons "
+"are defined using the <a href=\"%1$s\" target=\"_blank\">socials menu</a>"
+"</strong>. Read the <a href=\"%2$s\" target=\"_blank\">theme "
+"documentation</a> for detailed information."
+msgstr ""
+
+#: admin/options.php:1662
 msgid "Default Pages Menu"
 msgstr ""
 
-#: admin/options.php:1648
-msgid "Custom Theme CSS"
-msgstr ""
-
-#: admin/options.php:1649
-msgid ""
-"Insert your custom theme CSS. Styling declarations made here will override "
-"the theme's if they are specific enough."
-msgstr ""
-
-#: admin/options.php:1657
-msgid ""
-"Since version 4.7 WordPress includes an Additional CSS field of its own. We "
-"recommend you switch to using that one for better options consistency."
-msgstr ""
-
-#: admin/options.php:1664
+#: admin/options.php:1670
 msgid "Masonry"
 msgstr ""
 
-#: admin/options.php:1672
+#: admin/options.php:1678
 msgid "JS Defer loading"
 msgstr ""
 
-#: admin/options.php:1681
+#: admin/options.php:1687
 msgid "Autoscroll"
 msgstr ""
 
-#: admin/options.php:1689
+#: admin/options.php:1695
 msgid "Header image size requirements"
 msgstr ""
 
-#: admin/options.php:1697
+#: admin/options.php:1703
 msgid "Force mobile menu on iOS mobile devices"
 msgstr ""
 
-#: admin/options.php:1705
+#: admin/options.php:1711
 msgid "Editor Styles"
 msgstr ""
 
-#: admin/options.php:1713
+#: admin/options.php:1719
 msgid "FitVids"
 msgstr ""
 
-#: admin/options.php:1715
+#: admin/options.php:1721
 msgid "Enable"
 msgstr ""
 
-#: admin/options.php:1715
+#: admin/options.php:1721
 msgid "Enable on mobiles"
 msgstr ""
 
-#: admin/options.php:1715
+#: admin/options.php:1721
 msgid "Disable"
 msgstr ""
 
-#: admin/options.php:1716
+#: admin/options.php:1722
 msgid "<br>Only use these options to troubleshoot issues."
 msgstr ""
 
-#: admin/options.php:2223
+#: admin/options.php:2232
 msgid "Sidebar Left"
 msgstr ""
 
-#: admin/options.php:2230
+#: admin/options.php:2239
 msgid "Sidebar Right"
 msgstr ""
 
-#: admin/options.php:2238
+#: admin/options.php:2247
 msgid ""
 "You can configure how many columns the footer displays from the theme options"
 msgstr ""
 
-#: admin/options.php:2245
+#: admin/options.php:2254
 msgid "Content Before"
 msgstr ""
 
-#: admin/options.php:2252
+#: admin/options.php:2261
 msgid "Content After"
+msgstr ""
+
+#: admin/options.php:2269
+msgid ""
+"This widget area is displayed over the header image and requires an image to "
+"be set."
 msgstr ""
 
@@ -1513 +1466 @@
 msgstr ""
 
-#: includes/core.php:347
+#. $layout_class
+#: includes/core.php:353
 msgid "Home"
 msgstr ""
 
-#: includes/core.php:348
-msgid "Archive for category"
-msgstr ""
-
-#: includes/core.php:349
-msgid "Search results for"
-msgstr ""
-
-#: includes/core.php:350
+#. $text_home
+#: includes/core.php:354
+#, php-format
+msgid "Archive for category \"%s\""
+msgstr ""
+
+#. $text_archive
+#: includes/core.php:355
+#, php-format
+msgid "Search results for \"%s\""
+msgstr ""
+
+#. $text_search
+#: includes/core.php:356
 msgid "Posts tagged"
 msgstr ""
 
-#: includes/core.php:351
+#. $text_tag
+#: includes/core.php:357
 msgid "Articles posted by"
 msgstr ""
 
-#: includes/core.php:353
+#. $text_404
+#: includes/core.php:359
 msgid "Post format"
 msgstr ""
 
-#: includes/core.php:354
+#. $text_format
+#: includes/core.php:360
 msgid "Page"
 msgstr ""
@@ -1583 +1545 @@
 msgstr ""
 
-#: includes/comments.php:25
+#: includes/comments.php:24
 msgid "Pingback: "
 msgstr ""
 
-#: includes/comments.php:25 includes/comments.php:55
+#: includes/comments.php:24 includes/comments.php:54
 msgid "(Edit)"
 msgstr ""
 
-#: includes/comments.php:47
+#. 1: date, 2: time
+#: includes/comments.php:46
 msgid "at"
 msgstr ""
 
-#: includes/comments.php:50
+#: includes/comments.php:49
 #, php-format
 msgctxt "%s = human-readable time difference"
@@ -1601 +1564 @@
 msgstr ""
 
-#: includes/comments.php:62
+#: includes/comments.php:61
 msgid "Your comment is awaiting moderation."
 msgstr ""
 
-#: includes/comments.php:70
+#: includes/comments.php:69
 msgid "Reply"
 msgstr ""
 
+#: includes/comments.php:92
+msgid "Leave a comment"
+msgstr ""
+
 #: includes/comments.php:93
-msgid "Leave a comment"
-msgstr ""
-
-#: includes/comments.php:127 includes/comments.php:128
+#| msgid "One Comment"
+#| msgid_plural "%1$s Comments"
+msgid "One Comment"
+msgstr ""
+
+#: includes/comments.php:124 includes/comments.php:125
 msgid "Name"
 msgstr ""
 
-#: includes/comments.php:131 includes/comments.php:132
+#: includes/comments.php:128 includes/comments.php:129
 msgid "Email"
 msgstr ""
 
-#: includes/comments.php:135 includes/comments.php:136
+#: includes/comments.php:132 includes/comments.php:133
 msgid "Website"
 msgstr ""
 
-#: includes/comments.php:140
+#: includes/comments.php:137
 msgid ""
 "Save my name, email, and site URL in my browser for next time I post a "
@@ -1631 +1600 @@
 msgstr ""
 
-#: includes/comments.php:149 includes/comments.php:150
+#: includes/comments.php:146 includes/comments.php:147
 msgctxt "noun"
 msgid "Comment"

fluida/1.8.6/page.php

@@ -13 +13 @@
 get_header(); ?>
 
-    <div id="container" class="<?php echo fluida_get_layout_class(); ?>">
+    <div id="container" class="<?php fluida_get_layout_class(); ?>">
 
-        <main id="main" role="main" class="main">
+        <main id="main" class="main">
             <?php cryout_before_content_hook(); ?>
-            
+
             <?php get_template_part( 'content/content', 'page' ); ?>
 

fluida/1.8.6/readme.txt

@@ -3 +3 @@
 Contributors: Cryout Creations
 Requires at least: 4.5
-Tested up to: 5.5
-Stable tag: 1.8.5
-Requires PHP: 5.3
+Tested up to: 5.7
+Stable tag: 1.8.6
+Requires PHP: 5.4
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl.html
@@ -16 +16 @@
 Fluida also features social menus with over 100 social network icons available in 4 locations, 3 menus, 6 widget areas, 8 page templates, all post formats, is translation ready, RTL and compatible with older browsers.
 
-Copyright 2015-2019 Cryout Creations
+Copyright 2015-2021 Cryout Creations
 https://www.cryoutcreations.eu/
 
@@ -87 +87 @@
 == Changelog ==
 
+= 1.8.6 =
+*Release date - 15.03.2021*
+
+* Fixed "Inherit General Font" option not working as expected
+* Fixed block editor galleries layout
+* Fixed team members photos having a weird aspect ratio after Team Members plugin update
+* Fixed text indent option adding indentation to icons (including shortcodes)
+* Fixed search form overlapping mobile menu elements with small general font sizes
+* Fixed left sidebar navigation not being displayed when there are no widgets assigned
+* Fixed JS focus effects possibly breaking dynamic buttons functionality
+* Improved main navigation fallback markup
+* Renamed landing page 'static image' element to 'banner image' for clarity
+* Removed all padding/margins from before/after content and top/bottom inner widget areas
+* Added click-navigation to target panels in header content and site identity hints
+* Added configuration hint for header image when the theme's slider / banner image is active on the homepage
+* Cleaned up and optimized frontend scripts, including for WordPress 5.5/5.6 jQuery updates
+* Updated to Cryout Framework 0.8.5.7:
+    * Expanded hint control styling to apply in the Site Identity panel
+    * Fixed multi-font choices failing to apply correctly
+    * Added echo parameters to cryout_schema_microdata() and cryout_font_select() functions
+    * Improved breadcrumbs compatibility with plugins that filter section titles and add HTML markup
+    * Improved JS code to remove jQuery deprecation notices since WordPress 5.6
+    * Changed custom post type label in breadcrumbs from singular_name to name
+    * Better cleaning of weights in font enqueues
+    * Added the ability to inherit the general font on all other font control options
+    * Fixed Select2 selectors no longer working with WordPress 5.6 on Firefox
+    * Removed PHP and WP versions checks as these are now handled by WordPress
+
 = 1.8.5 =
 *Release date - 03.09.2020*
 * Improved mobile menu color options handling
 * Additional accessibility improvements
-* Fixed editor font sizes using the incorrect normal font size
+* Fixed block editor font sizes using the incorrect 'regular' slug
 * Fixed page layout meta option not working since 1.8.4
 * Fixed social icons sometimes overlapping mobile menu toggler on RTL

fluida/1.8.6/resources/fonts/fontfaces.css

@@ -5 +5 @@
  */
 
+/* System Fonts */
+@font-face {
+  font-family: "System Font";
+  font-style: normal;
+  src: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+}
 /* Glyph Icons */
 
@@ -23 +29 @@
     font-style: normal;
     font-weight: normal;
-    speak: none;
+    speak: never;
     display: inline-block;
     text-decoration: inherit;
@@ -277 +283 @@
     font-style: normal;
     font-weight: normal;
-    speak: none;
+    speak: never;
     content:  '\e83d';
     display: inline-block;
@@ -516 +522 @@
     font-style: normal;
     font-weight: normal;
-    speak: none;
+    speak: never;
     display: inline-block;
     text-decoration: inherit;
@@ -530 +536 @@
 }
 
-[id*="fluida_settings"].customize-control-iconselect select,
-[id*="fluida_settings"].customize-control-iconselect select option,
-[id*="fluida_settings"].customize-control-iconselect .select2-container,
-[id*="fluida-plus_settings"].customize-control-iconselect select,
-[id*="fluida-plus_settings"].customize-control-iconselect select option,
-[id*="fluida-plus_settings"].customize-control-iconselect .select2-container,
+.customize-control-cryout-iconselect select,
+.customize-control-cryout-iconselect select option,
+.customize-control-cryout-iconselect .select2-container,
 .select2-container.cryout-iconselect .select2-results__option {
-    font-family: "fluida-blocks";
+    font-family: "fluida-blocks", -apple-system, BlinkMacSystemFont, sans-serif;
 }
 

fluida/1.8.6/resources/js/ajax.js

@@ -30 +30 @@
      * Load new posts when the link is clicked.
      */
-    $( '#cryout_ajax_more_trigger' ).click( function() {
+    $( '#cryout_ajax_more_trigger' ).on( 'click', function() {
         /* Loading gif */
         $( this ).addClass( 'cryout_click_loading' );
@@ -46 +46 @@
                     /* Add articles one by one */
                     $data.each( function() {
-                        $( this ).css( 'opacity', '0' ).appendTo( '#content-masonry' );
+                        $( this ).css( 'opacity', 0 ).appendTo( '#content-masonry' );
                     });
 
@@ -53 +53 @@
                         /* Add articles one by one */
                         $data.each( function() {
-                            $( this ).css( 'opacity', '0' ).appendTo( '#content-masonry' );
+                            $( this ).css( 'opacity', 0 ).appendTo( '#content-masonry' );
                         });
 
@@ -71 +71 @@
                     else { // if not masonry
                         $data.each( function() {
-                            $( this ).css( {'opacity': '1', 'transform': 'none', '-webkit-transform': 'none'} ).appendTo( '#content-masonry' );
+                            $( this ).css( {'opacity': 1, 'transform': 'none', '-webkit-transform': 'none'} ).appendTo( '#content-masonry' );
                         });
                         if ( cryout_theme_settings.fitvids == 1 ) { $( this ).fitVids(); }

fluida/1.8.6/resources/js/frontend.js

@@ -5 +5 @@
  */
 
-/*
- * DOCUMENT.READY()
- */
 jQuery( document ).ready( function() {
 
@@ -13 +10 @@
     cryoutMobileMenuInit();
     cryoutFixedMobileMenu();
-    cryoutInitNav('#mobile-menu');
+    cryoutInitNav( '#mobile-menu' );
     cryoutMenuAnimate();
     cryoutBackToTop();
@@ -23 +20 @@
     cryoutTitleLettering()
     cryoutBoxesAnimation();
-    cryoutRemoveFocus('#access a, #site-title a, button');
+    cryoutRemoveFocus();
 
     if ( ( (cryout_theme_settings.fitvids == 2) && (cryout_theme_settings.is_mobile == 1) ) || ( cryout_theme_settings.fitvids == 1 ) ) {
@@ -35 +32 @@
 }); /* document.ready */
 
-/*
- * WINDOW.LOAD()
- */
-jQuery( window ).load( function() {
+jQuery( window ).on( 'load', function() {
 
     /* trigger scroll on load */
@@ -49 +43 @@
 
 /*
- * FUNCTIONS
- */
-
+ * Functions
+**/
+
+/* Force LP boxes images ratios */
 function cryoutLpBoxesRatios() {
-    for (index = 1; index <= cryout_theme_settings.lpboxratios.length; ++index) {
-        jQuery( '.lp-boxes-'+index+' .lp-box-image' ).keepRatio( cryout_theme_settings.lpboxratios[index-1] );
+    for ( var index = 1; index <= cryout_theme_settings.lpboxratios.length; ++index ) {
+        jQuery( '.lp-boxes-' + index + ' .lp-box-image' ).keepRatio( cryout_theme_settings.lpboxratios[index-1] );
     }
 } /* cryoutLpBoxesRatios() */
@@ -60 +55 @@
 function cryoutBoxesAnimation() {
     jQuery( ".lp-boxes-animated.lp-boxes" ).mousedir( ".lp-boxes-animated.lp-boxes:not(.lp-boxes-animated2) .lp-box" );
-}
+} /* cryoutBoxesAnimation() */
 
 /* Site Title Letter break */
@@ -82 +77 @@
 /* Menu animation */
 function cryoutMenuAnimate() {
-    jQuery( "#access > .menu ul li > a:not(:only-child)" ).attr( "aria-haspopup", "true" );/* IE10 mobile Fix */
-
-    jQuery( "#access li" ).hover( function() {
-        jQuery( this ).addClass('menu-hover');
-    }, function() {
-        jQuery( this ).removeClass('menu-hover');
-    });
-
-    jQuery('#access ul').find('a').on( 'focus', function() {
+    jQuery( '#access > .menu ul li > a:not(:only-child)' ).attr( 'aria-haspopup', 'true' );/* IE10 mobile Fix */
+
+    jQuery( '#access li' ).on( 'mouseenter', function() {
+        jQuery( this ).addClass( 'menu-hover' );
+    } ).on( 'mouseleave', function() {
+        jQuery( this ).removeClass( 'menu-hover' );
+    } );
+
+    jQuery( '#access ul' ).find( 'a' ).on( 'focus', function() {
         jQuery( this ).parents( '.menu-item, .page_item' ).addClass( 'menu-hover' );
-    });
-
-    jQuery('#access ul').find('a').on( 'blur', function() {
+    } );
+
+    jQuery( '#access ul' ).find( 'a' ).on( 'blur', function() {
         jQuery( this ).parents( '.menu-item, .page_item' ).removeClass( 'menu-hover' );
-    });
+    } );
 } /* cryoutMenuAnimate() */
 
 /* Back to top button animation */
 function cryoutBackToTop() {
-    jQuery( window ).scroll( function() {
+    jQuery( window ).on( 'scroll', function() {
         if ( jQuery( this ).scrollTop() > 500 ) {
             jQuery( "#toTop" ).css( { "bottom": "-2px", "opacity": 1 } );
@@ -112 +107 @@
             jQuery( ".fluida-fixed-menu #site-header-main" ).removeClass( "header-fixed" );
         }
-    });
-    jQuery( "#toTop" ).click( function( event ) {
+    } );
+
+    jQuery( '#toTop' ).on( 'click', function( event ) {
         event.preventDefault();
-        jQuery( "html, body" ).animate( { scrollTop: 0 }, 500 );
+        jQuery( 'html, body' ).animate( { scrollTop: 0 }, 500 );
         return false;
-    });
+    } );
 } /* cryoutBackToTop() */
 
 /* Search form animation */
 function cryoutSearchFormAnimation() {
-    var searchIcon = jQuery( "#access .menu-search-animated > a" );
-    var searchForm = jQuery( ".menu-search-animated .searchform" );
-    var searchInput = jQuery( "#access .menu-search-animated .s" );
+    var searchIcon = jQuery( "#access .menu-search-animated > a" ),
+    searchForm = jQuery( ".menu-search-animated .searchform" ),
+    searchInput = jQuery( "#access .menu-search-animated .s" );
 
     searchIcon.on( 'click', function( event ) {
         event.preventDefault();
         searchForm.slideToggle( 100 );
-        searchInput.focus();
+        searchInput.trigger( 'focus' );
         searchInput.css('outline', 'none');
         event.stopPropagation();
-    });
-
-    searchForm.click( function( event ){
+    } );
+
+    searchForm.on( 'click', function( event ){
         event.stopPropagation();
-    });
-
-    searchInput.blur( function() {
+    } );
+
+    searchInput.on( 'blur', function() {
         searchForm.fadeOut( 100 );
-    });
+    } );
 
 } /* cryoutSearchFormAnimation() */
@@ -149 +145 @@
     /* First and last elements in the menu */
     var firstTab = jQuery('nav#mobile-menu #mobile-nav > li:first-child a');
-    var lastTab  = jQuery('#nav-cancel '); /* Cancel button will always be last */
-
-    jQuery("#nav-toggle").click(function(e){
+    var lastTab  = jQuery('#nav-cancel'); /* Cancel button will always be last */
+    jQuery("#nav-toggle").on( 'click', function(e){
         e.preventDefault();
         jQuery("#mobile-menu").show().animate({left: "0"}, 500);
         jQuery('body').addClass("noscroll");
-        firstTab.focus();
+        firstTab.trigger('focus');
         return false;
     });
 
-    jQuery("#nav-cancel").click(function(e){
+    jQuery("#nav-cancel").on( 'click', function(e){
         e.preventDefault();
         jQuery("#mobile-menu").animate({left: "100%"},500,function(){jQuery(this).css("left","-100%").hide();});
         jQuery('body').removeClass("noscroll");
-        jQuery("#nav-toggle").focus();
+        jQuery("#nav-toggle").trigger('focus');
         return false;
     });
@@ -181 +176 @@
         if ((e.which === 9 && e.shiftKey)) {
             e.preventDefault();
-            lastTab.focus();
+            lastTab.trigger('focus');
         }
     });
@@ -190 +185 @@
         if (e.keyCode === 27 ) {
             jQuery('body').removeClass('noscroll');
-            lastTab.focus();
+            lastTab.trigger('focus');
         };
     });
@@ -212 +207 @@
     body = jQuery( 'body' );
 
-    jQuery(window).scroll(function () {
+    jQuery(window).on( 'scroll', function () {
         var a = jQuery(window).scrollTop();
         var b = jQuery(document).height();
@@ -221 +216 @@
         currentScrollBottom = b;
 
-        if (c < currentScrollTop && a > navbarHeight + navbarHeight) {
+        if ( c < currentScrollTop && a > navbarHeight + navbarHeight ) {
             /* scrolling down */
             body.removeClass('mobile-fixed');
@@ -240 +235 @@
 
 /* Add submenus toggles to the primary navigation */
-function cryoutInitNav(selector) {
-
-    container = jQuery(selector);
+function cryoutInitNav( selector ) {
+
+    container = jQuery( selector );
 
     /* Add dropdown toggle that display child menu items. */
@@ -250 +245 @@
     /* Toggle buttons and submenu items with active children menu items. */
     container.find( '.current-menu-ancestor > button, .current-page-ancestor > button' ).addClass( 'toggle-on' );
-    container.find( '.current-menu-ancestor > .sub-menu, .current-page-ancestor > .sub-menu, .current-menu-ancestor .children, .current-page-ancestor .children' ).show(0).addClass( 'toggled-on' );
-
-    container.find( '.dropdown-toggle' ).click( function( e ) {
+    container.find( '.current-menu-ancestor > .sub-menu, .current-page-ancestor > .sub-menu, .current-menu-ancestor .children, .current-page-ancestor .children' ).show( 0 ).addClass( 'toggled-on' );
+
+    container.find( '.dropdown-toggle' ).on( 'click', function( e ) {
         var _this = jQuery( this );
         e.preventDefault();
         _this.toggleClass( 'toggle-on' );
         if ( _this.hasClass( 'toggle-on') ) {
-            _this.next( '.children, .sub-menu' ).show(0).addClass( 'toggled-on' );
-            _this.prev("a").addClass( "toggled-on" );
+            _this.next( '.children, .sub-menu' ).show( 0 ).addClass( 'toggled-on' );
+            _this.prev( 'a' ).addClass( 'toggled-on' );
         }
         else {
@@ -265 +260 @@
             _this.next( '.children, .sub-menu' ).find( 'a' ).removeClass( 'toggled-on' );
             _this.next( '.children, .sub-menu' ).find( '.dropdown-toggle' ).removeClass( 'toggled-on' );
-            _this.prev("a").removeClass( "toggled-on" );
-
-            setTimeout(function() {
-                _this.next( '.children, .sub-menu' ).hide(0);
-                _this.next( '.children, .sub-menu' ).find( '.children, .sub-menu' ).hide(0);
-            },600)
+            _this.prev( 'a' ).removeClass( 'toggled-on' );
+
+            setTimeout( function() {
+                _this.next( '.children, .sub-menu' ).hide( 0 );
+                _this.next( '.children, .sub-menu' ).find( '.children, .sub-menu' ).hide( 0 );
+            }, 600 );
         }
 
@@ -278 +273 @@
 
     /* Close mobile menu on click/tap */
-    jQuery('body').on('click','#mobile-nav a', function() {
-        jQuery('#nav-cancel i').trigger('click');
-    });
+    jQuery( 'body' ).on( 'click', '#mobile-nav a', function() {
+        jQuery( '#nav-cancel i' ).trigger( 'click' );
+    } );
 
 } /* cryoutInitNav() */
@@ -289 +284 @@
     var $this = jQuery( this );
     var nh = $this.width() / ratio;
-    $this.css( "height", nh + "px" );
-    jQuery( window ).resize( function() {
+    $this.css( 'height', nh + 'px' );
+
+    jQuery( window ).on( 'resize', function() {
         var nh = $this.width() / ratio;
-        $this.css( "height", nh + "px" );
-    });
+        $this.css( 'height', nh + 'px' );
+    } );
 
 }; /* keepRatio() */
@@ -299 +295 @@
 /* LP Box Mouse direction overlay animation */
 jQuery.fn.mousedir = function( el ) {
-    if ( ! jQuery( "body" ).hasClass( "fluida-landing-page" ) ) return;
+    if ( ! jQuery( 'body' ).hasClass( 'fluida-landing-page' ) ) return;
 
     var $this = jQuery( this ),
         $el = jQuery( el ),
         last_position = {},
-        $output = "direction-down";
-
-    jQuery( document ).on( "mousemove", function (event) {
-
-        if ( typeof( last_position.x ) != "undefined" ) {
-            var deltaX = last_position.x - event.offsetX,
-                deltaY = last_position.y - event.offsetY;
-            if ( Math.abs( deltaX ) > Math.abs( deltaY ) && deltaX > 0 ) {
-                $output = "direction-left";
-            } else if ( Math.abs( deltaX ) > Math.abs( deltaY ) && deltaX < 0 ) {
-                $output = "direction-right";
-            } else if ( Math.abs( deltaY ) > Math.abs( deltaX ) && deltaY > 0 ) {
-                $output = "direction-up";
-            } else if ( Math.abs( deltaY ) > Math.abs( deltaX ) && deltaY < 0 ) {
-                $output = "direction-down";
-            } else {
-                $output = "direction-down";
+        $output = 'direction-down';
+
+    jQuery( document ).on( 'mousemove', function ( event ) {
+        if ( typeof( last_position.x ) !== 'undefined' ) {
+            var deltaX = last_position.x - event.offsetX,
+            deltaY = last_position.y - event.offsetY;
+            if ( ( Math.abs( deltaX ) > Math.abs( deltaY ) ) && ( deltaX > 0 ) ) {
+                $output = 'direction-left';
+            } else if ( ( Math.abs( deltaX ) > Math.abs( deltaY ) ) && ( deltaX < 0 ) ) {
+                $output = 'direction-right';
+            } else if ( ( Math.abs( deltaY ) > Math.abs( deltaX ) ) && ( deltaY > 0 ) ) {
+                $output = 'direction-up';
+            } else if ( ( Math.abs( deltaY ) > Math.abs( deltaX ) ) && ( deltaY < 0 ) ) {
+                $output = 'direction-down';
+            } else {
+                $output = 'direction-down';
             }
         }
         last_position = {
-            x : event.offsetX,
-            y : event.offsetY
+            x : event.offsetX,
+            y : event.offsetY
         };
-
-    });
-
-    $el.on( "mouseenter", function() {
-        jQuery( this ).removeClass( "in-direction-left in-direction-right in-direction-up in-direction-down out-direction-left out-direction-right out-direction-up out-direction-down" );
-        jQuery( this ).addClass( "in-" + $output );
+    } );
+
+    $el.on( 'mouseenter', function() {
+        $this.removeClass( 'in-direction-left in-direction-right in-direction-up in-direction-down' +
+            ' out-direction-left out-direction-right out-direction-up out-direction-down' );
+        $this.addClass( 'in-' + $output );
         return;
-    });
-    $el.on( "mouseleave", function() {
-        jQuery( this ).removeClass( "in-direction-left in-direction-right in-direction-up in-direction-down out-direction-left out-direction-right out-direction-up out-direction-down" );
-        jQuery( this ).addClass( "out-" + $output );
+    } );
+
+    $el.on( 'mouseleave', function() {
+        $this.removeClass( 'in-direction-left in-direction-right in-direction-up in-direction-down ' +
+            ' out-direction-left out-direction-right out-direction-up out-direction-down' );
+        $this.addClass( 'out-' + $output );
         return;
-    });
+    } );
 
 }; /* mouseDir() */
 
-/* See if element is visible in browser window */
+/* Check if element is visible in browser window */
 jQuery.fn.visible = function( partial ) {
     var $t            = jQuery( this ),
@@ -410 +407 @@
 
 /* Remove all off-canvas states */
-function cryoutRemoveFocus( selector ) {
-    jQuery( selector ).on('mouseup mousedown', function() {
+function cryoutRemoveFocus() {
+    jQuery( '#access a, #site-title a').on('mouseup mousedown', function() {
         jQuery( this ).blur();
     });
@@ -421 +418 @@
 /*  Tabs widget */
 function cryoutTabsWidget() {
-        var tabsNav       = jQuery('.cryout-wtabs-nav'),
-            tabsNavLis    = tabsNav.children('li'),
-            tabsContainer = jQuery('.cryout-wtabs-container');
-
-        tabsNav.each(function() {
-            var localthis = jQuery(this);
-            localthis.next().children('.cryout-wtab').stop(true, true).children('li').hide().parent().siblings( localthis.find('a').attr('href') ).children('li').show();
-            localthis.children('li').first().addClass('active').stop(true, true).show();
-        });
-
-        tabsNavLis.on('click', function(e) {
-            var localthis = jQuery(this);
-
-            localthis.siblings().removeClass('active').end().addClass('active');
-            var tabs_duration = 200;
-            localthis.parent().next().children('.cryout-wtab').stop(true, true).children( 'li' ).hide().parent().siblings( localthis.find('a').attr('href') ).children('li').each( function(index){
-                jQuery(this).fadeIn(tabs_duration*(index+1));
-            });
+        var tabsNav = jQuery( '.cryout-wtabs-nav' ),
+            tabsNavLis = tabsNav.children( 'li' );
+
+        tabsNav.each( function() {
+            var localthis = jQuery( this );
+            localthis.next().children( '.cryout-wtab' ).stop( true, true )
+                .children( 'li' ).hide()
+                .parent().siblings( localthis.find( 'a' ).attr( 'href' ) )
+                .children( 'li' ).show();
+            localthis.children( 'li' ).first()
+                .addClass( 'active' ).stop( true, true ).show();
+        } );
+
+        tabsNavLis.on( 'click', function( e ) {
+            var localthis = jQuery( this ),
+                tabs_duration = 200;
+
+            localthis.siblings().removeClass( 'active' ).end().addClass( 'active' );
+            localthis.parent().next().children( '.cryout-wtab' ).stop( true, true )
+                .children( 'li' ).hide()
+                .parent().siblings( localthis.find( 'a' ).attr( 'href' ) )
+                .children( 'li' ).each( function( index ) {
+                    jQuery( this ).fadeIn( tabs_duration * ( index + 1 ) );
+            } );
             e.preventDefault();
-        }).children( window.location.hash ? 'a[href="' + window.location.hash + '"]' : 'a:first' ).trigger('click');
+        } ).children( window.location.hash ? 'a[href="' + window.location.hash + '"]' : 'a:first' )
+            .trigger( 'click' );
 
 } /* cryoutTabsWidget() */
@@ -446 +450 @@
 /* Blog Masonry */
 function cryoutMasonry() {
-    if ( ( cryout_theme_settings.masonry == 1 ) && ( cryout_theme_settings.magazine != 1 ) && ( typeof jQuery.fn.masonry !== 'undefined' ) ) {
-        jQuery('#content-masonry').masonry({
+    if ( ( cryout_theme_settings.masonry == 1 ) &&
+        ( cryout_theme_settings.magazine != 1 ) &&
+        ( typeof jQuery.fn.masonry !== 'undefined' )
+    ) {
+        jQuery( '#content-masonry' ).masonry( {
             itemSelector: 'article',
             columnWidth: 'article',
             percentPosition: true,
             isRTL: cryout_theme_settings.rtl,
-        });
+        } );
     }
 } /* cryoutMasonry() */
@@ -459 +466 @@
 function cryoutPortfolioMasonry() {
     if ( ( cryout_theme_settings.masonry == 1 ) && ( typeof jQuery.fn.masonry !== 'undefined' ) ) {
-        jQuery('#lp-portfolio .jetpack-portfolio-shortcode').masonry({
+        jQuery( '#lp-portfolio .jetpack-portfolio-shortcode' ).masonry( {
             itemSelector: '.portfolio-entry',
             columnWidth: '.portfolio-entry:not(.hidey)',
             percentPosition: true,
             isRTL: cryout_theme_settings.rtl,
-        });
+        } );
     }
 } /* cryoutPortfolioMasonry() */
@@ -470 +477 @@
 /* Portfolio filtering */
 function cryoutPortfolioFilter() {
-    jQuery('body').on('click', '#portfolio-filter > a', function(e) {
+    jQuery( 'body' ).on( 'click', '#portfolio-filter > a', function( e ) {
         e.preventDefault();
-        jQuery('#portfolio-filter > a').removeClass('active');
-        jQuery(this).addClass('active');
-        var filter = jQuery(this).attr('data-slug');
-        jQuery('#portfolio-masonry .portfolio-entry').each( function(i,elm) {
-            if (filter == 'all') {
-                jQuery(elm).removeClass('hidey').fadeIn('fast');
+        jQuery( '#portfolio-filter > a' ).removeClass( 'active' );
+        jQuery( this ).addClass( 'active' );
+        var filter = jQuery( this ).attr( 'data-slug' );
+        jQuery( '#portfolio-masonry .portfolio-entry' ).each( function( i, elm ) {
+            if ( filter == 'all' ) {
+                jQuery( elm ).removeClass( 'hidey' ).fadeIn( 'fast' );
             } else {
-                if ( !jQuery(elm).hasClass('type-'+filter) ) {
-                    jQuery(elm).addClass('hidey').fadeOut('fast');
+                if ( ! jQuery( elm ).hasClass( 'type-' + filter ) ) {
+                    jQuery( elm ).addClass( 'hidey' ).fadeOut( 'fast' );
                 } else {
-                    jQuery(elm).removeClass('hidey').fadeIn('fast');
+                    jQuery( elm ).removeClass( 'hidey' ).fadeIn( 'fast' );
                 }
             }
-        }).promise().done( function() {
-            cryoutPortfolioMasonry();
-            /*jQuery('.jetpack-portfolio-shortcode').masonry();*/
-        });
+        } ).promise().done( function() {
+                cryoutPortfolioMasonry();
+                /*jQuery('.jetpack-portfolio-shortcode').masonry();*/
+        } );
         return false;
-    });
+    } );
 } /* cryoutPortfolioFilter() */
+/**
+ * Scroll to anchors
+ */
+function cryoutAutoScroll(document, history, location) {
+    document = window.document;
+    history = window.history;
+    location = window.location;
+    var HISTORY_SUPPORT = !! ( history && history.pushState );
+    var anchorScrolls = {
+        ANCHOR_REGEX: /^#[^ ]+$/,
+        OFFSET_HEIGHT_PX: jQuery( '.kahuna-fixed-menu #site-header-main' ).height(),
+
+        /* Establish events, and fix initial scroll position if a hash is provided. */
+        init: function() {
+            this.scrollToCurrent();
+            jQuery( window ).on(
+                'hashchange',
+                jQuery.proxy( this, 'scrollToCurrent' )
+            );
+            jQuery( 'body' ).on(
+                'click',
+                '.main a, nav ul li a, .meta-arrow',
+                jQuery.proxy( this, 'delegateAnchors' )
+            );
+        },
+
+        /*  Return the offset amount to deduct from the normal scroll position.
+            Modify as appropriate to allow for dynamic calculations. */
+        getFixedOffset: function() {
+            return ( this.OFFSET_HEIGHT_PX ) ? this.OFFSET_HEIGHT_PX : 0;
+        },
+
+        /* If the provided href is an anchor which resolves to an element on the page, scroll to it. */
+        scrollIfAnchor: function( href, pushToHistory ) {
+            var match, anchorOffset;
+
+            if ( ! this.ANCHOR_REGEX.test( href ) ) {
+                return false;
+            }
+
+            match = document.getElementById(href.slice(1));
+
+            if ( match && ( ! isInViewport( match ) ) && jQuery( match ).offset().top ) {
+                anchorOffset = jQuery( match ).offset().top - this.getFixedOffset();
+                jQuery( 'html, body' ).animate( { scrollTop: anchorOffset} );
+
+                /* Add the state to history as-per normal anchor links */
+                if ( HISTORY_SUPPORT && pushToHistory ) {
+                    history.pushState( {}, document.title, location.pathname + href );
+                }
+            }
+
+            return !!match;
+        },
+
+        /* Attempt to scroll to the current location's hash */
+        scrollToCurrent: function(e) {
+            if (this.scrollIfAnchor(window.location.hash) && e) {
+                e.preventDefault();
+            }
+        },
+
+        /* If the click event's target was an anchor, fix the scroll position */
+        delegateAnchors: function( e ) {
+            var elem = e.target.closest( 'a' );
+
+            if ( this.scrollIfAnchor( elem.getAttribute( 'href' ), true ) ) {
+                e.preventDefault();
+            }
+        }
+    };
+
+    jQuery( document ).ready( jQuery.proxy( anchorScrolls, 'init' ) );
+}
 
 /* FitVids 1.1*/
@@ -573 +654 @@
 
 /* IE .closest() fix */
-if (window.Element && !Element.prototype.closest) {
-    Element.prototype.closest =
-    function(s) {
-        var matches = (this.document || this.ownerDocument).querySelectorAll(s),
+if ( window.Element && ( ! Element.prototype.closest ) ) {
+    Element.prototype.closest = function( s ) {
+        var matches = ( this.document || this.ownerDocument ).querySelectorAll( s ),
             i,
             el = this;
         do {
             i = matches.length;
-            while (--i >= 0 && matches.item(i) !== el) {};
-        } while ((i < 0) && (el = el.parentElement));
+            while (--i >= 0 && matches.item( i ) !== el) {}
+        } while ( (i < 0) && ( el = el.parentElement ) );
         return el;
     };
 }
 
-/**
- * Scroll to anchors
- */
-function cryoutAutoScroll(document, history, location) {
-    document = window.document;
-    history = window.history;
-    location = window.location;
-    var HISTORY_SUPPORT = !!(history && history.pushState);
-    var anchorScrolls = {
-        ANCHOR_REGEX: /^#[^ ]+$/,
-        OFFSET_HEIGHT_PX: jQuery('.fluida-fixed-menu #site-header-main').height()+40,
-
-        /**
-        * Establish events, and fix initial scroll position if a hash is provided.
-        */
-        init: function() {
-            this.scrollToCurrent();
-            jQuery(window).on('hashchange', jQuery.proxy(this, 'scrollToCurrent'));
-            jQuery('body').on('click', '.main a, nav ul li a', jQuery.proxy(this, 'delegateAnchors'));
-        },
-
-        /**
-        * Return the offset amount to deduct from the normal scroll position.
-        * Modify as appropriate to allow for dynamic calculations
-        */
-        getFixedOffset: function() {
-            return this.OFFSET_HEIGHT_PX;
-        },
-
-        /**
-        * If the provided href is an anchor which resolves to an element on the
-        * page, scroll to it.
-        * @param  {String} href
-        * @return {Boolean} - Was the href an anchor.
-        */
-        scrollIfAnchor: function(href, pushToHistory) {
-            var match, anchorOffset;
-
-            if(!this.ANCHOR_REGEX.test(href)) {
-                return false;
-            }
-
-            match = document.getElementById(href.slice(1));
-
-            if(match && ! jQuery(match).visible( true )) {
-                anchorOffset = jQuery(match).offset().top - this.getFixedOffset();
-                jQuery('html, body').animate({ scrollTop: anchorOffset});
-
-                /* Add the state to history as-per normal anchor links */
-                if(HISTORY_SUPPORT && pushToHistory) {
-                    history.pushState({}, document.title, location.pathname + href);
-                }
-            }
-
-            return !!match;
-        },
-
-        /**
-        * Attempt to scroll to the current location's hash.
-        */
-        scrollToCurrent: function(e) {
-            if(this.scrollIfAnchor(window.location.hash) && e) {
-                e.preventDefault();
-            }
-        },
-
-        /**
-        * If the click event's target was an anchor, fix the scroll position.
-        */
-        delegateAnchors: function(e) {
-            var elem = e.target.closest('a');
-
-            if(this.scrollIfAnchor(elem.getAttribute('href'), true)) {
-                e.preventDefault();
-            }
-        }
-    };
-
-    jQuery(document).ready(jQuery.proxy(anchorScrolls, 'init'));
-}
-
 /* FIN */

fluida/1.8.6/search.php

@@ -8 +8 @@
 get_header(); ?>
 
-    <div id="container" class="<?php echo fluida_get_layout_class(); ?>">
-        <main id="main" role="main" class="main">
+    <div id="container" class="<?php fluida_get_layout_class(); ?>">
+        <main id="main" class="main">
             <?php cryout_before_content_hook(); ?>
 

fluida/1.8.6/sidebar-left.php

@@ -7 +7 @@
 ?>
 
-<?php if ( is_active_sidebar( 'sidebar-2' ) || current_user_can( 'edit_theme_options' ) ): ?>
-<aside id="primary" class="widget-area sidey" role="complementary" <?php cryout_schema_microdata( 'sidebar' );?>>
+<?php if ( is_active_sidebar( 'sidebar-2' ) || has_nav_menu( 'sidebar' ) || current_user_can( 'edit_theme_options' ) ): ?>
+<aside id="primary" class="widget-area sidey" <?php cryout_schema_microdata( 'sidebar' );?>>
     <?php cryout_before_primary_widgets_hook(); ?>
 
@@ -14 +14 @@
                 dynamic_sidebar( 'sidebar-2' );
             else:
-              if ( current_user_can( 'edit_theme_options' ) ) { ?>
+              if ( current_user_can( 'edit_theme_options' ) && ! has_nav_menu( 'sidebar' ) ) { ?>
                 <section class="widget-container widget-placeholder">
-                    <h3 class="widget-title"><?php _e( 'Left Sidebar', 'fluida' ); ?></h3>
+                    <h2 class="widget-title"><?php _e( 'Left Sidebar', 'fluida' ); ?></h2>
                     <p>
                         <?php

fluida/1.8.6/sidebar-right.php

@@ -8 +8 @@
 
 <?php if ( is_active_sidebar( 'sidebar-1' ) || current_user_can( 'edit_theme_options' ) ): ?>
-<aside id="secondary" class="widget-area sidey" role="complementary" <?php cryout_schema_microdata( 'sidebar' );?>>
+<aside id="secondary" class="widget-area sidey" <?php cryout_schema_microdata( 'sidebar' );?>>
     <?php cryout_before_secondary_widgets_hook(); ?>
 
@@ -16 +16 @@
             if ( current_user_can( 'edit_theme_options' ) ) { ?>
             <section class="widget-container widget-placeholder">
-                <h3 class="widget-title"><?php _e( 'Right Sidebar', 'fluida' ); ?></h3>
+                <h2 class="widget-title"><?php _e( 'Right Sidebar', 'fluida' ); ?></h2>
                 <p>
                     <?php
@@ -24 +24 @@
                 </p>
             </section>
-            
+
             <?php }
           endif; ?>

fluida/1.8.6/single.php

@@ -8 +8 @@
 get_header();?>
 
-<div id="container" class="<?php echo fluida_get_layout_class(); ?>">
-    <main id="main" role="main" class="main">
+<div id="container" class="<?php fluida_get_layout_class(); ?>">
+    <main id="main" class="main">
         <?php cryout_before_content_hook(); ?>
 

fluida/1.8.6/style.css

@@ -5 +5 @@
 Author: Cryout Creations
 Author URI: http://www.cryoutcreations.eu
-Version: 1.8.5
-Tested up to: 5.5
-Requires PHP: 5.3
+Version: 1.8.6
+Tested up to: 5.7
+Requires PHP: 5.4
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -13 +13 @@
 Text Domain: fluida
 
-Fluida WordPress Theme - Copyright 2015, Cryout Creations - http://www.cryoutcreations.eu
+Fluida WordPress Theme - Copyright 2015-2021, Cryout Creations - http://www.cryoutcreations.eu
 This theme, like WordPress, is licensed under the GPL.
 */
@@ -461 +461 @@
 textarea:focus,
 select:focus,
-input:focus {
-    outline: thin dotted;
+input:focus,
+button:focus,
+a:focus {
+    /* outline: thin dotted; */
 }
 
@@ -507 +509 @@
 }
 
+.entry-content a:not([class]),
+.entry-excerpt a:not([class]),
+#comments .comment-body a:not([class]),
+.widget-container.widget_text a:not([class]),
+.lp-text .lp-text-content a:not([class]),
+.lp-block .lp-block-text a:not([class]),
+.lp-box .lp-box-text-inside a:not([class]) {
+    text-decoration: underline;
+    -webkit-transition: .2s ease-out all;
+    transition: .2s ease-out all;
+}
+
 /* Text meant only for screen readers. */
 .screen-reader-text {
-  border: 0;
-  clip: rect(1px, 1px, 1px, 1px);
-  clip-path: inset(50%);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute !important;
-  width: 1px;
-  word-wrap: normal !important;
-  /* Many screen reader and browser combinations announce broken words as they would appear visually. */
+    border: 0;
+    clip: rect(1px, 1px, 1px, 1px);
+    clip-path: inset(50%);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute !important;
+    width: 1px;
+    word-wrap: normal !important;
+    /* Many screen reader and browser combinations announce broken words as they would appear visually. */
 }
 
 .screen-reader-text:focus {
-  background-color: #f1f1f1;
-  box-shadow: 0 0 5px 5px rgba(0, 0, 0, 0.2);
-  clip: auto !important;
-  clip-path: none;
-  color: #222;
-  display: block;
-  font-size: 14px;
-  font-size: 0.875rem;
-  font-weight: bold;
-  height: auto;
-  left: 6px;
-  line-height: normal;
-  padding: 15px 23px 14px;
-  text-decoration: none;
-  top: 6px;
-  width: auto;
-  z-index: 100000;
-  /* Above WP toolbar. */
+    background-color: #f1f1f1;
+    box-shadow: 0 0 5px 5px rgba(0, 0, 0, 0.2);
+    clip: auto !important;
+    clip-path: none;
+    color: #222;
+    display: block;
+    font-size: 14px;
+    font-size: 0.875rem;
+    font-weight: bold;
+    height: auto;
+    left: 6px;
+    line-height: normal;
+    padding: 15px 23px 14px;
+    text-decoration: none;
+    top: 6px;
+    width: auto;
+    z-index: 100000;
+    /* Above WP toolbar. */
 }
 
@@ -561 +575 @@
 .wp-block-quote.is-large, .wp-block-quote.is-style-large {
     padding: 1.5em;
-}
-
-.aligncenter[class^='wp-block']:not([class^='wp-block-cover']) {
-    display: table;
 }
 
@@ -987 +997 @@
 
 #access .sub-menu,
-#access .children {}
+#access .children {
+}
 
 #access ul ul {
@@ -1267 +1278 @@
 }
 
-#mobile-menu .menu-main-search { /* Search form in mobile menu will always be top */
+#mobile-menu .menu-main-search { /* searchbar overlaps first menu item with smaller (<.9em) text */
     position: absolute;
     top: 0;
@@ -1277 +1288 @@
     border: none;
     font-size: 1.2em;
+    z-index: -1;
 }
 
@@ -1831 +1843 @@
     ## AUTHOR INFO
 --------------------------------------------------------------*/
-#author-info {
+.author-info {
     display: block;
     clear: both;
@@ -1837 +1849 @@
 }
 
-#author-info #author-avatar {
+.author-info .author-avatar {
     float: right;
     height: 80px;
@@ -1843 +1855 @@
 
 }
-#author-info #author-description {
+.author-info .author-description {
     float: left;
     margin-right: 100px;
 }
 
-article #author-info {
+article .author-info {
     clear: both;
     overflow: hidden;
@@ -1856 +1868 @@
 }
 
-#author-avatar .avatar {
+.author-avatar .avatar {
     border-radius: 4px;
 }
 
-#author-info #author-link {
+.author-info .author-link {
     margin-top: .5em;
 }
@@ -3862 +3874 @@
 }
 
-.format-status .avatar {
+.format-status .avatar-container {
     display: block;
     float: left;
-    width: auto;
     margin-top: .5em;
     margin-right: 1em;
@@ -3896 +3907 @@
 
 #comments-title,
-#reply-title {
+#reply-title,
+.related-main-title {
     font-size: 1.8em;
 }
@@ -4286 +4298 @@
 }
 
-/* ## BEFORE CONTENT AND AFTER CONTENT WIDGET AREAS */
+/* ## INNER/OUTER TOP/BOTTOM WIDGET AREAS */
+
+.top-widget-area > section,
+.bottom-widget-area > section,
+.content-widget-before > section,
+.content-widget-after > section {
+    padding: 0;
+}
+
+.top-widget-area > section,
+.bottom-widget-area > section {
+    margin: 0;
+}
+
 .yoyo .widget-title {
     background: none;
@@ -4687 +4712 @@
     margin-top: 0.5em;
     margin-bottom: 0;
+    font-size: 1em;
     line-height: 1.3;
+}
+
+.related-posts .related-title a {
+    word-wrap: break-word;
 }
 
@@ -5667 +5697 @@
 .fluida-metahide-headerimg #header-image-main-inside,
 .fluida-metahide-breadcrumbs #breadcrumbs-container,
+.fluida-metahide-title.page .article-inner .entry-title,
+.fluida-metahide-title.single .article-inner .entry-title,
 .fluida-metahide-colophon #colophon,
 .fluida-metahide-footer #footer {
@@ -5806 +5838 @@
 
 /* Team Members */
-.tmm .tmm_member .tmm_photo {
+.tmm .tmm_container .tmm_member .tmm_photo {
     border-radius: 20px !important;
-}
-
-.tmm .tmm_member .tmm_textblock {
+    padding-bottom: 0;
+}
+
+.tmm .tmm_container .tmm_member .tmm_textblock {
     padding: 10px 25px;
 }
@@ -5816 +5849 @@
 /* Jetpack Portfolio shortcode in widget */
 .widget-container h2.portfolio-entry-title {
-    font-size: 1.2em;
+    font-size: 1.2em;
 }
 
@@ -5822 +5855 @@
 body.safari,
 .safari .lp-text {
-    background-attachment: scroll;
+    background-attachment: scroll;
     background-position: top center !important;
 }
@@ -6333 +6366 @@
     #nav-below,
     .comment-navigation,
-    #author-link,
+    .author-link,
     #breadcrumbs-container,
     a.continue-reading-link,