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

merged help

Browse Source
This commit is contained in:
following 2013-03-08 15:17:23 +01:00
commit 3e0e1cf96c
15 changed files with 149 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/doc/sql/db-changes.txt
View File

@ -35,3 +35,4 @@ date commit ID change
2013-02-17 b7b51eab added user.email_problems
2013-03-01 added caches.short2 und .short2_trans_id
2013-03-03 added profile_options.optionset
2013-03-04 new table helppages

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

@ -13,6 +13,7 @@
-- countries_list_default
-- countries_options
-- data_licenses
-- helppages
-- languages
-- languages_list_default
-- log_types
@ -520,6 +521,43 @@ INSERT INTO `data_licenses` (`id`, `license`) VALUES ('0', 'passively accepted n
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('1', 'declined new license');
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('2', 'actively accepted new license');
-- Table helppages
SET NAMES 'utf8';
TRUNCATE TABLE `helppages`;
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('activation', 'DE', 'Aktivierung');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('adoptcache', 'DE', 'Adoption');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('change_statpic', 'DE', 'Statistikbild');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('editcache', '*', '!articles.php?page=cacheinfo');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('editdesc', 'DE', 'Beschreibungstext');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('editlog', 'DE', 'Das Onlinelog');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('error', 'DE', 'Fehlermeldungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('htmlprev', 'DE', 'HTML-Vorschau');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('log_cache', 'DE', 'Das Onlinelog');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('login', 'DE', 'Login');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('mailto', 'DE', 'Benutzerprofil#Emailversand');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('*map2', 'DE', 'Cachekarte');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('mydetails', 'DE', 'Benutzerprofil#Einstellungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('myhome', 'DE', 'Benutzerprofil');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('myignores', 'DE', 'Caches ignorieren');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('mytop5', 'DE', 'Empfehlungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('myprofile', 'DE', 'Benutzerprofil#Einstellungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('mywatches', 'DE', 'Benachrichtigungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('newcache', '*', '!articles.php?page=cacheinfo');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('newdesc', 'DE', 'Beschreibungstext');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('newpw', 'DE', 'Passwort');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('picture', 'DE', 'Bilder');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('query', 'DE', 'Gespeicherte Suchen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('register', 'DE', 'Registrierung');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('removelog_logowner', 'DE', 'Logeintrag löschen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('removelog_cacheowner', 'DE', 'Logeintrag löschen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('reportcache', 'DE', 'Cache melden');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('search', 'DE', 'Suchformular');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('tops', 'DE', 'Empfehlungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('usertops', 'DE', 'Empfehlungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('viewcache', 'DE', 'Listing');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('viewlogs', 'DE', 'Das Onlinelog');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES('viewprofile', 'DE', 'Benutzerprofil');
-- Table languages
SET NAMES 'utf8';
TRUNCATE TABLE `languages`;
@ -5473,7 +5511,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 ('1414', 'DE', 'ungültiges Datum', '2012-08-26 09:10:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1415', 'DE', '(nur für Gefunden-Logs)', '2010-09-10 23:44:54');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1416', 'DE', 'Neuen Cache eintragen', '2010-09-10 23:44:37');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1417', 'DE', 'Falls dies dein erster Cache auf Opencaching.de sein sollte, lies bitte zuerst die <a href=\"articles.php?page=cacheinfo\">Beschreibung</a> zu den einzelnen Feldern durch.', '2010-09-10 23:46:21');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1417', 'DE', 'Falls dies dein erster Cache auf Opencaching.de sein sollte, lies bitte zuerst die <a href=\"articles.php?page=cacheinfo\">Beschreibung</a> zu den einzelnen Feldern durch. Beachte auch die <a href="http://wiki.opencaching.de/index.php/Wie_verstecke_ich_einen_Cache%3F" target="_blank">Anleitung</a> zum Verstecken von Caches!', '2010-09-10 23:46:21');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1418', 'DE', 'Wegstrecke', '2010-09-10 23:32:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1419', 'DE', 'Der Aufwand kann natürlich nur geschätzt werden und kann auch je nach Umwelteinflüssen sehr verschieden sein. Solltest du keine ausreichend genauen Angaben machen können, schreibe in beide Felder 0 (Null). (Siehe auch: <a href=\"articles.php?page=cacheinfo#time\" target=\"_blank\">Beschreibung</a>)', '2010-09-10 23:46:13');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1420', 'DE', 'Sprache:', '2010-09-10 23:45:25');

8
htdocs/doc/sql/tables/helppages.sql Normal file
View File

@ -0,0 +1,8 @@
SET NAMES 'utf8';
DROP TABLE IF EXISTS `helppages`;
CREATE TABLE `helppages` (
`ocpage` varchar(60) NOT NULL,
`language` char(2) NOT NULL,
`helppage` varchar(120) NOT NULL,
UNIQUE KEY `ocpage` (`ocpage`,`language`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;

14
htdocs/lang/de/ocstyle/lib/menu.php
View File

@ -456,4 +456,16 @@ function mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure)
}
}
}
?>
/*
* show help icon, if a help page exists for this template
*/
function mnu_EchoHelpLink($tplname)
{
$helplink = helppagelink($tplname);
if ($helplink != "")
echo $helplink . '<img src="resource2/ocstyle/images/openicons/35x35-system-help.png" /></a>';
}
?>

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

@ -270,9 +270,10 @@
<!-- CONTENT -->
<div class="content2">
<div id="breadcrumb">
<?php
mnu_EchoBreadCrumb($tplname, $pageidx);
?>
<?php mnu_EchoBreadCrumb($tplname, $pageidx); ?>
</div>
<div class="tplhelp">
<?php mnu_EchoHelpLink($tplname); ?>
</div>
<div id="ocmain">

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

@ -1220,4 +1220,43 @@ function __autoload($class_name)
// country could not be determined by the above checks -> return "GB"
return 'GB';
}
// wiki help embedding
// pay attention to use only ' quotes in $text (escape other ')
//
// see corresponding function in lib2/common.inc.php
function helppagelink($ocpage)
{
global $opt, $locale, $translate;
$rs = sql("SELECT `helppage` FROM `helppages` WHERE `ocpage`='&1' AND `language`='&2'",
$ocpage, $locale);
if (mysql_num_rows($rs) == 0)
{
mysql_free_result($rs);
$rs = sql("SELECT `helppage` FROM `helppages` WHERE `ocpage`='&1' AND `language`='*'",
$ocpage);
}
if (mysql_num_rows($rs) > 0)
{
$record = sql_fetch_array($rs);
$helppage = $record['helppage'];
}
else
$helppage = "";
$imgtitle = $translate->t('Instructions', '', basename(__FILE__), __LINE__);
$imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
if (substr($helppage,0,1) == "!")
return "<a class='nooutline' href='" . substr($helppage,1) . "' " . $imgtitle . " target='_blank'>";
else
if ($helppage != "" && isset($opt['locale'][$locale]['helpwiki']))
return "<a class='nooutline' href='" . $opt['locale'][$locale]['helpwiki'] .
str_replace(' ','_',$helppage) . "' " . $imgtitle . " target='_blank'>";
return "";
}
?>

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

@ -216,6 +216,7 @@ class OcSmarty extends Smarty
$this->assign('submenu', $menu->getSubMenu());
$this->assign('breadcrumb', $menu->getBreadcrumb());
$this->assign('menucolor', $menu->getMenuColor());
$this->assign('helplink', helppagelink($this->name));
if ($this->title == '')
$optn['template']['title'] = $menu->GetMenuTitle();

33
htdocs/lib2/common.inc.php
View File

@ -317,18 +317,35 @@ function fix_magic_quotes_gpc()
}
}
// prelminary wiki help embedding; needs translation table
//
// wiki help embedding
// pay attention to use only ' quotes in $text (escape other ')
function helppagelink($pagename)
//
// see corresponding function in lib/common.inc.php
function helppagelink($ocpage)
{
global $opt;
global $opt, $translate;
if (isset($opt['locale'][$opt['template']['locale']]['helpwiki']))
return "<a class='nooutline' href='" . $opt['locale'][$opt['template']['locale']]['helpwiki'] .
str_replace(' ','_',$pagename) . "' target='_blank'>";
$helppage = sql_value("SELECT `helppage` FROM `helppages`
WHERE `ocpage`='&1' AND `language`='&2'",
"", $ocpage, $opt['template']['locale']);
if ($helppage == "")
$helppage = sql_value("SELECT `helppage` FROM `helppages`
WHERE `ocpage`='&1' AND `language`='*'",
"", $ocpage);
if ($helppage == "" && isset($opt['locale'][$opt['template']['locale']]['help'][$ocpage]))
$helppage = $opt['locale'][$opt['template']['locale']]['help'][$ocpage];
$imgtitle = $translate->t('Instructions', '', basename(__FILE__), __LINE__);
$imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
if (substr($helppage,0,1) == "!")
return "<a class='nooutline' href='" . substr($helppage,1) . "' " . $imgtitle . " target='_blank'>";
else
return $text;
if ($helppage != "" && isset($opt['locale'][$opt['template']['locale']]['helpwiki']))
return "<a class='nooutline' href='" . $opt['locale'][$opt['template']['locale']]['helpwiki'] .
str_replace(' ','_',$helppage) . "' " . $imgtitle . " target='_blank'>";
return "";
}
?>

2
htdocs/map2.php
View File

@ -247,7 +247,7 @@
$tpl->assign('max_maxrecords', $opt['map']['max_maxrecords']);
$tpl->assign('help_oconly', helppagelink("OConly"));
$tpl->assign('help_map', helppagelink("Cachekarte"));
$tpl->assign('help_map', helppagelink("*map2"));
$tpl->display();

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

@ -240,7 +240,7 @@ ul#statmenu { padding: 0px; margin: 0px;}
.content2-container-2col-left, .content3-container-2col-left {float: left; width: 272px; margin: 0px; padding: 0px;}
.content2-container-2col-right, .content3-container-2col-right {float: right; width: 372px; margin: 0px; padding: 0px;}
/* ... up to here */
.content2-pagetitle, .content3-pagetitle {overflow: hidden; width: 769px; margin: 0px 0px 10px 0px; padding: 0px 0px 2px 0px; border-bottom: solid 3px rgb(88,144,168); color: rgb(88,144,168); font-weight: bold; font-size: 180%;}
.content2-pagetitle, .content3-pagetitle {overflow: hidden; width: 773px; margin: 0px 0px 10px 0px; padding: 0px 0px 2px 0px; border-bottom: solid 3px rgb(88,144,168); color: rgb(88,144,168); font-weight: bold; font-size: 180%;}
/*********************************/
/* SECTION 6 - COMMON PARAMETERS */
@ -917,6 +917,13 @@ a.info:hover span{ /*the span will display just on :hover state*/
text-indent:1ex;
}
div.tplhelp
{
position:absolute;
top:135px;
right:12px;
}
/* lists at hompage */
ul.nodot {
@ -932,7 +939,7 @@ ul.nodot li {
#suchbox {
position: absolute;
top:112px;
right: 5px;
right: 15px;
}
/* external links in Maindiv, decorated with ext-icon */

BIN
htdocs/resource2/ocstyle/images/openicons/35x35-system-help.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

1
htdocs/search.php
View File

@ -352,6 +352,7 @@
$options['country'] = isset($_REQUEST['country']) ? $_REQUEST['country'] : '';
$options['cachetype'] = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] : '';
$options['cachesize'] = isset($_REQUEST['cachesize']) ? $_REQUEST['cachesize'] : '';
$options['difficultymin'] = isset($_REQUEST['difficultymin']) ? $_REQUEST['difficultymin']+0 : 0;
$options['difficultymax'] = isset($_REQUEST['difficultymax']) ? $_REQUEST['difficultymax']+0 : 0;

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

@ -22,7 +22,6 @@
***************************************************************************}
{* OCSTYLE *}
{if $old_msie}
<script type="text/javascript">
{literal}<!--
@ -1747,7 +1746,9 @@ function toggle_attribselection(bSaveCookies)
<td rowspan="2"><a class="jslink" onclick="toggle_settings()"><img src="resource2/{$opt.template.style}/images/openicons/35x35-configure.png" class="mapbutton" style="margin-left:0px; margin-right:0px" height="35" width="35" alt="{t}Settings{/t}" title="{t}Settings{/t}" /></a></td>
{* help button *}
<td rowspan="2">{$help_map}<img src="resource2/{$opt.template.style}/images/openicons/35x35-system-help.png" class="mapbutton" style="margin-left:3px; margin-right:3px" height="35" width="35" alt="{t}Instructions{/t}" title="{t}Instructions{/t}" /></a></td>
{if $help_map != ""}
<td rowspan="2">{$help_map}<img src="resource2/{$opt.template.style}/images/openicons/35x35-system-help.png" class="mapbutton" style="margin-left:2px; margin-right:3px" height="35" width="35" alt="{t}Instructions{/t}" title="{t}Instructions{/t}" /></a></td>
{/if}
{* normal / full screen button *}
<td rowspan="2">

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

@ -190,6 +190,10 @@
<div id="breadcrumb_fullsize">{include file="sys_breadcrumb.tpl" items="$breadcrumb"}</div>
{/if}
{if $helplink != ""}
<div class="tplhelp">{$helplink}<img src="resource2/ocstyle/images/openicons/35x35-system-help.png" /></a></div>
{/if}
{* <!-- NAVIGATION --> *}
{* <!-- Navigation Level 3 --> *}
<div class="nav3">

1
htdocs/translate.php
View File

@ -368,6 +368,7 @@ function export()
$stab[] = 'countries_list_default';
$stab[] = 'countries_options';
$stab[] = 'data_licenses';
$stab[] = 'helppages';
$stab[] = 'languages';
$stab[] = 'languages_list_default';
$stab[] = 'log_types';