Skip to content
Permalink
Browse files

Merge pull request #477 from teiling88/feature/1031-handicap-attribute

#1031 - add new cache attribute
  • Loading branch information...
teiling88 committed May 3, 2017
2 parents 3c1efcd + 06ec657 commit 0b7f641e9557d0f525008b0e4eb25707c4c08843
Showing with 16,168 additions and 8 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 bin/dbupdate.php
  3. +3 −0 dev-ops/local.team-opencaching.de/actions/import-demo-data.sh
  4. +1 −1 dev-ops/local.team-opencaching.de/actions/import-sql-static.sh
  5. +1 −1 htdocs/lib/settings-dev.inc.php
  6. +6 −0 htdocs/maintenance.html
  7. BIN htdocs/resource2/ocstyle/images/attributes/blind-people-disabled.png
  8. BIN htdocs/resource2/ocstyle/images/attributes/blind-people-no.png
  9. BIN htdocs/resource2/ocstyle/images/attributes/blind-people.png
  10. BIN psh.phar
  11. +7 −0 sql/static-data/attribute_categories.sql
  12. +16 −0 sql/static-data/attribute_groups.sql
  13. +60 −0 sql/static-data/cache_attrib.sql
  14. +33 −0 sql/static-data/cache_logtype.sql
  15. +9 −0 sql/static-data/cache_report_reasons.sql
  16. +7 −0 sql/static-data/cache_report_status.sql
  17. +12 −0 sql/static-data/cache_size.sql
  18. +11 −0 sql/static-data/cache_status.sql
  19. +13 −0 sql/static-data/cache_type.sql
  20. +8 −0 sql/static-data/coordinates_type.sql
  21. +238 −0 sql/static-data/countries.sql
  22. +27 −0 sql/static-data/countries_list_default.sql
  23. +41 −0 sql/static-data/countries_options.sql
  24. +59 −0 sql/static-data/helppages.sql
  25. +38 −0 sql/static-data/languages.sql
  26. +51 −0 sql/static-data/languages_list_default.sql
  27. +13 −0 sql/static-data/log_types.sql
  28. +11 −0 sql/static-data/logentries_types.sql
  29. +6 −0 sql/static-data/news_topics.sql
  30. +17 −0 sql/static-data/nodes.sql
  31. +11 −0 sql/static-data/object_types.sql
  32. 0 sql/static-data/{ → old}/data.sql
  33. +16 −0 sql/static-data/profile_options.sql
  34. +1 −1 sql/static-data/pwlist.php
  35. +8 −0 sql/static-data/replication_overwritetypes.sql
  36. +99 −0 sql/static-data/search_ignore.sql
  37. +0 −4 sql/static-data/static-data.txt
  38. +14 −0 sql/static-data/statpics.sql
  39. +82 −0 sql/static-data/sys_menu.sql
  40. +1,933 −0 sql/static-data/sys_trans.sql
  41. +2,713 −0 sql/static-data/sys_trans_ref.sql
  42. +3 −0 sql/static-data/sys_trans_text_00.sql
  43. +1,931 −0 sql/static-data/sys_trans_text_de.sql
  44. +1,839 −0 sql/static-data/sys_trans_text_en.sql
  45. +1,542 −0 sql/static-data/sys_trans_text_es.sql
  46. +1,913 −0 sql/static-data/sys_trans_text_fr.sql
  47. +1,766 −0 sql/static-data/sys_trans_text_it.sql
  48. +916 −0 sql/static-data/sys_trans_text_nl.sql
  49. +75 −0 sql/static-data/sys_trans_text_pl.sql
  50. +482 −0 sql/static-data/sys_trans_text_ru.sql
  51. +127 −0 sql/static-data/towns.sql
  52. +7 −0 sql/static-data/watches_waitingtypes.sql
@@ -62,3 +62,4 @@ htdocs/translation.zip
/htdocs/translations.zip

.psh.yaml
/phpunit
@@ -20,7 +20,7 @@
echo "importing static-data/data.sql\n";
system(
'cat ' . $rootpath . '../sql/static-data/data.sql |' .
'cat ' . $rootpath . '../sql/static-data/*.sql |' .
' mysql -h' . $opt['db']['servername'] . ' -u' . $opt['db']['username'] . ' --password=' . $opt['db']['password'] . ' ' . $opt['db']['placeholder']['db']
);
@@ -5,6 +5,9 @@ mysql -u root -proot -e 'CREATE DATABASE __DB_NAME__;'
mysql -u root -proot -e "GRANT SELECT, INSERT, UPDATE, REFERENCES, DELETE, CREATE, DROP, ALTER, INDEX, CREATE TEMPORARY TABLES, LOCK TABLES, EVENT ON \`opencaching\`.* TO 'opencaching'@'%';"
mysql -u root -proot __DB_NAME__ < htdocs/opencaching_dump.sql

mysql -u root -proot __DB_NAME__ -e "UPDATE caches SET node = 4;"
mysql -u root -proot __DB_NAME__ -e "UPDATE cache_logs SET node = 4;"

INCLUDE: db-update.sh
INCLUDE: import-sql-static.sh

@@ -1,3 +1,3 @@
#!/usr/bin/env bash

mysql -u __DB_USER__ -h__DB_HOST__ -p__DB_PASSWORD__ __DB_NAME__ < sql/static-data/data.sql
cat ./sql/static-data/*.sql | mysql -u __DB_USER__ -h__DB_HOST__ -p__DB_PASSWORD__ __DB_NAME__
@@ -36,7 +36,7 @@
require_once __DIR__ . '/../config2/settings-dist-common.inc.php';
//id of the node; see config2/settings-dist.inc.php
$oc_nodeid = 5;
$oc_nodeid = 4;
$opt['logic']['node']['id'] = $oc_nodeid;
//name of the cookie
@@ -4,6 +4,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Wartungsmodus</title>

<script type="application/javascript">
window.setTimeout(function() {
window.location.reload();
}, 15000)
</script>

<style>
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font:1em monospace,serif}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +6.5 KB (100%) psh.phar
Binary file not shown.
@@ -0,0 +1,7 @@
-- Table attribute_categories
SET NAMES 'utf8';
TRUNCATE TABLE `attribute_categories`;
INSERT INTO `attribute_categories` (`id`, `name`, `trans_id`, `color`) VALUES ('1', 'Properties', '1342', '#FFDD51');
INSERT INTO `attribute_categories` (`id`, `name`, `trans_id`, `color`) VALUES ('2', 'Restrictions / Preconditions', '1343', '#69F765');
INSERT INTO `attribute_categories` (`id`, `name`, `trans_id`, `color`) VALUES ('3', 'Recommendations / Prohibitions', '1344', '#00F0FF');

@@ -0,0 +1,16 @@
-- Table attribute_groups
SET NAMES 'utf8';
TRUNCATE TABLE `attribute_groups`;
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('1', '1', 'Dangers', '1331');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('2', '1', 'Infrastructure', '1332');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('3', '1', 'Route', '1658');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('4', '1', 'Waypoints', '1333');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('5', '2', 'General', '1334');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('6', '2', 'Time', '1335');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('7', '2', 'Seasonal', '1336');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('8', '2', 'Listing', '1337');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('9', '2', 'Tools needed', '1338');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('10', '2', 'Preparation needed', '1339');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('11', '3', 'Persons', '1340');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('12', '3', 'Transportation', '1341');
INSERT INTO `attribute_groups` (`id`, `category_id`, `name`, `trans_id`) VALUES ('13', '3', 'Infrastructure', '1332');
Oops, something went wrong.

0 comments on commit 0b7f641

Please sign in to comment.
You can’t perform that action at this time.