You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2016/10/20 13:41:00 UTC
[1/8] james-project git commit: JAMES-1831 Add a docker container for
producing website
Repository: james-project
Updated Branches:
refs/heads/master 1ce23080e -> 32e5edd40
JAMES-1831 Add a docker container for producing website
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9a93fd94
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9a93fd94
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9a93fd94
Branch: refs/heads/master
Commit: 9a93fd9431d28960b3d599c4fedc265a5b4916d0
Parents: 1ce2308
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Oct 6 14:11:52 2016 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Oct 20 15:40:00 2016 +0200
----------------------------------------------------------------------
README.adoc | 4 +++
dockerfiles/site/Dockerfile | 22 ++++++++++++++++
dockerfiles/site/compile.sh | 55 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/9a93fd94/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index 31dda5b..a78b59a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -50,6 +50,10 @@ To deploy the technical reports use the "-Psite-reports" profile.
For wagon-ssh-external configuration see
http://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html
+You can alternatively use a docker container to build the website :
+
+ $ docker build -t james/site dockerfiles/site
+ $ docker run -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/site:/destination james/site master
Howto release via maven release plugin
======================================
http://git-wip-us.apache.org/repos/asf/james-project/blob/9a93fd94/dockerfiles/site/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/site/Dockerfile b/dockerfiles/site/Dockerfile
new file mode 100644
index 0000000..1bd3e76
--- /dev/null
+++ b/dockerfiles/site/Dockerfile
@@ -0,0 +1,22 @@
+# Build James
+#
+# VERSION 1.0
+
+FROM java:openjdk-6-jdk
+
+# Install Maven
+WORKDIR /root
+RUN wget http://mirrors.ircam.fr/pub/apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
+RUN tar -xvf apache-maven-3.2.5-bin.tar.gz
+RUN ln -s /root/apache-maven-3.2.5/bin/mvn /usr/bin/mvn
+
+# Install git
+RUN apt-get update
+RUN apt-get install -y git
+
+# Copy the script
+COPY compile.sh /root/compile.sh
+
+# Define the entrypoint
+WORKDIR /james-project
+ENTRYPOINT ["/root/compile.sh"]
http://git-wip-us.apache.org/repos/asf/james-project/blob/9a93fd94/dockerfiles/site/compile.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/site/compile.sh b/dockerfiles/site/compile.sh
new file mode 100755
index 0000000..3b313a1
--- /dev/null
+++ b/dockerfiles/site/compile.sh
@@ -0,0 +1,55 @@
+#!/bin/sh -e
+#
+
+printUsage() {
+ echo "Usage : "
+ echo "./compile.sh SHA1"
+ echo " SHA1: SHA1 to build (optional)"
+ exit 1
+}
+
+ORIGIN=/origin
+DESTINATION=/destination
+
+for arg in "$@"
+do
+ case $arg in
+ -*)
+ echo "Invalid option: -$OPTARG"
+ printUsage
+ ;;
+ *)
+ if ! [ -z "$1" ]; then
+ SHA1=$1
+ fi
+ ;;
+ esac
+ if [ "0" -lt "$#" ]; then
+ shift
+ fi
+done
+
+if [ -z "$SHA1" ]; then
+ SHA1=master
+fi
+
+# Sources retrieval
+git clone $ORIGIN/.
+git checkout $SHA1
+
+# Compilation
+
+mvn clean install -DskipTests
+mvn clean site:site -Dmaven.javadoc.skip=true
+
+# Retrieve result
+
+if [ $? -eq 0 ]; then
+ cp -r target/site/* $DESTINATION/
+ cp -r server/target/site $DESTINATION/server
+ cp -r mailbox/target/site $DESTINATION/mailbox
+ cp -r protocols/target/site $DESTINATION/protocols
+ cp -r mailet/target/site $DESTINATION/mailet
+ cp -r mpt/target/site $DESTINATION/mpt
+
+fi
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/8] james-project git commit: JAMES-1831 Increment James skin them
Posted by bt...@apache.org.
JAMES-1831 Increment James skin them
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b2d7ac48
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b2d7ac48
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b2d7ac48
Branch: refs/heads/master
Commit: b2d7ac48bcfb4b202e78bb35bbf4d84f938f0df0
Parents: f4b8230
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Oct 6 17:23:08 2016 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Oct 20 15:40:24 2016 +0200
----------------------------------------------------------------------
pom.xml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b2d7ac48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 036b12b..2ebcc30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,14 +36,6 @@
<version>3.0.0-beta5-SNAPSHOT</version>
<packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
-
<name>Apache James Project</name>
<description>
The Apache Java Enterprise Mail Server (a.k.a. Apache James) is a 100% pure Java SMTP, IMAP and POP3 Mail
@@ -560,7 +552,7 @@
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<target.jdk>1.6</target.jdk>
- <james-skin.version>1.7</james-skin.version>
+ <james-skin.version>1.8</james-skin.version>
<!--
This property contains the directory where to deploy when running using "-Psite-reports" profile
to avoid accidently overriding the common modules website. Empty by default.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[7/8] james-project git commit: JAMES-1831 Remove galleria
Posted by bt...@apache.org.
JAMES-1831 Remove galleria
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6170f93f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6170f93f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6170f93f
Branch: refs/heads/master
Commit: 6170f93f4d9e96291c8fdec13b08462fc7b10cad
Parents: b2d7ac4
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Oct 6 22:46:00 2016 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Oct 20 15:40:24 2016 +0200
----------------------------------------------------------------------
src/site/resources/js/galleria/galleria.js | 3765 ------------------
.../js/galleria/plugins/galleria.flickr.js | 221 -
.../js/galleria/themes/classic/README.rst | 10 -
.../galleria/themes/classic/classic-demo.html | 41 -
.../galleria/themes/classic/classic-loader.gif | Bin 1849 -> 0 bytes
.../js/galleria/themes/classic/classic-map.png | Bin 1840 -> 0 bytes
.../themes/classic/galleria.classic.css | 202 -
.../galleria/themes/classic/galleria.classic.js | 82 -
.../js/galleria/themes/fullscreen/b.png | Bin 1093 -> 0 bytes
.../js/galleria/themes/fullscreen/down.gif | Bin 54 -> 0 bytes
.../js/galleria/themes/fullscreen/fix.gif | Bin 43 -> 0 bytes
.../themes/fullscreen/fullscreen-demo.html | 34 -
.../themes/fullscreen/galleria.fullscreen.css | 42 -
.../themes/fullscreen/galleria.fullscreen.js | 163 -
.../js/galleria/themes/fullscreen/i.png | Bin 179 -> 0 bytes
.../js/galleria/themes/fullscreen/l.gif | Bin 82 -> 0 bytes
.../js/galleria/themes/fullscreen/loader.gif | Bin 1586 -> 0 bytes
.../js/galleria/themes/fullscreen/n.gif | Bin 59 -> 0 bytes
.../js/galleria/themes/fullscreen/p.gif | Bin 60 -> 0 bytes
.../js/galleria/themes/fullscreen/r.gif | Bin 82 -> 0 bytes
.../js/galleria/themes/fullscreen/up.gif | Bin 54 -> 0 bytes
21 files changed, 4560 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[8/8] james-project git commit: JAMES-1831 Remove call for logo
Posted by bt...@apache.org.
JAMES-1831 Remove call for logo
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/32e5edd4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/32e5edd4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/32e5edd4
Branch: refs/heads/master
Commit: 32e5edd40685eb9ad60e3d07864e9f6fc19100fe
Parents: 6170f93
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Oct 6 23:34:04 2016 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Oct 20 15:40:24 2016 +0200
----------------------------------------------------------------------
src/site/resources/logo-call/james-logo-1.png | Bin 38504 -> 0 bytes
src/site/resources/logo-call/james-logo-10.png | Bin 5243 -> 0 bytes
src/site/resources/logo-call/james-logo-2.png | Bin 4021 -> 0 bytes
src/site/resources/logo-call/james-logo-3.png | Bin 28561 -> 0 bytes
src/site/resources/logo-call/james-logo-4.png | Bin 30031 -> 0 bytes
.../resources/logo-call/james-logo-5-avatar.png | Bin 3436 -> 0 bytes
src/site/resources/logo-call/james-logo-5.png | Bin 8422 -> 0 bytes
.../resources/logo-call/james-logo-6-avatar.png | Bin 3851 -> 0 bytes
src/site/resources/logo-call/james-logo-6.png | Bin 13523 -> 0 bytes
src/site/resources/logo-call/james-logo-7.png | Bin 25024 -> 0 bytes
.../resources/logo-call/james-logo-8-avatar.png | Bin 3558 -> 0 bytes
src/site/resources/logo-call/james-logo-8.png | Bin 18159 -> 0 bytes
src/site/resources/logo-call/james-logo-9.png | Bin 21761 -> 0 bytes
.../logo-call/simon-funnell-FeatherJames.jpg | Bin 79066 -> 0 bytes
.../logo-call/simon-funnell-GreenJames.jpg | Bin 101229 -> 0 bytes
.../resources/logo-call/simon-funnell-James.gif | Bin 18378 -> 0 bytes
.../resources/logo-call/simon-funnell-James2.jpg | Bin 22307 -> 0 bytes
.../logo-call/simon-funnell-YellowJames.jpg | Bin 131772 -> 0 bytes
18 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-1.png b/src/site/resources/logo-call/james-logo-1.png
deleted file mode 100644
index 918842e..0000000
Binary files a/src/site/resources/logo-call/james-logo-1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-10.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-10.png b/src/site/resources/logo-call/james-logo-10.png
deleted file mode 100644
index 2ef3d9a..0000000
Binary files a/src/site/resources/logo-call/james-logo-10.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-2.png b/src/site/resources/logo-call/james-logo-2.png
deleted file mode 100644
index 9a7ace1..0000000
Binary files a/src/site/resources/logo-call/james-logo-2.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-3.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-3.png b/src/site/resources/logo-call/james-logo-3.png
deleted file mode 100644
index 207a1c2..0000000
Binary files a/src/site/resources/logo-call/james-logo-3.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-4.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-4.png b/src/site/resources/logo-call/james-logo-4.png
deleted file mode 100644
index 1cb82e3..0000000
Binary files a/src/site/resources/logo-call/james-logo-4.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-5-avatar.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-5-avatar.png b/src/site/resources/logo-call/james-logo-5-avatar.png
deleted file mode 100644
index 81e7bf8..0000000
Binary files a/src/site/resources/logo-call/james-logo-5-avatar.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-5.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-5.png b/src/site/resources/logo-call/james-logo-5.png
deleted file mode 100644
index 16594a4..0000000
Binary files a/src/site/resources/logo-call/james-logo-5.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-6-avatar.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-6-avatar.png b/src/site/resources/logo-call/james-logo-6-avatar.png
deleted file mode 100644
index bae384a..0000000
Binary files a/src/site/resources/logo-call/james-logo-6-avatar.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-6.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-6.png b/src/site/resources/logo-call/james-logo-6.png
deleted file mode 100644
index 445a09f..0000000
Binary files a/src/site/resources/logo-call/james-logo-6.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-7.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-7.png b/src/site/resources/logo-call/james-logo-7.png
deleted file mode 100644
index 49d616f..0000000
Binary files a/src/site/resources/logo-call/james-logo-7.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-8-avatar.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-8-avatar.png b/src/site/resources/logo-call/james-logo-8-avatar.png
deleted file mode 100644
index 7b46706..0000000
Binary files a/src/site/resources/logo-call/james-logo-8-avatar.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-8.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-8.png b/src/site/resources/logo-call/james-logo-8.png
deleted file mode 100644
index 442c654..0000000
Binary files a/src/site/resources/logo-call/james-logo-8.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/james-logo-9.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/james-logo-9.png b/src/site/resources/logo-call/james-logo-9.png
deleted file mode 100644
index b67d4e7..0000000
Binary files a/src/site/resources/logo-call/james-logo-9.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/simon-funnell-FeatherJames.jpg
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/simon-funnell-FeatherJames.jpg b/src/site/resources/logo-call/simon-funnell-FeatherJames.jpg
deleted file mode 100644
index 9116738..0000000
Binary files a/src/site/resources/logo-call/simon-funnell-FeatherJames.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/simon-funnell-GreenJames.jpg
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/simon-funnell-GreenJames.jpg b/src/site/resources/logo-call/simon-funnell-GreenJames.jpg
deleted file mode 100644
index b878812..0000000
Binary files a/src/site/resources/logo-call/simon-funnell-GreenJames.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/simon-funnell-James.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/simon-funnell-James.gif b/src/site/resources/logo-call/simon-funnell-James.gif
deleted file mode 100644
index afc1038..0000000
Binary files a/src/site/resources/logo-call/simon-funnell-James.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/simon-funnell-James2.jpg
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/simon-funnell-James2.jpg b/src/site/resources/logo-call/simon-funnell-James2.jpg
deleted file mode 100644
index 7f4d32a..0000000
Binary files a/src/site/resources/logo-call/simon-funnell-James2.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/32e5edd4/src/site/resources/logo-call/simon-funnell-YellowJames.jpg
----------------------------------------------------------------------
diff --git a/src/site/resources/logo-call/simon-funnell-YellowJames.jpg b/src/site/resources/logo-call/simon-funnell-YellowJames.jpg
deleted file mode 100644
index f5527cb..0000000
Binary files a/src/site/resources/logo-call/simon-funnell-YellowJames.jpg and /dev/null differ
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/8] james-project git commit: JAMES-1831 Replace old logo with the
new one
Posted by bt...@apache.org.
JAMES-1831 Replace old logo with the new one
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d9939ee7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d9939ee7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d9939ee7
Branch: refs/heads/master
Commit: d9939ee7360195bae9a7d9e7f2a1d55310589e69
Parents: 9a93fd9
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Oct 6 15:00:56 2016 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Oct 20 15:40:04 2016 +0200
----------------------------------------------------------------------
mailbox/src/reporting-site/site.xml | 4 +--
.../site/resources/images/asf-logo-reduced.gif | Bin 6636 -> 0 bytes
.../src/site/resources/images/james-logo.jpg | Bin 5180 -> 0 bytes
mailbox/src/site/site.xml | 4 +--
.../resources/images/logos/asf-logo-reduced.gif | Bin 6636 -> 0 bytes
.../images/logos/james-crypto-mailets-logo.gif | Bin 9186 -> 0 bytes
.../images/logos/james-mailet-base-logo.gif | Bin 8795 -> 0 bytes
.../images/logos/james-mailetapi-logo.gif | Bin 9121 -> 0 bytes
.../images/logos/james-mailetdocs-logo.gif | Bin 9007 -> 0 bytes
.../logos/james-standard-mailets-logo.gif | Bin 9293 -> 0 bytes
mailet/src/reporting-site/site-base.xml | 4 +--
mailet/src/reporting-site/site-crypto.xml | 4 +--
mailet/src/reporting-site/site-mailetdoc.xml | 4 +--
mailet/src/reporting-site/site-standard.xml | 4 +--
mailet/src/reporting-site/site.xml | 4 +--
mailet/src/reporting-site/site/site.xml | 4 +--
.../resources/images/logos/asf-logo-reduced.gif | Bin 6636 -> 0 bytes
.../images/logos/james-ai-mailets-logo.png | Bin 6999 -> 0 bytes
.../images/logos/james-crypto-mailets-logo.gif | Bin 9186 -> 0 bytes
.../site/resources/images/logos/james-logo.jpg | Bin 5180 -> 0 bytes
.../images/logos/james-mailet-base-logo.gif | Bin 8795 -> 0 bytes
.../images/logos/james-mailetapi-logo.gif | Bin 9121 -> 0 bytes
.../images/logos/james-mailetdocs-logo.gif | Bin 9007 -> 0 bytes
.../logos/james-standard-mailets-logo.gif | Bin 9293 -> 0 bytes
mailet/src/site/resources/images/logos/void.gif | Bin 49 -> 0 bytes
mailet/src/site/site.xml | 4 +--
mailet/src/site/xdoc/index.xml | 30 ++++---------------
mpt/src/reporting-site/site.xml | 4 +--
.../site/resources/images/asf-logo-reduced.gif | Bin 6636 -> 0 bytes
.../site/resources/images/james-mpt-logo.gif | Bin 5179 -> 0 bytes
mpt/src/site/site.xml | 4 +--
pom.xml | 8 +++++
protocols/src/reporting-site/site.xml | 4 +--
.../site/resources/images/asf-logo-reduced.gif | Bin 6636 -> 0 bytes
.../src/site/resources/images/james-logo.jpg | Bin 5180 -> 0 bytes
.../site/resources/images/james-server-logo.gif | Bin 6944 -> 0 bytes
protocols/src/site/site.xml | 4 +--
server/src/reporting-site/site.xml | 5 ++--
server/src/site/site.xml | 4 +--
src/reporting-site/site.xml | 6 ++--
src/site/resources/images/james-logo.png | Bin 0 -> 5243 bytes
.../resources/images/james-project-logo.gif | Bin 7227 -> 0 bytes
src/site/site.xml | 6 ++--
43 files changed, 51 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailbox/src/reporting-site/site.xml
----------------------------------------------------------------------
diff --git a/mailbox/src/reporting-site/site.xml b/mailbox/src/reporting-site/site.xml
index 333d83e..91ee660 100644
--- a/mailbox/src/reporting-site/site.xml
+++ b/mailbox/src/reporting-site/site.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>James Server</name>
- <src>images/logos/james-server-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/server/index.html</href>
- <alt>james-server-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailbox/src/site/resources/images/asf-logo-reduced.gif
----------------------------------------------------------------------
diff --git a/mailbox/src/site/resources/images/asf-logo-reduced.gif b/mailbox/src/site/resources/images/asf-logo-reduced.gif
deleted file mode 100644
index 93cc102..0000000
Binary files a/mailbox/src/site/resources/images/asf-logo-reduced.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailbox/src/site/resources/images/james-logo.jpg
----------------------------------------------------------------------
diff --git a/mailbox/src/site/resources/images/james-logo.jpg b/mailbox/src/site/resources/images/james-logo.jpg
deleted file mode 100644
index 6752e5e..0000000
Binary files a/mailbox/src/site/resources/images/james-logo.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailbox/src/site/site.xml
----------------------------------------------------------------------
diff --git a/mailbox/src/site/site.xml b/mailbox/src/site/site.xml
index ca68afe..d372085 100644
--- a/mailbox/src/site/site.xml
+++ b/mailbox/src/site/site.xml
@@ -27,9 +27,9 @@
<bannerLeft>
<name>James Server</name>
- <src>images/logos/james-server-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/server/index.html</href>
- <alt>james-server-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/resources/images/logos/asf-logo-reduced.gif
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/resources/images/logos/asf-logo-reduced.gif b/mailet/src/reporting-site/resources/images/logos/asf-logo-reduced.gif
deleted file mode 100644
index 93cc102..0000000
Binary files a/mailet/src/reporting-site/resources/images/logos/asf-logo-reduced.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif b/mailet/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif
deleted file mode 100644
index 6ba316b..0000000
Binary files a/mailet/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/resources/images/logos/james-mailet-base-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/resources/images/logos/james-mailet-base-logo.gif b/mailet/src/reporting-site/resources/images/logos/james-mailet-base-logo.gif
deleted file mode 100644
index 52ce0b5..0000000
Binary files a/mailet/src/reporting-site/resources/images/logos/james-mailet-base-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/resources/images/logos/james-mailetapi-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/resources/images/logos/james-mailetapi-logo.gif b/mailet/src/reporting-site/resources/images/logos/james-mailetapi-logo.gif
deleted file mode 100644
index 085d23e..0000000
Binary files a/mailet/src/reporting-site/resources/images/logos/james-mailetapi-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/resources/images/logos/james-mailetdocs-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/resources/images/logos/james-mailetdocs-logo.gif b/mailet/src/reporting-site/resources/images/logos/james-mailetdocs-logo.gif
deleted file mode 100644
index b9d08ec..0000000
Binary files a/mailet/src/reporting-site/resources/images/logos/james-mailetdocs-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/resources/images/logos/james-standard-mailets-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/resources/images/logos/james-standard-mailets-logo.gif b/mailet/src/reporting-site/resources/images/logos/james-standard-mailets-logo.gif
deleted file mode 100644
index b6e8d02..0000000
Binary files a/mailet/src/reporting-site/resources/images/logos/james-standard-mailets-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/site-base.xml
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/site-base.xml b/mailet/src/reporting-site/site-base.xml
index 6de1b60..ba033e6 100644
--- a/mailet/src/reporting-site/site-base.xml
+++ b/mailet/src/reporting-site/site-base.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES Basic Mailet Toolkit</name>
- <src>images/logos/james-mailet-base-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mailet/base/index.html</href>
- <alt>james-mailet-base-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/site-crypto.xml
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/site-crypto.xml b/mailet/src/reporting-site/site-crypto.xml
index a0c2615..5f7bf1f 100644
--- a/mailet/src/reporting-site/site-crypto.xml
+++ b/mailet/src/reporting-site/site-crypto.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES Cryptography Mailets</name>
- <src>images/logos/james-crypto-mailets-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mailet/crypto/index.html</href>
- <alt>james-crypto-mailets-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/site-mailetdoc.xml
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/site-mailetdoc.xml b/mailet/src/reporting-site/site-mailetdoc.xml
index c574dc5..3f63b2f 100644
--- a/mailet/src/reporting-site/site-mailetdoc.xml
+++ b/mailet/src/reporting-site/site-mailetdoc.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES MailetDocs Maven Plugin</name>
- <src>/images/logos/james-mailetdocs-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mailet/index.html</href>
- <alt>james-mailetdocs-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/site-standard.xml
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/site-standard.xml b/mailet/src/reporting-site/site-standard.xml
index 6aa7670..758977b 100644
--- a/mailet/src/reporting-site/site-standard.xml
+++ b/mailet/src/reporting-site/site-standard.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES Standard Mailets</name>
- <src>images/logos/james-standard-mailets-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mailet/standard/index.html</href>
- <alt>james-standard-mailets-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/site.xml
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/site.xml b/mailet/src/reporting-site/site.xml
index 4843ce0..572dd99 100644
--- a/mailet/src/reporting-site/site.xml
+++ b/mailet/src/reporting-site/site.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES Mailet API</name>
- <src>/images/logos/james-mailetapi-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mailet/index.html</href>
- <alt>james-mailetapi-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/reporting-site/site/site.xml
----------------------------------------------------------------------
diff --git a/mailet/src/reporting-site/site/site.xml b/mailet/src/reporting-site/site/site.xml
index 6a60402..011aa82 100644
--- a/mailet/src/reporting-site/site/site.xml
+++ b/mailet/src/reporting-site/site/site.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES MailetDocs Maven Plugin</name>
- <src>/images/logos/james-mailets-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mailet/index.html</href>
- <alt>james-mailets-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/asf-logo-reduced.gif
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/asf-logo-reduced.gif b/mailet/src/site/resources/images/logos/asf-logo-reduced.gif
deleted file mode 100644
index 93cc102..0000000
Binary files a/mailet/src/site/resources/images/logos/asf-logo-reduced.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/james-ai-mailets-logo.png
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/james-ai-mailets-logo.png b/mailet/src/site/resources/images/logos/james-ai-mailets-logo.png
deleted file mode 100644
index 265a076..0000000
Binary files a/mailet/src/site/resources/images/logos/james-ai-mailets-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/james-crypto-mailets-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/james-crypto-mailets-logo.gif b/mailet/src/site/resources/images/logos/james-crypto-mailets-logo.gif
deleted file mode 100644
index 6ba316b..0000000
Binary files a/mailet/src/site/resources/images/logos/james-crypto-mailets-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/james-logo.jpg
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/james-logo.jpg b/mailet/src/site/resources/images/logos/james-logo.jpg
deleted file mode 100644
index 6752e5e..0000000
Binary files a/mailet/src/site/resources/images/logos/james-logo.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/james-mailet-base-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/james-mailet-base-logo.gif b/mailet/src/site/resources/images/logos/james-mailet-base-logo.gif
deleted file mode 100644
index 52ce0b5..0000000
Binary files a/mailet/src/site/resources/images/logos/james-mailet-base-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/james-mailetapi-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/james-mailetapi-logo.gif b/mailet/src/site/resources/images/logos/james-mailetapi-logo.gif
deleted file mode 100644
index 085d23e..0000000
Binary files a/mailet/src/site/resources/images/logos/james-mailetapi-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/james-mailetdocs-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/james-mailetdocs-logo.gif b/mailet/src/site/resources/images/logos/james-mailetdocs-logo.gif
deleted file mode 100644
index b9d08ec..0000000
Binary files a/mailet/src/site/resources/images/logos/james-mailetdocs-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/james-standard-mailets-logo.gif
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/james-standard-mailets-logo.gif b/mailet/src/site/resources/images/logos/james-standard-mailets-logo.gif
deleted file mode 100644
index b6e8d02..0000000
Binary files a/mailet/src/site/resources/images/logos/james-standard-mailets-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/resources/images/logos/void.gif
----------------------------------------------------------------------
diff --git a/mailet/src/site/resources/images/logos/void.gif b/mailet/src/site/resources/images/logos/void.gif
deleted file mode 100644
index 75b945d..0000000
Binary files a/mailet/src/site/resources/images/logos/void.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/site.xml
----------------------------------------------------------------------
diff --git a/mailet/src/site/site.xml b/mailet/src/site/site.xml
index 33a57a7..2da56e0 100644
--- a/mailet/src/site/site.xml
+++ b/mailet/src/site/site.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>Apache James Project</name>
- <src>images/logos/james-mailets-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/index.html</href>
- <alt>james-mailets-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mailet/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/mailet/src/site/xdoc/index.xml b/mailet/src/site/xdoc/index.xml
index f1a81e8..9e501fa 100644
--- a/mailet/src/site/xdoc/index.xml
+++ b/mailet/src/site/xdoc/index.xml
@@ -87,47 +87,29 @@
<section name='Further Information'>
<ul>
<li>
- <a href='api/index.html'>
- <img src='images/logos/james-mailetapi-logo.gif' alt='Mailet API logo'/>
- </a>
- <br/>
+ <a href='api/index.html'>Mailet API</a>
describes the API implemented by Mailets
</li>
<li>
- <a href='base/index.html'>
- <img src='images/logos/james-mailet-base-logo.gif' alt='Mailet Base logo'/>
- </a>
- <br/>
+ <a href='base/index.html'>Mailet Base</a>
is a basic toolkit aimed at developers of Mailet implementations
</li>
<li>
- <a href='standard/index.html'>
- <img src='images/logos/james-standard-mailets-logo.gif' alt='Standard Mailets logo'/>
- </a>
- <br/>
+ <a href='standard/index.html'>Standard Mailets</a>
is a collection of basic Mailets with minimal dependencies
</li>
<li>
- <a href='crypto/index.html'>
- <img src='images/logos/james-crypto-mailets-logo.gif' alt='Crypto Mailets logo'/>
- </a>
- <br/>
+ <a href='crypto/index.html'>Crypto Mailets</a>
contains cryptographic Mailets which can be used to sign and verify signatures
</li>
<li>
- <a href='http://james.apache.org/jsieve/mailet/index.html'>
- <img src='http://james.apache.org/jsieve/mailet/images/james-jsieve-logo.gif' alt='JSieve log'/>
- </a>
- <br/>
+ <a href='http://james.apache.org/jsieve/mailet/index.html'>JSieve</a>
contains mailets using the
<a href='http://www.ietf.org/rfc/rfc3028.txt'>Sieve</a>
mail filter language
</li>
<li>
- <a href='mailetdocs-maven-plugin/index.html'>
- <img src='images/logos/james-mailetdocs-logo.gif' alt='Mailetdocs logo'/>
- </a>
- <br/>
+ <a href='mailetdocs-maven-plugin/index.html'>Mailetdocs</a>
generates catelogs and documentation for mailets.
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mpt/src/reporting-site/site.xml
----------------------------------------------------------------------
diff --git a/mpt/src/reporting-site/site.xml b/mpt/src/reporting-site/site.xml
index 54ad848..9b4cc56 100644
--- a/mpt/src/reporting-site/site.xml
+++ b/mpt/src/reporting-site/site.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES MPT</name>
- <src>images/logo/james-mpt-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mpt/index.html</href>
- <alt>james-mpt-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mpt/src/site/resources/images/asf-logo-reduced.gif
----------------------------------------------------------------------
diff --git a/mpt/src/site/resources/images/asf-logo-reduced.gif b/mpt/src/site/resources/images/asf-logo-reduced.gif
deleted file mode 100644
index 93cc102..0000000
Binary files a/mpt/src/site/resources/images/asf-logo-reduced.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mpt/src/site/resources/images/james-mpt-logo.gif
----------------------------------------------------------------------
diff --git a/mpt/src/site/resources/images/james-mpt-logo.gif b/mpt/src/site/resources/images/james-mpt-logo.gif
deleted file mode 100644
index 9a75b4f..0000000
Binary files a/mpt/src/site/resources/images/james-mpt-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/mpt/src/site/site.xml
----------------------------------------------------------------------
diff --git a/mpt/src/site/site.xml b/mpt/src/site/site.xml
index e413e62..1f1371d 100644
--- a/mpt/src/site/site.xml
+++ b/mpt/src/site/site.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>JAMES MPT</name>
- <src>images/logo/james-mpt-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/mpt/index.html</href>
- <alt>james-mpt-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb67816..036b12b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,14 @@
<version>3.0.0-beta5-SNAPSHOT</version>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-skin</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
+
<name>Apache James Project</name>
<description>
The Apache Java Enterprise Mail Server (a.k.a. Apache James) is a 100% pure Java SMTP, IMAP and POP3 Mail
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/protocols/src/reporting-site/site.xml
----------------------------------------------------------------------
diff --git a/protocols/src/reporting-site/site.xml b/protocols/src/reporting-site/site.xml
index 8a796b9..9480e57 100644
--- a/protocols/src/reporting-site/site.xml
+++ b/protocols/src/reporting-site/site.xml
@@ -21,9 +21,9 @@
<bannerLeft>
<name>James Server</name>
- <src>images/logos/james-server-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/server/index.html</href>
- <alt>james-server-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/protocols/src/site/resources/images/asf-logo-reduced.gif
----------------------------------------------------------------------
diff --git a/protocols/src/site/resources/images/asf-logo-reduced.gif b/protocols/src/site/resources/images/asf-logo-reduced.gif
deleted file mode 100644
index 93cc102..0000000
Binary files a/protocols/src/site/resources/images/asf-logo-reduced.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/protocols/src/site/resources/images/james-logo.jpg
----------------------------------------------------------------------
diff --git a/protocols/src/site/resources/images/james-logo.jpg b/protocols/src/site/resources/images/james-logo.jpg
deleted file mode 100644
index 6752e5e..0000000
Binary files a/protocols/src/site/resources/images/james-logo.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/protocols/src/site/resources/images/james-server-logo.gif
----------------------------------------------------------------------
diff --git a/protocols/src/site/resources/images/james-server-logo.gif b/protocols/src/site/resources/images/james-server-logo.gif
deleted file mode 100644
index f69394f..0000000
Binary files a/protocols/src/site/resources/images/james-server-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/protocols/src/site/site.xml
----------------------------------------------------------------------
diff --git a/protocols/src/site/site.xml b/protocols/src/site/site.xml
index 6d7f66a..395f26d 100644
--- a/protocols/src/site/site.xml
+++ b/protocols/src/site/site.xml
@@ -27,9 +27,9 @@
<bannerLeft>
<name>James Server</name>
- <src>images/logos/james-server-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/server/index.html</href>
- <alt>james-server-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/server/src/reporting-site/site.xml
----------------------------------------------------------------------
diff --git a/server/src/reporting-site/site.xml b/server/src/reporting-site/site.xml
index 8ab760a..114ce47 100644
--- a/server/src/reporting-site/site.xml
+++ b/server/src/reporting-site/site.xml
@@ -21,11 +21,12 @@
<bannerLeft>
<name>James Server</name>
- <src>images/logos/james-server-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/index.html</href>
- <alt>james-server-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
+
<body>
<menu ref="reports" />
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/server/src/site/site.xml b/server/src/site/site.xml
index 2b7ea3b..a328ad4 100644
--- a/server/src/site/site.xml
+++ b/server/src/site/site.xml
@@ -27,9 +27,9 @@
<bannerLeft>
<name>Apache James Server 3.0</name>
- <src>images/logos/james-server-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/server/index.html</href>
- <alt>james-server-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<body>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/src/reporting-site/site.xml
----------------------------------------------------------------------
diff --git a/src/reporting-site/site.xml b/src/reporting-site/site.xml
index 4b4ca40..c5670b9 100644
--- a/src/reporting-site/site.xml
+++ b/src/reporting-site/site.xml
@@ -31,14 +31,14 @@
<bannerLeft>
<name>James Server</name>
- <src>images/logos/james-server-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/index.html</href>
- <alt>james-project-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<bannerRight>
<name>The Apache Software Foundation</name>
- <src>images/logos/asf-logo-reduced.gif</src>
+ <src>images/asf_logo_small.png</src>
<href>http://www.apache.org/index.html</href>
</bannerRight>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/src/site/resources/images/james-logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/james-logo.png b/src/site/resources/images/james-logo.png
new file mode 100644
index 0000000..2ef3d9a
Binary files /dev/null and b/src/site/resources/images/james-logo.png differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/src/site/resources/images/james-project-logo.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/images/james-project-logo.gif b/src/site/resources/images/james-project-logo.gif
deleted file mode 100644
index 715a9bf..0000000
Binary files a/src/site/resources/images/james-project-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9939ee7/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index ab14fe5..62142e7 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -31,14 +31,14 @@
<bannerLeft>
<name>James Project</name>
- <src>images/logos/james-project-logo.gif</src>
+ <src>images/logos/james-logo.png</src>
<href>http://james.apache.org/index.html</href>
- <alt>james-project-logo.gif</alt>
+ <alt>james-logo.png</alt>
</bannerLeft>
<bannerRight>
<name>The Apache Software Foundation</name>
- <src>images/logos/asf-logo-reduced.gif</src>
+ <src>images/logos/asf_logo_small.png</src>
<href>http://www.apache.org/index.html</href>
</bannerRight>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[6/8] james-project git commit: JAMES-1831 Remove galleria
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/galleria.js
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/galleria.js b/src/site/resources/js/galleria/galleria.js
deleted file mode 100644
index 635fb92..0000000
--- a/src/site/resources/js/galleria/galleria.js
+++ /dev/null
@@ -1,3765 +0,0 @@
-/*
- * Galleria v 1.2 prerelease 1.1 2010-11-04
- * http://galleria.aino.se
- *
- * Copyright (c) 2010, Aino
- * Licensed under the MIT license.
- */
-
-(function($) {
-
-// some references
-var undef,
- window = this,
- doc = document,
- $doc = $( doc );
-
-// internal constants
-var DEBUG = false,
- NAV = navigator.userAgent.toLowerCase(),
- HASH = window.location.hash.replace(/#\//, ''),
- CLICK = function() {
- // use this to make touch devices snappier
- return Galleria.TOUCH ? 'touchstart' : 'click';
- },
- IE = (function() {
- var v = 3,
- div = doc.createElement( 'div' );
- while (
- div.innerHTML = '<!--[if gt IE '+(++v)+']><i></i><![endif]-->',
- div.getElementsByTagName('i')[0]
- );
- return v > 4 ? v : undef;
- }() ),
- DOM = function() {
- return {
- html: doc.documentElement,
- body: doc.body,
- head: doc.getElementsByTagName('head')[0],
- title: doc.title
- };
- },
-
- // the internal timeouts object
- // provides helper methods for controlling timeouts
- _timeouts = {
-
- trunk: {},
-
- add: function( id, fn, delay, loop ) {
- loop = loop || false;
- this.clear( id );
- if ( loop ) {
- var old = fn;
- fn = function() {
- old();
- _timeouts.add( id, fn, delay );
- };
- }
- this.trunk[ id ] = window.setTimeout( fn, delay );
- },
-
- clear: function( id ) {
-
- var del = function( i ) {
- window.clearTimeout( this.trunk[ i ] );
- delete this.trunk[ i ];
- };
-
- if ( !!id && id in this.trunk ) {
- del.call( _timeouts, id );
-
- } else if ( typeof id == 'undefined' ) {
- for ( var i in this.trunk ) {
- del.call( _timeouts, i );
- }
- }
- }
- },
-
- // the internal gallery holder
- _galleries = [],
-
- // the transitions holder
- _transitions = {
-
- fade: function(params, complete) {
- $(params.next).css('opacity', 0).show().animate({
- opacity: 1
- }, params.speed, complete);
-
- if (params.prev) {
- $(params.prev).css('opacity', 1).show().animate({
- opacity: 0
- }, params.speed);
- }
- },
-
- flash: function(params, complete) {
- $(params.next).css('opacity', 0);
- if (params.prev) {
- $(params.prev).animate({
- opacity: 0
- }, (params.speed / 2), function() {
- $(params.next).animate({
- opacity: 1
- }, params.speed, complete);
- });
- } else {
- $(params.next).animate({
- opacity: 1
- }, params.speed, complete);
- }
- },
-
- pulse: function(params, complete) {
- if (params.prev) {
- $(params.prev).hide();
- }
- $(params.next).css('opacity', 0).animate({
- opacity:1
- }, params.speed, complete);
- },
-
- slide: function(params, complete) {
- var image = $(params.next).parent(),
- images = this.$('images'), // ??
- width = this._stageWidth,
- easing = this.getOptions( 'easing' );
-
- image.css({
- left: width * ( params.rewind ? -1 : 1 )
- });
- images.animate({
- left: width * ( params.rewind ? 1 : -1 )
- }, {
- duration: params.speed,
- queue: false,
- easing: easing,
- complete: function() {
- images.css('left', 0);
- image.css('left', 0);
- complete();
- }
- });
- },
-
- fadeslide: function(params, complete) {
-
- var x = 0,
- easing = this.getOptions('easing'),
- distance = this.getStageWidth();
-
- if (params.prev) {
- x = Utils.parseValue( $(params.prev).css('left') );
- $(params.prev).css({
- opacity: 1,
- left: x
- }).animate({
- opacity: 0,
- left: x + ( distance * ( params.rewind ? 1 : -1 ) )
- },{
- duration: params.speed,
- queue: false,
- easing: easing
- });
- }
-
- x = Utils.parseValue( $(params.next).css('left') );
-
- $(params.next).css({
- left: x + ( distance * ( params.rewind ? -1 : 1 ) ),
- opacity: 0
- }).animate({
- opacity: 1,
- left: x
- }, {
- duration: params.speed,
- complete: complete,
- queue: false,
- easing: easing
- });
- }
- },
-
- // the Utils singleton
- Utils = (function() {
-
- return {
-
- array : function( obj ) {
- return Array.prototype.slice.call(obj);
- },
-
- create : function( className, nodeName ) {
- nodeName = nodeName || 'div';
- var elem = doc.createElement( nodeName );
- elem.className = className;
- return elem;
- },
-
- forceStyles : function( elem, styles ) {
- elem = $(elem);
- if ( elem.attr( 'style' ) ) {
- elem.data( 'styles', elem.attr( 'style' ) ).removeAttr( 'style' );
- }
- elem.css( styles );
- },
-
- revertStyles : function() {
- $.each( Utils.array( arguments ), function( i, elem ) {
-
- elem = $( elem ).removeAttr( 'style' );
-
- if ( elem.data( 'styles' ) ) {
- elem.attr( 'style', elem.data('styles') ).data( 'styles', null );
- }
- });
- },
-
- moveOut : function( elem ) {
- Utils.forceStyles( elem, {
- position: 'absolute',
- left: -10000
- });
- },
-
- moveIn : function() {
- Utils.revertStyles.apply( Utils, Utils.array( arguments ) );
- },
-
- hide : function( elem, speed, callback ) {
- elem = $(elem);
-
- // save the value if not exist
- if (! elem.data('opacity') ) {
- elem.data('opacity', elem.css('opacity') );
- }
-
- // always hide
- var style = { opacity: 0 };
-
- if (speed) {
- elem.stop().animate( style, speed, callback );
- } else {
- elem.css( style );
- };
- },
-
- show : function( elem, speed, callback ) {
- elem = $(elem);
-
- // bring back saved opacity
- var saved = parseFloat( elem.data('opacity') ) || 1,
- style = { opacity: saved };
-
- // reset save if opacity == 1
- if (saved == 1) {
- elem.data('opacity', null);
- }
-
- // animate or toggle
- if (speed) {
- elem.stop().animate( style, speed, callback );
- } else {
- elem.css( style );
- };
- },
-
- addTimer : function() {
- _timeouts.add.apply( _timeouts, Utils.array( arguments ) );
- return this;
- },
-
- clearTimer : function() {
- _timeouts.clear.apply( _timeouts, Utils.array( arguments ) );
- return this;
- },
-
- wait : function(options) {
- options = $.extend({
- until : function() { return false; },
- success : function() {},
- error : function() { Galleria.raise('Could not complete wait function.'); },
- timeout: 3000
- }, options);
-
- var start = Utils.timestamp(),
- elapsed,
- now;
-
- window.setTimeout(function() {
- now = Utils.timestamp();
- elapsed = now - start;
- if ( options.until( elapsed ) ) {
- options.success();
- return false;
- }
-
- if (now >= start + options.timeout) {
- options.error();
- return false;
- }
- window.setTimeout(arguments.callee, 2);
- }, 2);
- },
-
- toggleQuality : function( img, force ) {
-
- if ( !( IE == 7 || IE == 8 ) || !!img === false ) {
- return;
- }
-
- if ( typeof force === 'undefined' ) {
- force = img.style.msInterpolationMode == 'nearest-neighbor';
- }
-
- img.style.msInterpolationMode = force ? 'bicubic' : 'nearest-neighbor';
- },
-
- insertStyleTag : function( styles ) {
- var style = doc.createElement( 'style' );
- DOM().head.appendChild( style );
-
- if ( style.styleSheet ) { // IE
- style.styleSheet.cssText = styles;
- } else {
- var cssText = doc.createTextNode( styles );
- style.appendChild( cssText );
- }
- },
-
- // a loadscript method that works for local scripts
- loadScript: function( url, callback ) {
- var done = false,
- script = $('<scr'+'ipt>').attr({
- src: url,
- async: true
- }).get(0);
-
- // Attach handlers for all browsers
- script.onload = script.onreadystatechange = function() {
- if ( !done && (!this.readyState ||
- this.readyState == 'loaded' || this.readyState == 'complete') ) {
- done = true;
-
- if (typeof callback == 'function') {
- callback.call( this, this );
- }
-
- // Handle memory leak in IE
- script.onload = script.onreadystatechange = null;
- }
- };
-
- var s = doc.getElementsByTagName( 'script' )[0];
- s.parentNode.insertBefore( script, s );
- },
-
- // parse anything into a number
- parseValue: function( val ) {
- if (typeof val == 'number') {
- return val;
- } else if (typeof val == 'string') {
- var arr = val.match(/\-?\d/g);
- return arr && arr.constructor == Array ? arr.join('') * 1 : 0;
- } else {
- return 0;
- }
- },
-
- // timestamp abstraction
- timestamp: function() {
- return new Date().getTime();
- },
-
- // this is pretty crap, but works for now
- // it will add a callback, but it can't guarantee that the styles can be fetched
- // using getComputedStyle further checking needed, possibly a dummy element
- loadCSS : function( href, id, callback ) {
-
- var link,
- ready = false,
- length;
-
- // look for manual css
- $('link[rel=stylesheet]').each(function() {
- if ( new RegExp( href ).test( this.href ) ) {
- link = this;
- return false;
- }
- });
-
- if ( typeof id == 'function' ) {
- callback = id;
- id = undef;
- }
-
- callback = callback || function() {}; // dirty
-
- // if already present, return
- if ( link ) {
- callback.call( link, link );
- return link;
- }
-
- // save the length of stylesheets to check against
- length = doc.styleSheets.length;
-
- // add timestamp if DEBUG is true
- if ( DEBUG ) {
- href += '?' + Utils.timestamp();
- }
-
- // check for existing id
- if( $('#'+id).length ) {
- $('#'+id).attr('href', href);
- length--;
- ready = true;
- } else {
- link = $( '<link>' ).attr({
- rel: 'stylesheet',
- href: href,
- id: id
- }).get(0);
-
- window.setTimeout(function() {
- var styles = $('link[rel="stylesheet"], style');
- if ( styles.length ) {
- styles.get(0).parentNode.insertBefore( link, styles[0] );
- } else {
- DOM().head.appendChild( link );
- }
-
- if ( IE ) {
- link.attachEvent( 'onreadystatechange', function(e) {
- if( link.readyState == 'complete' ) {
- ready = true;
- }
- });
- } else {
- // what to do here? returning for now.
- ready = true;
- }
- }, 10);
- }
-
- if (typeof callback == 'function') {
-
- Utils.wait({
- until: function() {
- return ready && doc.styleSheets.length > length;
- },
- success: function() {
- Utils.addTimer( 'css', function() {
- callback.call( link, link );
- }, 100);
- },
- error: function() {
- Galleria.raise( 'Theme CSS could not load' );
- },
- timeout: 1000
- });
- }
- return link;
- }
- };
- })();
-
-/**
- The main Galleria class
-
- @class
-
- @example var gallery = new Galleria();
-
- @author http://aino.se
-
- @requires jQuery
-
- @returns {Galleria}
-*/
-
-Galleria = function() {
-
- var self = this;
-
- // the theme used
- this._theme = undef;
-
- // internal options
- this._options = {};
-
- // flag for controlling play/pause
- this._playing = false;
-
- // internal interval for slideshow
- this._playtime = 5000;
-
- // internal variable for the currently active image
- this._active = null;
-
- // the internal queue, arrayified
- this._queue = { length: 0 };
-
- // the internal data array
- this._data = [];
-
- // the internal dom collection
- this._dom = {};
-
- // the internal thumbnails array
- this._thumbnails = [];
-
- // internal init flag
- this._initialized = false;
-
- // global stagewidth/height
- this._stageWidth = 0;
- this._stageHeight = 0;
-
- // target holder
- this._target = undef;
-
- // instance id
- this._id = Utils.timestamp();
-
- // add some elements
- var divs = 'container stage images image-nav image-nav-left image-nav-right ' +
- 'info info-text info-title info-description info-author ' +
- 'thumbnails thumbnails-list thumbnails-container thumb-nav-left thumb-nav-right ' +
- 'loader counter tooltip',
- spans = 'current total';
-
- $.each( divs.split(' '), function( i, elemId ) {
- self._dom[ elemId ] = Utils.create( 'galleria-' + elemId );
- });
-
- $.each( spans.split(' '), function( i, elemId ) {
- self._dom[ elemId ] = Utils.create( 'galleria-' + elemId, 'span' );
- });
-
- // the internal keyboard object
- // keeps reference of the keybinds and provides helper methods for binding keys
- var keyboard = this._keyboard = {
-
- keys : {
- 'UP': 38,
- 'DOWN': 40,
- 'LEFT': 37,
- 'RIGHT': 39,
- 'RETURN': 13,
- 'ESCAPE': 27,
- 'BACKSPACE': 8,
- 'SPACE': 32
- },
-
- map : {},
-
- bound: false,
-
- press: function(e) {
- var key = e.keyCode || e.which;
- if ( key in keyboard.map && typeof keyboard.map[key] == 'function' ) {
- keyboard.map[key].call(self, e);
- }
- },
-
- attach: function(map) {
- for( var key in map ) {
- var up = key.toUpperCase();
- if ( up in keyboard.keys ) {
- keyboard.map[ keyboard.keys[up] ] = map[key];
- }
- }
- if ( !keyboard.bound ) {
- keyboard.bound = true;
- $doc.bind('keydown', keyboard.press);
- }
- },
-
- detach: function() {
- keyboard.bound = false;
- $doc.unbind('keydown', keyboard.press);
- }
- };
-
- // internal controls for keeping track of active / inactive images
- var controls = this._controls = {
-
- 0: undef,
-
- 1: undef,
-
- active : 0,
-
- swap : function() {
- controls.active = controls.active ? 0 : 1;
- },
-
- getActive : function() {
- return controls[ controls.active ];
- },
-
- getNext : function() {
- return controls[ 1 - controls.active ];
- }
- };
-
- // internal carousel object
- var carousel = this._carousel = {
-
- // shortcuts
- next: self.$('thumb-nav-right'),
- prev: self.$('thumb-nav-left'),
-
- // cache the width
- width: 0,
-
- // track the current position
- current: 0,
-
- // cache max value
- max: 0,
-
- // save all hooks for each width in an array
- hooks: [],
-
- // update the carousel
- // you can run this method anytime, f.ex on window.resize
- update: function() {
- var w = 0,
- h = 0,
- hooks = [0];
-
- $.each( self._thumbnails, function( i, thumb ) {
- if ( thumb.ready ) {
- w += thumb.outerWidth || $( thumb.container ).outerWidth( true );
- hooks[ i+1 ] = w;
- h = Math.max( h, thumb.outerHeight || $( thumb.container).outerHeight() );
- }
- });
- self.$( 'thumbnails-container' ).toggleClass( 'galleria-carousel', w > self._stageWidth );
-
- self.$( 'thumbnails' ).css({
- width: w,
- height: h
- });
-
- carousel.max = w;
- carousel.hooks = hooks;
- carousel.width = self.$( 'thumbnails-list' ).width();
- carousel.setClasses();
-
- // todo: fix so the carousel moves to the left
- },
-
- bindControls: function() {
-
- carousel.next.bind( CLICK(), function(e) {
- e.preventDefault();
-
- if ( self._options.carousel_steps == 'auto' ) {
-
- for ( var i = carousel.current; i < carousel.hooks.length; i++ ) {
- if ( carousel.hooks[i] - carousel.hooks[ carousel.current ] > carousel.width ) {
- carousel.set(i - 2);
- break;
- }
- }
-
- } else {
- carousel.set( carousel.current + self._options.carousel_steps);
- }
- });
-
- carousel.prev.bind( CLICK(), function(e) {
- e.preventDefault();
-
- if ( self._options.carousel_steps == 'auto' ) {
-
- for ( var i = carousel.current; i >= 0; i-- ) {
- if ( carousel.hooks[ carousel.current ] - carousel.hooks[i] > carousel.width ) {
- carousel.set( i + 2 );
- break;
- } else if ( i == 0 ) {
- carousel.set( 0 );
- break;
- }
- }
- } else {
- carousel.set( carousel.current - self._options.carousel_steps );
- }
- });
- },
-
- // calculate and set positions
- set: function( i ) {
- i = Math.max( i, 0 );
- while ( carousel.hooks[i - 1] + carousel.width > carousel.max && i >= 0 ) {
- i--;
- }
- carousel.current = i;
- carousel.animate();
- },
-
- // get the last position
- getLast: function(i) {
- return ( i || carousel.current ) - 1;
- },
-
- // follow the active image
- follow: function(i) {
-
- //don't follow if position fits
- if ( i == 0 || i == carousel.hooks.length - 2 ) {
- carousel.set( i );
- return;
- }
-
- // calculate last position
- var last = carousel.current;
- while( carousel.hooks[last] - carousel.hooks[ carousel.current ] <
- carousel.width && last <= carousel.hooks.length ) {
- last ++;
- }
-
- // set position
- if ( i - 1 < carousel.current ) {
- carousel.set( i - 1 );
- } else if ( i + 2 > last) {
- carousel.set( i - last + carousel.current + 2 );
- }
- },
-
- // helper for setting disabled classes
- setClasses: function() {
- carousel.prev.toggleClass( 'disabled', !carousel.current );
- carousel.next.toggleClass( 'disabled', carousel.hooks[ carousel.current ] + carousel.width > carousel.max );
- },
-
- // the animation method
- animate: function(to) {
- carousel.setClasses();
- var num = carousel.hooks[ carousel.current ] * -1;
-
- if ( isNaN( num ) ) {
- return;
- }
-
- self.$( 'thumbnails' ).animate({
- left: num
- },{
- duration: self._options.carousel_speed,
- easing: self._options.easing,
- queue: false
- });
- }
- };
-
- // tooltip control
- // added in 1.2
- var tooltip = this._tooltip = {
-
- initialized : false,
-
- active: null,
-
- open: false,
-
- init: function() {
-
- tooltip.initialized = true;
-
- var css = '.galleria-tooltip{padding:3px 8px;max-width:50%;background:#ffe;color:#000;z-index:3;position:absolute;font-size:11px;line-height:1.3' +
- 'opacity:0;box-shadow:0 0 2px rgba(0,0,0,.4);-moz-box-shadow:0 0 2px rgba(0,0,0,.4);-webkit-box-shadow:0 0 2px rgba(0,0,0,.4);}';
-
- Utils.insertStyleTag(css);
-
- self.$( 'tooltip' ).css('opacity', .8);
- Utils.hide( self.get('tooltip') );
-
- },
-
- // move handler
- move: function( e ) {
- var mouseX = self.getMousePosition(e).x,
- mouseY = self.getMousePosition(e).y,
- $elem = self.$( 'tooltip' ),
- x = mouseX,
- y = mouseY,
- height = $elem.outerHeight( true ) + 1,
- width = $elem.outerWidth( true ),
- limitY = height + 15;
-
- var maxX = self._stageWidth - width,
- maxY = self._stageHeight - height;
-
- if ( !isNaN(x) && !isNaN(y) ) {
-
- x += 15;
- y -= 35;
-
- x = Math.max( 0, Math.min( maxX, x ) );
- y = Math.max( 0, Math.min( maxY, y ) );
-
- if( mouseY < limitY ) {
- y = limitY;
- }
-
- $elem.css({ left: x, top: y });
- }
- },
-
- // bind elements to the tooltip
- // you can bind multiple elementIDs using { elemID : function } or { elemID : string }
- // you can also bind single DOM elements using bind(elem, string)
- bind: function( elem, value ) {
-
- if (! tooltip.initialized ) {
- tooltip.init();
- }
-
- var hover = function( elem, value) {
-
- tooltip.define( elem, value );
-
- $( elem ).hover(function() {
-
- tooltip.active = elem;
- Utils.clearTimer('switch_tooltip');
- self.$('container').unbind( 'mousemove', tooltip.move ).bind( 'mousemove', tooltip.move ).trigger( 'mousemove' );
- tooltip.show( elem );
-
- Galleria.utils.addTimer( 'tooltip', function() {
- self.$( 'tooltip' ).stop();
- Utils.show( self.get( 'tooltip' ), 400 );
- tooltip.open = true;
-
- }, tooltip.open ? 0 : 1000);
-
- }, function() {
-
- tooltip.active = null;
-
- self.$( 'container' ).unbind( 'mousemove', tooltip.move );
- Utils.clearTimer( 'tooltip' );
-
- Utils.hide( self.get( 'tooltip' ), 200, function() {
- Utils.addTimer('switch_tooltip', function() {
- tooltip.open = false;
- }, 1000);
- });
- });
- };
-
- if (typeof value == 'string') {
- hover( ( elem in self._dom ? self.get(elem) : elem ), value );
- } else {
- // asume elemID here
- $.each( elem, function( elemID, val ) {
- hover( self.get(elemID), val );
- });
- }
- },
-
- show: function( elem ) {
- var text = $(elem).data('tt');
- if ( ! text ) {
- return;
- }
- text = typeof text == 'function' ? text() : text;
- self.$( 'tooltip' ).html( text.replace(/\s/, ' ') );
- },
-
- // redefine the tooltip here
- define: function( elem, value ) {
-
- // we store functions, not strings
- if (typeof value !== 'function') {
- var s = value;
- value = function() {
- return s;
- };
- }
-
- if ( elem in self._dom ) {
- elem = self.get( elem );
- }
-
- $(elem).data('tt', value);
-
- tooltip.show( elem );
-
- },
-
- refresh: function() {
- $.each( arguments, function(i, elem) {
- if ( tooltip.active == elem ) {
- tooltip.show( elem );
- }
- });
- }
- };
-
- // internal fullscreen control
- // added in 1.195
- // still kind of experimental
- var fullscreen = this._fullscreen = {
- scrolled: 0,
- enter: function(callback) {
-
- // hide the image until rescale is complete
- Utils.hide( self.getActiveImage() );
-
- self.$( 'container' ).addClass( 'fullscreen' );
-
- fullscreen.scrolled = $(window).scrollTop();
-
- // begin styleforce
- Utils.forceStyles(self.get('container'), {
- position: 'fixed',
- top: 0,
- left: 0,
- width: '100%',
- height: '100%',
- zIndex: 10000
- });
-
- var htmlbody = {
- height: '100%',
- overflow: 'hidden',
- margin:0,
- padding:0
- };
-
- Utils.forceStyles( DOM().html, htmlbody );
- Utils.forceStyles( DOM().body, htmlbody );
-
- // attach some keys
- self.attachKeyboard({
- escape: self.exitFullscreen,
- right: self.next,
- left: self.prev
- });
-
- // init the first rescale and attach callbacks
- self.rescale(function() {
-
- Utils.addTimer('fullscreen_enter', function() {
- // show the image after 50 ms
- Utils.show( self.getActiveImage() );
-
- if (typeof callback == 'function') {
- callback.call( self );
- }
-
- }, 100);
-
- self.trigger( Galleria.FULLSCREEN_ENTER );
- });
-
- // bind the scaling to the resize event
- $(window).resize( function() {
- fullscreen.scale();
- } );
- },
-
- scale : function() {
- self.rescale();
- },
-
- exit: function(callback) {
-
- Utils.hide( self.getActiveImage() );
-
- self.$('container').removeClass( 'fullscreen' );
-
- // revert all styles
- Utils.revertStyles( self.get('container'), DOM().html, DOM().body );
-
- // scroll back
- window.scrollTo(0, fullscreen.scrolled);
-
- // detach all keyboard events (is this good?)
- self.detachKeyboard();
-
- self.rescale(function() {
- Utils.addTimer('fullscreen_exit', function() {
-
- // show the image after 50 ms
- Utils.show( self.getActiveImage() );
-
- if ( typeof callback == 'function' ) {
- callback.call( self );
- }
-
- }, 50);
-
- self.trigger( Galleria.FULLSCREEN_EXIT );
- });
-
- $(window).unbind('resize', fullscreen.scale);
- }
- };
-
- // the internal idle object for controlling idle states
- // TODO occational event conflicts
- var idle = this._idle = {
-
- trunk: [],
-
- bound: false,
-
- add: function(elem, to) {
- if (!elem) {
- return;
- }
- if (!idle.bound) {
- idle.addEvent();
- }
- elem = $(elem);
-
- var from = {};
-
- for (var style in to) {
- from[style] = elem.css(style);
- }
- elem.data('idle', {
- from: from,
- to: to,
- complete: true,
- busy: false
- });
- idle.addTimer();
- idle.trunk.push(elem);
- },
-
- remove: function(elem) {
-
- elem = jQuery(elem);
-
- $.each(idle.trunk, function(i, el) {
- if ( el.length && !el.not(elem).length ) {
- self._idle.show(elem);
- self._idle.trunk.splice(i, 1);
- }
- });
-
- if (!idle.trunk.length) {
- idle.removeEvent();
- Utils.clearTimer('idle');
- }
- },
-
- addEvent : function() {
- idle.bound = true;
- self.$('container').bind('mousemove click', idle.showAll );
- },
-
- removeEvent : function() {
- idle.bound = false;
- self.$('container').unbind('mousemove click', idle.showAll );
- },
-
- addTimer : function() {
- Utils.addTimer('idle', function() {
- self._idle.hide();
- }, self._options.idle_time );
- },
-
- hide : function() {
- self.trigger( Galleria.IDLE_ENTER );
-
- $.each( idle.trunk, function(i, elem) {
-
- var data = elem.data('idle');
-
- if (! data) {
- return;
- }
-
- data.complete = false;
-
- elem.stop().animate(data.to, {
- duration: 600,
- queue: false,
- easing: 'swing'
- });
- });
- },
-
- showAll : function() {
- Utils.clearTimer('idle');
-
- $.each(self._idle.trunk, function( i, elem ) {
- self._idle.show( elem );
- });
- },
-
- show: function(elem) {
-
- var data = elem.data('idle');
-
- if (!data.busy && !data.complete) {
-
- data.busy = true;
-
- self.trigger( Galleria.IDLE_EXIT );
-
- elem.animate(data.from, {
- duration: 300,
- queue: false,
- easing: 'swing',
- complete: function() {
- $(this).data('idle').busy = false;
- $(this).data('idle').complete = true;
- }
- });
- }
- idle.addTimer();
- }
- };
-
- // internal lightbox object
- // creates a predesigned lightbox for simple popups of images in galleria
- var lightbox = this._lightbox = {
-
- width : 0,
-
- height : 0,
-
- initialized : false,
-
- active : null,
-
- image : null,
-
- elems : {},
-
- init : function() {
-
- // trigger the event
- self.trigger( Galleria.LIGHTBOX_OPEN );
-
- if ( lightbox.initialized ) {
- return;
- }
- lightbox.initialized = true;
-
- // create some elements to work with
- var elems = 'overlay box content shadow title info close prevholder prev nextholder next counter image',
- el = {},
- op = self._options,
- css = '',
- cssMap = {
- overlay: 'position:fixed;display:none;opacity:'+op.overlay_opacity+';top:0;left:0;width:100%;height:100%;background:'+op.overlay_background+';z-index:99990',
- box: 'position:fixed;display:none;width:400px;height:400px;top:50%;left:50%;margin-top:-200px;margin-left:-200px;z-index:99991',
- shadow: 'position:absolute;background:#000;width:100%;height:100%;',
- content: 'position:absolute;background-color:#fff;top:10px;left:10px;right:10px;bottom:10px;overflow:hidden',
- info: 'position:absolute;bottom:10px;left:10px;right:10px;color:#444;font:11px/13px arial,sans-serif;height:13px',
- close: 'position:absolute;top:10px;right:10px;height:20px;width:20px;background:#fff;text-align:center;cursor:pointer;color:#444;font:16px/22px arial,sans-serif;z-index:99999',
- image: 'position:absolute;top:10px;left:10px;right:10px;bottom:30px;overflow:hidden',
- prevholder: 'position:absolute;width:50%;height:100%;cursor:pointer',
- nextholder: 'position:absolute;width:50%;height:100%;right:0;cursor:pointer',
- prev: 'position:absolute;top:50%;margin-top:-20px;height:40px;width:30px;background:#fff;left:20px;display:none;line-height:40px;text-align:center;color:#000',
- next: 'position:absolute;top:50%;margin-top:-20px;height:40px;width:30px;background:#fff;right:20px;left:auto;display:none;line-height:40px;text-align:center;color:#000',
- title: 'float:left',
- counter: 'float:right;margin-left:8px'
- },
- hover = function(elem) {
- return elem.hover(
- function() { $(this).css( 'color', '#bbb' ); },
- function() { $(this).css( 'color', '#444' ); }
- );
- };
-
- // create and insert CSS
- $.each(cssMap, function( key, value ) {
- css += '.galleria-lightbox-'+key+'{'+value+'}';
- });
-
- Utils.insertStyleTag( css );
-
- // create the elements
- $.each(elems.split(' '), function( i, elemId ) {
- self.addElement( 'lightbox-' + elemId );
- el[ elemId ] = lightbox.elems[ elemId ] = self.get( 'lightbox-' + elemId );
- });
-
- // initiate the image
- lightbox.image = new Galleria.Picture();
-
- // append the elements
- self.append({
- 'lightbox-box': ['lightbox-shadow','lightbox-content', 'lightbox-close','lightbox-prevholder','lightbox-nextholder'],
- 'lightbox-info': ['lightbox-title','lightbox-counter'],
- 'lightbox-content': ['lightbox-info', 'lightbox-image'],
- 'lightbox-prevholder': 'lightbox-prev',
- 'lightbox-nextholder': 'lightbox-next'
- });
-
- $( el.image ).append( lightbox.image.container );
-
- $( DOM().body ).append( el.overlay, el.box );
-
- // add the prev/next nav and bind some controls
-
- hover( $( el.close ).bind( CLICK(), lightbox.hide ).html('×') );
-
- $.each( ['Prev','Next'], function(i, dir) {
-
- var $d = $( el[ dir.toLowerCase() ] ).html( /v/.test( dir ) ? '\u2039 ' : ' \u203a' );
-
- $( el[ dir.toLowerCase()+'holder'] ).hover(function() {
- $d.show();
- }, function() {
- $d.fadeOut( 200 );
- }).bind( CLICK(), function() {
- lightbox[ 'show' + dir ]();
- });
-
- });
- $( el.overlay ).bind( CLICK(), lightbox.hide );
-
- },
-
- rescale: function(event) {
-
- // calculate
- var width = Math.min( $(window).width(), lightbox.width ),
- height = Math.min( $(window).height(), lightbox.height ),
- ratio = Math.min( (width - 60) / lightbox.width, (height - 80) / lightbox.height ),
- destWidth = ( lightbox.width * ratio ) + 40,
- destHeight = ( lightbox.height * ratio ) + 60,
- to = {
- width: destWidth,
- height: destHeight,
- marginTop: Math.ceil( destHeight / 2 ) *- 1,
- marginLeft: Math.ceil( destWidth / 2 ) *- 1
- };
-
- // if rescale event, don't animate
- if ( event ) {
- $( lightbox.elems.box ).css( to );
- } else {
- $( lightbox.elems.box ).animate(
- to,
- self._options.lightbox_transition_speed,
- self._options.easing,
- function() {
- var image = lightbox.image,
- speed = self._options.lightbox_fade_speed;
-
- self.trigger({
- type: Galleria.LIGHTBOX_IMAGE,
- imageTarget: image.image
- });
-
- image.show();
- Utils.show( image.image, speed );
- Utils.show( lightbox.elems.info, speed );
- }
- );
- }
- },
-
- hide: function() {
-
- // remove the image
- lightbox.image.image = null;
-
- $(window).unbind('resize', lightbox.rescale);
-
- $( lightbox.elems.box ).hide();
-
- Utils.hide( lightbox.elems.info );
-
- Utils.hide( lightbox.elems.overlay, 200, function() {
- $( this ).hide().css( 'opacity', self._options.overlay_opacity );
- self.trigger( Galleria.LIGHTBOX_CLOSE );
- });
- },
-
- showNext: function() {
- lightbox.show( self.getNext( lightbox.active ) );
- },
-
- showPrev: function() {
- lightbox.show( self.getPrev( lightbox.active ) );
- },
-
- show: function(index) {
-
- lightbox.active = index = typeof index == 'number' ? index : self.getIndex();
-
- if ( !lightbox.initialized ) {
- lightbox.init();
- }
-
- $(window).unbind('resize', lightbox.rescale );
-
- var data = self.getData(index),
- total = self.getDataLength();
-
- Utils.hide( lightbox.elems.info );
-
- lightbox.image.load( data.image, function( image ) {
-
- lightbox.width = image.original.width;
- lightbox.height = image.original.height;
-
- $( image.image ).css({
- width: '100.5%',
- height: '100.5%',
- top: 0,
- zIndex: 99998,
- opacity: 0
- });
-
- lightbox.elems.title.innerHTML = data.title;
- lightbox.elems.counter.innerHTML = (index + 1) + ' / ' + total;
- $(window).resize( lightbox.rescale );
- lightbox.rescale();
- });
-
- $( lightbox.elems.overlay ).show();
- $( lightbox.elems.box ).show();
- }
- };
-
- return this;
-};
-
-// end Galleria constructor
-
-Galleria.prototype = {
-
- /**
- Use this function to initialize the gallery and start loading.
- Should only be called once per instance.
-
- @param {HTML Element} target The target element
- @param {Object} options The gallery options
-
- @returns {Galleria}
- */
-
- init: function( target, options ) {
-
- var self = this;
-
- // save the instance
- _galleries.push( this );
-
- // save the original ingredients
- this._original = {
- target: target,
- options: options,
- data: null
- };
-
- // save the target here
- this._target = this._dom.target = target.nodeName ? target : $( target ).get(0);
-
- // raise error if no target is detected
- if ( !this._target ) {
- Galleria.raise('Target not found.');
- return;
- }
-
- // apply options
- this._options = {
- autoplay: false,
- carousel: true,
- carousel_follow: true,
- carousel_speed: 400,
- carousel_steps: 'auto',
- clicknext: false,
- data_config : function( elem ) { return {}; },
- data_selector: 'img',
- data_source: this._target,
- debug: undef,
- easing: 'galleria',
- extend: function(options) {},
- height: 'auto',
- idle_time: 3000,
- image_crop: false,
- image_margin: 0,
- image_pan: false,
- image_pan_smoothness: 12,
- image_position: '50%',
- keep_source: false,
- lightbox_fade_speed: 200,
- lightbox_transition_speed: 500,
- link_source_images: true,
- max_scale_ratio: undef,
- min_scale_ratio: undef,
- on_image: function(img,thumb) {},
- overlay_opacity: .85,
- overlay_background: '#0b0b0b',
- pause_on_interaction: true, // 1.9.96
- popup_links: false,
- preload: 2,
- queue: true,
- show: 0,
- show_info: true,
- show_counter: true,
- show_imagenav: true,
- thumb_crop: true,
- thumb_event_type: CLICK(),
- thumb_fit: true,
- thumb_margin: 0,
- thumb_quality: 'auto',
- thumbnails: true,
- transition: 'fade',
- transition_initial: undef,
- transition_speed: 400,
- width: 'auto'
- };
-
- // apply debug
- if ( options && options.debug === true ) {
- DEBUG = true;
- }
-
- // hide all content
- $( this._target ).children().hide();
-
- // now we just have to wait for the theme...
- if ( Galleria.theme ) {
- this._init();
- } else {
- Utils.addTimer('themeload', function() {
- Galleria.raise( 'No theme found.', true);
- }, 2000);
-
- $doc.one( Galleria.THEMELOAD, function() {
- Utils.clearTimer( 'themeload' );
- self._init.call( self );
- });
- }
- },
-
- // the internal _init is called when the THEMELOAD event is triggered
- // this method should only be called once per instance
- // for manipulation of data, use the .load method
-
- _init: function() {
- var self = this;
-
- if ( this._initialized ) {
- Galleria.raise( 'Init failed: Gallery instance already initialized.' );
- return this;
- }
-
- this._initialized = true;
-
- if ( !Galleria.theme ) {
- Galleria.raise( 'Init failed: No theme found.' );
- return this;
- }
-
- // merge the theme & caller options
- $.extend( true, this._options, Galleria.theme.defaults, this._original.options );
-
- // bind the gallery to run when data is ready
- this.bind( Galleria.DATA, function() {
-
- // save the new data
- this._original.data = this._data;
-
- // lets show the counter here
- this.get('total').innerHTML = this.getDataLength();
-
- // cache the container
- var $container = this.$( 'container' );
-
- // the gallery is ready, let's just wait for the css
- var num = { width: 0, height: 0 };
- var testElem = Utils.create('galleria-image');
-
- // check container and thumbnail height
- Utils.wait({
- until: function() {
-
- // keep trying to get the value
- $.each(['width', 'height'], function( i, m ) {
-
- if (self._options[ m ] && typeof self._options[ m ] == 'number') {
- num[ m ] = self._options[ m ];
- } else {
- num[m] = Utils.parseValue( self.$( 'target' ).css( m ) ) ||
- Utils.parseValue( $container.css( m ) ) ||
- self.$( 'target' )[ m ]() ||
- $container[ m ]()
- }
-
- });
-
- var thumbHeight = function() {
- return true;
- };
-
- // make sure thumbnails have a height as well
- if ( self._options.thumbnails ) {
- self.$('thumbnails').append( testElem );
- thumbHeight = function() {
- return !!$( testElem ).height();
- };
- }
-
- return thumbHeight() && num.width && num.height > 50;
-
- },
- success: function() {
-
- // remove the testElem
- $( testElem ).remove();
-
- // apply the new meassures
- $container.width( num.width );
- $container.height( num.height );
-
- // for some strange reason, webkit needs a single setTimeout to play ball
- if ( Galleria.WEBKIT ) {
- window.setTimeout( function() {
- self._run();
- }, 1);
- } else {
- self._run();
- }
- },
- error: function() {
- // Height was probably not set, raise a hard error
- Galleria.raise('Width & Height not found.', true);
- },
- timeout: 2000
- });
- });
-
- // postrun some stuff after the gallery is ready
- // make sure it only runs once
- var one = false;
-
- this.bind( Galleria.READY, function() {
-
- // show counter
- Utils.show( this.get('counter') );
-
- // bind clicknext
- if ( this._options.clicknext ) {
- $.each( this._data, function( i, data ) {
- delete data.link;
- });
- this.$( 'stage' ).css({ cursor : 'pointer' }).bind( CLICK(), function(e) {
- self.next();
- });
- }
-
- // bind carousel nav
- if ( this._options.carousel ) {
- this._carousel.bindControls();
- }
-
- // start autoplay
- if ( this._options.autoplay ) {
-
- this.pause();
-
- if ( typeof this._options.autoplay == 'number' ) {
- this._playtime = this._options.autoplay;
- }
-
- this.trigger( Galleria.PLAY );
- this._playing = true;
- }
-
- // if second load, just do the show and return
- if ( one ) {
- if ( typeof this._options.show == 'number' ) {
- this.show( this._options.show );
- }
- return;
- }
-
- one = true;
-
- // initialize the History plugin
- if ( Galleria.History ) {
-
- // bind the show method
- Galleria.History.change(function(e) {
-
- // grab history ID
- var val = parseInt( e.value.replace( /\//, '' ) );
-
- // if ID is NaN, the user pressed back from the first image
- // return to previous address
- if (isNaN(val)) {
- window.history.go(-1);
-
- // else show the image
- } else {
- self.show( val, undef, true );
- }
- });
- }
-
- // call the theme init method
- Galleria.theme.init.call( this, this._options );
-
- // call the extend option
- this._options.extend.call( this, this._options );
-
- // show the initial image
- // first test for permalinks in history
- if ( /^[0-9]{1,4}$/.test( HASH ) && Galleria.History ) {
- this.show( HASH, undef, true );
-
- } else {
- this.show( this._options.show );
- }
-
- });
-
- // build the gallery frame
- this.append({
- 'info-text' :
- ['info-title', 'info-description', 'info-author'],
- 'info' :
- ['info-text'],
- 'image-nav' :
- ['image-nav-right', 'image-nav-left'],
- 'stage' :
- ['images', 'loader', 'counter', 'image-nav'],
- 'thumbnails-list' :
- ['thumbnails'],
- 'thumbnails-container' :
- ['thumb-nav-left', 'thumbnails-list', 'thumb-nav-right'],
- 'container' :
- ['stage', 'thumbnails-container', 'info', 'tooltip']
- });
-
- Utils.hide( this.$( 'counter' ).append(
- this.get( 'current' ),
- ' / ',
- this.get( 'total' )
- ) );
-
- this.setCounter('–');
-
- // add images to the controls
- $.each( new Array(2), function(i) {
-
- // create a new Picture instance
- var image = new Galleria.Picture();
-
- // apply some styles
- $( image.container ).css({
- position: 'absolute',
- top: 0,
- left: 0
- });
-
- // append the image
- self.$( 'images' ).append( image.container );
-
- // reload the controls
- self._controls[i] = image;
-
- });
-
- // some forced generic styling
- this.$( 'images' ).css({
- position: 'relative',
- top: 0,
- left: 0,
- width: '100%',
- height: '100%'
- });
-
- this.$( 'thumbnails, thumbnails-list' ).css({
- overflow: 'hidden',
- position: 'relative'
- });
-
- // bind image navigation arrows
- this.$( 'image-nav-right, image-nav-left' ).bind( CLICK(), function(e) {
-
- // tune the clicknext option
- if ( self._options.clicknext ) {
- e.stopPropagation();
- }
-
- // pause if options is set
- if ( self._options.pause_on_interaction ) {
- self.pause();
- }
-
- // navigate
- var fn = /right/.test( this.className ) ? 'next' : 'prev';
- self[ fn ]();
-
- });
-
- // hide controls if chosen to
- $.each( ['info','counter','image-nav'], function( i, el ) {
- if ( self._options[ 'show_' + el.replace(/-/, '') ] === false ) {
- Utils.moveOut( self.get( el ) );
- }
- });
-
- // load up target content
- this.load();
-
- // now it's usually safe to remove the content
- // IE will never stop loading if we remove it, so let's keep it hidden for IE (it's usually fast enough anyway)
- if ( !this._options.keep_source && !IE ) {
- this._target.innerHTML = '';
- }
-
- // append the gallery frame
- this.$( 'target' ).append( this.get( 'container' ) );
-
- // parse the carousel on each thumb load
- if ( this._options.carousel ) {
- this.bind( Galleria.THUMBNAIL, function() {
- this.updateCarousel();
- });
- }
-
- // bind on_image helper
- this.bind( Galleria.IMAGE, function( e ) {
- this._options.on_image.call( this, e.imageTarget, e.thumbTarget );
- });
-
- return this;
- },
-
- // the internal _run method should be called after loading data into galleria
- // creates thumbnails and makes sure the gallery has proper meassurements
- _run : function() {
- // shortcuts
- var self = this,
- o = this._options,
-
- // width/height for calculations
- width = 0,
- height = 0,
-
- // cache the thumbnail option
- optval = typeof o.thumbnails == 'string' ? o.thumbnails.toLowerCase() : null;
-
- // loop through data and create thumbnails
- for( var i = 0; this._data[i]; i++ ) {
-
- var thumb,
- data = this._data[i],
- $container;
-
- if ( o.thumbnails === true ) {
-
- // add a new Picture instance
- thumb = new Galleria.Picture(i);
-
- // get source from thumb or image
- var src = data.thumb || data.image;
-
- // append the thumbnail
- this.$( 'thumbnails' ).append( thumb.container );
-
- // cache the container
- $container = $( thumb.container );
-
- // move some data into the instance
- // for some reason, jQuery cant handle css(property) when zooming in FF, breaking the gallery
- // so we resort to getComputedStyle for browsers who support it
- var getStyle = function( prop ) {
- return doc.defaultView && doc.defaultView.getComputedStyle ?
- doc.defaultView.getComputedStyle( thumb.container, null )[ prop ] :
- $container.css( prop );
- };
-
- thumb.data = {
- width : Utils.parseValue( getStyle( 'width' ) ),
- height : Utils.parseValue( getStyle( 'height' ) ),
- order : i
- };
-
- // grab & reset size for smoother thumbnail loads
- $container.css(( o.thumb_fit && o.thumb_crop !== true ) ?
- { width: 0, height: 0 } :
- { width: thumb.data.width, height: thumb.data.height });
-
- // load the thumbnail
- thumb.load( src, function( thumb ) {
-
- // scale when ready
- thumb.scale({
- width: thumb.data.width,
- height: thumb.data.height,
- crop: o.thumb_crop,
- margin: o.thumb_margin,
- complete: function( thumb ) {
-
- // shrink thumbnails to fit
- var top = ['left', 'top'];
- var arr = ['Width', 'Height'];
-
- // calculate shrinked positions
- $.each(arr, function( i, meassure ) {
- var m = meassure.toLowerCase();
- if ( (o.thumb_crop !== true || o.thumb_crop == m ) && o.thumb_fit ) {
- var css = {};
- css[m] = thumb[m];
- $( thumb.container ).css( css );
- css = {};
- css[top[i]] = 0;
- $( thumb.image ).css( css);
- }
-
- // cache outer meassures
- thumb['outer' + meassure] = $( thumb.container )['outer' + meassure]( true );
- });
-
- // set high quality if downscale is moderate
- Utils.toggleQuality( thumb.image,
- o.thumb_quality === true ||
- ( o.thumb_quality == 'auto' && thumb.original.width < thumb.width * 3 )
- );
-
- // trigger the THUMBNAIL event
- self.trigger({
- type: Galleria.THUMBNAIL,
- thumbTarget: thumb.image,
- index: thumb.data.order
- });
- }
- });
- });
-
- // preload all images here
- if ( o.preload == 'all' ) {
- thumb.add( data.image );
- }
-
- // create empty spans if thumbnails is set to 'empty'
- } else if ( optval == 'empty' || optval == 'numbers' ) {
-
- thumb = {
- container: Utils.create( 'galleria-image' ),
- image: Utils.create( 'img', 'span' ),
- ready: true
- };
-
- // create numbered thumbnails
- if ( optval == 'numbers' ) {
- $( thumb.image ).text( i + 1 );
- }
-
- $( thumb.container ).append( thumb.image );
- this.$( 'thumbnails' ).append( thumb.container );
-
- self.trigger({
- type: Galleria.THUMBNAIL,
- thumbTarget: thumb.image,
- index: i
- });
-
- // create null object to silent errors
- } else {
- thumb = {
- container: null,
- image: null
- };
- }
-
- // add events for thumbnails
- // you can control the event type using thumb_event_type
- // we'll add the same event to the source if it's kept
-
- $( thumb.container ).add( o.keep_source && o.link_source_images ? data.original : null )
- .data('index', i).bind(o.thumb_event_type, function(e) {
- // pause if option is set
- if ( o.pause_on_interaction ) {
- self.pause();
- }
-
- // extract the index from the data
- var index = $( e.currentTarget ).data( 'index' );
- if ( self.getIndex() !== index ) {
- self.show( index );
- }
-
- e.preventDefault();
- });
-
- this._thumbnails.push( thumb );
- }
-
- // make sure we have a stageHeight && stageWidth
-
- Utils.wait({
-
- until: function() {
- self._stageWidth = self.$( 'stage' ).width();
- self._stageHeight = self.$( 'stage' ).height();
- return( self._stageWidth && self._stageHeight > 50 ); // what is an acceptable height?
- },
-
- success: function() {
- self.trigger( Galleria.READY );
- },
-
- error: function() {
- Galleria.raise('stage meassures not found');
- }
-
- });
- },
-
- /**
- Loads data into the gallery.
- You can call this method on an existing gallery to reload the gallery with new data.
-
- @param {Array or String} source Optional JSON array of data or selector of where to find data in the document.
- Defaults to the Galleria target or data_source option.
-
- @param {String} selector Optional element selector of what elements to parse.
- Defaults to 'img'.
-
- @param {Function} config Optional function to modify the data extraction proceedure from the selector.
- See the data_config option for more information.
-
- @returns {Galleria}
- */
-
- load : function( source, selector, config ) {
-
- var self = this;
-
- // empty the data array
- this._data = [];
-
- // empty the thumbnails
- this._thumbnails = [];
- this.$('thumbnails').empty();
-
- // shorten the arguments
- if ( typeof selector == 'function' ) {
- config = selector;
- selector = null;
- }
-
- // use the source set by target
- source = source || this._options.data_source;
-
- // use selector set by option
- selector = selector || this._options.data_selector;
-
- // use the data_config set by option
- config = config || this._options.data_config;
-
- // check if the data is an array already
- if ( source.constructor == Array ) {
- if ( this.validate( source) ) {
- this._data = source;
- this.trigger( Galleria.DATA );
- } else {
- Galleria.raise( 'Load failed: JSON Array not valid.' );
- }
- return this;
- }
- // loop through images and set data
- $( source ).find( selector ).each( function( i, img ) {
- var data = {},
- img = $( img ),
- parent = img.parent(),
- href = parent.attr( 'href' );
-
- // check if it's a link to another image
- if ( /\.(png|gif|jpg|jpeg)$/i.test(href) ) {
- data.image = href;
-
- // else assign the href as a link if it exists
- } else if ( href ) {
- data.link = href;
- }
-
- // mix default extractions with the hrefs and config
- // and push it into the data array
- self._data.push( $.extend({
-
- title: img.attr('title'),
- thumb: img.attr('src'),
- image: img.attr('src'),
- description: img.attr('alt'),
- link: img.attr('longdesc'),
- original: img.get(0) // saved as a reference
-
- }, data, config( img ) ) );
-
- });
- // trigger the DATA event and return
- if ( this.getDataLength() ) {
- this.trigger( Galleria.DATA );
- } else {
- Galleria.raise('Load failed: no data found.');
- }
- return this;
-
- },
-
- _getActive: function() {
- return this._controls.getActive();
- },
-
- validate : function( data ) {
- // todo: validate a custom data array
- return true;
- },
-
- /**
- Bind any event to Galleria
-
- @param {String} type The Event type to listen for
- @param {Function} fn The function to execute when the event is triggered
-
- @example this.bind( Galleria.IMAGE, function() { Galleria.log('image shown') });
-
- @returns {Galleria}
- */
-
- bind : function(type, fn) {
- this.$( 'container' ).bind( type, this.proxy(fn) );
- return this;
- },
-
- /**
- Unbind any event to Galleria
-
- @param {String} type The Event type to forget
-
- @returns {Galleria}
- */
-
- unbind : function(type) {
- this.$( 'container' ).unbind( type );
- return this;
- },
-
- /**
- Manually trigger a Galleria event
-
- @param {String} type The Event to trigger
-
- @returns {Galleria}
- */
-
- trigger : function( type ) {
- type = typeof type == 'object' ?
- $.extend( type, { scope: this } ) :
- { type: type, scope: this };
- this.$( 'container' ).trigger( type );
- return this;
- },
-
- /**
- Assign an "idle state" to any element.
- The idle state will be applied after a certain amount of idle time
- Useful to hide f.ex navigation when the gallery is inactive
-
- @param {HTML Element or String} elem The Dom node or selector to apply the idle state to
- @param {Object} styles the CSS styles to apply
-
- @example addIdleState( this.get('image-nav'), { opacity: 0 });
- @example addIdleState( '.galleria-image-nav', { top: -200 });
-
- @returns {Galleria}
- */
-
- addIdleState: function( elem, styles ) {
- this._idle.add.apply( this._idle, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Removes any idle state previously set using addIdleState()
-
- @param {HTML Element or String} elem The Dom node or selector to remove the idle state from.
-
- @returns {Galleria}
- */
-
- removeIdleState: function( elem ) {
- this._idle.remove.apply( this._idle, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Force Galleria to enter idle mode.
-
- @returns {Galleria}
- */
-
- enterIdleMode: function() {
- this._idle.hide();
- return this;
- },
-
- /**
- Force Galleria to exit idle mode.
-
- @returns {Galleria}
- */
-
- exitIdleMode: function() {
- this.idle._show();
- return this;
- },
-
- /**
- Enter FullScreen mode
-
- @param {Function} callback the function to be executed when the fullscreen mode is fully applied.
-
- @returns {Galleria}
- */
-
- enterFullscreen: function( callback ) {
- this._fullscreen.enter.apply( this, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Exits FullScreen mode
-
- @param {Function} callback the function to be executed when the fullscreen mode is fully applied.
-
- @returns {Galleria}
- */
-
- exitFullscreen: function( callback ) {
- this._fullscreen.exit.apply( this, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Adds a tooltip to any element.
- You can also call this method with an object as argument with elemID:value pairs to apply tooltips to (see examples)
-
- @param {HTML Element} elem The DOM Node to attach the event to
- @param {String or Function} value The tooltip message. Can also be a function that returns a string.
-
- @example this.bindTooltip( this.get('thumbnails'), 'My thumbnails');
- @example this.bindTooltip( this.get('thumbnails'), function() { return 'My thumbs' });
- @example this.bindTooltip( { image_nav: 'Navigation' });
-
- @returns {Galleria}
- */
-
- bindTooltip: function( elem, value ) {
- this._tooltip.bind.apply( this._tooltip, Utils.array(arguments) );
- return this;
- },
-
- /**
- Redefine a tooltip
- Use this if you want to change the tooltip value at runtime
-
- @param {HTML Element} elem The DOM Node to attach the event to
- @param {String or Function} value The tooltip message. Can also be a function that returns a string.
-
- @returns {Galleria}
- */
-
- defineTooltip: function( elem, value ) {
- this._tooltip.define.apply( this._tooltip, Utils.array(arguments) );
- return this;
- },
-
- // leave this out of the API for now
-
- refreshTooltip: function() {
- this._tooltip.refresh.apply( this._tooltip, Utils.array(arguments) );
- return this;
- },
-
- /**
- Open a pre-designed lightbox with the currently active image.
- You can control some visuals using gallery options.
-
- @returns {Galleria}
- */
-
- openLightbox: function() {
- this._lightbox.show.apply( this._lightbox, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Close the lightbox.
-
- @returns {Galleria}
- */
-
- closeLightbox: function() {
- this._lightbox.hide.apply( this._lightbox, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Get the currently active image element.
-
- @returns {HTML Element} The image element
- */
-
- getActiveImage: function() {
- return this._getActive().image || undef;
- },
-
- /**
- Get the currently active thumbnail element.
-
- @returns {HTML Element} The thumbnail element
- */
-
- getActiveThumb: function() {
- return this._thumbnails[ this._active ].image || undef;
- },
-
- /**
- Get the mouse position relative to the gallery container
-
- @param e The mouse event
-
- @example
-
-var gallery = this;
-$(document).mousemove(function(e) {
- console.log( gallery.getMousePosition(e).x );
-});
-
- @returns {Object} Object with x & y of the relative mouse postion
- */
-
- getMousePosition : function(e) {
- return {
- x: e.pageX - this.$( 'stage' ).offset().left,
- y: e.pageY - this.$( 'stage' ).offset().top
- };
- },
-
- /**
- Adds a panning effect to the image
-
- @param img The optional image element. If not specified it takes the currently active image
-
- @returns {Galleria}
- */
-
- addPan : function( img ) {
-
- if ( this._options.image_crop === false ) {
- return;
- }
-
- img = $( img || this.getActiveImage() );
-
- // define some variables and methods
- var self = this,
- x = img.width() / 2,
- y = img.height() / 2,
- curX = destX = parseInt( img.css( 'left' ) ) || 0,
- curY = destY = parseInt( img.css( 'top' ) ) || 0,
- distX = 0,
- distY = 0,
- active = false,
- ts = Utils.timestamp(),
- cache = 0,
- move = 0,
-
- // positions the image
- position = function( dist, cur, pos ) {
- if ( dist > 0 ) {
- move = Math.round( Math.max( dist * -1, Math.min( 0, cur ) ) );
- if ( cache != move ) {
-
- cache = move;
-
- if ( IE == 8 ) { // scroll is faster for IE
- img.parent()[ 'scroll' + pos ]( move * -1 );
- } else {
- var css = {};
- css[ pos.toLowerCase() ] = move;
- img.css(css);
- }
- }
- }
- },
-
- // calculates mouse position after 50ms
- calculate = function(e) {
- if (Utils.timestamp() - ts < 50) {
- return;
- }
- active = true;
- x = self.getMousePosition(e).x;
- y = self.getMousePosition(e).y;
- },
-
- // the main loop to check
- loop = function(e) {
-
- if (!active) {
- return;
- }
-
- distX = img.width() - self._stageWidth;
- distY = img.height() - self._stageHeight;
- destX = x / self._stageWidth * distX * -1;
- destY = y / self._stageHeight * distY * -1;
- curX += ( destX - curX ) / self._options.image_pan_smoothness;
- curY += ( destY - curY ) / self._options.image_pan_smoothness;
-
- position( distY, curY, 'Top' );
- position( distX, curX, 'Left' );
-
- };
-
- // we need to use scroll in IE8 to speed things up
- if ( IE == 8 ) {
-
- img.parent().scrollTop( curY * -1 ).scrollLeft( curX * -1 );
- img.css({
- top: 0,
- left: 0
- });
-
- }
-
- // unbind and bind event
- this.$( 'stage' ).unbind( 'mousemove', calculate ).bind( 'mousemove', calculate );
-
- // loop the loop
- Utils.addTimer('pan', loop, 50, true);
-
- return this;
- },
-
- /**
- Brings the scope into any callback
-
- @param fn The callback to bring the scope into
- @param scope Optional scope to bring
-
- @example $('#fullscreen').click( this.proxy(function() { this.enterFullscreen(); }) )
-
- @returns {Function} Return the callback with the gallery scope
- */
-
- proxy : function( fn, scope ) {
- if ( typeof fn !== 'function' ) {
- return function() {};
- }
- scope = scope || this;
- return function() {
- return fn.apply( scope, Utils.array( arguments ) );
- };
- },
-
- /**
- Removes the panning effect set by addPan()
-
- @returns {Galleria}
- */
-
- removePan: function() {
-
- if ( IE == 8 ) {
- // todo: doublecheck this
- }
- this.$( 'stage' ).unbind( 'mousemove' );
-
- Utils.clearTimer('pan');
-
- this.rescale();
-
- return this;
- },
-
- /**
- Adds an element to the Galleria DOM array.
- When you add an element here, you can access it using element ID in many API calls
-
- @param {String} id The element ID you wish to use. You can add many elements by adding more arguments.
-
- @example addElement('mybutton');
- @example addElement('mybutton','mylink');
-
- @returns {Galleria}
- */
-
- addElement : function( id ) {
-
- var dom = this._dom;
-
- $.each( Utils.array(arguments), function( i, blueprint ) {
- dom[ blueprint ] = Utils.create( 'galleria-' + blueprint );
- });
-
- return this;
- },
-
- /**
- Attach keyboard events to Galleria
-
- @param {Object} map The map object of events.
- Possible keys are 'UP', 'DOWN', 'LEFT', 'RIGHT', 'RETURN', 'ESCAPE', 'BACKSPACE', and 'SPACE'.
-
- @example
-
-this.attachKeyboard({
- right: this.next,
- left: this.prev,
- up: function() {
- console.log( 'up key pressed' )
- }
-});
-
- @returns {Galleria}
- */
-
- attachKeyboard : function( map ) {
- this._keyboard.attach.apply( this._keyboard, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Detach all keyboard events to Galleria
-
- @returns {Galleria}
- */
-
- detachKeyboard : function() {
- this._keyboard.detach.apply( this._keyboard, Utils.array( arguments ) );
- return this;
- },
-
- /**
- Fast helper for appending galleria elements that you added using addElement()
-
- @param {String} parentID The parent element ID where the element will be appended
- @param {String} childID the element ID that should be appended
-
- @example this.addElement('myElement');
- this.appendChild( 'info', 'myElement' );
-
- @returns {Galleria}
- */
-
- appendChild : function( parentID, childID ) {
- this.$( parentID ).append( this.get( childID ) || childID );
- return this;
- },
-
- /**
- Fast helper for appending galleria elements that you added using addElement()
-
- @param {String} parentID The parent element ID where the element will be preppended
- @param {String} childID the element ID that should be preppended
-
- @example
-
-this.addElement('myElement');
-this.prependChild( 'info', 'myElement' );
-
- @returns {Galleria}
- */
-
- prependChild : function( parentID, childID ) {
- this.$( parentID ).prepend( this.get( childID ) || childID );
- return this;
- },
-
- /**
- Remove an element by blueprint
-
- @param {String} elemID The element to be removed.
- You can remove multiple elements by adding arguments.
-
- @returns {Galleria}
- */
-
- remove : function( elemID ) {
- this.$( Utils.array( arguments ).join(',') ).remove();
- return this;
- },
-
- // a fast helper for building dom structures
- // leave this out of the API for now
-
- append : function( data ) {
- for( var i in data) {
- if ( data[i].constructor == Array ) {
- for( var j = 0; data[i][j]; j++ ) {
- this.appendChild( i, data[i][j] );
- }
- } else {
- this.appendChild( i, data[i] );
- }
- }
- return this;
- },
-
- // an internal helper for scaling according to options
- _scaleImage : function( image, options ) {
-
- options = $.extend({
- width: this._stageWidth,
- height: this._stageHeight,
- crop: this._options.image_crop,
- max: this._options.max_scale_ratio,
- min: this._options.min_scale_ratio,
- margin: this._options.image_margin,
- position: this._options.image_position
- }, options );
-
- ( image || this._controls.getActive() ).scale( options );
-
- return this;
- },
-
- /**
- Updates the carousel,
- useful if you resize the gallery and want to re-check if the carousel nav is needed.
-
- @returns {Galleria}
- */
-
- updateCarousel : function() {
- this._carousel.update();
- return this;
- },
-
- /**
- Rescales the gallery
-
- @param {Number} width The target width
- @param {Number} height The target height
- @param {Function} complete The callback to be called when the scaling is complete
-
- @returns {Galleria}
- */
-
- rescale : function( width, height, complete ) {
-
- var self = this;
-
- // allow rescale(fn)
- if ( typeof width == 'function' ) {
- complete = width;
- width = undef;
- }
-
- var scale = function() {
-
- // shortcut
- var o = self._options;
-
- // set stagewidth
- self._stageWidth = width || self.$( 'stage' ).width();
- self._stageHeight = height || self.$( 'stage' ).height();
-
- // scale the active image
- self._scaleImage();
-
- if ( self._options.carousel ) {
- self.updateCarousel();
- }
-
- self.trigger( Galleria.RESCALE );
-
- if ( typeof complete == 'function' ) {
- complete.call( self );
- }
- };
-
- if ( Galleria.WEBKIT && !width && !height ) {
- Utils.addTimer( 'scale', scale, 5 );// webkit is too fast
- } else {
- scale.call( self );
- }
-
- return this;
- },
-
- /**
- Refreshes the gallery.
- Useful if you change image options at runtime and want to apply the changes to the active image.
-
- @returns {Galleria}
- */
-
- refreshImage : function() {
- this._scaleImage();
- if ( this._options.image_pan ) {
- this.addPan();
- }
- return this;
- },
-
- /**
- Shows an image by index
-
- @param {Number} index The index to show
- @param {Boolean} rewind A boolean that should be true if you want the transition to go back
-
- @returns {Galleria}
- */
-
- show : function( index, rewind, _history ) {
-
- // do nothing if index is false or queue is false and transition is in progress
- if ( index === false || !this._options.queue && this._queue.stalled ) {
- return;
- }
-
- index = Math.max( 0, Math.min( parseInt(index), this.getDataLength() - 1 ) );
-
- rewind = typeof rewind != 'undefined' ? !!rewind : index < this.getIndex();
-
- _history = _history || false;
-
- // do the history thing and return
- if ( !_history && Galleria.History ) {
- Galleria.History.value( index.toString() );
- return;
- }
-
- this._active = index;
-
- Array.prototype.push.call( this._queue, {
- index : index,
- rewind : rewind
- });
- if ( !this._queue.stalled ) {
- this._show();
- }
-
- return this;
- },
-
- // the internal _show method does the actual showing
- _show : function() {
-
- // shortcuts
- var self = this,
- queue = this._queue[ 0 ],
- data = this.getData( queue.index );
-
- if ( !data ) {
- return;
- }
-
- var src = data.image,
- active = this._controls.getActive(),
- next = this._controls.getNext(),
- cached = next.isCached( src ),
- thumb = this._thumbnails[ queue.index ];
-
- // to be fired when loading & transition is complete:
- var complete = function() {
-
- // remove stalled
- self._queue.stalled = false;
-
- // optimize quality
- Utils.toggleQuality( next.image, self._options.image_quality );
-
- // swap
- $( active.container ).css({
- zIndex: 0,
- opacity: 0
- });
- $( next.container ).css({
- zIndex: 1,
- opacity: 1
- });
- self._controls.swap();
-
- // add pan according to option
- if ( self._options.image_pan ) {
- self.addPan( next.image );
- }
-
- // make the image link
- if ( data.link ) {
- $( next.image ).css({
- cursor: 'pointer'
- }).bind( CLICK(), function() {
-
- // popup link
- if ( self._options.popup_links ) {
- var win = window.open( data.link, '_blank' );
- } else {
- window.location.href = data.link;
- }
- });
- }
-
- // remove the queued image
- Array.prototype.shift.call( self._queue );
-
- // if we still have images in the queue, show it
- if ( self._queue.length ) {
- self._show();
- }
-
- // check if we are playing
- self._playCheck();
-
- // trigger IMAGE event
- self.trigger({
- type: Galleria.IMAGE,
- index: queue.index,
- imageTarget: next.image,
- thumbTarget: thumb.image
- });
- };
-
- // let the carousel follow
- if ( this._options.carousel && this._options.carousel_follow ) {
- this._carousel.follow( queue.index );
- }
-
- // preload images
- if ( this._options.preload ) {
-
- var p,
- n = this.getNext();
-
- try {
- for ( var i = this._options.preload; i > 0; i-- ) {
- p = new Galleria.Picture();
- p.add( self.getData( n ).image );
- n = self.getNext( n );
- }
-
<TRUNCATED>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/8] james-project git commit: JAMES-1831 Remove galleria
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/plugins/galleria.flickr.js
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/plugins/galleria.flickr.js b/src/site/resources/js/galleria/plugins/galleria.flickr.js
deleted file mode 100644
index 9e0bf59..0000000
--- a/src/site/resources/js/galleria/plugins/galleria.flickr.js
+++ /dev/null
@@ -1,221 +0,0 @@
-/*!
- * Galleria Flickr Plugin v 1.2
- * http://galleria.aino.se
- *
- * Copyright 2010, Aino
- * Licensed under the MIT license.
- */
-
-(function($) {
-
-// If no Galleria, fail silently
-var G = window.Galleria;
-if (typeof G == 'undefined') {
- return;
-}
-
-var F = G.Flickr = function(api_key) {
-
- if (!api_key) {
- G.raise('No API key found');
- return;
- }
-
- this.callback = function() {};
-
- // The required API key
- this.api_key = api_key;
-
- this.options = {
- max: 40, // photos to return
- size: 'big', // photo size ( small,medium,big,original )
- sort: 'interestingness-desc', // sort option ( date-posted-asc, date-posted-desc, date-taken-asc, date-taken-desc, interestingness-desc, interestingness-asc, relevance )
- description: false // set this to true to get description as caption
- };
-};
-
-F.prototype = {
-
- // find any photos by search string
- search: function( str ) {
- this._set(arguments);
- return this._find({
- text: str
- });
- },
-
- // find any photos by tagname
- getTags: function( str ) {
- this._set(arguments);
- return this._find({
- tags: str
- });
- },
-
- // get photos from a user
- getUser: function(username) {
- var args = arguments;
- return this._call({
- method: 'flickr.urls.lookupUser',
- url: 'flickr.com/photos/' + username
- }, function(data) {
- this._set(args);
- this._find({
- user_id: data.user.id,
- method: 'flickr.people.getPublicPhotos'
- });
- });
- },
-
- // get photos from a photoset
- getSet: function(photoset_id) {
- this._set(arguments);
- return this._find({
- photoset_id: photoset_id,
- method: 'flickr.photosets.getPhotos'
- });
- },
-
- // get photos from a gallery
- getGallery: function(gallery_id) {
- this._set(arguments);
- return this._find({
- gallery_id: gallery_id,
- method: 'flickr.galleries.getPhotos'
- });
- },
-
- // search for groups by search string, returns an array with group objects
- // use getGroup to get the photos from a group ID
- // added in 1.2
- searchGroup: function(str, callback) {
- callback = callback || function() {};
- this._call({
- text: str,
- method: 'flickr.groups.search'
- }, function(data) {
- callback.call( window, data.groups.group);
- });
- return this;
- },
-
- // get photos from a group ID
- // added in 1.2
- getGroup: function ( group_id ) {
- this._set( arguments );
- return this._find({
- group_id: group_id,
- method: 'flickr.groups.pools.getPhotos'
- });
- },
-
- // set options
- setOptions: function( options ) {
- $.extend(this.options, options);
- return this;
- },
-
- // shortens the arguments and applies options
- // private
- _set: function( args ) {
-
- args = Array.prototype.slice.call(args);
-
- this.callback = args[2] || args[1];
-
- if (typeof args[1] == 'object') {
- this.setOptions(args[1]);
- }
-
- return this;
- },
-
- // call Flickr and raise errors
- _call: function( params, callback ) {
-
- var url = 'http://api.flickr.com/services/rest/?';
-
- var scope = this;
-
- params = $.extend({
- format : 'json',
- jsoncallback : '?',
- api_key: this.api_key
- }, params );
-
- $.each(params, function( key, value ) {
- url += '&' + key + '=' + value;
- });
-
- $.getJSON(url, function(data) {
- if ( data.stat == 'ok' ) {
- callback.call(scope, data);
- } else {
- Galleria.raise( data.code.toString() + ' ' + data.stat + ': ' + data.message );
- }
- });
- return scope;
- },
-
- // ask flickr for photos, parse the result and call the callback with the galleria-ready data array
- _find: function(params) {
-
- params = $.extend({
- method: 'flickr.photos.search',
- extras: 'url_t, url_m, url_o, url_s, url_l, description',
- sort: this.options.sort
- }, params );
-
- return this._call(params, function(data) {
-
- var gallery = [],
- photos = data.photos ? data.photos.photo : data.photoset.photo,
- len = Math.min(this.options.max, photos.length);
-
- for ( var i=0; i<len; i++ ) {
- var photo = photos[i],
- img = photo.url_m;
-
- switch(this.options.size) {
- case 'small':
- img = photo.url_s;
- break;
-
- case ( 'big' || 'large' ):
- if ( photo.url_l ) {
- img = photo.url_l;
- } else if ( parseInt( photo.width_o ) > 1280 ) {
- img = 'http://farm'+photo['farm']+'.static.flickr.com/'+photo['server']+
- '/'+photo['id']+'_' + photo['secret'] + '_b.jpg';
-
- } else if( photo.url_o ) {
- img = photo.url_o;
- }
- break;
-
- case 'original':
- if( photo.url_o ) {
- img = photo.url_o;
- }
- break;
- }
- var item = {
- thumb: photos[i].url_t,
- image: img,
- title: photos[i].title,
- description: this.options.description && photos[i].description ? photos[i].description._content : ''
- };
- gallery.push( item );
- }
- this.callback.call( this, gallery );
- });
- }
-};
-
-// Static
-// TODO: fetch any flickr feed ( YQL integration )
-F.getFeed = function(type, params) {
-
-};
-
-})( jQuery );
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/classic/README.rst
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/classic/README.rst b/src/site/resources/js/galleria/themes/classic/README.rst
deleted file mode 100644
index df0e20e..0000000
--- a/src/site/resources/js/galleria/themes/classic/README.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-======================
-Galleria Classic Theme
-======================
-
-This is the Galleria Classic Theme that fetches image data from a list of IMG elements and generates thumbnails. If the thumbnail\u2019s total width exceeds the containing width, Galleria automatically adds a carousel (unless disabled). Galleria automatically adjusts it\u2019s width to the containing element\u2019s size.
-
-Check out classic-demo.html for example usage.
-
-Copyright (c) 2010, Aino
-Licensed under the MIT license.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/classic/classic-demo.html
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/classic/classic-demo.html b/src/site/resources/js/galleria/themes/classic/classic-demo.html
deleted file mode 100644
index 54015c2..0000000
--- a/src/site/resources/js/galleria/themes/classic/classic-demo.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Galleria Classic Theme</title>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
- <script src="../../../src/galleria.js"></script>
- <style>
- html,body{background:#333}
- .content{color:#eee;font:14px/1.4 "helvetica neue", arial,sans-serif;width:620px;margin:20px auto}
- h1{line-height:1.1;letter-spacing:-1px;}
- a {color:#fff;}
- #galleria{height:400px;}
- </style>
- </head>
-<body>
- <div class="content">
- <h1>Galleria Classic Theme</h1>
-
- <div id="galleria">
- <img alt="Squirrel! That is all." src="http://upload.wikimedia.org/wikipedia/commons/thumb/0/02/Eichh%C3%B6rnchen_D%C3%BCsseldorf_Hofgarten_edit.jpg/800px-Eichh%C3%B6rnchen_D%C3%BCsseldorf_Hofgarten_edit.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/f/f8/Sea-otter-morro-bay_13.jpg/800px-Sea-otter-morro-bay_13.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/7/70/Kuznetsk_Alatau_3.jpg/500px-Kuznetsk_Alatau_3.jpg">
- <img alt="Strawberries, yum yum! Shiny red" src="http://upload.wikimedia.org/wikipedia/commons/thumb/d/de/Basket_of_strawberries_red_accent.jpg/500px-Basket_of_strawberries_red_accent.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/2/2d/Ns1-unsharp.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/6/67/Laser_effects.jpg/500px-Laser_effects.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/1/1b/PizBernina3.jpg/500px-PizBernina3.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/4/47/La_Galera_2.jpg/500px-La_Galera_2.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/9/92/Costa_rica_santa_elena_skywalk.jpg/500px-Costa_rica_santa_elena_skywalk.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/b/b2/Smoky_forest.jpg/500px-Smoky_forest.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/Alcea_rosea_and_blue_sky.jpg/500px-Alcea_rosea_and_blue_sky.jpg">
- </div>
- </div>
- <script>
- // Load the classic theme
- Galleria.loadTheme('galleria.classic.js');
- // Initialize Galleria
- $('#galleria').galleria();
- </script>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/classic/classic-loader.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/classic/classic-loader.gif b/src/site/resources/js/galleria/themes/classic/classic-loader.gif
deleted file mode 100644
index 27df81f..0000000
Binary files a/src/site/resources/js/galleria/themes/classic/classic-loader.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/classic/classic-map.png
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/classic/classic-map.png b/src/site/resources/js/galleria/themes/classic/classic-map.png
deleted file mode 100644
index 8d3c8c4..0000000
Binary files a/src/site/resources/js/galleria/themes/classic/classic-map.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/classic/galleria.classic.css
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/classic/galleria.classic.css b/src/site/resources/js/galleria/themes/classic/galleria.classic.css
deleted file mode 100644
index a46caf8..0000000
--- a/src/site/resources/js/galleria/themes/classic/galleria.classic.css
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Galleria Classic Theme
- * Copyright (c) 2010, Aino
- * Licensed under the MIT license.
- */
-
-.galleria-container {
- position: relative;
- overflow: hidden;
- background: #000;
-}
-.galleria-container img {
- -moz-user-select: none;
- -webkit-user-select: none;
- -o-user-select: none;
-}
-.galleria-stage {
- position: absolute;
- top: 10px;
- bottom: 60px;
- left: 10px;
- right: 10px;
- overflow:hidden;
-}
-.galleria-thumbnails-container {
- height: 50px;
- bottom: 0;
- position: absolute;
- left: 10px;
- right: 10px;
- z-index: 2;
-}
-.galleria-carousel .galleria-thumbnails-list {
- margin-left: 30px;
- margin-right: 30px;
-}
-.galleria-thumbnails .galleria-image {
- height: 40px;
- width: 60px;
- background: #000;
- margin: 0 5px 0 0;
- border: 1px solid #000;;
- float: left;
- cursor: pointer;
-}
-.galleria-counter {
- position: absolute;
- bottom: 10px;
- left: 10px;
- text-align: right;
- color: #fff;
- font: normal 11px/1 arial,sans-serif;
- z-index: 2;
-}
-.galleria-loader {
- background: #000;
- width: 20px;
- height: 20px;
- position: absolute;
- top: 10px;
- right: 10px;
- z-index: 2;
- display: none;
- background: url(classic-loader.gif) no-repeat 2px 2px;
-}
-.galleria-info {
- width: 50%;
- top: 15px;
- left: 15px;
- z-index: 2;
- position: absolute;
-}
-.galleria-info-text {
- background-color: #000;
- padding: 12px;
- display: none;
- /* IE7 */ zoom:1;
-}
-.galleria-info-title {
- font: bold 12px/1.1 arial,sans-serif;
- margin: 0;
- color: #fff;
-}
-.galleria-info-description {
- font: italic 12px/1.4 georgia,serif;
- margin: 0;
- color: #bbb;
-}
-.galleria-info-title+.galleria-info-description {
- margin-top: 7px;
-}
-.galleria-info-close {
- width: 9px;
- height: 9px;
- position: absolute;
- top: 5px;
- right: 5px;
- background-position: -753px -11px;
- opacity: .5;
- filter: alpha(opacity=50);
- cursor: pointer;
- display: none;
-}
-.galleria-info-close:hover{
- opacity:1;
- filter: alpha(opacity=100);
-}
-.galleria-info-link {
- background-position: -669px -5px;
- opacity: .7;
- filter: alpha(opacity=70);
- position: absolute;
- width: 20px;
- height: 20px;
- cursor: pointer;
- background-color: #000;
-}
-.galleria-info-link:hover {
- opacity: 1;
- filter: alpha(opacity=100);
-}
-.galleria-image-nav {
- position: absolute;
- top: 50%;
- margin-top: -62px;
- width: 100%;
- height: 62px;
- left: 0;
-}
-.galleria-image-nav-left,
-.galleria-image-nav-right {
- opacity: .3;
- filter: alpha(opacity=30);
- cursor: pointer;
- width: 62px;
- height: 124px;
- position: absolute;
- left: 10px;
- z-index: 2;
- background-position: 0 46px;
-}
-.galleria-image-nav-right {
- left: auto;
- right: 10px;
- background-position: -254px 46px;
- z-index: 2;
-}
-.galleria-image-nav-left:hover,
-.galleria-image-nav-right:hover {
- opacity: 1;
- filter: alpha(opacity=100);
-}
-.galleria-thumb-nav-left,
-.galleria-thumb-nav-right {
- cursor: pointer;
- display: none;
- background-position: -495px 5px;
- position: absolute;
- left: 0;
- top: 0;
- height: 40px;
- width: 23px;
- z-index: 3;
- opacity: .8;
- filter: alpha(opacity=80);
-}
-.galleria-thumb-nav-right {
- background-position: -578px 5px;
- border-right: none;
- right: 0;
- left: auto;
-}
-.galleria-thumbnails-container .disabled {
- opacity: .2;
- filter: alpha(opacity=20);
- cursor: default;
-}
-.galleria-thumb-nav-left:hover,
-.galleria-thumb-nav-right:hover {
- opacity: 1;
- filter: alpha(opacity=100);
- background-color: #111;
-}
-.galleria-thumbnails-container .disabled:hover {
- opacity: 0.2;
- filter: alpha(opacity=20);
- background-color: transparent;
-}
-
-.galleria-carousel .galleria-thumb-nav-left,
-.galleria-carousel .galleria-thumb-nav-right {
- display: block;
-}
-.galleria-thumb-nav-left,
-.galleria-thumb-nav-right,
-.galleria-info-link,
-.galleria-info-close,
-.galleria-image-nav-left,
-.galleria-image-nav-right {
- background-image: url(classic-map.png);
- background-repeat: no-repeat;
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/classic/galleria.classic.js
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/classic/galleria.classic.js b/src/site/resources/js/galleria/themes/classic/galleria.classic.js
deleted file mode 100644
index 1d32775..0000000
--- a/src/site/resources/js/galleria/themes/classic/galleria.classic.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Galleria Classic Theme v. 1.5 2010-10-28
- * http://galleria.aino.se
- *
- * Copyright (c) 2010, Aino
- * Licensed under the MIT license.
- */
-
-(function($) {
-
-Galleria.addTheme({
- name: 'classic',
- author: 'Galleria',
- version: '1.5',
- css: 'galleria.classic.css',
- defaults: {
- transition: 'slide',
- thumb_crop: 'height',
-
- // set this to false if you want to show the caption all the time:
- _toggle_info: true
- },
- init: function(options) {
-
- // add some elements
- this.addElement('info-link','info-close');
- this.append({
- 'info' : ['info-link','info-close']
- });
-
- // cache some stuff
- var toggle = this.$('image-nav-left,image-nav-right,counter'),
- info = this.$('info-link,info-close,info-text'),
- click = Galleria.TOUCH ? 'touchstart' : 'click';
-
- // show loader & counter with opacity
- this.$('loader,counter').show().css('opacity',.4)
-
- // some stuff for non-touch browsers
- if (! Galleria.TOUCH ) {
-
- // fade thumbnails
- this.$('thumbnails').children().hover(function() {
- $(this).not('.active').children().stop().fadeTo(100, 1);
- }, function() {
- $(this).not('.active').children().stop().fadeTo(400, .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 });
- }
-
- // toggle info
- if ( options._toggle_info ) {
- info.bind( click, function() {
- info.toggle();
- });
- }
-
- // bind some stuff
- this.bind(Galleria.THUMBNAIL, function(e) {
- $(e.thumbTarget).parent(':not(.active)').children().css('opacity',.6)
- });
-
- this.bind(Galleria.LOADSTART, function(e) {
- if (!e.cached) {
- this.$('loader').show().fadeTo(200, .4);
- }
-
- this.$('info').toggle( this.hasInfo() );
-
- $(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity',.6);
- });
-
- this.bind(Galleria.LOADFINISH, function(e) {
- this.$('loader').fadeOut(200);
- });
- }
-});
-
-})(jQuery);
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/b.png
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/b.png b/src/site/resources/js/galleria/themes/fullscreen/b.png
deleted file mode 100644
index 42ee9a0..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/b.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/down.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/down.gif b/src/site/resources/js/galleria/themes/fullscreen/down.gif
deleted file mode 100644
index 006dcc2..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/down.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/fix.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/fix.gif b/src/site/resources/js/galleria/themes/fullscreen/fix.gif
deleted file mode 100644
index 35d42e8..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/fix.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/fullscreen-demo.html
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/fullscreen-demo.html b/src/site/resources/js/galleria/themes/fullscreen/fullscreen-demo.html
deleted file mode 100644
index 29aa95c..0000000
--- a/src/site/resources/js/galleria/themes/fullscreen/fullscreen-demo.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html lang="sv">
- <head>
- <title>Galleria Fullscreen Theme Demo 01</title>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
- <script src="../../galleria.js"></script>
- <script src="../../plugins/galleria.flickr.js"></script>
- <style>
- body{background:#000;}
- </style>
- </head>
-<body>
- <div id="galleria">
- <img alt="Squirrel! That is all." src="http://upload.wikimedia.org/wikipedia/commons/thumb/0/02/Eichh%C3%B6rnchen_D%C3%BCsseldorf_Hofgarten_edit.jpg/800px-Eichh%C3%B6rnchen_D%C3%BCsseldorf_Hofgarten_edit.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/f/f8/Sea-otter-morro-bay_13.jpg/800px-Sea-otter-morro-bay_13.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/7/70/Kuznetsk_Alatau_3.jpg/500px-Kuznetsk_Alatau_3.jpg">
- <img alt="Strawberries, yum yum! Shiny red" src="http://upload.wikimedia.org/wikipedia/commons/thumb/d/de/Basket_of_strawberries_red_accent.jpg/500px-Basket_of_strawberries_red_accent.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/2/2d/Ns1-unsharp.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/6/67/Laser_effects.jpg/500px-Laser_effects.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/1/1b/PizBernina3.jpg/500px-PizBernina3.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/4/47/La_Galera_2.jpg/500px-La_Galera_2.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/9/92/Costa_rica_santa_elena_skywalk.jpg/500px-Costa_rica_santa_elena_skywalk.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/b/b2/Smoky_forest.jpg/500px-Smoky_forest.jpg">
- <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/Alcea_rosea_and_blue_sky.jpg/500px-Alcea_rosea_and_blue_sky.jpg">
- </div>
- <script>
- // Load theme
- Galleria.loadTheme('galleria.fullscreen.js');
-
- $('#galleria').galleria();
-
- </script>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.css
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.css b/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.css
deleted file mode 100644
index b52f657..0000000
--- a/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.css
+++ /dev/null
@@ -1,42 +0,0 @@
-html,body{background:#000;}
-.galleria-container{height:100%;overflow:hidden;position:fixed;top:0;left:0;width:100%;background:#000;}
-.galleria-container img{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none}
-.galleria-stage{width:100%;height:100%;position:absolute;}
-.galleria-thumbnails-container{position:absolute;bottom:0;z-index:2;padding-top:16px;width:100%;}
-.galleria-thumbnails-tab{opacity:.7;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";filter:alpha(opacity=70);
- position:absolute;left:50%;margin-left:-50px;top:0;height:16px;width:100px;background:#000 url(up.gif) no-repeat 50% 5px;cursor:pointer;
- -moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;-webkit-border-top-left-radius:4px}
-
-.galleria-thumbnails-tab:hover{opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";filter:alpha(opacity=100);}
-.galleria-thumbnails-tab.open,
-.galleria-thumbnails-tab.open:hover{background-image:url(down.gif);opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";filter:alpha(opacity=100);}
-.galleria-thumbnails{background:#000;overflow:hidden;}
-.galleria-thumbnails-list{background:#000;padding-top:5px;padding-bottom:5px;overflow:hidden;}
-.galleria-thumbnails .galleria-image{width:80px;height:50px;float:left;cursor:pointer;margin-right:5px;}
-.galleria-thumbnails .galleria-image img{background:#000;}
-.galleria-thumbnails .active{cursor:default;}
-.galleria-carousel .galleria-thumbnails-list{border-left:30px solid #000;border-right:30px solid #000;}
-.galleria-image-nav{width:100%;height:100%;position:absolute;top:0;left:0;}
-.galleria-image-nav-right,
-.galleria-image-nav-left{width:100px;right:0;top:0;height:100%;background: url(r.gif) no-repeat 50% 50%;position:absolute;cursor:pointer;z-index:2;display:none;}
-.galleria-image-nav-left{left:0;right:auto;background-image:url(l.gif);}
-.galleria-loader{width:30px;height:30px;background:#fff url(loader.gif) no-repeat 50% 50%;position:absolute;top:50%;left:50%;margin-top:-15px;margin-left:-15px;z-index:3;}
-
-.galleria-info{z-index:4;font:11px/1.4 arial,sans-serif;text-shadow:rgba(0,0,0,.2) 1px 1px 1px;color:#fff;position:absolute;top:0;width:100%;
- border-top:2px solid #000;display:none;text-align:center;padding:10px 0;background:rgba(0,0,0,.4);}
-.galleria-info-text{width:50%;margin:0 auto;}
-.galleria-info-title{font-weight:bold;}
-
-.galleria-thumb-nav-left,
-.galleria-thumb-nav-right{cursor:pointer;display:none;background:url(p.gif) no-repeat 50% 50%;position:absolute;left:5px;top:21px;bottom:5px;width:20px;z-index:3;
- opacity:.8;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";filter:alpha(opacity=80);}
-
-.galleria-thumb-nav-right{background-image:url(n.gif);left:auto;right:5px;}
-.galleria-carousel .galleria-thumb-nav-left,
-.galleria-carousel .galleria-thumb-nav-right{display:block;}
-.galleria-carousel .galleria-thumb-nav-left:hover,
-.galleria-carousel .galleria-thumb-nav-right:hover{background-color:#222;}
-.galleria-thumb-nav-left.disabled,
-.galleria-thumb-nav-right.disabled,
-.galleria-thumb-nav-left.disabled:hover,
-.galleria-thumb-nav-right.disabled:hover{opacity:.2;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";filter:alpha(opacity=20);cursor:default;}
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.js
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.js b/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.js
deleted file mode 100644
index 82550d7..0000000
--- a/src/site/resources/js/galleria/themes/fullscreen/galleria.fullscreen.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Galleria Fullscreen Theme v. 2.2 2010-10-28
- * http://galleria.aino.se
- *
- * Copyright (c) 2010, Aino
- * Licensed under the MIT license.
- */
-
-(function($) {
-
-Galleria.addTheme({
- name: 'fullscreen',
- author: 'Galleria',
- version: '2.2',
- css: 'galleria.fullscreen.css',
- defaults: {
- transition: 'none',
- image_crop: true,
- thumb_crop: 'height',
- // set this to false if you want to keep the thumbnails:
- _hide_dock: true,
- // set this to true if you want to shrink the carousel when clicking a thumbnail:
- _close_on_click: false
- },
- init: function(options) {
-
- this.addElement('thumbnails-tab');
- this.appendChild('thumbnails-container', 'thumbnails-tab');
-
- var tab = this.$('thumbnails-tab'),
- loader = this.$('loader'),
- thumbs = this.$('thumbnails-container'),
- list = this.$('thumbnails-list'),
- infotext = this.$('info-text'),
- info = this.$('info'),
- OPEN = !options._hide_dock,
- POS = 0,
- CLICK = Galleria.TOUCH ? 'touchstart' : 'click';
-
- if (Galleria.IE) {
- this.addElement('iefix');
- this.appendChild('container', 'iefix');
- this.$('iefix').css({
- zIndex: 3,
- position: 'absolute',
- backgroundColor: '#000',
- opacity: .4
- });
- }
-
- if ( options.thumbnails === false ) {
- thumbs.hide();
- }
-
- var fixCaption = this.proxy(function(img) {
-
- if (!(img || img.width)) {
- return;
- }
- var w = Math.min(img.width, $(window).width());
- infotext.width(w - 40);
- if (Galleria.IE && this.getOptions('show_info')) {
- this.$('iefix').width(info.outerWidth()).height(info.outerHeight());
- }
- });
- this.bind(Galleria.RESCALE, function() {
- POS = this.getStageHeight() - tab.height() - 2;
- thumbs.css('top', OPEN ? POS - list.outerHeight() + 2 : POS);
- var img = this.getActiveImage();
- if (img) {
- fixCaption(img);
- }
- });
-
- this.bind(Galleria.LOADSTART, function(e) {
- if (!e.cached) {
- loader.show().fadeTo(100, 1);
- }
- $(e.thumbTarget).css('opacity', 1).parent().siblings().children().css('opacity', .6);
- });
-
- this.bind(Galleria.LOADFINISH, function(e) {
- loader.fadeOut(300);
- this.$('info, iefix').toggle(this.hasInfo());
- });
-
- this.bind(Galleria.IMAGE, function(e) {
- fixCaption(e.imageTarget);
- });
-
- this.bind(Galleria.THUMBNAIL, function(e) {
- $(e.thumbTarget).parent(':not(.active)').children().css('opacity', .6);
- $(e.thumbTarget).click(function() {
- if (OPEN && options._close_on_click) {
- tab.click();
- }
- });
- });
-
- this.trigger(Galleria.RESCALE);
-
- this.addIdleState(thumbs, { opacity: 0 });
- this.addIdleState(this.get('info'), { opacity: 0 });
-
- if (Galleria.IE) {
- this.addIdleState(this.get('iefix'), { opacity: 0 });
- }
-
- this.$('image-nav-left, image-nav-right').css('opacity', 0.01).hover(function() {
- $(this).animate({opacity: 1}, 100);
- }, function() {
- $(this).animate({opacity: 0});
- }).show();
-
- if (options._hide_dock) {
- tab.click(this.proxy(function() {
- tab.toggleClass('open', !OPEN);
- if (!OPEN) {
- thumbs.animate({
- top: POS - list.outerHeight() + 2
- }, 400, 'galleria');
- } else {
- thumbs.animate({
- top: POS
- }, 400, 'galleria');
- }
- OPEN = !OPEN;
- }));
- } else {
- this.bind(Galleria.THUMBNAIL, function() {
- thumbs.css('top', POS - list.outerHeight() + 2);
- });
- tab.css('visibility', 'hidden');
- }
-
- this.$('thumbnails').children().hover(function() {
- $(this).not('.active').children().stop().fadeTo(100, 1);
- }, function() {
- $(this).not('.active').children().stop().fadeTo(400, .6);
- });
-
- this.enterFullscreen();
- this.attachKeyboard({
- escape: function(e) {
- return false;
- },
- up: function(e) {
- if (!OPEN) {
- tab.click();
- }
- e.preventDefault();
- },
- down: function(e) {
- if (OPEN) {
- tab.click();
- }
- e.preventDefault();
- }
- });
- }
-});
-
-})(jQuery);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/i.png
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/i.png b/src/site/resources/js/galleria/themes/fullscreen/i.png
deleted file mode 100644
index 2e61d85..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/i.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/l.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/l.gif b/src/site/resources/js/galleria/themes/fullscreen/l.gif
deleted file mode 100644
index 36b43fa..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/l.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/loader.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/loader.gif b/src/site/resources/js/galleria/themes/fullscreen/loader.gif
deleted file mode 100644
index e005708..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/loader.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/n.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/n.gif b/src/site/resources/js/galleria/themes/fullscreen/n.gif
deleted file mode 100644
index df1d4ed..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/n.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/p.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/p.gif b/src/site/resources/js/galleria/themes/fullscreen/p.gif
deleted file mode 100644
index 9626e4e..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/p.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/r.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/r.gif b/src/site/resources/js/galleria/themes/fullscreen/r.gif
deleted file mode 100644
index 2d6a6ea..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/r.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/james-project/blob/6170f93f/src/site/resources/js/galleria/themes/fullscreen/up.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/js/galleria/themes/fullscreen/up.gif b/src/site/resources/js/galleria/themes/fullscreen/up.gif
deleted file mode 100644
index fc00d14..0000000
Binary files a/src/site/resources/js/galleria/themes/fullscreen/up.gif and /dev/null differ
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/8] james-project git commit: JAMES-1831 add news about new logo
Posted by bt...@apache.org.
JAMES-1831 add news about new logo
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f4b82307
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f4b82307
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f4b82307
Branch: refs/heads/master
Commit: f4b8230707f0fdde5334419d33431d516ca63574
Parents: d9939ee
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Oct 6 15:09:41 2016 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Oct 20 15:40:20 2016 +0200
----------------------------------------------------------------------
src/site/xdoc/index.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f4b82307/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 2a3f458..23a92f6 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -180,6 +180,10 @@
<subsection name="News">
<ul>
+ <li>Oct/2016 - <ul>
+ <li><a href="newsarchive.html#20161001">We choosed a new logo! <img src='images/james-logo.png' alt='New James logo'/></a></li>
+ </ul>
+ </li>
<li>Sep/2016 - <ul>
<li><a href="newsarchive.html#20160901"><strong>Apache James Server 3.0</strong> We are currently working on the release.</a></li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org