[Linpha-cvs] SF.net SVN: linpha: [4631] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4631] trunk/linpha2
|
From: <bz...@us...> - 2006-11-10 11:02:00
|
Revision: 4631
http://svn.sourceforge.net/linpha/?rev=4631&view=rev
Author: bzrudi
Date: 2006-11-10 03:01:46 -0800 (Fri, 10 Nov 2006)
Log Message:
-----------
fixed sqlite query bug, fixed some issues in view_meta
Modified Paths:
--------------
trunk/linpha2/ChangeLog
trunk/linpha2/lib/classes/linpha.imgview.class.php
trunk/linpha2/templates/default/themes/vertical-nav/css/view_img.css
trunk/linpha2/templates/default/view_meta.html.php
trunk/linpha2/templates/default/view_thumb_static.html.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog 2006-11-09 22:22:06 UTC (rev 4630)
+++ trunk/linpha2/ChangeLog 2006-11-10 11:01:46 UTC (rev 4631)
@@ -1,3 +1,7 @@
+2006-11-09 bzrudi
+ * made sqlite work again (broken query)
+ * fixed a couple of issues in view_meta
+
2006-11-09 flo
* added a maintenance part in the admin pages
* added a db maintenance script
Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-11-09 22:22:06 UTC (rev 4630)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-11-10 11:01:46 UTC (rev 4631)
@@ -24,9 +24,11 @@
*/
if(!defined('LINPHA_DIR')) { exit(1); }
-define('SELECT_FIELDS',PREFIX."photos.id, ".PREFIX."photos.name, ".PREFIX."photos.img_type, ".
- PREFIX."photos.md5sum, ".PREFIX."photos.width, ".PREFIX."photos.height, ".
- PREFIX."photos.stats_numbers, ".PREFIX."photos.time_add");
+define('SELECT_FIELDS',PREFIX."photos.id AS id, ".PREFIX."photos.name AS name, " .
+ "".PREFIX."photos.img_type AS img_type, ".PREFIX."photos.md5sum AS md5sum, " .
+ "".PREFIX."photos.width AS width, ".PREFIX."photos.height AS height, " .
+ "".PREFIX."photos.stats_numbers AS stats_numbers, " .
+ "".PREFIX."photos.time_add AS time_add");
class LinImgview {
@@ -85,7 +87,6 @@
*/
$current_data = $GLOBALS['linpha']->db->GetRow("SELECT id, name, img_type, parent_id, md5sum, width, height FROM ".PREFIX."photos " .
"WHERE id = '".linSql::linAddslashes($GLOBALS['linpha']->template->idCurrent)."'");
-
/**
* check for valid id
*/
@@ -230,6 +231,7 @@
function filterPhotosNotPermitted()
{
$this->photos_filtered = Array();
+
if(isset($this->photos))
{
foreach($this->photos AS $key=>$value)
Modified: trunk/linpha2/templates/default/themes/vertical-nav/css/view_img.css
===================================================================
--- trunk/linpha2/templates/default/themes/vertical-nav/css/view_img.css 2006-11-09 22:22:06 UTC (rev 4630)
+++ trunk/linpha2/templates/default/themes/vertical-nav/css/view_img.css 2006-11-10 11:01:46 UTC (rev 4631)
@@ -12,7 +12,7 @@
margin-left: 10px;
width: 120px;
- min-height: 667px;
+ min-height: 650px;
height:expression( "650px" ); /* ie hack */
}
Modified: trunk/linpha2/templates/default/view_meta.html.php
===================================================================
--- trunk/linpha2/templates/default/view_meta.html.php 2006-11-09 22:22:06 UTC (rev 4630)
+++ trunk/linpha2/templates/default/view_meta.html.php 2006-11-10 11:01:46 UTC (rev 4631)
@@ -10,8 +10,8 @@
width: 300px;
}
</style>
-<a href="<?php echo $linTpl->URL_full.'&view=img'; ?>">Back to normal view</a>
-<h1 class="linStyle"><?php i18n("Edit Image Imformation"); ?></h1>
+<a href="<?php echo $linTpl->URL_full.'&view=img'; ?>"><?php echo i18n("<< Back To Default View");?></a>
+<h1 class="linStyle"><?php echo i18n("Edit Image Imformation")?></h1>
<?php
if($GLOBALS['linpha']->sql->checkPermission('metadata_edit'))
@@ -29,9 +29,13 @@
<form action="<?php echo $linTpl->URL_full; ?>" method="POST">
<table border='1'>
<tr>
- <td width="150"><b><?php i18n("Name"); ?></b></td>
- <td width="200"><b><?php i18n("Value"); ?></b></td>
- <td rowspan="<?php echo $num_query['0']+1; ?>"><?php echo $linTpl->output['image']; ?></td>
+ <td width="150"><b><?php echo i18n("Name"); ?></b></td>
+ <td width="200"><b><?php echo i18n("Value"); ?></b></td>
+ <td rowspan="<?php echo $num_query['0']+1; ?>">
+ <img src="<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='.$GLOBALS['linpha']->template->idCurrent;?>
+ width="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>"
+ height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>"
+ </td>
</tr>
<?php
while($data = $query->FetchRow())
Modified: trunk/linpha2/templates/default/view_thumb_static.html.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb_static.html.php 2006-11-09 22:22:06 UTC (rev 4630)
+++ trunk/linpha2/templates/default/view_thumb_static.html.php 2006-11-10 11:01:46 UTC (rev 4631)
@@ -39,7 +39,8 @@
<div class="linDivThumb">
<?php echo $linTpl->output['thumb_infos'][$value['id']]['before']; ?>
<div class="linDivImg">
- <a href="<?php echo $linTpl->URL_base.'&linId='.$value['id']; ?>"><img src="<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='.$value['id']; ?>" width="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" alt="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" title="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" class="linImgThumb" /></a>
+ <a href="<?php echo $linTpl->URL_base.'&linId='.$value['id']; ?>">
+ <img src="<?php echo LINPHA_CLIENT.'/get_thumb.php?linId='.$value['id']; ?>" width="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" alt="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" title="<?php echo $linTpl->output['thumb_infos'][$value['id']]['title']; ?>" class="linImgThumb" /></a>
</div>
<div class="linDivText"><?php echo $linTpl->output['thumb_infos'][$value['id']]['after']; ?></div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
