[Linpha-cvs] SF.net SVN: linpha: [4584] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4584] trunk/linpha2
|
From: <fan...@us...> - 2006-10-12 06:44:03
|
Revision: 4584
http://svn.sourceforge.net/linpha/?rev=4584&view=rev
Author: fangehrn
Date: 2006-10-11 14:22:44 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
2006-10-11 flo
* modified controls of slideshow/fullscreen
slideshow does not yet work
* added missing graphics - sorry...
Modified Paths:
--------------
trunk/linpha2/ChangeLog
trunk/linpha2/lib/classes/linpha.imgview.class.php
trunk/linpha2/lib/js/LinImage.js
trunk/linpha2/templates/default/css/view_img.css
trunk/linpha2/templates/default/global.html.php
trunk/linpha2/templates/default/view_img.html.php
Added Paths:
-----------
trunk/linpha2/lib/graphics/loading.gif
trunk/linpha2/lib/graphics/ss_first.gif
trunk/linpha2/lib/graphics/ss_last.gif
trunk/linpha2/lib/graphics/ss_loop.gif
trunk/linpha2/lib/graphics/ss_next.gif
trunk/linpha2/lib/graphics/ss_noloop.gif
trunk/linpha2/lib/graphics/ss_norandom.gif
trunk/linpha2/lib/graphics/ss_play.gif
trunk/linpha2/lib/graphics/ss_previous.gif
trunk/linpha2/lib/graphics/ss_random.gif
trunk/linpha2/lib/graphics/ss_stop.gif
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog 2006-10-10 20:30:19 UTC (rev 4583)
+++ trunk/linpha2/ChangeLog 2006-10-11 21:22:44 UTC (rev 4584)
@@ -1,3 +1,8 @@
+2006-10-11 flo
+ * modified controls of slideshow/fullscreen
+ slideshow does not yet work
+ * added missing graphics - sorry...
+
2006-10-10 flo
* disable scrollbars on fullscreen
* added accesskey: 'f' for fullscreen start/stop
Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-10-10 20:30:19 UTC (rev 4583)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-10-11 21:22:44 UTC (rev 4584)
@@ -163,9 +163,9 @@
if(isset($_GET['admin_cmd'])) {
$this->adminCommands();
}
- if(isset($_GET['slideshow'])) {
+ /*if(isset($_GET['slideshow'])) {
$this->slideshow();
- }
+ }*/
/**
* set admin menu and more menu
Added: trunk/linpha2/lib/graphics/loading.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/loading.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_first.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_first.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_last.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_last.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_loop.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_loop.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_next.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_next.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_noloop.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_noloop.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_norandom.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_norandom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_play.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_play.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_previous.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_previous.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_random.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_random.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/linpha2/lib/graphics/ss_stop.gif
===================================================================
(Binary files differ)
Property changes on: trunk/linpha2/lib/graphics/ss_stop.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/linpha2/lib/js/LinImage.js
===================================================================
--- trunk/linpha2/lib/js/LinImage.js 2006-10-10 20:30:19 UTC (rev 4583)
+++ trunk/linpha2/lib/js/LinImage.js 2006-10-11 21:22:44 UTC (rev 4584)
@@ -64,15 +64,17 @@
},
movePrev: function() {
- if(prevThumbs[ prevThumbs.length - 1 ])
- {
+ if(prevThumbs[ prevThumbs.length - 1 ]) {
myLinImage.loadImage(prevThumbs[ prevThumbs.length - 1 ]);
+ } else { // end reached, do nothing but enable keyboard navigation again
+ myLinImage.enableKeyboardNav();
}
},
moveNext: function() {
- if(nextThumbs[0])
- {
+ if(nextThumbs[0]) {
myLinImage.loadImage(nextThumbs[0]);
+ } else { // end reached, do nothing but enable keyboard navigation again
+ myLinImage.enableKeyboardNav();
}
},
@@ -333,7 +335,7 @@
} else { // mozilla
keycode = e.which;
}
-
+
key = String.fromCharCode(keycode).toLowerCase();
if( slideshowActive && ( (key == 'x') || (key == 'o') || (key == 'c') ) ) { // close slideshow
@@ -503,6 +505,22 @@
slideshowChangeDelay: function()
{
//currentDelay=document.optionsForm.delay.options[document.optionsForm.delay.selectedIndex].value * 1000;*/
+ },
+ slideshowChangeLoop: function()
+ {
+ if( Element.getOpacity('ssLoop') > 0.9) {
+ Element.setOpacity('ssLoop',0.7);
+ } else {
+ Element.setOpacity('ssLoop',1);
+ }
+ },
+ slideshowChangeRandom: function()
+ {
+ if( Element.getOpacity('ssRandom') > 0.9) {
+ Element.setOpacity('ssRandom',0.7);
+ } else {
+ Element.setOpacity('ssRandom',1);
+ }
}
}
Modified: trunk/linpha2/templates/default/css/view_img.css
===================================================================
--- trunk/linpha2/templates/default/css/view_img.css 2006-10-10 20:30:19 UTC (rev 4583)
+++ trunk/linpha2/templates/default/css/view_img.css 2006-10-11 21:22:44 UTC (rev 4584)
@@ -141,16 +141,21 @@
padding: 0px;
margin: 0px;
- width: 500px;
- margin-left: -250px; /* should be the half of 'width' */
-
+ width: 600px;
+ margin-left: -300px; /* should be the half of 'width' */
+
z-index: 91;
}
+#divSlideshowControlsInner
+{
+ padding: 5px;
+ margin: 0px;
+}
#divSlideshowImage {
position: absolute;
- top: 60px;
+ top: 65px;
padding: 0px;
margin: 0px;
Modified: trunk/linpha2/templates/default/global.html.php
===================================================================
--- trunk/linpha2/templates/default/global.html.php 2006-10-10 20:30:19 UTC (rev 4583)
+++ trunk/linpha2/templates/default/global.html.php 2006-10-11 21:22:44 UTC (rev 4584)
@@ -103,9 +103,5 @@
<?php $GLOBALS['linpha']->template->includeFile('body'); ?>
-<?php if( isset( $GLOBALS['linpha']->template->output['slideshow_body'] ) ) {
- echo '<!-- slideshow-->';
- echo $GLOBALS['linpha']->template->output['slideshow_body'];
-} ?>
</body>
</html>
\ No newline at end of file
Modified: trunk/linpha2/templates/default/view_img.html.php
===================================================================
--- trunk/linpha2/templates/default/view_img.html.php 2006-10-10 20:30:19 UTC (rev 4583)
+++ trunk/linpha2/templates/default/view_img.html.php 2006-10-11 21:22:44 UTC (rev 4584)
@@ -77,13 +77,18 @@
<div id="divSlideshowOverlay" style="display: none;"></div>
<div id="divSlideshowControls" style="display: none;">
- <div style="float: left; padding-left: 5px; ">
- <a href="javascript:myLinImage.movePrev()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/prev.gif" width="25" height="25" border="0"></a>
- <a href="javascript:myLinImage.moveNext()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/next.gif" width="25" height="25" border="0"></a>
- ||
- <a href="javascript:myLinImage.slideshowPlay()">Play</a>/<a href="javascript:myLinImage.slideshowPause()">Pause</a>
- <?php echo i18n("Delay"); ?>:
- <select id="delay" name="delay" size="1" onchange="changeDelay()">
+ <div id="divSlideshowControlsInner">
+ <div style="float: left; margin-left: 10px; ">
+ <a href="javascript:myLinImage.moveFirst()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_first.gif" width="25" height="25" border="0" alt="First" title="<?php echo i18n("First"); ?>" /></a>
+ <a href="javascript:myLinImage.movePrev()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_previous.gif" width="25" height="25" border="0" alt="Previous" title="<?php echo i18n("Previous"); ?>" /></a>
+ <a href="javascript:myLinImage.slideshowPlay()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_play.gif" width="25" height="25" border="0" alt="Play" title="<?php echo i18n("Play"); ?>" /></a>
+ <a href="javascript:myLinImage.slideshowPause()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_stop.gif" width="25" height="25" border="0" alt="Stop" title="<?php echo i18n("Stop"); ?>" /></a>
+ <a href="javascript:myLinImage.moveNext()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_next.gif" width="25" height="25" border="0" alt="Next" title="<?php echo i18n("Next"); ?>" /></a>
+ <a href="javascript:myLinImage.moveLast()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_last.gif" width="25" height="25" border="0" alt="Last" title="<?php echo i18n("Last"); ?>" /></a>
+ </div>
+
+ <div style="float: left; margin-left: 40px; ">
+ <select id="ssDelay" name="delay" size="1" onchange="changeDelay()" title="<?php echo i18n("Delay"); ?>">
<option value="3">3 s</option>
<option value="4">4 s</option>
<option value="5" selected>5 s</option>
@@ -93,28 +98,26 @@
<option value="45">45 s</option>
<option value="60">60 s</option>
</select>
- ||
- </div>
- <div id="divSlideshowImgNr" style="float: left;"></div>
- ||
- <a href="javascript:myLinImage.fullscreenStop()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/close.gif" width="25" height="25" border="0"></a>
+ </div>
+ <div style="float: left; margin-left: 10px; ">
+ <a href="javascript:myLinImage.slideshowChangeLoop()"><img id="ssLoop" src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_loop.gif" width="25" height="25" border="0" alt="Loop" title="<?php echo i18n("Enable/disable Loop"); ?>" /></a>
+ <!--<a href="javascript:myLinImage.slideshowChangeLoop()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_noloop.gif" width="25" height="25" border="0" /></a>-->
+ <a href="javascript:myLinImage.slideshowChangeRandom()"><img id="ssRandom" src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_norandom.gif" width="25" height="25" border="0" alt="Random" title="<?php echo i18n("Enable/disable Random Play Order"); ?>" /></a>
+ <!--<a href="javascript:myLinImage.slideshowChangeRandom()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_random.gif" width="25" height="25" border="0" /></a>-->
+ </div>
- <div style="clear: both;"></div>
+ <div id="divSlideshowImgNr" style="float: left; margin-left: 40px; "></div>
+
+ <div style="float: left; margin-left: 40px; ">
+ <a href="javascript:myLinImage.fullscreenStop()"><img src="<?php echo LINPHA_DIR; ?>/lib/graphics/ss_stop.gif" width="25" height="25" border="0" alt="Exit" title="<?php echo i18n("Exit Fullscreen"); ?>" ></a>
+ </div>
+
+ <div style="clear: both;"></div>
+ </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>
<div id="divSlideshowImage" style="display: none;"></div>
-<!--
-<div id="divSlideshowImage" style="display: none;">
- <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="divSlideshowImageInner"></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>
--->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
