Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updating svn version to be in line with github

git-svn-id: http://svn.wp-plugins.org/galleria-galleria/trunk@367767 b8457f37-d9ea-0310-8a92-e5e31aec5664
  • Loading branch information...
commit b5205bff9bdf5b8f0f0f787e9836ea8af4e11cb5 1 parent 9caf417
gluten authored
View
13 galleria-galleria.php
@@ -125,10 +125,18 @@ function galleria_galleria_admin_head() {
'value' => 'dots',
'label' => __( 'Dots' )
),
+<<<<<<< HEAD
+=======
+/*
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
'fullscreen' => array(
'value' => 'fullscreen',
'label' => __( 'Fullscreen' )
)
+<<<<<<< HEAD
+=======
+*/
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
);
$transition_options = array(
@@ -360,8 +368,13 @@ function galleria_galleria_load_scripts( ) {
if( !$add_galleria_scripts )
return;
+<<<<<<< HEAD
wp_enqueue_script('photo-galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
wp_print_scripts('photo-galleria');
+=======
+ wp_enqueue_script('galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
+ wp_print_scripts('galleria');
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
galleria_galleria_scripts_head();
}
add_action('wp_footer', 'galleria_galleria_load_scripts' );
View
7 galleria-themes/classic/galleria.classic.css
@@ -80,15 +80,22 @@
font: bold 12px/1.1 arial,sans-serif;
margin: 0;
color: #fff;
+<<<<<<< HEAD
+=======
+ margin-bottom: 7px;
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
}
.galleria-info-description {
font: italic 12px/1.4 georgia,serif;
margin: 0;
color: #bbb;
}
+<<<<<<< HEAD
.galleria-info-title+.galleria-info-description {
margin-top: 7px;
}
+=======
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
.galleria-info-close {
width: 9px;
height: 9px;
View
77 galleria-themes/classic/galleria.classic.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/*
* Galleria Classic Theme v. 1.5 2010-10-28
* http://galleria.aino.se
@@ -5,12 +6,24 @@
* Copyright (c) 2010, Aino
* Licensed under the MIT license.
*/
+=======
+/**
+ * @preserve Galleria Classic Theme 2011-02-14
+ * http://galleria.aino.se
+ *
+ * Copyright (c) 2011, Aino
+ * Licensed under the MIT license.
+ */
+
+/*global jQuery, Galleria */
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
(function($) {
Galleria.addTheme({
name: 'classic',
author: 'Galleria',
+<<<<<<< HEAD
version: '1.5',
css: 'galleria.classic.css',
defaults: {
@@ -19,6 +32,15 @@ Galleria.addTheme({
// set this to false if you want to show the caption all the time:
_toggle_info: true
+=======
+ css: 'galleria.classic.css',
+ defaults: {
+ transition: 'slide',
+ thumbCrop: 'height',
+
+ // set this to false if you want to show the caption all the time:
+ _toggleInfo: true
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
},
init: function(options) {
@@ -29,6 +51,7 @@ Galleria.addTheme({
});
// cache some stuff
+<<<<<<< HEAD
var toggle = this.$('image-nav-left,image-nav-right,counter'),
info = this.$('info-link,info-close,info-text'),
click = Galleria.TOUCH ? 'touchstart' : 'click';
@@ -46,12 +69,24 @@ Galleria.addTheme({
$(this).not('.active').children().stop().fadeTo(400, .6);
});
+=======
+ var info = this.$('info-link,info-close,info-text'),
+ touch = Galleria.TOUCH,
+ click = touch ? 'touchstart' : 'click';
+
+ // show loader & counter with opacity
+ this.$('loader,counter').show().css('opacity', 0.4);
+
+ // some stuff for non-touch browsers
+ if (! touch ) {
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
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 });
}
// toggle info
+<<<<<<< HEAD
if ( options._toggle_info ) {
info.bind( click, function() {
info.toggle();
@@ -66,17 +101,59 @@ Galleria.addTheme({
this.bind(Galleria.LOADSTART, function(e) {
if (!e.cached) {
this.$('loader').show().fadeTo(200, .4);
+=======
+ if ( options._toggleInfo === true ) {
+ info.bind( click, function() {
+ info.toggle();
+ });
+ } else {
+ info.show();
+ this.$('info-link, info-close').hide();
+ }
+
+ // bind some stuff
+ this.bind('thumbnail', function(e) {
+
+ if (! touch ) {
+ // fade thumbnails
+ $(e.thumbTarget).css('opacity', 0.6).parent().hover(function() {
+ $(this).not('.active').children().stop().fadeTo(100, 1);
+ }, function() {
+ $(this).not('.active').children().stop().fadeTo(400, 0.6);
+ });
+
+ if ( e.index === options.show ) {
+ $(e.thumbTarget).css('opacity',1);
+ }
+ }
+ });
+
+ this.bind('loadstart', function(e) {
+ if (!e.cached) {
+ this.$('loader').show().fadeTo(200, 0.4);
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
}
this.$('info').toggle( this.hasInfo() );
+<<<<<<< HEAD
$(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity',.6);
});
this.bind(Galleria.LOADFINISH, function(e) {
+=======
+ $(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity', 0.6);
+ });
+
+ this.bind('loadfinish', function(e) {
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
this.$('loader').fadeOut(200);
});
}
});
+<<<<<<< HEAD
})(jQuery);
+=======
+}(jQuery));
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
View
14 galleria-themes/classic/galleria.classic.min.js
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Galleria Classic Theme v. 1.5 2010-10-28
* http://galleria.aino.se
*
@@ -8,4 +9,15 @@
(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,
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());
-a(b.thumbTarget).css("opacity",1).parent().siblings().children().css("opacity",0.6)});this.bind(Galleria.LOADFINISH,function(){this.$("loader").fadeOut(200)})}})})(jQuery);
+a(b.thumbTarget).css("opacity",1).parent().siblings().children().css("opacity",0.6)});this.bind(Galleria.LOADFINISH,function(){this.$("loader").fadeOut(200)})}})})(jQuery);
+=======
+ Galleria Classic Theme 2011-02-14
+ http://galleria.aino.se
+
+ Copyright (c) 2011, Aino
+ Licensed under the MIT license.
+*/
+(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"),
+{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||
+this.$("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);
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
View
4,096 js/galleria-1.2.2.js
4,096 additions, 0 deletions not shown
View
27 readme.txt
@@ -4,12 +4,17 @@ Donate link: https://github.com/samargulies/galleria-galleria/
Tags: photo, photos, gallery, galleries, photo gallery, lightbox
Requires at least: 3.0
Tested up to: 3.1
+<<<<<<< HEAD
Stable tag: 0.1a
+=======
+Stable tag: 0.1
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
Transform standard WordPress galleries into galleria slideshows.
== Description ==
+<<<<<<< HEAD
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!
@@ -23,6 +28,28 @@ Galleria Galleria is a fork of [Photo Galleria](http://wordpress.org/extend/plug
== Frequently Asked Questions ==
+=======
+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. 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.
+
+== Installation ==
+
+1. Upload the entire `galleria-galleria` folder to the `/wp-content/plugins/` directory
+2. Activate the plugin through the 'Plugins' menu in WordPress
+3. All existing galleries inserted using the [gallery] shortcode will now use Galleria Galleria.
+
+== Screenshots ==
+
+1. The Galleria Galleria settings page
+2. An example gallery
+== Frequently Asked Questions ==
+
+= How is this plugin different from other Wordpress gallery plugins? =
+Galleria 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.
+
+== Other Notes ==
+This 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.
+
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
== Changelog ==
= Version 0.1 =
View
BIN  screenshot-2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.