[Linpha-cvs] SF.net SVN: linpha: [4567] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4567] trunk/linpha2
|
From: <fan...@us...> - 2006-10-02 19:10:29
|
Revision: 4567
http://svn.sourceforge.net/linpha/?rev=4567&view=rev
Author: fangehrn
Date: 2006-10-02 12:09:18 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
2006-10-02 flo
* working on an ajax image view... ;-)
Modified Paths:
--------------
trunk/linpha2/ChangeLog
trunk/linpha2/lib/classes/linpha.imgview.class.php
trunk/linpha2/templates/default/view_thumb.head.php
trunk/linpha2/templates/default/view_thumb.html.php
Added Paths:
-----------
trunk/linpha2/templates/default/view_thumb_static.html.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog 2006-09-25 21:07:11 UTC (rev 4566)
+++ trunk/linpha2/ChangeLog 2006-10-02 19:09:18 UTC (rev 4567)
@@ -1,3 +1,6 @@
+2006-10-02 flo
+ * working on an ajax image view... ;-)
+
2006-09-25 flo
* some minor updates
* improved admin/import
Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-09-25 21:07:11 UTC (rev 4566)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-10-02 19:09:18 UTC (rev 4567)
@@ -51,6 +51,14 @@
{
$this->orderby = getSqlSortOrder($GLOBALS['linpha']->sql->config->value['sys_style_sortorder']);
+ /**
+ * set usage of javascript
+ */
+ if(isset($_GET['use_js']))
+ {
+ $_SESSION['use_js'] = true;
+ }
+
if(isset($_GET['id']) && $_GET['id'] != 0)
{
/**
@@ -569,8 +577,6 @@
*/
function viewThumb()
{
- $GLOBALS['linpha']->template->setModuleName('view_thumb');
-
$this->viewThumbSetSubFolders();
/**
@@ -617,11 +623,10 @@
/**
* switch between javascript
*/
- if(isset($_GET['use_js']))
+ if(isset($_SESSION['use_js']))
{
- $this->use_javascript = 1;
- $GLOBALS['linpha']->template->URL_base .= '&use_js=1';
- $GLOBALS['linpha']->template->URL_full .= '&use_js=1';
+ $GLOBALS['linpha']->template->setModuleName('view_thumb');
+
$GLOBALS['linpha']->template->output['page_nr_left'] = '';
$GLOBALS['linpha']->template->output['page_nr_right'] = '';
$GLOBALS['linpha']->template->output['page_nr'] = '';
@@ -655,7 +660,8 @@
}
else
{
- $this->use_javascript = 0;
+ $GLOBALS['linpha']->template->setModuleName('view_thumb_static');
+ $GLOBALS['linpha']->template->overrideModule('css','view_thumb');
$this->viewThumbNojs();
}
@@ -663,7 +669,7 @@
/**
- * thumbnail view with javascript disabled
+ * thumbnail view with javascript disabled (static)
* @uses LinImgView::viewThumb()
*/
function viewThumbNojs()
@@ -710,7 +716,7 @@
}
/**
- * setup page numbers
+ * setup page numbers (only used if static)
*/
function viewThumbWritePageNumbers()
{
@@ -1051,7 +1057,7 @@
/**
- * stuff used img and meta view
+ * stuff used Img and Meta view
* @uses LinImageview::viewImg
* @uses LinImageview:viewMeta
*/
Modified: trunk/linpha2/templates/default/view_thumb.head.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb.head.php 2006-09-25 21:07:11 UTC (rev 4566)
+++ trunk/linpha2/templates/default/view_thumb.head.php 2006-10-02 19:09:18 UTC (rev 4567)
@@ -1,4 +1,3 @@
-<?php if($GLOBALS['linpha']->imgview->use_javascript) { ?>
<script language="JavaScript" type="text/javascript">
var tot_photos = <?php echo $GLOBALS['linpha']->imgview->tot_photos; ?>;
var startup_page = 1;
@@ -8,5 +7,4 @@
var photos_per_page = 'auto';
<?php echo $GLOBALS['linpha']->template->output['files_db']."\n"; ?>
</script>
-<script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/classes/thumbnails.js"> </script>
-<?php } ?>
\ No newline at end of file
+<script type="text/javascript" language="javascript" src="<?php echo LINPHA_DIR; ?>/lib/classes/thumbnails.js"> </script>
\ No newline at end of file
Modified: trunk/linpha2/templates/default/view_thumb.html.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb.html.php 2006-09-25 21:07:11 UTC (rev 4566)
+++ trunk/linpha2/templates/default/view_thumb.html.php 2006-10-02 19:09:18 UTC (rev 4567)
@@ -1,17 +1,7 @@
<script language="JavaScript" type="text/javascript">
<!--
- <?php // javascript enabled
- if($GLOBALS['linpha']->imgview->use_javascript) {
- ?>
- window.onresize = display_images;
- <?php
- } else { // javascript disabled
- ?>
- location.href = "<?php echo convert_amp($GLOBALS['linpha']->template->URL_full.'&use_js=1'); ?>";
- <?php
- }
- ?>
+ window.onresize = display_images;
//-->
</script>
@@ -47,42 +37,15 @@
</div>
<div id="main">
-
- <?php // javascript disabled
- if( ! $GLOBALS['linpha']->imgview->use_javascript && isset($GLOBALS['linpha']->imgview->photos_show))
- {
- for($i=1; list($key,$value) = each($GLOBALS['linpha']->imgview->photos_show); $i++)
- {
- // add clear float to last div on row
- if( ($i-1) % $GLOBALS['linpha']->sql->config->value['sys_style_thumb_nojsnrcols'] == 0) {
- $str_clear = ' clear: left;';
- } else {
- $str_clear = '';
- }
- ?>
- <div style="<?php echo $str_clear; ?>" class="imgdiv">
- <?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['before']; ?>
- <a href="<?php echo LINPHA_DIR.'/?cat=alb&id='.$value['id']; ?>"><img height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" src="<?php echo LINPHA_DIR.'/get_thumb.php?id='.$value['id']; ?>" title="<?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['title']; ?>" class="img_thumbnail" /></a>
- <?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['after']; ?>
- </div>
- <?php
- }
- }
- ?>
-
+ <noscript><h1><?php echo i18n("If you have just disabled Javascript, you will need to restart your browser."); ?></h1></noscript>
</div>
<div style="clear: both;"></div>
+
<div class="roundbottom">
<img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/bl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" />
</div>
</div>
-
- <?php // javascript enabled
- if($GLOBALS['linpha']->imgview->use_javascript) {
- ?>
- <script language="JavaScript" type="text/javascript">
- display_images();
- </script>
- <?php
- }
- ?>
\ No newline at end of file
+
+<script language="JavaScript" type="text/javascript">
+display_images();
+</script>
\ No newline at end of file
Added: trunk/linpha2/templates/default/view_thumb_static.html.php
===================================================================
--- trunk/linpha2/templates/default/view_thumb_static.html.php (rev 0)
+++ trunk/linpha2/templates/default/view_thumb_static.html.php 2006-10-02 19:09:18 UTC (rev 4567)
@@ -0,0 +1,68 @@
+
+<script language="JavaScript" type="text/javascript">
+<!--
+location.href = "<?php echo convert_amp($GLOBALS['linpha']->template->URL_full.'&use_js=1'); ?>";
+//-->
+</script>
+
+<!-- navigation -->
+<?php if(isset($GLOBALS['linpha']->template->output['navigation']) && !empty($GLOBALS['linpha']->template->output['navigation'])) { ?>
+ <div id="divnavigation">
+ <div class="roundtop">
+ <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/tl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" />
+ </div>
+ <div id="navigation">
+ <?php echo $GLOBALS['linpha']->template->output['navigation']; ?>
+ </div>
+ <div class="roundbottom">
+ <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/bl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" />
+ </div>
+ </div>
+<?php } ?>
+
+<div id="spacer_height">
+</div>
+
+<div id="divmain">
+ <div class="roundtop">
+ <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/tl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" />
+ </div>
+
+ <div id="divpage_nr">
+ <div id="page_nr">
+ <div id="page_nr_left" class="page_nr_divs"><?php echo $GLOBALS['linpha']->template->output['page_nr_left']; ?></div>
+ <div id="page_nr_middle" class="page_nr_divs page_nr_maindiv"><?php echo $GLOBALS['linpha']->template->output['page_nr']; ?></div>
+ <div id="page_nr_right" class="page_nr_divs"><?php echo $GLOBALS['linpha']->template->output['page_nr_right']; ?></div>
+ </div>
+ </div>
+
+ <div id="main">
+
+ <?php
+ if( isset($GLOBALS['linpha']->imgview->photos_show))
+ {
+ for($i=1; list($key,$value) = each($GLOBALS['linpha']->imgview->photos_show); $i++)
+ {
+ // add clear float to last div on row
+ if( ($i-1) % $GLOBALS['linpha']->sql->config->value['sys_style_thumb_nojsnrcols'] == 0) {
+ $str_clear = ' clear: left;';
+ } else {
+ $str_clear = '';
+ }
+ ?>
+ <div style="<?php echo $str_clear; ?>" class="imgdiv">
+ <?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['before']; ?>
+ <a href="<?php echo LINPHA_DIR.'/?cat=alb&id='.$value['id']; ?>"><img height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" src="<?php echo LINPHA_DIR.'/get_thumb.php?id='.$value['id']; ?>" title="<?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['title']; ?>" class="img_thumbnail" /></a>
+ <?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['after']; ?>
+ </div>
+ <?php
+ }
+ }
+ ?>
+
+ </div>
+ <div style="clear: both;"></div>
+ <div class="roundbottom">
+ <img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/bl.gif'; ?>" alt="" width="15" height="15" class="corner" style="display: none" />
+ </div>
+</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
