[Linpha-cvs] SF.net SVN: linpha: [4607] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4607] trunk/linpha2
|
From: <fan...@us...> - 2006-10-29 13:25:20
|
Revision: 4607
http://svn.sourceforge.net/linpha/?rev=4607&view=rev
Author: fangehrn
Date: 2006-10-29 05:24:46 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
* added new version csshover.htc
* fixed thumbview spacers to best fit in firefox, opera and internet explorer
Modified Paths:
--------------
trunk/linpha2/ChangeLog
trunk/linpha2/docs/dev/external_libraries.txt
trunk/linpha2/lib/classes/linpha.imgview.class.php
trunk/linpha2/lib/classes/linpha.template.class.php
trunk/linpha2/lib/js/LinThumbnails.js
trunk/linpha2/templates/default/themes/default/DefsThumbView.js
trunk/linpha2/templates/default/themes/default/css/global.css
trunk/linpha2/templates/default/themes/default/css/view_thumb.css
trunk/linpha2/templates/default/view_thumb.head.php
trunk/linpha2/templates/default/view_thumb.html.php
Added Paths:
-----------
trunk/linpha2/templates/misc/roundcorners.php
trunk/linpha2/templates/misc/roundcorners_test.php
Removed Paths:
-------------
trunk/linpha2/templates/default/themes/default/css/csshover.htc
trunk/linpha2/templates/roundcorners.php
trunk/linpha2/templates/roundcorners_test.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/ChangeLog 2006-10-29 13:24:46 UTC (rev 4607)
@@ -1,6 +1,8 @@
2006-10-29 flo
* changed accesskey for prev/next to page up/down
* improved basket view
+ * added new version csshover.htc
+ * fixed thumbview spacers to best fit in firefox, opera and internet explorer
2006-10-28 flo
* improved a lot
Modified: trunk/linpha2/docs/dev/external_libraries.txt
===================================================================
--- trunk/linpha2/docs/dev/external_libraries.txt 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/docs/dev/external_libraries.txt 2006-10-29 13:24:46 UTC (rev 4607)
@@ -1,7 +1,15 @@
+- csshover.htc V1.42.060206
-phpmail.class.php
+- scriptaculous 1.6.4 (contains prototype)
+- prototype 1.5.0_rc1
+- adodb
+
+- getid3
+
+- phpmail.class.php
+
line 560
from
@@ -10,7 +18,7 @@
include_once(LINPHA_DIR . "/lib/classes/smtp.class.php");
-PHP_JPEG_Metadata_Toolkit_1.11
+- PHP_JPEG_Metadata_Toolkit_1.11
CHANGES
-------
Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -579,6 +579,7 @@
$array_image_infos = MetaData::readInformations( $full_filename, $filename, $md5sum, $flag_nr );
$index = 'before';
+ $i=0;
foreach($array_image_infos AS $value)
{
/**
@@ -593,14 +594,17 @@
if($index == 'before')
{
$GLOBALS['linpha']->template->output['thumb_infos'][$photo_value['id']]['before'] .= $value['value'].'<br />'; // $value['value'] is already escaped
+ $i++;
}
elseif($index == 'after')
{
$GLOBALS['linpha']->template->output['thumb_infos'][$photo_value['id']]['after'] .= $value['value'].'<br />'; // $value['value'] is already escaped
+ $i++;
}
}
}
+ $this->nr_text_lines = $i; // used in LinThumbnails.js to calculate the space for the thumb height
$GLOBALS['linpha']->template->output['thumb_infos'][$photo_value['id']]['title'] = $photo_value['name']; // $photo_value['name'] is already escaped
}
Modified: trunk/linpha2/lib/classes/linpha.template.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.template.class.php 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/lib/classes/linpha.template.class.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -98,7 +98,7 @@
<!--[if lt IE 7]>
<style type="text/css" media="screen">
body {
- behavior: url(templates/default/css/csshover.htc);
+ behavior: url(templates/misc/csshover.htc); /* enable span:hover */
font-size: 100%;
}
@@ -258,15 +258,15 @@
if(empty($alpha)) // default
{
- $str = '<div style="background: url('.LINPHA_DIR.'/templates/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&align='.$alignright.') no-repeat top right;">';
- $str .= '<img src="'.LINPHA_DIR.'/templates/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&align='.$alignleft.'" alt="" width="'.$size.'" height="'.$size.'" class="corner" />';
+ $str = '<div style="background: url('.LINPHA_DIR.'/misc/templates/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&align='.$alignright.') no-repeat top right;">';
+ $str .= '<img src="'.LINPHA_DIR.'/templates/misc/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&align='.$alignleft.'" alt="" width="'.$size.'" height="'.$size.'" class="corner" />';
$str .= '</div>';
}
else // currently only used in slideshow, does not work well in internet explorer
{
- $str = '<div style="position: relative; background: url('.LINPHA_DIR.'/templates/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&alpha&align='.$alignright.') no-repeat top right;">';
+ $str = '<div style="position: relative; background: url('.LINPHA_DIR.'/templates/misc/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&alpha&align='.$alignright.') no-repeat top right;">';
$str .= '<div class="roundAlphabottomInner"> </div>';
- $str .= '<img src="'.LINPHA_DIR.'/templates/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&align='.$alignleft.'&alpha" alt="" width="'.$size.'" height="'.$size.'" class="AlphaCorner" />';
+ $str .= '<img src="'.LINPHA_DIR.'/templates/misc/roundcorners.php?color='.$color.'&bgcolor='.$bgcolor.'&size='.$size.'&align='.$alignleft.'&alpha" alt="" width="'.$size.'" height="'.$size.'" class="AlphaCorner" />';
$str .= '</div>';
}
Modified: trunk/linpha2/lib/js/LinThumbnails.js
===================================================================
--- trunk/linpha2/lib/js/LinThumbnails.js 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/lib/js/LinThumbnails.js 2006-10-29 13:24:46 UTC (rev 4607)
@@ -23,6 +23,8 @@
function display_images()
{
+// alert( $('main')['offsetHeight'] );
+
/**
* set correct main height only if photos_per_page == auto
* needs to be in display_images!
@@ -35,8 +37,8 @@
switch( photos_per_page )
{
case 'auto':
- var nr_cols = Math.floor( document.getElementById('main')['offsetWidth'] / (tn_size + img_spacer_width) );
- var nr_rows = Math.floor( document.getElementById('main')['offsetHeight'] / (tn_size + img_spacer_height + img_div_spacer_height) );
+ var nr_cols = Math.floor( (document.getElementById('main')['offsetWidth']-main_spacer_width) / (tn_size + img_spacer_width) );
+ var nr_rows = Math.floor( (document.getElementById('main')['offsetHeight']-main_spacer_height) / (tn_size + img_spacer_height + (img_div_spacer_height*nr_text_lines) ) );
var max_photos_per_page = nr_rows * nr_cols;
break;
case 'all':
@@ -87,36 +89,35 @@
var img_nr = 1;
var startup_img_nr = (current_page - 1)*max_photos_per_page;
- var DivMain = document.getElementById("main");
- DivMain.innerHTML='';
+ $('main').innerHTML='';
divhtmltext = '';
+ if(view_mode == 'thumbdetail') {
+ var style2text = ' divimgdetail';
+ var style3text = 'divtextdetail';
+ } else {
+ var style2text = '';
+ var style3text = 'divtext';
+ }
+
for (i in img_ids)
{
if(i >= startup_img_nr && img_nr <= max_photos_per_page)
{
if( (img_nr-1) % nr_cols == 0) {
- var styletext = ' style="clear:left;"';
- } else {
- var styletext = '';
+ //var styletext = ' style="clear:left;"';
+ divhtmltext += '<div style="clear: left;"></div>';
}
- if(view_mode == 'thumbdetail') {
- var style2text = ' divimgdetail';
- } else {
- var style2text = '';
- }
-
-
divhtmltext +=
- '<div id="div' + i + '"' + styletext + ' class="divthumb">' +
+ '<div id="divthumb' + i + '" class="divthumb">' +
img_ids[i]['before'] + '<div class="divimg' + style2text + '">' +
'<a href="' + link_url + '&id=' + img_ids[i]['id'] + '">' +
'<img src="' + link_get_thumb + img_ids[i]['id'] + '"' +
' height="' + tn_size + '" width="' + tn_size + '" ' +
' alt="' + img_ids[i]['title'] + '" title="' + img_ids[i]['title'] + '"' +
' class="imgthumb" />' +
- '</a></div><div class="divtext">' + img_ids[i]['after'] + '</div></div>';
+ '</a></div><div class="' + style3text + '">' + img_ids[i]['after'] + '</div></div>';
/**
* flush buffer of divhtmltext on end of line
@@ -127,7 +128,7 @@
*/
if( (img_nr-1) % nr_cols == 0)
{
- DivMain.innerHTML += divhtmltext;
+ $('main').innerHTML += divhtmltext;
divhtmltext = '';
}
@@ -135,9 +136,19 @@
}
}
- DivMain.innerHTML += divhtmltext;
+ $('main').innerHTML += divhtmltext;
}
+/**
+ * resize_window, use this function between because internet explorer triggers the resize event to fast
+ */
+var timerResize;
+function resize_window()
+{
+ clearTimeout(timerResize);
+ timerResize=setTimeout(display_images,250);
+}
+
function goto_page(nr)
{
current_page = nr;
@@ -426,8 +437,6 @@
location.href = link_url + '&id=' + img_ids[0]['id'] + '&slideshow';
}
-/**
- * function view_source_code() removed
- * use firefox extension "Aardvark"
- * much nicer ;-)
- */
\ No newline at end of file
+Event.observe(window, 'load', display_images, false);
+Event.observe(window, 'resize', resize_window, false);
+
\ No newline at end of file
Modified: trunk/linpha2/templates/default/themes/default/DefsThumbView.js
===================================================================
--- trunk/linpha2/templates/default/themes/default/DefsThumbView.js 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/default/themes/default/DefsThumbView.js 2006-10-29 13:24:46 UTC (rev 4607)
@@ -4,15 +4,19 @@
*
* better a space more than a space too less
*/
+
+var main_spacer_width = 20; // padding left and right
+var main_spacer_height = 0;
+
if(view_mode == 'thumbdetail')
{
- var img_spacer_width = 150 + 28; // used to calculate nr_cols, 150 = width of text div, 28 = overhead
- var img_spacer_height = 10; // used to calculate nr_rows
- var img_div_spacer_height = 0; // used to calculate max-height of the image (depending how much text we would like to add at bottom)
+ var img_spacer_width = 162; // used to calculate nr_cols, 150 = width of text div, 12 = space between thumbs
+ var img_spacer_height = 4; // used to calculate nr_rows, 4 = space between thumbs
+ var img_div_spacer_height = 0; // in detail mode, we dont have any text at bottom of the image
}
else // 'thumb'
{
- var img_spacer_width = 12; // used to calculate nr_cols
- var img_spacer_height = 11; // used to calculate nr_rows
- var img_div_spacer_height = 11; // used to calculate max-height of the image (depending how much text we would like to add at bottom)
+ var img_spacer_width = 4; // used to calculate nr_cols, 4 = space between thumbs
+ var img_spacer_height = 4; // used to calculate nr_rows, 4 = space between thumbs
+ var img_div_spacer_height = 16; // used to calculate max-height of the image (this value is multiplied with the number of text lines (filename, etc.)
}
\ No newline at end of file
Deleted: trunk/linpha2/templates/default/themes/default/css/csshover.htc
===================================================================
--- trunk/linpha2/templates/default/themes/default/css/csshover.htc 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/default/themes/default/css/csshover.htc 2006-10-29 13:24:46 UTC (rev 4607)
@@ -1,115 +0,0 @@
-<attach event="ondocumentready" handler="parseStylesheets" />
-<script>
-/**
- * Whatever:hover - V1.41.050927 - hover & active
- * ------------------------------------------------------------
- * (c) 2005 - Peter Nederlof
- * Peterned - http://www.xs4all.nl/~peterned/
- * License - http://creativecommons.org/licenses/LGPL/2.1/
- *
- * Whatever:hover is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Whatever:hover is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Credits and thanks to:
- * Arnoud Berendsen, Martin Reurings, Robert Hanson
- *
- * howto: body { behavior:url("csshover.htc"); }
- * ------------------------------------------------------------
- */
-
-var csshoverReg = /(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i,
-currentSheet, doc = window.document, hoverEvents = [], activators = {
- onhover:{on:'onmouseover', off:'onmouseout'},
- onactive:{on:'onmousedown', off:'onmouseup'}
-}
-
-function parseStylesheets() {
- if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
- window.attachEvent('onunload', unhookHoverEvents);
- var sheets = doc.styleSheets, l = sheets.length;
- for(var i=0; i<l; i++)
- parseStylesheet(sheets[i]);
-}
- function parseStylesheet(sheet) {
- if(sheet.imports) {
- try {
- var imports = sheet.imports, l = imports.length;
- for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
- } catch(securityException){}
- }
-
- try {
- var rules = (currentSheet = sheet).rules, l = rules.length;
- for(var j=0; j<l; j++) parseCSSRule(rules[j]);
- } catch(securityException){}
- }
-
- function parseCSSRule(rule) {
- var select = rule.selectorText, style = rule.style.cssText;
- if(!csshoverReg.test(select) || !style) return;
-
- var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
- var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
- var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
- var affected = select.replace(/:(hover|active).*$/, '');
- var elements = getElementsBySelect(affected);
- if(elements.length == 0) return;
-
- currentSheet.addRule(newSelect, style);
- for(var i=0; i<elements.length; i++)
- new HoverElement(elements[i], className, activators[pseudo]);
- }
-
-function HoverElement(node, className, events) {
- if(!node.hovers) node.hovers = {};
- if(node.hovers[className]) return;
- node.hovers[className] = true;
- hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
- hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
- function hookHoverEvent(node, type, handler) {
- node.attachEvent(type, handler);
- hoverEvents[hoverEvents.length] = {
- node:node, type:type, handler:handler
- };
- }
-
- function unhookHoverEvents() {
- for(var e,i=0; i<hoverEvents.length; i++) {
- e = hoverEvents[i];
- e.node.detachEvent(e.type, e.handler);
- }
- }
-
-function getElementsBySelect(rule) {
- var parts, nodes = [doc];
- parts = rule.split(' ');
- for(var i=0; i<parts.length; i++) {
- nodes = getSelectedNodes(parts[i], nodes);
- } return nodes;
-}
- function getSelectedNodes(select, elements) {
- var result, node, nodes = [];
- var identify = (/\#([a-z0-9_-]+)/i).exec(select);
- if(identify) return [doc.getElementById(identify[1])];
-
- var classname = (/\.([a-z0-9_-]+)/i).exec(select);
- var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
- var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
- for(var i=0; i<elements.length; i++) {
- result = tagName? elements[i].all.tags(tagName):elements[i].all;
- for(var j=0; j<result.length; j++) {
- node = result[j];
- if(classReg && !classReg.test(node.className)) continue;
- nodes[nodes.length] = node;
- }
- } return nodes;
- }
-</script>
\ No newline at end of file
Modified: trunk/linpha2/templates/default/themes/default/css/global.css
===================================================================
--- trunk/linpha2/templates/default/themes/default/css/global.css 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/default/themes/default/css/global.css 2006-10-29 13:24:46 UTC (rev 4607)
@@ -94,7 +94,9 @@
padding: 0px;
}
#main {
- padding: 10px;
+ padding: 0px;
+ padding-left: 10px;
+ padding-right: 10px;
}
/**
@@ -191,7 +193,7 @@
/**
* hover
*/
- #menu a:hover, #menu span:hover {
+ #menu li a:hover, #menu span:hover {
background: #bbbbbb;
}
@@ -228,6 +230,15 @@
color: #000000;
/*background: #FFFFFF;*/
}
+ #menu ul span {
+ background: url(../images/expand.gif) no-repeat 100% 100%;
+ }
+
+
+ #menu li {
+ position: relative;
+ }
+
/**
* only two or more level elements
@@ -259,10 +270,6 @@
border-top-width: 0px;
background: #eeeeee;
}
-
- #menu ul span {
- background: url(../images/expand.gif) no-repeat 100% 100%;
- }
#menu ul ul span {
background: #eeeeee url(../images/expand.gif) no-repeat 100% 100%;
}
@@ -271,23 +278,19 @@
* the most important thing
* enable/disable submenus
*/
- #menu li {
- position: relative;
- }
+ div#menu ul ul,
+ div#menu ul li:hover ul ul,
+ div#menu ul ul li:hover ul ul
+ {
+ display: none;
+ }
+ div#menu ul li:hover ul,
+ div#menu ul ul li:hover ul,
+ div#menu ul ul ul li:hover ul
+ {
+ display: block;
+ }
- div#menu ul ul,
- div#menu ul li:hover ul ul,
- div#menu ul ul li:hover ul ul
- {
- display: none;
- }
- div#menu ul li:hover ul,
- div#menu ul ul li:hover ul,
- div#menu ul ul ul li:hover ul
- {
- display: block;
- }
-
/**
* third stage, switch to horizontal menu entries
*/
Modified: trunk/linpha2/templates/default/themes/default/css/view_thumb.css
===================================================================
--- trunk/linpha2/templates/default/themes/default/css/view_thumb.css 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/default/themes/default/css/view_thumb.css 2006-10-29 13:24:46 UTC (rev 4607)
@@ -33,23 +33,44 @@
/**
* thumbnails
*/
+ #main {
+ /*border: 1px solid black;*/
+ }
+
.divthumb { /* outer div */
- margin: 3px;
+ margin: 0px;
+ padding: 0px;
+ margin-right: 5px;
+ margin-bottom: 5px;
+
text-align: center;
float: left;
font-size: 8pt;
}
.divimg { /* inner div with thumbnail */
+ margin: 0px;
+ padding: 0px;
}
.divimgdetail { /* in detail mode, additional to .divimg */
+ margin: 0px;
+ padding: 0px;
float: left;
}
.imgthumb { /* thumbnail */
+ margin: 0px;
+ padding: 0px;
border: 0;
}
.divtext { /* inner div with bottom or right text */
- padding-left: 10px;
+ margin: 0px;
+ padding: 0px;
+ text-align: center;
+ }
+ .divtextdetail {
+ margin: 0px;
+ padding: 0px;
+ padding-left: 5px;
text-align: left;
width: 150px; /* hardcoded in LinThumbnails.js */
float: left;
Modified: trunk/linpha2/templates/default/view_thumb.head.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb.head.php 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/default/view_thumb.head.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -6,6 +6,7 @@
var tn_size = <?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>;
var photos_per_page = 'auto';
var view_mode = '<?php echo $_SESSION['mode_thumbview']; ?>';
+var nr_text_lines = <?php echo $GLOBALS['linpha']->imgview->nr_text_lines; ?>;
<?php echo $tpl->output['files_db']."\n"; ?>
</script>
Modified: trunk/linpha2/templates/default/view_thumb.html.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb.html.php 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/default/view_thumb.html.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -1,10 +1,4 @@
-<script language="JavaScript" type="text/javascript">
-<!--
- window.onresize = display_images;
-//-->
-</script>
-
<!-- navigation -->
<?php if(isset($tpl->output['navigation']) && !empty($tpl->output['navigation'])) { ?>
<div id="divnavigation">
@@ -39,7 +33,3 @@
<?php echo $tpl->divRoundCorners('bottom'); ?>
</div>
-
-<script language="JavaScript" type="text/javascript">
-display_images();
-</script>
\ No newline at end of file
Copied: trunk/linpha2/templates/misc/roundcorners.php (from rev 4603, trunk/linpha2/templates/roundcorners.php)
===================================================================
--- trunk/linpha2/templates/misc/roundcorners.php (rev 0)
+++ trunk/linpha2/templates/misc/roundcorners.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -0,0 +1,87 @@
+<?php
+if(!defined('LINPHA_DIR')) { define('LINPHA_DIR','../..'); }
+
+include_once( LINPHA_DIR.'/lib/plugins/watermark/func.watermark.php' );
+
+if(!isset($_GET['color']))
+{
+ $_GET['color'] = 'orange';
+}
+
+if(!isset($_GET['bgcolor']))
+{
+ $_GET['bgcolor'] = 'white';
+}
+
+if(!isset($_GET['align']))
+{
+ $_GET['align'] = 'tl';
+}
+
+if(!isset($_GET['size']))
+{
+ $size = 15;
+}
+else
+{
+ $size = $_GET['size'];
+}
+
+switch($_GET['align'])
+{
+case 'tl': $cx = $size; $cy = $size; $workaround = 0; break;
+case 'tr': $cx = -1; $cy = $size; $workaround = 0; break;
+case 'bl': $cx = $size; $cy = 0; $workaround = 1; break;
+case 'br': $cx = -1; $cy = -1; $workaround = 1; break;
+}
+
+// create image
+$image = imagecreatetruecolor($size, $size);
+
+// create colors
+$rgb = get_rgb_from_all($_GET['color']);
+$color = imagecolorallocate($image, $rgb['r'], $rgb['g'], $rgb['b']);
+
+if(isset($_GET['alpha']))
+{
+ imageAlphaBlending($image, false);
+ imageSaveAlpha($image, true);
+ $bgcolor = imagecolorallocatealpha($image, 0, 0, 0, 127);
+}
+else
+{
+ $rgb = get_rgb_from_all($_GET['bgcolor']);
+ $bgcolor = imagecolorallocate($image, $rgb['r'], $rgb['g'], $rgb['b']);
+}
+
+// fill image with background color
+imagefill($image, 0, 0, $bgcolor);
+
+
+// draw circly
+imagefilledellipse($image, $cx, $cy, ($size*2), ($size*2), $color);
+
+// workaround
+if($workaround)
+{
+ imageline($image, 0, 0, $size-1, 0, $color );
+}
+
+// flush image
+Header('Content-type: image/png');
+
+/**
+ * force caching in browser
+ * works in firefox and internet explorer
+ */
+Header("Last-Modified: " . gmdate("D, d M Y H:i:s",mktime (0,0,0,1,1,2000)) . " GMT"); // Date in the past
+Header("Expires: Mon, 26 Jul 2100 05:00:00 GMT"); // In other words... never expire the image
+Header("Cache-Control: max-age=10000000, s-maxage=1000000, proxy-revalidate, must-revalidate");
+
+
+
+imagepng($image);
+imagedestroy($image);
+
+
+?>
\ No newline at end of file
Copied: trunk/linpha2/templates/misc/roundcorners_test.php (from rev 4601, trunk/linpha2/templates/roundcorners_test.php)
===================================================================
--- trunk/linpha2/templates/misc/roundcorners_test.php (rev 0)
+++ trunk/linpha2/templates/misc/roundcorners_test.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -0,0 +1,23 @@
+<body style="background: blue;">
+
+<img src="roundcorners.php?align=tl" /><br /><br />
+<img src="roundcorners.php?align=tr" /><br /><br />
+<img src="roundcorners.php?align=bl" /><br /><br />
+<img src="roundcorners.php?align=br" /><br /><br />
+
+<img src="roundcorners.php?align=tl&alpha" /><br /><br />
+<img src="roundcorners.php?align=tr&alpha" /><br /><br />
+<img src="roundcorners.php?align=bl&alpha" /><br /><br />
+<img src="roundcorners.php?align=br&alpha" /><br /><br />
+
+<img src="roundcorners.php?align=tl&size=100&color=pink" /><br /><br />
+<img src="roundcorners.php?align=tr&size=75&color=skyblue" /><br /><br />
+<img src="roundcorners.php?align=bl&size=50&color=gray" /><br /><br />
+<img src="roundcorners.php?align=br&size=25&color=red" /><br /><br />
+
+<img src="roundcorners.php?align=tl&size=100&color=pink&alpha" /><br /><br />
+<img src="roundcorners.php?align=tr&size=75&color=skyblue&alpha" /><br /><br />
+<img src="roundcorners.php?align=bl&size=50&color=gray&alpha" /><br /><br />
+<img src="roundcorners.php?align=br&size=25&color=red&alpha" /><br /><br />
+
+</body>
\ No newline at end of file
Deleted: trunk/linpha2/templates/roundcorners.php
===================================================================
--- trunk/linpha2/templates/roundcorners.php 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/roundcorners.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -1,87 +0,0 @@
-<?php
-if(!defined('LINPHA_DIR')) { define('LINPHA_DIR','..'); }
-
-include_once( LINPHA_DIR.'/lib/plugins/watermark/func.watermark.php' );
-
-if(!isset($_GET['color']))
-{
- $_GET['color'] = 'orange';
-}
-
-if(!isset($_GET['bgcolor']))
-{
- $_GET['bgcolor'] = 'white';
-}
-
-if(!isset($_GET['align']))
-{
- $_GET['align'] = 'tl';
-}
-
-if(!isset($_GET['size']))
-{
- $size = 15;
-}
-else
-{
- $size = $_GET['size'];
-}
-
-switch($_GET['align'])
-{
-case 'tl': $cx = $size; $cy = $size; $workaround = 0; break;
-case 'tr': $cx = -1; $cy = $size; $workaround = 0; break;
-case 'bl': $cx = $size; $cy = 0; $workaround = 1; break;
-case 'br': $cx = -1; $cy = -1; $workaround = 1; break;
-}
-
-// create image
-$image = imagecreatetruecolor($size, $size);
-
-// create colors
-$rgb = get_rgb_from_all($_GET['color']);
-$color = imagecolorallocate($image, $rgb['r'], $rgb['g'], $rgb['b']);
-
-if(isset($_GET['alpha']))
-{
- imageAlphaBlending($image, false);
- imageSaveAlpha($image, true);
- $bgcolor = imagecolorallocatealpha($image, 0, 0, 0, 127);
-}
-else
-{
- $rgb = get_rgb_from_all($_GET['bgcolor']);
- $bgcolor = imagecolorallocate($image, $rgb['r'], $rgb['g'], $rgb['b']);
-}
-
-// fill image with background color
-imagefill($image, 0, 0, $bgcolor);
-
-
-// draw circly
-imagefilledellipse($image, $cx, $cy, ($size*2), ($size*2), $color);
-
-// workaround
-if($workaround)
-{
- imageline($image, 0, 0, $size-1, 0, $color );
-}
-
-// flush image
-Header('Content-type: image/png');
-
-/**
- * force caching in browser
- * works in firefox and internet explorer
- */
-Header("Last-Modified: " . gmdate("D, d M Y H:i:s",mktime (0,0,0,1,1,2000)) . " GMT"); // Date in the past
-Header("Expires: Mon, 26 Jul 2100 05:00:00 GMT"); // In other words... never expire the image
-Header("Cache-Control: max-age=10000000, s-maxage=1000000, proxy-revalidate, must-revalidate");
-
-
-
-imagepng($image);
-imagedestroy($image);
-
-
-?>
\ No newline at end of file
Deleted: trunk/linpha2/templates/roundcorners_test.php
===================================================================
--- trunk/linpha2/templates/roundcorners_test.php 2006-10-29 13:12:56 UTC (rev 4606)
+++ trunk/linpha2/templates/roundcorners_test.php 2006-10-29 13:24:46 UTC (rev 4607)
@@ -1,23 +0,0 @@
-<body style="background: blue;">
-
-<img src="roundcorners.php?align=tl" /><br /><br />
-<img src="roundcorners.php?align=tr" /><br /><br />
-<img src="roundcorners.php?align=bl" /><br /><br />
-<img src="roundcorners.php?align=br" /><br /><br />
-
-<img src="roundcorners.php?align=tl&alpha" /><br /><br />
-<img src="roundcorners.php?align=tr&alpha" /><br /><br />
-<img src="roundcorners.php?align=bl&alpha" /><br /><br />
-<img src="roundcorners.php?align=br&alpha" /><br /><br />
-
-<img src="roundcorners.php?align=tl&size=100&color=pink" /><br /><br />
-<img src="roundcorners.php?align=tr&size=75&color=skyblue" /><br /><br />
-<img src="roundcorners.php?align=bl&size=50&color=gray" /><br /><br />
-<img src="roundcorners.php?align=br&size=25&color=red" /><br /><br />
-
-<img src="roundcorners.php?align=tl&size=100&color=pink&alpha" /><br /><br />
-<img src="roundcorners.php?align=tr&size=75&color=skyblue&alpha" /><br /><br />
-<img src="roundcorners.php?align=bl&size=50&color=gray&alpha" /><br /><br />
-<img src="roundcorners.php?align=br&size=25&color=red&alpha" /><br /><br />
-
-</body>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
