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

button design changes, HTML syntax fixes etc.; updates #292

Browse Source 
- improved design of download buttons in listing and search result view
- special improvements for MSIE, with separate style sheet
- use standard button design for "all countries" buttons in newcache/editcache
- fixed </option> tags in newcache/editcache pages
- set checkbox style for cache note coordinate input
- fixed cardinal direction input field sizes in Chrome
This commit is contained in:
following
2013-08-10 20:37:57 +02:00
parent 42f8bb6ce3
commit 2b46a32434
16 changed files with 73 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/editcache.php
View File

@@ -665,11 +665,11 @@ function getWaypoints($cacheid)
{
if ($cache_difficulty == $i)
{
$difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</options>';
$difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
}
else
{
$difficulty_options .= '<option value="' . $i . '">' . $i / 2 . '</options>';
$difficulty_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
}
$difficulty_options .= "\n";
}
@@ -681,11 +681,11 @@ function getWaypoints($cacheid)
{
if ($cache_terrain == $i)
{
$terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</options>';
$terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
}
else
{
$terrain_options .= '<option value="' . $i . '">' . $i / 2 . '</options>';
$terrain_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
}
$terrain_options .= "\n";
}
@@ -805,11 +805,11 @@ function getWaypoints($cacheid)
{
if ($cache_activate_hour == $i)
{
$activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</options>';
$activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
}
else
{
$activation_hours .= '<option value="' . $i . '">' . $i . '</options>';
$activation_hours .= '<option value="' . $i . '">' . $i . '</option>';
}
$activation_hours .= "\n";
}

2
htdocs/lang/de/ocstyle/editcache.inc.php
View File

@@ -21,7 +21,7 @@
$error_wrong_node = t('This cache has been created on another Opencaching website. The cache can only be edited there.');
$all_countries_submit = '<input type="submit" name="show_all_countries_submit" value="' . t('Show all') . '"/>';
$all_countries_submit = '<input type="submit" name="show_all_countries_submit" id="showallcountries" value="' . t('Show all') . '" class="formbutton" onclick="submitbutton(\'showallcountries\')" />';
$error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
$name_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
$date_message = '<span class="errormsg">' . t('date is invalid') . '</span>';

6
htdocs/lang/de/ocstyle/editcache.tpl.php
View File

@@ -162,7 +162,7 @@ function toggleAttr(id)
<tr>
<td valign="top">{t}Coordinates:{/t}</td>
<td>
<select name="latNS" class="input40">
<select name="latNS">
<option value="N"{selLatN}>{t}N{/t}</option>
<option value="S"{selLatS}>{t}S{/t}</option>
</select>
@@ -170,7 +170,7 @@ function toggleAttr(id)
°&nbsp;<input type="text" name="lat_min" maxlength="6" value="{lat_min}" class="input50" />&nbsp;'&nbsp;
{lat_message}
&nbsp;&nbsp;
<select name="lonEW" class="input40">
<select name="lonEW">
<option value="E"{selLonE}>{t}E{/t}</option>
<option value="W"{selLonW}>{t}W{/t}</option>
</select>
@@ -187,7 +187,7 @@ function toggleAttr(id)
<select name="country" class="input200">
{countryoptions}
</select>
{show_all_countries_submit}
&nbsp;{show_all_countries_submit}
</td>
</tr>
<tr><td class="spacer" colspan="2"></td></tr>

3
htdocs/lang/de/ocstyle/main.tpl.php
View File

@@ -68,6 +68,9 @@
<link rel="apple-touch-icon" sizes="114x114" href="resource2/{style}/images/oclogo/apple-touch-icon-iphone-retina.png" />
<link rel="apple-touch-icon" sizes="144x144" href="resource2/{style}/images/oclogo/apple-touch-icon-ipad-retina.png" />
<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{style}/css/style_screen.css?ft={screen_css_time}" />
<!--[if IE]>
<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{style}/css/style_screen_msie.css?ft={screen_msie_css_time}" />
<![endif]-->
<script type="text/javascript">
<!--
<?php

8
htdocs/lang/de/ocstyle/newcache.tpl.php
View File

@@ -160,7 +160,7 @@ function toggleAttr(id)
<tr>
<td valign="top">{t}Coordinates:{/t}</td>
<td>
<select name="latNS" class="input40">
<select name="latNS">
<option value="N"{latNsel}>{t}N{/t}</option>
<option value="S"{latSsel}>{t}S{/t}</option>
</select>
@@ -168,7 +168,7 @@ function toggleAttr(id)
°&nbsp;<input type="text" name="lat_min" maxlength="6" value="{lat_min}" class="input50" />&nbsp;'&nbsp;
{lat_message}
&nbsp;&nbsp;
<select name="lonEW" class="input40">
<select name="lonEW">
<option value="E"{lonEsel}>{t}E{/t}</option>
<option value="W"{lonWsel}>{t}W{/t}</option>
</select>
@@ -184,7 +184,7 @@ function toggleAttr(id)
<select name="country" class="input200">
{countryoptions}
</select>
{show_all_countries_submit}
&nbsp;{show_all_countries_submit}
</td>
</tr>
<tr><td class="spacer" colspan="2"></td></tr>
@@ -364,7 +364,7 @@ function toggleAttr(id)
<td>{t}Publication:{/t}</td>
<td>
<input type="radio" class="radio" name="publish" id="publish_now" value="now2" {publish_now_checked} />&nbsp;<label for="publish_now">{t}Publish now{/t}</label><br />
<input type="radio" class="radio" name="publish" id="publish_later" value="later" {publish_later_checked} />&nbsp;<label for="publish_later">{t}Publish on{/t}</label>
<input type="radio" class="radio" name="publish" id="publish_later" value="later" {publish_later_checked} />&nbsp;<label for="publish_later">{t}Publish on{/t}</label>&nbsp;
<input class="input20" type="text" name="activate_day" maxlength="2" value="{activate_day}"/>.
<input class="input20" type="text" name="activate_month" maxlength="2" value="{activate_month}"/>.
<input class="input40" type="text" name="activate_year" maxlength="4" value="{activate_year}"/>&nbsp;

4
htdocs/lang/de/ocstyle/search1/search.tpl.php
View File

@@ -531,14 +531,14 @@ function switchAttributeCat2()
<tr>
<td valign="top">{t}Of coordinates:{/t}</td>
<td colspan="2" valign="top">
<select name="latNS" class="input40">
<select name="latNS">
<option value="N" {latN_sel}>{t}N{/t}</option>
<option value="S" {latS_sel}>{t}S{/t}</option>
</select>&nbsp;
<input type="text" name="lat_h" maxlength="2" value="{lat_h}" class="input30" />&nbsp;°&nbsp;
<input type="text" name="lat_min" maxlength="6" value="{lat_min}" class="input40" />&nbsp;'&nbsp;
<br>
<select name="lonEW" class="input40">
<select name="lonEW">
<option value="E" {lonE_sel}>{t}E{/t}</option>
<option value="W" {lonW_sel}>{t}W{/t}</option>
</select>&nbsp;

1
htdocs/lib/common.inc.php
View File

@@ -446,6 +446,7 @@ function __autoload($class_name)
global $tpl_usercountries;
tpl_set_var('screen_css_time',filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_screen.css"));
tpl_set_var('screen_msie_css_time',filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_screen_msie.css"));
tpl_set_var('print_css_time',filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_print.css"));
if (isset($bScriptExecution))

1
htdocs/lib2/OcSmarty.class.php
View File

@@ -281,6 +281,7 @@ class OcSmarty extends Smarty
$this->assign('sys_runtime', $this->bench->diff());
$this->assign('screen_css_time',filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen.css"));
$this->assign('screen_msie_css_time',filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen_msie.css"));
$this->assign('print_css_time',filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_print.css"));
// check if the template is compiled

14
htdocs/newcache.php
View File

@@ -258,11 +258,11 @@
{
if ($activate_hour == $i)
{
$activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</options>';
$activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
}
else
{
$activation_hours .= '<option value="' . $i . '">' . $i . '</options>';
$activation_hours .= '<option value="' . $i . '">' . $i . '</option>';
}
$activation_hours .= "\n";
}
@@ -287,11 +287,11 @@
{
if ($difficulty == $i)
{
$difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</options>';
$difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
}
else
{
$difficulty_options .= '<option value="' . $i . '">' . $i / 2 . '</options>';
$difficulty_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
}
$difficulty_options .= "\n";
}
@@ -304,11 +304,11 @@
{
if ($terrain == $i)
{
$terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</options>';
$terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
}
else
{
$terrain_options .= '<option value="' . $i . '">' . $i / 2 . '</options>';
$terrain_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
}
$terrain_options .= "\n";
}
@@ -405,7 +405,7 @@
if ($show_all_countries == 0)
{
tpl_set_var('show_all_countries', '0');
tpl_set_var('show_all_countries_submit', '<input type="submit" name="show_all_countries_submit" value="' . $show_all . '"/>');
tpl_set_var('show_all_countries_submit', '<input type="submit" id="showallcountries" class="formbutton" name="show_all_countries_submit" value="' . $show_all . '" onclick="submitbutton(\'showallcountries\')" />');
$rs = sql("SELECT `countries`.`short`, IFNULL(`sys_trans_text`.`text`, `countries`.`name`) AS `name` FROM `countries` INNER JOIN `countries_list_default` ON `countries_list_default`.`show`=`countries`.`short` LEFT JOIN `sys_trans` ON `countries`.`trans_id`=`sys_trans`.`id` LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND `sys_trans_text`.`lang`='&1' WHERE `countries_list_default`.`lang`='&1' ORDER BY `name` ASC", $locale);
}

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

@@ -48,6 +48,7 @@ body.popup {
position: relative;
}
/* MSIE hacks */
* html .page-container-1 {top: 29px;}
*+html .page-container-1 {top: 29px;}
@@ -302,7 +303,7 @@ ul#statmenu { padding: 0px; margin: 0px;}
/* Titles */
.bg-blue02 {background-color: rgb(219,230,241);
padding: 2px 0px 2px 4px;
margin: 2px 0 17px 0;
margin: 2px 0 17px 0; /* see adjustment in style_screen_msie.css */
border-radius: 5px; -webkit-border-radius: 5px; -moz-border-radius: 5px;
box-shadow: 1px 1px 2px #676767;
-moz-box-shadow: 1px 1px 2px #676767;
@@ -624,16 +625,24 @@ input.formbutton_active {
/* Buttons and Dropdown list for data export */
.exportbutton, .exportlist {
background: rgb(234,239,247);
border-right: #005e9d 2px outset;
border-top: #000000 1px outset;
background: rgb(234,239,247); /* see adjustment in style_screen_msie.css */
font-weight: bold;
font-size: 8pt;
padding-bottom: 2px;
border-left: #000000 1px outset;
padding-top: 2px;
border-bottom: #005e9d 2px outset;
border: 1px solid #5f90bb;
padding: 2px; /* see adjustment in style_screen_msie.css */
font-family: verdana, tahoma, sans-serif;
color: #202020;
}
.exportbutton:hover, .exportlist:hover {
box-shadow: 0px 0px 1px #555;
-moz-box-shadow: 0px 0px 1px #555;
-webkit-box-shadow: 0px 0px 1px #555;
}
/* Chrome/Safari hack */
@media screen and (-webkit-min-device-pixel-ratio:0) {
.exportbutton { padding: 3px 6px 3px 6px; }
}
/* Editor fields for Descritpions, Logs etc. */

13
htdocs/resource2/ocstyle/css/style_screen_msie.css Normal file
View File

@@ -0,0 +1,13 @@
/*************************************************************/
/* Style sheet adjustments for Internet Explorer. */
/* Use this only if it cannot be avoided! */
/*************************************************************/
/* When overriding any styles, leave a comment in style_screen.css! */
/* remove shadow margin space */
.bg-blue02 { margin: 0 0 15px 0; }
/* buttons */
.exportlist { background: white; }
.exportbutton { padding: 1px; width:180px; }

2
htdocs/templates2/ocstyle/cache_note.tpl
View File

@@ -12,7 +12,7 @@
<textarea name="note" rows="4" cols="60" >{$note}</textarea>
</td>
<td>
<input type="checkbox" name="incl_coord" value="true" {if $inclCoord}checked="checked"{/if}/>{t}Include a coordinate in the note{/t}<br />
<input type="checkbox" class="checkbox" name="incl_coord" value="true" {if $inclCoord}checked="checked"{/if}/> {t}Include a coordinate in the note{/t}<br />
{include file='coordinate_input.tpl'}
</td>
</tr>

12
htdocs/templates2/ocstyle/coordinate_input.tpl
View File

@@ -6,30 +6,30 @@
<table class="table">
<tr>
<td>
<select name="lat_hem" class="input40" {if $disabled}disabled=""{/if}>
<select name="lat_hem" {if $disabled}disabled=""{/if}>
<option value="N" {if $lat_hem == 'N'} selected {/if}>{t}N{/t}</option>
<option value="S" {if $lat_hem == 'S'} selected {/if}>{t}S{/t}</option>
</select>
</td>
<td>
<input type="text" name="lat_deg" maxlength="2" value="{$lat_deg}" class="input30" {if $disabled}disabled=""{/if} /> &deg;
<nobr><input type="text" name="lat_deg" maxlength="2" value="{$lat_deg}" class="input30" {if $disabled}disabled=""{/if} /> &deg;</nobr>
</td>
<td>
<input type="text" name="lat_min" maxlength="6" value="{$lat_min}" class="input50" {if $disabled}disabled=""{/if} /> '
<nobr><input type="text" name="lat_min" maxlength="6" value="{$lat_min}" class="input50" {if $disabled}disabled=""{/if} /> '</nobr>
</td>
</tr>
<tr>
<td>
<select name="lon_hem" class="input40" {if $disabled}disabled=""{/if}>
<select name="lon_hem" {if $disabled}disabled=""{/if}>
<option value="E" {if $lat_hem == 'E'} selected {/if}>{t}E{/t}</option>
<option value="W" {if $lat_hem == 'W'} selected {/if}>{t}W{/t}</option>
</select>
</td>
<td>
<input type="text" name="lon_deg" maxlength="3" value="{$lon_deg}" class="input30" {if $disabled}disabled=""{/if} /> &deg;
<nobr><input type="text" name="lon_deg" maxlength="3" value="{$lon_deg}" class="input30" {if $disabled}disabled=""{/if} /> &deg;</nobr>
</td>
<td>
<input type="text" name="lon_min" maxlength="6" value="{$lon_min}" class="input50" {if $disabled}disabled=""{/if} /> '
<nobr><input type="text" name="lon_min" maxlength="6" value="{$lon_min}" class="input50" {if $disabled}disabled=""{/if} /> '</nobr>
</td>
</tr>

4
htdocs/templates2/ocstyle/search.tpl
View File

@@ -580,14 +580,14 @@ function switchAttributeCat2()
<tr>
<td valign="top">... {t}from coordinates:{/t}</td>
<td valign="top">
<select name="latNS" class="input40">
<select name="latNS">
<option value="N" {if $latN_sel}selected="selected"{/if}>{t}N{/t}</option>
<option value="S" {if $latS_sel}selected="selected"{/if}>{t}S{/t}</option>
</select>&nbsp;
<input type="text" name="lat_h" maxlength="2" value="{$lat_h}" class="input30" />&nbsp;°&nbsp;
<input type="text" name="lat_min" maxlength="6" value="{$lat_min}" class="input50" />&nbsp;'&nbsp;
<br />
<select name="lonEW" class="input40">
<select name="lonEW">
<option value="E" {if $lonE_sel}selected="selected"{/if}>{t}E{/t}</option>
<option value="W" {if $lonW_sel}selected="selected"{/if}>{t}W{/t}</option>
</select>&nbsp;

3
htdocs/templates2/ocstyle/sys_main.tpl
View File

@@ -31,6 +31,9 @@
<link rel="apple-touch-icon" sizes="114x114" href="resource2/{$opt.template.style}/images/oclogo/apple-touch-icon-iphone-retina.png" />
<link rel="apple-touch-icon" sizes="144x144" href="resource2/{$opt.template.style}/images/oclogo/apple-touch-icon-ipad-retina.png" />
<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{$opt.template.style}/css/style_screen.css?ft={$screen_css_time}" />
<!--[if IE]>
<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{$opt.template.style}/css/style_screen_msie.css?ft={$screen_msie_css_time}" />
<![endif]-->
<link rel="stylesheet" type="text/css" media="print" href="resource2/{$opt.template.style}/css/style_print.css?ft={$print_css_time}" />
{literal}
<script type="text/javascript">

5
htdocs/templates2/ocstyle/viewcache.tpl
View File

@@ -272,7 +272,7 @@
<option value="search.php?searchto=searchbycacheid&showresult=1&f_inactive=0&f_ignored=0&startat=0&cacheid={$cache.cacheid}&output=txt">TXT</option>
</select>&nbsp;
<img src="resource2/{$opt.template.style}/images/viewcache/14x19-gps-device.png" class="icon16" alt="" />
<a href="#" onclick="window.open('garmin.php?lat={$cache.latitude}&lon={$cache.longitude}&wp={$cache.wpoc}','{t escape=js}Send{/t}','width=640,height=320,resizable=no,scrollbars=1')"><input class="exportbutton" value="{t}Send to GPS device{/t}" type="button" /></a>
<input type="button" class="exportbutton" value="{t}Send to GPS device{/t}" onclick="window.open('garmin.php?lat={$cache.latitude}&lon={$cache.longitude}&wp={$cache.wpoc}','{t escape=js}Send{/t}','width=640,height=320,resizable=no,scrollbars=1')" />
</p></td>
</tr>
</table>
@@ -282,7 +282,7 @@
<!-- Attributes -->
{if count($attributes)>0}
<div class="content2-container line-box"></div>
<div class="content2-container line-box" style="height:0px"></div> {* MSIE needs explicit height *}
<div class="content2-container">
<div style="padding-left:2px">
<p style="line-height: 1.6em;">
@@ -290,6 +290,7 @@
</p>
</div>
</div>
<div style="height:2px"></div>
{else}
<br />
{/if}