Skip to content

Commit

Permalink
OKAPI r781; new 'okapi apps' menu option to user profile
Browse files Browse the repository at this point in the history
  • Loading branch information
following committed May 2, 2013
1 parent 0d4037a commit 8e7a127
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
5 changes: 5 additions & 0 deletions htdocs/doc/sql/static-data/data.sql
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@ INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustrin
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('92', 'MNU_MYPROFILE_PUBLIC', 'Public profile', '1952', 'Public profile', '1952', '0', 'viewprofile.php', '1', '9', '2', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('92', 'MNU_MYPROFILE_PUBLIC', 'Public profile', '1952', 'Public profile', '1952', '0', 'viewprofile.php', '1', '9', '2', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('93', 'MNU_ADMIN_RESTORE', 'Vandalism', '1880', 'Vandalism', '1880', '0', 'restorecaches.php', '1', '12', '5', '', '0', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('93', 'MNU_ADMIN_RESTORE', 'Vandalism', '1880', 'Vandalism', '1880', '0', 'restorecaches.php', '1', '12', '5', '', '0', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('94', 'MNU_START_NEWLOGSREST', 'Without Germany', '121', 'Without Germany', '121', '0', 'newlogsrest.php', '1', '7', '1', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('94', 'MNU_START_NEWLOGSREST', 'Without Germany', '121', 'Without Germany', '121', '0', 'newlogsrest.php', '1', '7', '1', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('95', 'MNU_MYPROFILE_OKAPI', 'OKAPI Applications', '2008', 'OKAPI Apps', '2009', '0', '!okapi/apps/', '1', '9', '9', '', '1', NULL);


-- Table sys_trans -- Table sys_trans
SET NAMES 'utf8'; SET NAMES 'utf8';
Expand Down Expand Up @@ -2445,6 +2446,8 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2004', 'active
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2005', 'Show active', '2013-04-25 23:00:00'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2005', 'Show active', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2006', 'Deleted by', '2013-04-25 23:00:00'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2006', 'Deleted by', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2007', 'User data', '2013-04-25 23:00:00'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2007', 'User data', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2008', 'OKAPI Applications', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2009', 'OKAPI Apps', '2013-04-25 23:00:00');


-- Table sys_trans_ref -- Table sys_trans_ref
SET NAMES 'utf8'; SET NAMES 'utf8';
Expand Down Expand Up @@ -6222,6 +6225,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2005', 'DE', 'aktive anzeigen', '2013-04-25 23:00:00'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2005', 'DE', 'aktive anzeigen', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2006', 'DE', 'gelöscht von', '2013-04-25 23:00:00'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2006', 'DE', 'gelöscht von', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2007', 'DE', 'Benutzerdaten', '2013-04-25 23:00:00'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2007', 'DE', 'Benutzerdaten', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2008', 'DE', 'API-Anwendungen', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2009', 'DE', 'API-Anwendungen', '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 ('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'); 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');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');
Expand Down
2 changes: 1 addition & 1 deletion htdocs/okapi/core.php
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ class Okapi
{ {
public static $data_store; public static $data_store;
public static $server; public static $server;
public static $revision = 776; # This gets replaced in automatically deployed packages public static $revision = 781; # This gets replaced in automatically deployed packages
private static $okapi_vars = null; private static $okapi_vars = null;


/** Get a variable stored in okapi_vars. If variable not found, return $default. */ /** Get a variable stored in okapi_vars. If variable not found, return $default. */
Expand Down
Binary file modified htdocs/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.mo
View file
Binary file not shown.
21 changes: 11 additions & 10 deletions htdocs/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.po
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: OKAPI\n" "Project-Id-Version: OKAPI\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-18 20:26+0100\n" "POT-Creation-Date: 2013-05-03 00:54+0100\n"
"PO-Revision-Date: 2013-04-18 20:29+0100\n" "PO-Revision-Date: 2013-05-03 00:58+0100\n"
"Last-Translator: following <following@online.de>\n" "Last-Translator: following <following@online.de>\n"
"Language-Team: following <following@online.de>\n" "Language-Team: following <following@online.de>\n"
"Language: German\n" "Language: German\n"
Expand All @@ -19,19 +19,19 @@ msgstr ""
"X-Poedit-SearchPath-1: D:\\PRIV\\Projekty\\EclipseWorkspace\\opencaching-api" "X-Poedit-SearchPath-1: D:\\PRIV\\Projekty\\EclipseWorkspace\\opencaching-api"
"\\okapi\n" "\\okapi\n"


#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:910 #: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:911
msgid "Stage" msgid "Stage"
msgstr "Station" msgstr "Station"


#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1138 #: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1139
#, php-format #, php-format
msgid "" msgid ""
"This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</" "This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</"
"a> site." "a> site."
msgstr "" msgstr ""
"Diese <a href='%s'>Cache</a>-Beschreibung stammt von <a href='%s'>%s</a>." "Diese <a href='%s'>Cache</a>-Beschreibung stammt von <a href='%s'>%s</a>."


#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1150 #: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1151
#, php-format #, php-format
msgid "" msgid ""
"&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://" "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://"
Expand All @@ -42,7 +42,7 @@ msgstr ""
"creativecommons.org/licenses/by-nc-nd/3.0/de/'>CC-BY-NC-ND</a>, Stand: %s; " "creativecommons.org/licenses/by-nc-nd/3.0/de/'>CC-BY-NC-ND</a>, Stand: %s; "
"alle Logeinträge &copy; jeweiliger Autor" "alle Logeinträge &copy; jeweiliger Autor"


#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1161 #: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1162
#, php-format #, php-format
msgid "" msgid ""
"&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://" "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://"
Expand Down Expand Up @@ -91,15 +91,16 @@ msgstr "Attribute"
msgid "Trackables" msgid "Trackables"
msgstr "Geokrets" msgstr "Geokrets"


#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:84 #: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:76
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:92
msgid "Images" msgid "Images"
msgstr "Bilder" msgstr "Bilder"


#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:91 #: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:99
msgid "Spoilers" msgid "Spoilers"
msgstr "Spoiler" msgstr "Spoiler"


#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:99 #: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:108
msgid "Image descriptions" msgid "Image descriptions"
msgstr "Bildbeschreibungen" msgstr "Bildbeschreibungen"


Expand Down Expand Up @@ -302,7 +303,7 @@ msgstr "Meine Apps"


#: c:\source\oc\server-3.0\htdocs\okapi/views/apps/index.tpl.php:29 #: c:\source\oc\server-3.0\htdocs\okapi/views/apps/index.tpl.php:29
msgid "Your external applications" msgid "Your external applications"
msgstr "Deine externe Anwendung" msgstr "Deine externen Anwendungen"


#: c:\source\oc\server-3.0\htdocs\okapi/views/apps/index.tpl.php:31 #: c:\source\oc\server-3.0\htdocs\okapi/views/apps/index.tpl.php:31
#, php-format #, php-format
Expand Down
2 changes: 1 addition & 1 deletion htdocs/okapi/services/users/user.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</li> </li>
<li><b>internal_id</b> - internal ID of the user (<b>DO NOT</b> use this! <li><b>internal_id</b> - internal ID of the user (<b>DO NOT</b> use this!
use the <b>uuid</b> as the user identifier),</li> use the <b>uuid</b> as the user identifier),</li>
<li><b>caches_found</b> - number of "Found it" log entries,</li> <li><b>caches_found</b> - number of "Found it" and "Attended" log entries,</li>
<li><b>caches_notfound</b> - number of "Didn't find it" log entries,</li> <li><b>caches_notfound</b> - number of "Didn't find it" log entries,</li>
<li><b>caches_hidden</b> - number of caches owned,</li> <li><b>caches_hidden</b> - number of caches owned,</li>
<li><b>rcmds_given</b> - number of recommendations given.</li> <li><b>rcmds_given</b> - number of recommendations given.</li>
Expand Down

0 comments on commit 8e7a127

Please sign in to comment.