From 85a962c4d6d0267fb465662b8c4d0c6fdb30004d Mon Sep 17 00:00:00 2001
From: following <following>
Date: Sun, 17 Mar 2013 01:00:52 +0100
Subject: [PATCH] re-enabled non-javascript full-picture links, and ... moved
 search form javascript warning to a place were we won't see it flicker

---
 htdocs/doc/sql/static-data/data.sql                |  8 +++-----
 htdocs/lang/de/ocstyle/search.tpl.php              |  8 ++++----
 htdocs/resource2/ocstyle/js/enlargeit/enlargeit.js |  8 ++++++++
 htdocs/templates2/ocstyle/res_logentry.tpl         |  6 ++++++
 htdocs/templates2/ocstyle/res_logentry_logitem.tpl | 12 ++++++------
 htdocs/templates2/ocstyle/res_logpicture.tpl       |  4 +++-
 htdocs/templates2/ocstyle/res_logpictures.tpl      |  6 ++++++
 7 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql
index e583ecd4..0cbb9433 100644
--- a/htdocs/doc/sql/static-data/data.sql
+++ b/htdocs/doc/sql/static-data/data.sql
@@ -1888,7 +1888,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1377', '(leave
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1378', 'Please note the <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">description</a>', '2010-09-07 20:19:00');
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1379', 'Less', '2010-09-07 20:19:02');
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1380', 'Search for caches', '2010-09-07 20:19:02');
-INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1381', 'JavaScript is not activated, you cannot use the following options (sorting to attributes) - basic search is supported nevertheless.', '2010-09-07 20:19:02');
+INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1381', 'JavaScript is not activated, you cannot use the above options (sorting to attributes) - basic search is supported nevertheless.', '2010-09-07 20:19:02');
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1382', 'Sorting of result:', '2010-09-07 20:19:02');
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1383', 'Last log', '2010-09-07 20:19:02');
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1384', 'Show recommendation from other users first', '2010-09-07 20:19:02');
@@ -5553,7 +5553,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1378', 'DE', 'Bitte die <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">Beschreibung</a> beachten!', '2010-09-10 23:53:07');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1379', 'DE', 'weniger', '2010-09-10 23:52:53');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1380', 'DE', 'Cachesuche', '2010-09-10 23:52:44');
-INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'DE', 'JavaScript ist bei dir deaktiviert, du kannst die folgenden Optionen (Sortierung bis Attribute) nicht nutzen - die Suche funktioniert aber trotzdem.', '2010-09-10 23:52:36');
+INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'DE', 'JavaScript ist bei dir deaktiviert, daher kannst du die obenstehenden Optionen (Sortierung bis Attribute) nicht nutzen - die Suche funktioniert aber trotzdem.', '2010-09-10 23:52:36');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1382', 'DE', 'Ausgabe sortieren nach:', '2010-09-10 23:52:28');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1383', 'DE', 'letztes Log', '2012-07-24 21:30:00');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1384', 'DE', 'von anderen Benutzern empfohlene Caches zuerst anzeigen', '2010-09-10 23:51:58');
@@ -7035,7 +7035,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1378', 'EN', 'Please note the <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">description</a>', '2010-09-10 23:53:16');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1379', 'EN', 'Less', '2010-09-10 23:52:53');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1380', 'EN', 'Search for caches', '2010-09-10 23:52:44');
-INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'EN', 'JavaScript is not activated, you cannot use the following options (search to attributes) - basic search is supported nevertheless.', '2010-09-10 23:52:36');
+INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'EN', 'JavaScript is not activated, therefore you cannot use the above options (search to attributes) - basic search is supported nevertheless.', '2010-09-10 23:52:36');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1382', 'EN', 'Sort results by:', '2010-09-10 23:52:28');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1383', 'EN', 'Last logs', '2010-09-10 23:52:16');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1384', 'EN', 'Show caches recommended by other users first', '2010-09-10 23:51:58');
@@ -8519,7 +8519,6 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1378', 'ES', '¡Por favor, tenga en cuenta la <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">descripción</a>!', '2010-12-09 00:17:59');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1379', 'ES', 'Menor', '2010-12-09 00:17:59');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1380', 'ES', 'Buscar por caches', '2010-12-09 00:17:59');
-INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'ES', 'JavaScript no se activa, no puede utilizar las siguientes opciones - búsqueda básica se admite.', '2010-12-09 00:17:59');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1382', 'ES', 'Ordenar los resultados por:', '2010-12-09 00:17:59');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1383', 'ES', 'Último log', '2010-12-09 00:17:59');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1384', 'ES', 'Mostar primero las recomendaciones de otros usuarios', '2010-12-09 00:17:59');
@@ -10090,7 +10089,6 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1378', 'IT', 'Si prega di prendere visione della <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">Descrizione</a>!', '2010-09-10 23:53:07');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1379', 'IT', 'Meno', '2010-09-10 23:52:53');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1380', 'IT', 'Ricerca cache', '2010-09-10 23:52:44');
-INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'IT', 'JavaScript non è attivo, non puoi usare le seguenti opzioni - tuttavia la ricerca di base è ugualmente possibile.', '2010-09-10 23:52:36');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1382', 'IT', 'Risultati ordinati per:', '2010-10-27 18:49:19');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1383', 'IT', 'Ultimo log', '2010-09-10 23:52:16');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1384', 'IT', 'Visualizza prima le raccomandazioni di altri utenti', '2010-09-10 23:51:58');
diff --git a/htdocs/lang/de/ocstyle/search.tpl.php b/htdocs/lang/de/ocstyle/search.tpl.php
index c987c35c..4209cc1c 100644
--- a/htdocs/lang/de/ocstyle/search.tpl.php
+++ b/htdocs/lang/de/ocstyle/search.tpl.php
@@ -270,10 +270,6 @@ function switchAttributeCat2()
 
 <form name="optionsform" style="display:inline;">
 
-<div id="scriptwarning" style="margin:0 5px 0 5px;">
-	<p><span class="errormsg">{t}JavaScript is not activated, you cannot use the following options (sorting to attributes) - basic search is supported nevertheless.{/t}</span></p>
-</div>
-
 <div class="searchdiv">
 	<table class="table">
 		
@@ -413,6 +409,10 @@ function switchAttributeCat2()
 </div>
 </form>
 
+<div id="scriptwarning" style="margin:0 5px 0 5px;">
+	<p><span class="errormsg">{t}JavaScript is not activated, you cannot use the above options (sorting to attributes) - basic search is supported nevertheless.{/t}</span></p>
+</div>
+
 <script language="javascript">
 <!--
 	document.getElementById("scriptwarning").style.display = "none";
diff --git a/htdocs/resource2/ocstyle/js/enlargeit/enlargeit.js b/htdocs/resource2/ocstyle/js/enlargeit/enlargeit.js
index d105ff8c..336ee752 100644
--- a/htdocs/resource2/ocstyle/js/enlargeit/enlargeit.js
+++ b/htdocs/resource2/ocstyle/js/enlargeit/enlargeit.js
@@ -5,6 +5,14 @@ General Public License as published by the Free Software Foundation, either
 version 3 of the License, or (at your option) any later version. See LICENSE.TXT 
 for details. */
 
+// disable non-javascript fallback links do that enlargeit receives the mouse clicks
+function remove_piclinks()
+{
+	var piclinks = document.getElementsByName("piclink");
+	for (var pic=0; pic<piclinks.length; pic++)
+		piclinks[pic].removeAttribute('href');
+}
+
 // modify these
 var enl_gifpath='./resource2/ocstyle/js/enlargeit/'; // path to graphics
 var enl_brdsize=6;    // border thickness (5-30)
diff --git a/htdocs/templates2/ocstyle/res_logentry.tpl b/htdocs/templates2/ocstyle/res_logentry.tpl
index 9f3a2d9c..19972e98 100644
--- a/htdocs/templates2/ocstyle/res_logentry.tpl
+++ b/htdocs/templates2/ocstyle/res_logentry.tpl
@@ -45,3 +45,9 @@
 
 {* $log != "N" *}
 {/if}
+
+<script type="text/javascript">
+<!--
+ remove_piclinks();
+-->
+</script>
diff --git a/htdocs/templates2/ocstyle/res_logentry_logitem.tpl b/htdocs/templates2/ocstyle/res_logentry_logitem.tpl
index 2ab66d85..9ef0800b 100644
--- a/htdocs/templates2/ocstyle/res_logentry_logitem.tpl
+++ b/htdocs/templates2/ocstyle/res_logentry_logitem.tpl
@@ -62,16 +62,16 @@
 				<b>{t}Pictures for this logentry:{/t}</b><br />
 			{/if}
 
-			<a onclick="enlarge(document.getElementById('pic{$pictureItem.id}'))" style="cursor:pointer">{$pictureItem.title|escape}</a>
-			{* the position of this image is the anchor for enlargit activity: *}
-			<img id="pic{$pictureItem.id}" src="resource2/ocstyle/images/misc/empty.png" longdesc="{$pictureItem.url}" />
+			{* the position of the following image is the anchor for enlargit activity: *}
+			<a name="piclink" href="{$pictureItem.url}" onclick="enlarge(document.getElementById('pic{$pictureItem.id}'))" style="cursor:pointer">{$pictureItem.title|escape}<img id="pic{$pictureItem.id}" src="resource2/ocstyle/images/misc/empty.png" longdesc="{$pictureItem.url}" /></a>
+			{if $pictureItem.spoiler}
+				({t}Spoiler{/t})
+			{/if}
 			{if $logItem.userid==$login.userid}
+				&nbsp;
 				[<a href="picture.php?action=edit&uuid={$pictureItem.uuid|escape}">{t}Edit{/t}</a>]
 				[<a href="picture.php?action=delete&uuid={$pictureItem.uuid|escape}">{t}Delete{/t}</a>]
 			{/if}
-			{if $pictureItem.spoiler}
-				&nbsp;({t}Spoiler{/t})
-			{/if}
 			<br />
 		{/foreach}
 	</div>
diff --git a/htdocs/templates2/ocstyle/res_logpicture.tpl b/htdocs/templates2/ocstyle/res_logpicture.tpl
index 3aef39dd..ea906e58 100644
--- a/htdocs/templates2/ocstyle/res_logpicture.tpl
+++ b/htdocs/templates2/ocstyle/res_logpicture.tpl
@@ -2,7 +2,9 @@
 	<table width="100%" height="100%"><tr>
 		<td style="text-align:center; padding:0" align="center" valign="middle">
 			<div style="max-width:{$itemwidth}px; overflow:hidden">
-				<img src="thumbs.php?uuid={$picture.pic_uuid}" class="img-shadow-loggallery" onclick="enlarge(this);" longdesc="{$picture.pic_url}" onload="this.alt='{$picture.title}'"/>
+				<a name="piclink" href="{$picture.pic_url}">
+					<img src="thumbs.php?uuid={$picture.pic_uuid}" class="img-shadow-loggallery" onclick="enlarge(this);" longdesc="{$picture.pic_url}" onload="this.alt='{$picture.title}'" />
+				</a>
 				{if $logdate || $loguser}
 					<div style="line-height:1.2em; max-height:2.4em; margin-top:5px">
 						{if $logdate}
diff --git a/htdocs/templates2/ocstyle/res_logpictures.tpl b/htdocs/templates2/ocstyle/res_logpictures.tpl
index 1a981c1f..77101941 100644
--- a/htdocs/templates2/ocstyle/res_logpictures.tpl
+++ b/htdocs/templates2/ocstyle/res_logpictures.tpl
@@ -30,3 +30,9 @@
 	</table>
 	<div style="height:8px"></div>
 </div>
+
+<script type="text/javascript">
+<!--
+ remove_piclinks();
+-->
+</script>