From photark-commits-return-271-apmail-incubator-photark-commits-archive=incubator.apache.org@incubator.apache.org Fri May 14 04:48:19 2010 Return-Path: Delivered-To: apmail-incubator-photark-commits-archive@minotaur.apache.org Received: (qmail 36644 invoked from network); 14 May 2010 04:48:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 May 2010 04:48:19 -0000 Received: (qmail 82045 invoked by uid 500); 14 May 2010 04:48:19 -0000 Delivered-To: apmail-incubator-photark-commits-archive@incubator.apache.org Received: (qmail 82019 invoked by uid 500); 14 May 2010 04:48:18 -0000 Mailing-List: contact photark-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: photark-dev@incubator.apache.org Delivered-To: mailing list photark-commits@incubator.apache.org Received: (qmail 82011 invoked by uid 99); 14 May 2010 04:48:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 May 2010 04:48:17 +0000 X-ASF-Spam-Status: No, hits=-1926.2 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 May 2010 04:48:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B878C2388906; Fri, 14 May 2010 04:47:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r944109 - in /incubator/photark/trunk: photark-appengine-webapp/war/ photark-appengine-webapp/war/js/ photark-ui-admin/src/main/webapp/admin/ photark-ui-admin/src/main/webapp/admin/css/ photark-ui-admin/src/main/webapp/admin/js/ photark-ui/... Date: Fri, 14 May 2010 04:47:52 -0000 To: photark-commits@incubator.apache.org From: lresende@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100514044752.B878C2388906@eris.apache.org> Author: lresende Date: Fri May 14 04:47:51 2010 New Revision: 944109 URL: http://svn.apache.org/viewvc?rev=944109&view=rev Log: PHOTARK-39 - Applying patch from Henry Saputra to refactory images, js, etc to it's own folder/files Added: incubator/photark/trunk/photark-appengine-webapp/war/js/ incubator/photark/trunk/photark-appengine-webapp/war/js/constants.js - copied, changed from r943794, incubator/photark/trunk/photark-appengine-webapp/war/constants.js incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/css/ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/css/upload.css (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/js/ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/js/admin.js (with props) incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/js/upload.js (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js incubator/photark/trunk/photark-ui/src/main/webapp/css/ incubator/photark/trunk/photark-ui/src/main/webapp/css/styles.css (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/styles.css incubator/photark/trunk/photark-ui/src/main/webapp/images/ incubator/photark/trunk/photark-ui/src/main/webapp/images/index.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/index.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/index_on.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/index_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/next.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/next.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/next_disabled.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/next_disabled.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/next_on.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/next_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/prev.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/prev.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_disabled.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/prev_disabled.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_on.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/prev_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_on.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow_on.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_before_start.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/slide_before_start.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_pause.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/slide_pause.gif incubator/photark/trunk/photark-ui/src/main/webapp/images/space.gif (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/space.gif incubator/photark/trunk/photark-ui/src/main/webapp/js/ incubator/photark/trunk/photark-ui/src/main/webapp/js/constants.js (contents, props changed) - copied, changed from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/constants.js incubator/photark/trunk/photark-ui/src/main/webapp/js/gallery.js (with props) Removed: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js incubator/photark/trunk/photark-ui/src/main/webapp/constants.js incubator/photark/trunk/photark-ui/src/main/webapp/index.gif incubator/photark/trunk/photark-ui/src/main/webapp/index_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/next.gif incubator/photark/trunk/photark-ui/src/main/webapp/next_disabled.gif incubator/photark/trunk/photark-ui/src/main/webapp/next_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/prev.gif incubator/photark/trunk/photark-ui/src/main/webapp/prev_disabled.gif incubator/photark/trunk/photark-ui/src/main/webapp/prev_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/show_slide.gif incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow.gif incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow_on.gif incubator/photark/trunk/photark-ui/src/main/webapp/slide_before_start.gif incubator/photark/trunk/photark-ui/src/main/webapp/slide_pause.gif incubator/photark/trunk/photark-ui/src/main/webapp/space.gif incubator/photark/trunk/photark-ui/src/main/webapp/styles.css Modified: incubator/photark/trunk/photark-appengine-webapp/war/constants.js incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html incubator/photark/trunk/photark-ui/src/main/webapp/gallery.html incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml Modified: incubator/photark/trunk/photark-appengine-webapp/war/constants.js URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-appengine-webapp/war/constants.js?rev=944109&r1=944108&r2=944109&view=diff ============================================================================== --- incubator/photark/trunk/photark-appengine-webapp/war/constants.js (original) +++ incubator/photark/trunk/photark-appengine-webapp/war/constants.js Fri May 14 04:47:51 2010 @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -if (! photark) { - var photark = {}; -} - -if (! photark.constants) { - photark.constants = {}; -} - -photark.constants.GalleryServiceEndpoint = "/Gallery?smd"; \ No newline at end of file Copied: incubator/photark/trunk/photark-appengine-webapp/war/js/constants.js (from r943794, incubator/photark/trunk/photark-appengine-webapp/war/constants.js) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-appengine-webapp/war/js/constants.js?p2=incubator/photark/trunk/photark-appengine-webapp/war/js/constants.js&p1=incubator/photark/trunk/photark-appengine-webapp/war/constants.js&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== (empty) Copied: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/css/upload.css (from r943794, incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/css/upload.css?p2=incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/css/upload.css&p1=incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css (original) +++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/css/upload.css Fri May 14 04:47:51 2010 @@ -32,6 +32,7 @@ CSS treatments. */ margin:0; padding:0; + text-align:center; } @@ -101,3 +102,32 @@ padding-top: 40px; } +.uploadBtn{ + border:1px solid #333333; + background:url(images/buttonEnabled.png) #d0d0d0 repeat-x scroll 0px top; + font-size:14px; + width:201px; + height:30px; + vertical-align:middle; /* emulates a +
  • @@ -276,8 +63,13 @@
    -
    Edit album Description
    -
    Cancel
    +
    + Edit album Description +
    +
    + Cancel +
    @@ -289,19 +81,23 @@
  • - +
  • -
    Select Files
    -
    Upload
    +
    + Select Files +
    +
    + Upload +
    • -
    - +
    - \ No newline at end of file Copied: incubator/photark/trunk/photark-ui/src/main/webapp/css/styles.css (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/styles.css) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/css/styles.css?p2=incubator/photark/trunk/photark-ui/src/main/webapp/css/styles.css&p1=incubator/photark/trunk/photark-ui/src/main/webapp/styles.css&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui/src/main/webapp/styles.css (original) +++ incubator/photark/trunk/photark-ui/src/main/webapp/css/styles.css Fri May 14 04:47:51 2010 @@ -22,6 +22,7 @@ body { color: #888888; background-color: #000000; margin-top: 0px; + text-align: center; } html { Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/css/styles.css ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/photark/trunk/photark-ui/src/main/webapp/gallery.html URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/gallery.html?rev=944109&r1=944108&r2=944109&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui/src/main/webapp/gallery.html (original) +++ incubator/photark/trunk/photark-ui/src/main/webapp/gallery.html Fri May 14 04:47:51 2010 @@ -18,306 +18,77 @@ --> -Apache PhotArk - Photo Gallery + Apache PhotArk - Photo Gallery - - - - - - + + + + -
    -

    Apache PhotArk Gallery

    -
    -
    - - - - +
    +

    Apache PhotArk Gallery

    +
    + +
    + + + + - \ No newline at end of file + Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/index.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/index.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/index.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/index.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/index.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/index.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/index_on.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/index_on.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/index_on.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/index_on.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/index_on.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/index_on.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/next.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/next.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/next.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/next.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/next.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/next.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/next_disabled.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/next_disabled.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/next_disabled.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/next_disabled.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/next_disabled.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/next_disabled.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/next_on.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/next_on.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/next_on.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/next_on.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/next_on.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/next_on.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/prev.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/prev.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/prev.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/prev.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/prev.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/prev.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_disabled.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/prev_disabled.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_disabled.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_disabled.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/prev_disabled.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_disabled.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_on.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/prev_on.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_on.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_on.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/prev_on.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/prev_on.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/show_slide.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_on.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_on.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_on.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_on.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_on.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_on.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow_on.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow_on.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow_on.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow_on.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/show_slide_slow_on.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/show_slide_slow_on.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_before_start.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/slide_before_start.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_before_start.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_before_start.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/slide_before_start.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_before_start.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_pause.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/slide_pause.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_pause.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_pause.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/slide_pause.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/slide_pause.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/images/space.gif (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/space.gif) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/images/space.gif?p2=incubator/photark/trunk/photark-ui/src/main/webapp/images/space.gif&p1=incubator/photark/trunk/photark-ui/src/main/webapp/space.gif&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== Binary files - no diff available. Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/images/space.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Copied: incubator/photark/trunk/photark-ui/src/main/webapp/js/constants.js (from r943794, incubator/photark/trunk/photark-ui/src/main/webapp/constants.js) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/js/constants.js?p2=incubator/photark/trunk/photark-ui/src/main/webapp/js/constants.js&p1=incubator/photark/trunk/photark-ui/src/main/webapp/constants.js&r1=943794&r2=944109&rev=944109&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui/src/main/webapp/constants.js (original) +++ incubator/photark/trunk/photark-ui/src/main/webapp/js/constants.js Fri May 14 04:47:51 2010 @@ -31,4 +31,4 @@ photark.constants.adminContextRoot = "/p photark.constants.GalleryServiceEndpoint = photark.constants.contextRoot + "GalleryService?smd"; -photark.constants.UploadEndpoint = photark.constants.adminContextRoot + "upload"; \ No newline at end of file +photark.constants.UploadEndpoint = photark.constants.adminContextRoot + "upload"; Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/js/constants.js ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/photark/trunk/photark-ui/src/main/webapp/js/gallery.js URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/js/gallery.js?rev=944109&view=auto ============================================================================== --- incubator/photark/trunk/photark-ui/src/main/webapp/js/gallery.js (added) +++ incubator/photark/trunk/photark-ui/src/main/webapp/js/gallery.js Fri May 14 04:47:51 2010 @@ -0,0 +1,264 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var index_off= new Image(31,31); index_off.src = "images/index.gif"; +var index_on = new Image(31,31); index_on.src = "images/index_on.gif"; +var next_off = new Image(31,31); next_off.src = "images/next.gif"; +var next_on = new Image(31,31); next_on.src = "images/next_on.gif"; +var prev_off = new Image(31,31); prev_off.src = "images/prev.gif"; +var prev_on = new Image(31,31); prev_on.src = "images/prev_on.gif"; +var slide_before_start = new Image(31,31); slide_before_start.src = "images/slide_before_start.gif"; +var slide_pause = new Image(31,31); slide_pause.src = "images/slide_pause.gif"; +var show_slide = new Image(31,31); show_slide.src = "images/show_slide.gif"; +var show_slide_on = new Image(31,31); show_slide_on.src = "images/show_slide_on.gif"; +var show_slide_slow = new Image(31,31); show_slide_slow.src = "images/show_slide_slow.gif"; +var show_slide_slow_on = new Image(31,31); show_slide_slow_on.src = "images/show_slide_slow_on.gif"; + +var gallery; +var galleryName; +var galleryAlbums; +var albumCovers = new Array(); +var albumName; +var albumItems; +var albumPos = 0; +var pos = 0; +var slideShowSpeed=0; +var timer; + +dojo.addOnLoad(function() { + dojo.require("dojo.rpc.JsonService"); + dojo.addOnLoad(initServices); + dojo.addOnLoad(initGallery); + }); + +function initServices(){ + gallery = new dojo.rpc.JsonService( photark.constants.GalleryServiceEndpoint ); +} + +function initGallery() { + try { + if( !gallery) { + gallery = new dojo.rpc.JsonService( photark.constants.GalleryServiceEndpoint ); + } + gallery.getAlbums().addCallback(gallery_getAlbumsResponse); + } catch(exception) { + alert(exception); + } +} + +function gallery_getAlbumsResponse(albums, exception) { + if(exception) { + alert(exception.msg); + return; + } + galleryAlbums = albums; + + for(i=0; i< galleryAlbums.length; i++) + { + gallery.getAlbumCover(galleryAlbums[i].name).addCallback(gallery_getAlbumCoverResponse); + } +} + + +function gallery_getAlbumCoverResponse(cover, exception) { + if(exception){ + alert(exception.msg); + return; + } + albumCovers[pos] = cover; + pos += 1; + if(albumCovers.length == galleryAlbums.length) + { + initializeGallery(); + displayGallery(); + } +} + +function initializeGallery() { + var table=document.getElementById('tableGallery'); + var lastRow = table.rows.length; + for (i = 0; i < galleryAlbums.length; i++) { + var row = table.insertRow(lastRow++); + var column = row.insertCell(0); + + if (albumCovers[i] != null) { + + var albumName = galleryAlbums[i].name; + var img = document.createElement("img"); + img.src = window.location.href + "gallery/"+ albumName +"/" + albumCovers[i]; + var img_html = "\"\"/"; + var html = "" + img_html + ""; + column.innerHTML = html; + + column = row.insertCell(1); + column.innerHTML = "
    "+galleryAlbums[i].description+"
    "; + + row = table.insertRow(lastRow++); + column = row.insertCell(0) + column.innerHTML = albumName; + + row = table.insertRow(lastRow++); + column = row.insertCell(0) + column.innerHTML = "\"\""; + } + } +} + +function displayGallery() { + setVisibility('gallery',true); + setVisibility('album',false); +} + +function initializeAlbum(albumName) { + try { + this.albumName = albumName; + gallery.getAlbumPictures(albumName).addCallback(gallery_getAlbumPicturesResponse); + } catch(exception) { + alert(e); + } +} + +function gallery_getAlbumPicturesResponse(items, exception) { + if(exception) { + alert(exception.msg); + displayGallery(); + return; + } + albumItems = items; + albumPos = 0; + showAlbum(); +} + +function showAlbum() { + if(albumItems.length > 0) { + showImage(albumPos); + } + displayAlbum(); +} + +function displayAlbum() { + setVisibility('gallery',false); + setVisibility('album',true); +} + +function showImage(albumPos) { + var img = document.createElement("img"); + img.onload = function(evt) { + document.getElementById("albumImage").src = this.src; + document.getElementById("albumImage").width=this.width; + document.getElementById("albumImage").height=this.height; + } + img.src = window.location.href + "gallery/"+ this.albumName +"/" + albumItems[albumPos]; + return false; +} + +function goNext() { + if(albumPos < albumItems.length - 1) { + albumPos++; + showImage(albumPos); + } +} + +function goPrevious() { + if(albumPos > 0) { + albumPos--; + showImage(albumPos); + } +} + +function setVisibility(divId, visible) { + //valid values { visible, hidden } + if (document.getElementById) { + var element = document.getElementById(divId) + if(visible) { + element.style.display = 'block'; + element.style.visibility = 'visible'; + } else { + element.style.display = 'none'; + element.style.visibility = 'hidden'; + } + } +} + +function onGoPreviousMouseOver(){ + if(albumPos == 0){ + document.previous.src=prev_off.src; + }else{ + document.previous.src=prev_on.src; + } +} + +function onGoNextMouseOver(){ + if(albumPos == albumItems.length - 1){ + document.next.src=next_off.src; + }else{ + document.next.src=next_on.src; + } +} + +function goSlideShow(){ + if(slideShowSpeed==0){ + slideShowSpeed=1; + clearTimeout(timer); + startTimer(5000); + }else if(slideShowSpeed==1) { + slideShowSpeed=2; + clearTimeout(timer); + startTimer(2000); + }else{ + slideShowSpeed=0; + clearTimeout(timer); + } +} + +function beforeClick(){ + clearTimeout(timer); + slideShowSpeed=0; + document.show.src=slide_before_start.src; +} + +function onSlideShow(){ + if(slideShowSpeed==0){ + document.show.src=show_slide_slow_on.src; + }else if(slideShowSpeed==1){ + document.show.src=show_slide_on.src; + }else{ + document.show.src=slide_pause.src; + } +} + +function offSlideShow(){ + if(slideShowSpeed==0){ + document.show.src=slide_before_start.src; + }else if(slideShowSpeed==1){ + document.show.src=show_slide_slow.src; + }else{ + document.show.src=show_slide.src; + } +} + +function startTimer(time){ + if(albumPos < albumItems.length - 1) { + albumPos++; + }else{ + albumPos=1; + } + showImage(albumPos); + timer=setTimeout("startTimer("+time+")",time); +} Propchange: incubator/photark/trunk/photark-ui/src/main/webapp/js/gallery.js ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=944109&r1=944108&r2=944109&view=diff ============================================================================== --- incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml (original) +++ incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml Fri May 14 04:47:51 2010 @@ -21,8 +21,4 @@ xmlns:photark="http://org.apache.photoark"> -