WordPress.org
Get WordPress

Plugin Directory

Changeset 1294950


Ignore:
Timestamp:
11/26/2015 11:14:00 AM (10 years ago)
Author:
pdamsten
Message:

WP 4.4 & protocol-less css import

Location:
fullscreen-galleria
Files:
4 deleted
3 edited
14 copied

Legend:

Unmodified
Added
Removed

  • fullscreen-galleria/tags/1.4.12/galleria-fs.css

    r919149 r1294950  
    66******************************************************************************/
    77
    8 @import url(http://fonts.googleapis.com/css?family=Open+Sans:300,400,400italic,600,600italic,700,700italic);
     8@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,400italic,600,600italic,700,700italic);
    99
    1010.olControlAttribution {
    … …  
    148148    bottom: 20px;
    149149    display: table-row;
     150    min-width: 550px;
    150151}
    151152.galleria-info-text {

  • fullscreen-galleria/tags/1.4.12/galleria-fs.php

    r1237853 r1294950  
    55Plugin URI: http://torturedmind.org/
    66Description: Fullscreen gallery for Wordpress
    7 Version: 1.4.11
     7Version: 1.4.12
    88Author: Petri Damstén
    99Author URI: http://torturedmind.org/
    … …  
    1212******************************************************************************/
    1313
    14 $fsg_ver = '1.4.11';
     14$fsg_ver = '1.4.12';
    1515$fsg_db_key = 'fsg_plugin_settings';
    1616
    … …  
    2424if (file_exists(dirname(__FILE__).'/mygear.php')) {
    2525  include 'mygear.php';
     26}
     27if (file_exists(dirname(__FILE__).'/description.php')) {
     28  include 'description.php';
    2629}
    2730
    … …  
    817820            $caption = '';
    818821          }
    819           if ($this->options['show_description'] && !empty($val['data']->post_content)) {
    820             $layer_has_info = true;
    821             $description = $this->js_string($val['data']->post_content);
    822             $description = "<p class=\"galleria-info-description\">".$description."</p>";
    823           } else {
    824             $description = '';
     822          $description = '';
     823          if ($this->options['show_description']) {
     824            if (!empty($val['data']->post_content)) {
     825              $description .= $this->js_string($val['data']->post_content);
     826            }
     827            if (function_exists('fsg_description')) {
     828              $description .= $this->js_string(fsg_description($val['data']->post_title));
     829            }
     830            if (!empty($description)) {
     831              $layer_has_info = true;
     832              $description = "<p class=\"galleria-info-description\">".$description."</p>";
     833            }
    825834          }
    826835          if ($this->options['show_camera_info'] && !empty($meta['image_meta']['info'])) {

  • fullscreen-galleria/tags/1.4.12/readme.txt

    r1237853 r1294950  
    66Tags: galleria, gallery, photography, images
    77Requires at least: 4.0
    8 Tested up to: 4.3
     8Tested up to: 4.4
    99Stable tag: trunk
    1010License: MIT
    … …  
    8787
    8888== Changelog ==
     89= 1.4.12 =
     90* Tested with WP 4.4
     91* Protocol-less url for css import
     92* Support for descriptions read from separate file
     93
    8994= 1.4.11 =
    9095* Tested with WP 4.3

  • fullscreen-galleria/trunk/galleria-fs.css

    r919149 r1294950  
    66******************************************************************************/
    77
    8 @import url(http://fonts.googleapis.com/css?family=Open+Sans:300,400,400italic,600,600italic,700,700italic);
     8@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,400italic,600,600italic,700,700italic);
    99
    1010.olControlAttribution {
    … …  
    148148    bottom: 20px;
    149149    display: table-row;
     150    min-width: 550px;
    150151}
    151152.galleria-info-text {

  • fullscreen-galleria/trunk/galleria-fs.php

    r1237853 r1294950  
    55Plugin URI: http://torturedmind.org/
    66Description: Fullscreen gallery for Wordpress
    7 Version: 1.4.11
     7Version: 1.4.12
    88Author: Petri Damstén
    99Author URI: http://torturedmind.org/
    … …  
    1212******************************************************************************/
    1313
    14 $fsg_ver = '1.4.11';
     14$fsg_ver = '1.4.12';
    1515$fsg_db_key = 'fsg_plugin_settings';
    1616
    … …  
    2424if (file_exists(dirname(__FILE__).'/mygear.php')) {
    2525  include 'mygear.php';
     26}
     27if (file_exists(dirname(__FILE__).'/description.php')) {
     28  include 'description.php';
    2629}
    2730
    … …  
    817820            $caption = '';
    818821          }
    819           if ($this->options['show_description'] && !empty($val['data']->post_content)) {
    820             $layer_has_info = true;
    821             $description = $this->js_string($val['data']->post_content);
    822             $description = "<p class=\"galleria-info-description\">".$description."</p>";
    823           } else {
    824             $description = '';
     822          $description = '';
     823          if ($this->options['show_description']) {
     824            if (!empty($val['data']->post_content)) {
     825              $description .= $this->js_string($val['data']->post_content);
     826            }
     827            if (function_exists('fsg_description')) {
     828              $description .= $this->js_string(fsg_description($val['data']->post_title));
     829            }
     830            if (!empty($description)) {
     831              $layer_has_info = true;
     832              $description = "<p class=\"galleria-info-description\">".$description."</p>";
     833            }
    825834          }
    826835          if ($this->options['show_camera_info'] && !empty($meta['image_meta']['info'])) {

  • fullscreen-galleria/trunk/readme.txt

    r1237853 r1294950  
    66Tags: galleria, gallery, photography, images
    77Requires at least: 4.0
    8 Tested up to: 4.3
     8Tested up to: 4.4
    99Stable tag: trunk
    1010License: MIT
    … …  
    8787
    8888== Changelog ==
     89= 1.4.12 =
     90* Tested with WP 4.4
     91* Protocol-less url for css import
     92* Support for descriptions read from separate file
     93
    8994= 1.4.11 =
    9095* Tested with WP 4.3
Note: See TracChangeset for help on using the changeset viewer.