WordPress.org
Get WordPress

Plugin Directory

Changeset 367769


Ignore:
Timestamp:
04/01/2011 03:09:11 AM (15 years ago)
Author:
gluten
Message:

Merge branch 'master' of github.com:samargulies/galleria-galleria

Conflicts:

galleria-galleria.php
galleria-themes/classic/classic-loader.gif
galleria-themes/classic/classic-map.png
galleria-themes/classic/galleria.classic.css
galleria-themes/classic/galleria.classic.js
galleria-themes/classic/galleria.classic.min.js
readme.txt
screenshot-1.png

Location:
galleria-galleria/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • galleria-galleria/trunk/galleria-galleria.php

    r367767 r367769  
    126126        'label' => __( 'Dots' )
    127127    ),
    128 <<<<<<< HEAD
    129 =======
    130128/*
    131 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    132129        'fullscreen' => array(
    133130        'value' =>  'fullscreen',
    134131        'label' => __( 'Fullscreen' )
    135132    )
    136 <<<<<<< HEAD
    137 =======
    138133*/
    139 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    140134);
    141135
    … …  
    369363        return;
    370364       
    371 <<<<<<< HEAD
    372     wp_enqueue_script('photo-galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
    373     wp_print_scripts('photo-galleria');
    374 =======
    375365    wp_enqueue_script('galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
    376366    wp_print_scripts('galleria');
    377 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    378367    galleria_galleria_scripts_head();
    379368}

  • galleria-galleria/trunk/galleria-themes/classic/classic-loader.gif

    • Property svn:executable deleted

  • galleria-galleria/trunk/galleria-themes/classic/classic-map.png

    • Property svn:executable deleted

  • galleria-galleria/trunk/galleria-themes/classic/galleria.classic.css

    • Property svn:executable deleted
    r367767 r367769  
    8181    margin: 0;
    8282    color: #fff;
    83 <<<<<<< HEAD
    84 =======
    8583    margin-bottom: 7px;
    86 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    8784}
    8885.galleria-info-description {
    … …  
    9188    color: #bbb;
    9289}
    93 <<<<<<< HEAD
    94 .galleria-info-title+.galleria-info-description {
    95     margin-top: 7px;
    96 }
    97 =======
    98 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    9990.galleria-info-close {
    10091    width: 9px;

  • galleria-galleria/trunk/galleria-themes/classic/galleria.classic.js

    • Property svn:executable deleted
    r367767 r367769  
    1 <<<<<<< HEAD
    2 /*
    3  * Galleria Classic Theme v. 1.5 2010-10-28
    4  * http://galleria.aino.se
    5  *
    6  * Copyright (c) 2010, Aino
    7  * Licensed under the MIT license.
    8  */
    9 =======
    101/**
    112 * @preserve Galleria Classic Theme 2011-02-14
    … …  
    178 
    189/*global jQuery, Galleria */
    19 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    2010
    2111(function($) {
    … …  
    2414    name: 'classic',
    2515    author: 'Galleria',
    26 <<<<<<< HEAD
    27     version: '1.5',
    28     css: 'galleria.classic.css',
    29     defaults: {
    30         transition: 'slide',
    31         thumb_crop: 'height',
    32        
    33         // set this to false if you want to show the caption all the time:
    34         _toggle_info: true
    35 =======
    3616    css: 'galleria.classic.css',
    3717    defaults: {
    … …  
    4121        // set this to false if you want to show the caption all the time:
    4222        _toggleInfo: true
    43 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    4423    },
    4524    init: function(options) {
    … …  
    5231       
    5332        // cache some stuff
    54 <<<<<<< HEAD
    55         var toggle   = this.$('image-nav-left,image-nav-right,counter'),
    56             info     = this.$('info-link,info-close,info-text'),
    57             click    = Galleria.TOUCH ? 'touchstart' : 'click';
    58        
    59         // show loader & counter with opacity
    60         this.$('loader,counter').show().css('opacity',.4)
    61 
    62         // some stuff for non-touch browsers
    63         if (! Galleria.TOUCH ) {
    64            
    65             // fade thumbnails
    66             this.$('thumbnails').children().hover(function() {
    67                 $(this).not('.active').children().stop().fadeTo(100, 1);
    68             }, function() {
    69                 $(this).not('.active').children().stop().fadeTo(400, .6);
    70             });
    71            
    72 =======
    7333        var info = this.$('info-link,info-close,info-text'),
    7434            touch = Galleria.TOUCH,
    … …  
    8040        // some stuff for non-touch browsers
    8141        if (! touch ) {
    82 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    8342            this.addIdleState( this.get('image-nav-left'), { left:-50 });
    8443            this.addIdleState( this.get('image-nav-right'), { right:-50 });
    … …  
    8746       
    8847        // toggle info
    89 <<<<<<< HEAD
    90         if ( options._toggle_info ) {
    91             info.bind( click, function() {
    92                 info.toggle();
    93             });
    94         }
    95        
    96         // bind some stuff
    97         this.bind(Galleria.THUMBNAIL, function(e) {
    98             $(e.thumbTarget).parent(':not(.active)').children().css('opacity',.6)
    99         });
    100        
    101         this.bind(Galleria.LOADSTART, function(e) {
    102             if (!e.cached) {
    103                 this.$('loader').show().fadeTo(200, .4);
    104 =======
    10548        if ( options._toggleInfo === true ) {
    10649            info.bind( click, function() {
    … …  
    13275            if (!e.cached) {
    13376                this.$('loader').show().fadeTo(200, 0.4);
    134 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    13577            }
    13678           
    13779            this.$('info').toggle( this.hasInfo() );
    13880           
    139 <<<<<<< HEAD
    140             $(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity',.6);
    141         });
    142        
    143         this.bind(Galleria.LOADFINISH, function(e) {
    144 =======
    14581            $(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity', 0.6);
    14682        });
    14783       
    14884        this.bind('loadfinish', function(e) {
    149 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    15085            this.$('loader').fadeOut(200);
    15186        });
    … …  
    15388});
    15489
    155 <<<<<<< HEAD
    156 })(jQuery);
    157 =======
    15890}(jQuery));
    159 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d

  • galleria-galleria/trunk/galleria-themes/classic/galleria.classic.min.js

    • Property svn:executable set to *
    r367767 r367769  
    11/*
    2 <<<<<<< HEAD
    3  * Galleria Classic Theme v. 1.5 2010-10-28
    4  * http://galleria.aino.se
    5  *
    6  * Copyright (c) 2010, Aino
    7  * Licensed under the MIT license.
    8  */
    9 
    10 (function(a){Galleria.addTheme({name:"classic",author:"Galleria",version:"1.5",css:"galleria.classic.css",defaults:{transition:"slide",thumb_crop:"height",_toggle_info:true},init:function(d){this.addElement("info-link","info-close");this.append({info:["info-link","info-close"]});this.$("image-nav-left,image-nav-right,counter");var c=this.$("info-link,info-close,info-text"),e=Galleria.TOUCH?"touchstart":"click";this.$("loader,counter").show().css("opacity",0.4);if(!Galleria.TOUCH){this.$("thumbnails").children().hover(function(){a(this).not(".active").children().stop().fadeTo(100,
    11 1)},function(){a(this).not(".active").children().stop().fadeTo(400,0.6)});this.addIdleState(this.get("image-nav-left"),{left:-50});this.addIdleState(this.get("image-nav-right"),{right:-50});this.addIdleState(this.get("counter"),{opacity:0})}d._toggle_info&&c.bind(e,function(){c.toggle()});this.bind(Galleria.THUMBNAIL,function(b){a(b.thumbTarget).parent(":not(.active)").children().css("opacity",0.6)});this.bind(Galleria.LOADSTART,function(b){b.cached||this.$("loader").show().fadeTo(200,0.4);this.$("info").toggle(this.hasInfo());
    12 a(b.thumbTarget).css("opacity",1).parent().siblings().children().css("opacity",0.6)});this.bind(Galleria.LOADFINISH,function(){this.$("loader").fadeOut(200)})}})})(jQuery);
    13 =======
    142 Galleria Classic Theme 2011-02-14
    153 http://galleria.aino.se
    … …  
    219{right:-50});this.addIdleState(this.get("counter"),{opacity:0})}if(e._toggleInfo===true)c.bind(f,function(){c.toggle()});else{c.show();this.$("info-link, info-close").hide()}this.bind("thumbnail",function(a){if(!d){b(a.thumbTarget).css("opacity",0.6).parent().hover(function(){b(this).not(".active").children().stop().fadeTo(100,1)},function(){b(this).not(".active").children().stop().fadeTo(400,0.6)});a.index===e.show&&b(a.thumbTarget).css("opacity",1)}});this.bind("loadstart",function(a){a.cached||
    2210this.$("loader").show().fadeTo(200,0.4);this.$("info").toggle(this.hasInfo());b(a.thumbTarget).css("opacity",1).parent().siblings().children().css("opacity",0.6)});this.bind("loadfinish",function(){this.$("loader").fadeOut(200)})}})})(jQuery);
    23 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d

  • galleria-galleria/trunk/readme.txt

    r367767 r367769  
    55Requires at least: 3.0
    66Tested up to: 3.1
    7 <<<<<<< HEAD
    8 Stable tag: 0.1a
    9 =======
    107Stable tag: 0.1
    11 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    128
    139Transform standard WordPress galleries into galleria slideshows.
    … …  
    1511== Description ==
    1612
    17 <<<<<<< HEAD
    18 Galleria Galleria is a fork of [Photo Galleria](http://wordpress.org/extend/plugins/photo-galleria/) that is designed to minimize resources and selectively load javascript. I love how the Photo Galleria plugin was integrated into the Wordpress gallery system but I could not stand seeing so many resources load on every page when only one might contain a gallery. Galleria Galleria will only load javascript on pages that actually have a gallery. Beyond that, we will see what other improvements I can make to this plugin. I'm open for suggestions!
    19 
    20 
    21 == Installation ==
    22 
    23 1. Upload the entire `photo-galleria` folder to the `/wp-content/plugins/` directory
    24 1. Activate the plugin through the 'Plugins' menu in WordPress
    25 1. All existing galleries inserted using the [gallery] shortcode will now use Galleria Galleria.
    26 
    27 == Screenshots ==
    28 
    29 == Frequently Asked Questions ==
    30 
    31 =======
    3213Galleria Galleria is a fork of [Photo Galleria](http://wordpress.org/extend/plugins/photo-galleria/) that is designed to minimize resources and selectively load javascript. This plugin will only load javascript on pages that actually have a gallery. Galleria Galleria also keeps standard gallery styling if javascript is not enabled.  Beyond that, this plugin is built using the [Galleria javascript library](http://galleria.aino.se/) that allows for advanced theming and customization.
    3314
    … …  
    5031This plugin uses the standard [gallery] shortcode to create slideshows. It also adds support for a per gallery height attribute in the format [gallery height=500] to create a gallery with a height of 500px.
    5132
    52 >>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    5333== Changelog ==
    5434
Note: See TracChangeset for help on using the changeset viewer.