WordPress.org
Get WordPress

Plugin Directory

Changeset 367767


Ignore:
Timestamp:
04/01/2011 02:23:06 AM (15 years ago)
Author:
gluten
Message:

updating svn version to be in line with github

Location:
galleria-galleria/trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

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

    r366106 r367767  
    126126        'label' => __( 'Dots' )
    127127    ),
     128<<<<<<< HEAD
     129=======
     130/*
     131>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    128132        'fullscreen' => array(
    129133        'value' =>  'fullscreen',
    130134        'label' => __( 'Fullscreen' )
    131135    )
     136<<<<<<< HEAD
     137=======
     138*/
     139>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    132140);
    133141
    … …  
    361369        return;
    362370       
     371<<<<<<< HEAD
    363372    wp_enqueue_script('photo-galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
    364373    wp_print_scripts('photo-galleria');
     374=======
     375    wp_enqueue_script('galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
     376    wp_print_scripts('galleria');
     377>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    365378    galleria_galleria_scripts_head();
    366379}

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

    r366106 r367767  
    8181    margin: 0;
    8282    color: #fff;
     83<<<<<<< HEAD
     84=======
     85    margin-bottom: 7px;
     86>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    8387}
    8488.galleria-info-description {
    … …  
    8791    color: #bbb;
    8892}
     93<<<<<<< HEAD
    8994.galleria-info-title+.galleria-info-description {
    9095    margin-top: 7px;
    9196}
     97=======
     98>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    9299.galleria-info-close {
    93100    width: 9px;

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

    r366106 r367767  
     1<<<<<<< HEAD
    12/*
    23 * Galleria Classic Theme v. 1.5 2010-10-28
    … …  
    67 * Licensed under the MIT license.
    78 */
     9=======
     10/**
     11 * @preserve Galleria Classic Theme 2011-02-14
     12 * http://galleria.aino.se
     13 *
     14 * Copyright (c) 2011, Aino
     15 * Licensed under the MIT license.
     16 */
     17 
     18/*global jQuery, Galleria */
     19>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    820
    921(function($) {
    … …  
    1224    name: 'classic',
    1325    author: 'Galleria',
     26<<<<<<< HEAD
    1427    version: '1.5',
    1528    css: 'galleria.classic.css',
    … …  
    2033        // set this to false if you want to show the caption all the time:
    2134        _toggle_info: true
     35=======
     36    css: 'galleria.classic.css',
     37    defaults: {
     38        transition: 'slide',
     39        thumbCrop:  'height',
     40       
     41        // set this to false if you want to show the caption all the time:
     42        _toggleInfo: true
     43>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    2244    },
    2345    init: function(options) {
    … …  
    3052       
    3153        // cache some stuff
     54<<<<<<< HEAD
    3255        var toggle   = this.$('image-nav-left,image-nav-right,counter'),
    3356            info     = this.$('info-link,info-close,info-text'),
    … …  
    4770            });
    4871           
     72=======
     73        var info = this.$('info-link,info-close,info-text'),
     74            touch = Galleria.TOUCH,
     75            click = touch ? 'touchstart' : 'click';
     76       
     77        // show loader & counter with opacity
     78        this.$('loader,counter').show().css('opacity', 0.4);
     79
     80        // some stuff for non-touch browsers
     81        if (! touch ) {
     82>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    4983            this.addIdleState( this.get('image-nav-left'), { left:-50 });
    5084            this.addIdleState( this.get('image-nav-right'), { right:-50 });
    … …  
    5387       
    5488        // toggle info
     89<<<<<<< HEAD
    5590        if ( options._toggle_info ) {
    5691            info.bind( click, function() {
    … …  
    67102            if (!e.cached) {
    68103                this.$('loader').show().fadeTo(200, .4);
     104=======
     105        if ( options._toggleInfo === true ) {
     106            info.bind( click, function() {
     107                info.toggle();
     108            });
     109        } else {
     110            info.show();
     111            this.$('info-link, info-close').hide();
     112        }
     113       
     114        // bind some stuff
     115        this.bind('thumbnail', function(e) {
     116           
     117            if (! touch ) {
     118                // fade thumbnails
     119                $(e.thumbTarget).css('opacity', 0.6).parent().hover(function() {
     120                    $(this).not('.active').children().stop().fadeTo(100, 1);
     121                }, function() {
     122                    $(this).not('.active').children().stop().fadeTo(400, 0.6);
     123                });
     124               
     125                if ( e.index === options.show ) {
     126                    $(e.thumbTarget).css('opacity',1);
     127                }
     128            }
     129        });
     130       
     131        this.bind('loadstart', function(e) {
     132            if (!e.cached) {
     133                this.$('loader').show().fadeTo(200, 0.4);
     134>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    69135            }
    70136           
    71137            this.$('info').toggle( this.hasInfo() );
    72138           
     139<<<<<<< HEAD
    73140            $(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity',.6);
    74141        });
    75142       
    76143        this.bind(Galleria.LOADFINISH, function(e) {
     144=======
     145            $(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity', 0.6);
     146        });
     147       
     148        this.bind('loadfinish', function(e) {
     149>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    77150            this.$('loader').fadeOut(200);
    78151        });
    … …  
    80153});
    81154
     155<<<<<<< HEAD
    82156})(jQuery);
     157=======
     158}(jQuery));
     159>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d

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

    r366106 r367767  
    11/*
     2<<<<<<< HEAD
    23 * Galleria Classic Theme v. 1.5 2010-10-28
    34 * http://galleria.aino.se
    … …  
    10111)},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());
    1112a(b.thumbTarget).css("opacity",1).parent().siblings().children().css("opacity",0.6)});this.bind(Galleria.LOADFINISH,function(){this.$("loader").fadeOut(200)})}})})(jQuery);
     13=======
     14 Galleria Classic Theme 2011-02-14
     15 http://galleria.aino.se
     16
     17 Copyright (c) 2011, Aino
     18 Licensed under the MIT license.
     19*/
     20(function(b){Galleria.addTheme({name:"classic",author:"Galleria",css:"galleria.classic.css",defaults:{transition:"slide",thumbCrop:"height",_toggleInfo:true},init:function(e){this.addElement("info-link","info-close");this.append({info:["info-link","info-close"]});var c=this.$("info-link,info-close,info-text"),d=Galleria.TOUCH,f=d?"touchstart":"click";this.$("loader,counter").show().css("opacity",0.4);if(!d){this.addIdleState(this.get("image-nav-left"),{left:-50});this.addIdleState(this.get("image-nav-right"),
     21{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||
     22this.$("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

    r367764 r367767  
    55Requires at least: 3.0
    66Tested up to: 3.1
     7<<<<<<< HEAD
    78Stable tag: 0.1a
     9=======
     10Stable tag: 0.1
     11>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    812
    913Transform standard WordPress galleries into galleria slideshows.
    … …  
    1115== Description ==
    1216
     17<<<<<<< HEAD
    1318Galleria 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!
    1419
    … …  
    2429== Frequently Asked Questions ==
    2530
     31=======
     32Galleria 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.
     33
     34== Installation ==
     35
     361. Upload the entire `galleria-galleria` folder to the `/wp-content/plugins/` directory
     372. Activate the plugin through the 'Plugins' menu in WordPress
     383. All existing galleries inserted using the [gallery] shortcode will now use Galleria Galleria.
     39
     40== Screenshots ==
     41
     421. The Galleria Galleria settings page
     432. An example gallery
     44== Frequently Asked Questions ==
     45
     46= How is this plugin different from other Wordpress gallery plugins? =
     47Galleria Galleria is designed to only selectively load javascript to reduce the load time of your site. It also works seamlessly with galleries you have already created for your site in Wordpress.
     48
     49== Other Notes ==
     50This 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.
     51
     52>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
    2653== Changelog ==
    2754
Note: See TracChangeset for help on using the changeset viewer.