Commit 2c00f01e authored by Hermann Mayer's avatar Hermann Mayer

Application

  - Upgraded Frontend Libraries (jQuery 1.7.2 and fancybox 2.0.6)
  - Modified Extern Template to handle eBays new Link policy
parent 9ecf427d
[development]
app.bootstrap.filepath = APPLICATION_PATH "/Module/Bootstrap.php"
app.bootstrap.class = Bootstrap
app.version = 2.0
app.version = 2.0.1
app.name = eBay-Tool
app.servername = http://workstation.lan:85
app.default.module = default
......@@ -35,7 +35,7 @@ smarty.cachepath = cache
[production]
app.bootstrap.filepath = APPLICATION_PATH "/Module/Bootstrap.php"
app.bootstrap.class = Bootstrap
app.version = 2.0
app.version = 2.0.1
app.name = eBay-Tool
app.servername = http://ebay-tool.dev.hermann-mayer.net
app.default.module = default
......
......@@ -4,6 +4,14 @@
<div class="content">
{include file='simply_elegant/messages.html'}
<ul>
<li>2012-06-10</li>
<ul>
<li>Application</li>
<ul>
<li>Upgraded Frontend Libraries (jQuery 1.7.2 and fancybox 2.0.6)</li>
<li>Modified Extern Template to handle eBays new Link policy</li>
</ul>
</ul>
<li>2012-06-09</li>
<ul>
<li>Application</li>
......
......@@ -41,8 +41,8 @@
<ul style="list-style: circle;">
<li>Javascript</li>
<ul style="list-style: square;">
<li>AJAX Engine: <a target="_blank" href="http://jquery.com/">jQuery 1.7.1</a></li>
<li>Image Galery: <a target="_blank" href="http://fancybox.net/">fancyBox 2.0.5</a></li>
<li>AJAX Engine: <a target="_blank" href="http://jquery.com/">jQuery 1.7.2</a></li>
<li>Image Galery: <a target="_blank" href="http://fancybox.net/">fancyBox 2.0.6</a></li>
</ul>
</ul>
</ul>
......
......@@ -26,7 +26,7 @@
<h1>Galerie</h1>
<p id="galerie_content">
{foreach $product->getImages() as $product_image}
<a class="fancybox" rel="gallery" href="{$APP_SERVER}/extern/images/{$product->getId()}/{$product_image->getName()}">
<a id="image_{$product_image@index}" class="fancybox" rel="gallery" href="{$APP_SERVER}/extern/images/{$product->getId()}/{$product_image->getName()}">
<img src="{$APP_SERVER}/extern/images/{$product->getId()}/{$product_image->getName()}">
</a>
{/foreach}
......@@ -119,7 +119,7 @@
<li><b>Haben Sie Fragen oder Anregungen? - Kein Problem!</b></li>
<ul>
<li style="margin-top: 5px">
Diese beantworte ich natürlich gern per <a href="mailto:{$product->getUser()->getEmail()}">E-Mail</a> oder über den Ebay Nachrichten-Dienst.
Diese beantworte ich natürlich gern per <a id="link_mail" href="mailto:{$product->getUser()->getEmail()}">E-Mail</a> oder über den Ebay Nachrichten-Dienst.
Des weiteren verfahren wir nach dem Prinzip der Geteilten-Kosten. Wir zahlen die anfallenden eBay-Gebühren und Sie die Versandkosten.
Nach erfolgreicher Überweisung des Betrags, wird der Artikel umgehend versandt.
</li>
......@@ -143,8 +143,8 @@
</div>
</div>
<div id="foot">
Diese Beschreibung wurde mit dem <a target="_blank" href="{$APP_SERVER}">eBay Tool</a>
(&copy; 2011-2012 <a target="_blank" href="http://hermann-mayer.net">Hermann Mayer</a>) erstellt
Diese Beschreibung wurde mit dem <a id="link_ebay_tool" target="_blank" href="{$APP_SERVER}">eBay Tool</a>
(&copy; 2011-2012 <a id="link_hm" target="_blank" href="http://hermann-mayer.net">Hermann Mayer</a>) erstellt
</div>
</div>
<script type="text/javascript" src="{$APP_SERVER}/extern/js/jquery.min.js"></script>
......@@ -152,6 +152,22 @@
<script type="text/javascript" src="{$APP_SERVER}/extern/js/fancybox/jquery.fancybox.pack.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$('#link_mail').click(function(){
window.open('mailto:{$product->getUser()->getEmail()}', '_blank'); return false;
});
$('#link_ebay_tool').click(function(){
window.open('http://ebay-tool.hermann-mayer.net', '_blank'); return false;
});
$('#link_hm').click(function(){
window.open('http://hermann-mayer.net', '_blank'); return false;
});
{foreach $product->getImages() as $product_image}
$('#image_{$product_image@index}').attr('href', '{$APP_SERVER}/extern/images/{$product->getId()}/{$product_image->getName()}');
{/foreach}
$("#galerie_content a").fancybox({
openEffect : 'elastic',
openSpeed : 150,
......
File mode changed from 100644 to 100755
......@@ -4,7 +4,7 @@ define('PROJECT_PATH', dirname(__FILE__) . '/');
define('APPLICATION_PATH', dirname(__FILE__) . '/application');
if (! defined('APPLICATION_ENV'))
(getenv('APPLICATION_ENV')) ? define('APPLICATION_ENV', getenv('APPLICATION_ENV')) : define('APPLICATION_ENV', 'development');
(getenv('APPLICATION_ENV')) ? define('APPLICATION_ENV', getenv('APPLICATION_ENV')) : define('APPLICATION_ENV', 'production');
require_once PROJECT_PATH . '/library/Class/Application.php';
......
File mode changed from 100644 to 100755
......@@ -2,7 +2,7 @@
position: fixed;
left: 0;
width: 100%;
z-index: 1005;
z-index: 8050;
}
#fancybox-buttons.top {
......
/*!
* Media helper for fancyBox
* version: 1.0.0
* @requires fancyBox v2.0 or later
*
* Usage:
* $(".fancybox").fancybox({
* media: {}
* });
*
* Supports:
* Youtube
* http://www.youtube.com/watch?v=opj24KnzrWo
* http://youtu.be/opj24KnzrWo
* Vimeo
* http://vimeo.com/25634903
* Metacafe
* http://www.metacafe.com/watch/7635964/dr_seuss_the_lorax_movie_trailer/
* http://www.metacafe.com/watch/7635964/
* Dailymotion
* http://www.dailymotion.com/video/xoytqh_dr-seuss-the-lorax-premiere_people
* Twitvid
* http://twitvid.com/QY7MD
* Twitpic
* http://twitpic.com/7p93st
* Instagram
* http://instagr.am/p/IejkuUGxQn/
* http://instagram.com/p/IejkuUGxQn/
* Google maps
* http://maps.google.com/maps?q=Eiffel+Tower,+Avenue+Gustave+Eiffel,+Paris,+France&t=h&z=17
* http://maps.google.com/?ll=48.857995,2.294297&spn=0.007666,0.021136&t=m&z=16
* http://maps.google.com/?ll=48.859463,2.292626&spn=0.000965,0.002642&t=m&z=19&layer=c&cbll=48.859524,2.292532&panoid=YJ0lq28OOy3VT2IqIuVY0g&cbp=12,151.58,,0,-15.56
*/
(function ($) {
//Shortcut for fancyBox object
var F = $.fancybox;
//Add helper object
F.helpers.media = {
beforeLoad : function(opts, obj) {
var href = obj.href || '',
type = false,
rez;
if ((rez = href.match(/(youtube\.com|youtu\.be)\/(v\/|u\/|embed\/|watch\?v=)?([^#\&\?]*).*/i))) {
href = '//www.youtube.com/embed/' + rez[3] + '?autoplay=1&autohide=1&fs=1&rel=0&enablejsapi=1';
type = 'iframe';
} else if ((rez = href.match(/vimeo.com\/(\d+)\/?(.*)/))) {
href = '//player.vimeo.com/video/' + rez[1] + '?hd=1&autoplay=1&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1';
type = 'iframe';
} else if ((rez = href.match(/metacafe.com\/watch\/(\d+)\/?(.*)/))) {
href = '//www.metacafe.com/fplayer/' + rez[1] + '/.swf?playerVars=autoPlay=yes';
type = 'swf';
} else if ((rez = href.match(/dailymotion.com\/video\/(.*)\/?(.*)/))) {
href = '//www.dailymotion.com/swf/video/' + rez[1] + '?additionalInfos=0&autoStart=1';
type = 'swf';
} else if ((rez = href.match(/twitvid\.com\/([a-zA-Z0-9_\-\?\=]+)/i))) {
href = '//www.twitvid.com/embed.php?autoplay=0&guid=' + rez[1];
type = 'iframe';
} else if ((rez = href.match(/twitpic\.com\/(?!(?:place|photos|events)\/)([a-zA-Z0-9\?\=\-]+)/i))) {
href = '//twitpic.com/show/full/' + rez[1];
type = 'image';
} else if ((rez = href.match(/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i))) {
href = '//' + rez[1] + '/p/' + rez[2] + '/media/?size=l';
type = 'image';
} else if ((rez = href.match(/maps\.google\.com\/(\?ll=|maps\/?\?q=)(.*)/i))) {
href = '//maps.google.com/' + rez[1] + '' + rez[2] + '&output=' + (rez[2].indexOf('layer=c') ? 'svembed' : 'embed');
type = 'iframe';
}
if (type) {
obj.href = href;
obj.type = type;
}
}
}
}(jQuery));
\ No newline at end of file
#fancybox-thumbs {
position: fixed;
left: 0px;
left: 0;
width: 100%;
overflow: hidden;
z-index: 1005;
z-index: 8050;
}
#fancybox-thumbs.bottom {
......
/*!
* Thumbnail helper for fancyBox
* version: 1.0.2
* version: 1.0.4
* @requires fancyBox v2.0 or later
*
* Usage:
* Usage:
* $(".fancybox").fancybox({
* thumbs: {
* width : 50,
* height : 50
* width : 50,
* height : 50
* }
* });
*
*
* Options:
* width - thumbnail width
* height - thumbnail height
* source - function to obtain the URL of the thumbnail image
* position - 'top' or 'bottom'
*
*
*/
(function ($) {
//Shortcut for fancyBox object
......@@ -30,7 +30,13 @@
//Default function to obtain the URL of the thumbnail image
source: function (el) {
var img = $(el).find('img');
var img;
if ($.type(el) === 'string') {
return el;
}
img = $(el).find('img');
return img.length ? img.attr('src') : el.href;
},
......@@ -90,11 +96,11 @@
$(this).hide().appendTo(parent).fadeIn(300);
}).attr('src', thumbSource(this));
}).attr('src', thumbSource( F.group[ i ] ));
});
//Set initial width
this.width = this.list.children().eq(0).outerWidth();
this.width = this.list.children().eq(0).outerWidth(true);
this.list.width(this.width * (F.group.length + 1)).css('left', Math.floor($(window).width() * 0.5 - (F.current.index * this.width + this.width * 0.5)));
},
......@@ -109,7 +115,7 @@
},
beforeLoad: function (opts) {
//Remove self if gallery do not have at least two items
//Remove self if gallery do not have at least two items
if (F.group.length < 2) {
F.coming.helpers.thumbs = false;
......
/*! fancyBox v2.0.5 fancyapps.com | fancyapps.com/fancybox/#license */
/*! fancyBox v2.0.6 fancyapps.com | fancyapps.com/fancybox/#license */
.fancybox-tmp iframe, .fancybox-tmp object {
vertical-align: top;
padding: 0;
......@@ -9,10 +9,10 @@
position: absolute;
top: 0;
left: 0;
z-index: 1002;
z-index: 8020;
}
.fancybox-outer {
.fancybox-skin {
position: relative;
padding: 0;
margin: 0;
......@@ -21,34 +21,39 @@
text-shadow: none;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
border-radius: 4px;
}
.fancybox-opened {
z-index: 1003;
z-index: 8030;
}
.fancybox-opened .fancybox-outer {
.fancybox-opened .fancybox-skin {
-webkit-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
}
.fancybox-inner {
width: 100%;
height: 100%;
.fancybox-outer, .fancybox-inner {
padding: 0;
margin: 0;
position: relative;
outline: none;
}
.fancybox-inner {
overflow: hidden;
}
.fancybox-type-iframe .fancybox-inner {
-webkit-overflow-scrolling: touch;
}
.fancybox-error {
color: #444;
font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
margin: 0;
padding: 10px;
font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
margin: 0;
padding: 10px;
}
.fancybox-image, .fancybox-iframe {
......@@ -79,7 +84,7 @@
background-position: 0 -108px;
opacity: 0.8;
cursor: pointer;
z-index: 1010;
z-index: 8020;
}
#fancybox-loading div {
......@@ -95,7 +100,7 @@
width: 36px;
height: 36px;
cursor: pointer;
z-index: 1004;
z-index: 8040;
}
.fancybox-nav {
......@@ -105,11 +110,12 @@
height: 100%;
cursor: pointer;
background: transparent url('blank.gif'); /* helps IE */
z-index: 1003;
-webkit-tap-highlight-color: rgba(0,0,0,0);
z-index: 8040;
}
.fancybox-prev {
left: 0;
left: 0;
}
.fancybox-next {
......@@ -120,10 +126,10 @@
position: absolute;
top: 50%;
width: 36px;
height: 36px;
height: 34px;
margin-top: -18px;
cursor: pointer;
z-index: 1003;
z-index: 8040;
visibility: hidden;
}
......@@ -158,18 +164,24 @@
left: 0;
overflow: hidden;
display: none;
z-index: 1001;
z-index: 8010;
background: #000;
}
#fancybox-overlay.overlay-fixed {
position: fixed;
bottom: 0;
right: 0;
}
/* Title helper */
.fancybox-title {
visibility: hidden;
visibility: hidden;
font: normal 13px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
position: relative;
text-shadow: none;
z-index: 1005;
z-index: 8050;
}
.fancybox-opened .fancybox-title {
......@@ -181,7 +193,7 @@
bottom: 0;
right: 50%;
margin-bottom: -35px;
z-index: 1003;
z-index: 8030;
text-align: center;
}
......@@ -193,7 +205,7 @@
background: rgba(0, 0, 0, 0.8);
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
border-radius: 15px;
text-shadow: 0 1px 2px #222;
color: #FFF;
font-weight: bold;
......@@ -214,7 +226,7 @@
.fancybox-title-over-wrap {
position: absolute;
bottom: 0;
left: 0;
left: 0;
color: #fff;
padding: 10px;
background: #000;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -187,7 +187,8 @@ html,body,#nofoot {
text-align: justify;
min-height: 145px;
min-width: 490px;
max-width: 820px;
/* max-width: 820px; */
max-width: 780px;
}
#messages_close {
......@@ -337,6 +338,10 @@ i {
text-shadow: 0 -1px 1px #D0D0D0, 0 1px 1px #CCCCCC;
}
#galerie_content {
text-align: left !important;
}
#galerie_content img {
height: 150px;
margin: 5px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment