OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

added personal note and additional waypoints to print view

Browse Source
This commit is contained in:
following 2013-04-27 21:27:01 +02:00
parent 9a6b155a77
commit d0defcfc9b
5 changed files with 108 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/doc/sql/static-data/data.sql
View File

@ -6202,7 +6202,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 ('1993', 'DE', 'Opencaching bei Facebook', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1994', 'DE', 'Opencaching bei Google+', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1995', 'DE', 'Opencaching bei Twitter', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1996', 'DE', 'Die gesuchte Webseite <b>%1</b> existiert nicht, aber wir haben folgende geeignete Seiten gefunden:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1996', 'DE', 'Die gesuchte Webseite <b>%1</b> existiert nicht, aber wir haben folgende Seiten gefunden:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1997', 'DE', 'OK', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');

2
htdocs/doc/xml/xml11.htm
View File

@ -292,7 +292,7 @@
<a>http://www.opencaching.de/xml/ocxml12.php?sessionid=12345&amp;file=2</a><br/>
<a>http://www.opencaching.de/xml/ocxml12.php?sessionid=12345&amp;file=3</a></p>
<p>Die Sessionid ist zwei Stunden lang gültig, wobei sich dieser Zeitraum mit jedem
einzelnen Dateiabruf verlängert &ndash; zwischen den Einzelabrufen dürften also
einzelnen Dateiabruf verlängert &ndash; zwischen den Einzelabrufen dürfen also
maximal zwei Stunden vergehen. Dauert es länger, müsste eine neue sessionid
angefordert werden.</p>
<h3>Alle Ergebnisse mit einem Aufruf abfragen</h3>

2
htdocs/resource2/ocstyle/css/style_print.css
View File

@ -218,6 +218,8 @@ div.changelog ul li {margin: 0px 0px 0.1em 0px; }
.narrowtable th {margin: 0px; background-color: rgb(127,162,202); padding: 0 7px 0 7px; border: solid 0px rgb(150,150,150); empty-cells: show; text-align: left; font-size: 120%; color: rgb(255,255,255); }
.narrowtable-caption {margin: 0.5em 0px 1.0em 30px; padding: 0px; clear: both; text-align: left; font-size: 120%;}
.printwptable td { line-height:1.4em; font-size:12px; }
/* Images */
.img-left-noborder-notopmargin {float: left; margin: 0px 10px 0px 0px;}
.img-left-noborder-topmargin {float: left; margin: 3px 10px 0px 0px;}

2
htdocs/resource2/ocstyle/css/style_screen.css
View File

@ -337,6 +337,8 @@ td.listicon {
vertical-align:center;
}
.printwptable td { line-height:1.4em; font-size:12px; }
/* Images */
.img-left-noborder-notopmargin {float: left; margin: 0px 10px 0px 0px;}
.img-left-noborder-topmargin {float: left; margin: 3px 10px 0px 0px;}

117
htdocs/templates2/ocstyle/viewcache_print.tpl
View File

@ -153,6 +153,7 @@
</td>
</tr>
{* Attributes *}
{if count($attributes)>0}
<tr>
{if $print==y}
@ -187,6 +188,7 @@
<tr><td class="spacer"><br /></td></tr>
{/if}
{* Description *}
<tr>
{if $print==y}
<td class="header-small-print">
@ -231,7 +233,86 @@
</td>
</tr>
{* personal note *}
{if $enableCacheNote && ($note != "" || $inclCoord)}
{if $print==y}
<tr><td class="spacer-print"><br></td></tr>
{else}
<tr><td class="spacer"><br></td></tr>
{/if}
<tr>
{if $print==y}
<td class="header-small-print">
{else}
<td class="header-small">
{/if}
<img src="resource2/{$opt.template.style}/images/description/22x22-description.png" width="20" height="20" style="vertical-align:middle" border="0">
<b>{t}Personal cache note{/t}</b> &nbsp;&nbsp;
&nbsp;
</td>
</tr>
{if $inclCoord}
<tr><td>{$lat_hem} {$lat_deg}° {$lat_min}' &nbsp; {$lon_hem} {$lon_deg}° {$lon_min}'</td></tr>
{/if}
<tr><td>{$note|escape}</td></tr>
{/if}
{* Additional waypoints *}
{if count($childWaypoints)>0}
{if $print==y}
<tr><td class="spacer-print"><br></td></tr>
{else}
<tr><td class="spacer"><br></td></tr>
{/if}
<tr>
{if $print==y}
<td class="header-small-print">
{else}
<td class="header-small">
{/if}
<img src="resource2/{$opt.template.style}/images/description/20x20-compass.png" width="20" height="20" style="vertical-align:middle" border="0">
<b>{t}Additional waypoints{/t}</b> &nbsp;&nbsp;
&nbsp;
</td>
</tr>
<tr>
{if $print==y}
<td class="inner-print">
{else}
<td>
{/if}
<table class="table printwptable" width="95%">
{foreach from=$childWaypoints item=childWaypoint}
<tr>
<td width="1%">
<table class="table">
<tr>
<td style="margin:0; padding:0"><img src="{$childWaypoint.image}" /></td>
<td><nobr>{$childWaypoint.name|escape}</nobr></td>
</tr>
</table>
</td>
<td width="1%" style="white-space:norwap"><nobr>{$childWaypoint.coordinateHtml}</nobr></td>
<td width="1%"></td>
<td>{$childWaypoint.description|escape|replace:"\r\n":"<br />"}</td>
</tr>
{/foreach}
</table>
</td>
</tr>
{/if}
{* Hint *}
{if $cache.hint!=''}
{if $print==y}
<tr><td class="spacer-print"><br></td></tr>
{else}
<tr><td class="spacer"><br></td></tr>
{/if}
<tr>
{if $print==y}
<td class="header-small-print">
@ -314,6 +395,7 @@
</tr>
{/if}
{* Pictures *}
{if count($pictures)>0}
<tr>
{if $print==y}
@ -346,16 +428,19 @@
{/if}
{/if}
<tr>
{if $print==y}
<td class="header-small-print" valign="middle">
{else}
<td class="header-small" valign="middle">
{/if}
<img src="resource2/{$opt.template.style}/images/description/22x22-utility.png" width="22" height="22" style="vertical-align:middle" border="0" title="">
{t}Utilities{/t}
</td>
</tr>
{* Nature protection areas *}
{if count($npaareasWarning) + count($npaareasNoWarning) > 0}
<tr>
{if $print==y}
<td class="header-small-print" valign="middle">
{else}
<td class="header-small" valign="middle">
{/if}
<img src="resource2/{$opt.template.style}/images/description/22x22-utility.png" width="22" height="22" style="vertical-align:middle" border="0" title="">
<b>{t}Nature protection{/t}</b>
</td>
</tr>
{/if}
{if count($npaareasWarning) > 0}
{if $print==y}
@ -400,6 +485,7 @@
</tr>
{/if}
{* Geokrets *}
{if $geokret_count!=0}
<tr>
{if $print==y}
@ -426,11 +512,12 @@
</tr>
{/if}
{if $print==y}
<tr><td class="spacer-print"><br></td></tr>
{else}
<tr><td class="spacer"><br></td></tr>
{/if}
{* Logs *}
{if $print==y}
<tr><td class="spacer-print"><br></td></tr>
{else}
<tr><td class="spacer"><br></td></tr>
{/if}
<tr>
{if $print==y}
<td class="inner-print">