From 1c40ea1a2fc24edbb8c96c10e48ddd9abed880f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 8 Sep 2009 19:41:43 +0000 Subject: [PATCH] A lot directories for game XML templates added, first building XML added --- .gitattributes | 10 ++ application/ship-simu/templates/de/.xml | 23 +++++ .../de/code/action_ship_simu_login_refill.ctp | 4 +- .../ship-simu/templates/de/game/!MISSING | 4 + .../ship-simu/templates/de/game/.htaccess | 1 + .../templates/de/game/building/.htaccess | 1 + .../de/game/building/base_building.xml | 99 +++++++++++++++++++ .../templates/de/game/company/.htaccess | 1 + .../templates/de/game/contract/.htaccess | 1 + .../templates/de/game/merchant/.htaccess | 1 + .../templates/de/game/research/.htaccess | 1 + .../templates/de/game/resource/.htaccess | 1 + .../ship-simu/templates/de/menu/base_menu.xml | 22 +++++ .../de/menu/generic_menu_entries.xml | 23 ++++- docs/COPYING | 6 +- docs/TODOs.txt | 1 - 16 files changed, 192 insertions(+), 7 deletions(-) create mode 100644 application/ship-simu/templates/de/.xml create mode 100644 application/ship-simu/templates/de/game/!MISSING create mode 100644 application/ship-simu/templates/de/game/.htaccess create mode 100644 application/ship-simu/templates/de/game/building/.htaccess create mode 100644 application/ship-simu/templates/de/game/building/base_building.xml create mode 100644 application/ship-simu/templates/de/game/company/.htaccess create mode 100644 application/ship-simu/templates/de/game/contract/.htaccess create mode 100644 application/ship-simu/templates/de/game/merchant/.htaccess create mode 100644 application/ship-simu/templates/de/game/research/.htaccess create mode 100644 application/ship-simu/templates/de/game/resource/.htaccess diff --git a/.gitattributes b/.gitattributes index 8b128c6..c2d7bb6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -217,6 +217,7 @@ application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php -text application/ship-simu/starter.php -text application/ship-simu/templates/.htaccess -text application/ship-simu/templates/de/.htaccess -text +application/ship-simu/templates/de/.xml -text application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp -text application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp -text application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp -text @@ -272,6 +273,15 @@ application/ship-simu/templates/de/code/shipsimu_main.ctp -text application/ship-simu/templates/de/code/status.ctp -text application/ship-simu/templates/de/emails/.htaccess -text application/ship-simu/templates/de/emails/text_resend_link.tpl -text +application/ship-simu/templates/de/game/!MISSING -text +application/ship-simu/templates/de/game/.htaccess -text +application/ship-simu/templates/de/game/building/.htaccess -text +application/ship-simu/templates/de/game/building/base_building.xml -text +application/ship-simu/templates/de/game/company/.htaccess -text +application/ship-simu/templates/de/game/contract/.htaccess -text +application/ship-simu/templates/de/game/merchant/.htaccess -text +application/ship-simu/templates/de/game/research/.htaccess -text +application/ship-simu/templates/de/game/resource/.htaccess -text application/ship-simu/templates/de/html/.htaccess -text application/ship-simu/templates/de/html/nav_advert.tpl -text application/ship-simu/templates/de/html/selector_ship-simu.tpl -text diff --git a/application/ship-simu/templates/de/.xml b/application/ship-simu/templates/de/.xml new file mode 100644 index 0000000..e253bdd --- /dev/null +++ b/application/ship-simu/templates/de/.xml @@ -0,0 +1,23 @@ + + diff --git a/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp b/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp index 84c29c0..fdc7c4e 100644 --- a/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp +++ b/application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp @@ -15,8 +15,8 @@ $helperInstance->addInputSelectField('type', "--- Bitte auswählen ---"); $helperInstance->addSelectSubOption('currencies', "--- Währungen ---"); $helperInstance->addSelectOption('currency', "{?currency?}"); -// Raw materials -$helperInstance->addSelectSubOption('raw_materials', "--- Rohstoffe ---"); +// Raw resources +$helperInstance->addSelectSubOption('raw_resources', "--- Rohstoffe ---"); $helperInstance->addSelectOption('raw_wood', "Holz"); $helperInstance->addSelectOption('raw_iron', "Metall"); $helperInstance->addSelectOption('raw_stones', "Steine"); diff --git a/application/ship-simu/templates/de/game/!MISSING b/application/ship-simu/templates/de/game/!MISSING new file mode 100644 index 0000000..b2730b9 --- /dev/null +++ b/application/ship-simu/templates/de/game/!MISSING @@ -0,0 +1,4 @@ + + + + diff --git a/application/ship-simu/templates/de/game/.htaccess b/application/ship-simu/templates/de/game/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/game/building/.htaccess b/application/ship-simu/templates/de/game/building/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/building/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/game/building/base_building.xml b/application/ship-simu/templates/de/game/building/base_building.xml new file mode 100644 index 0000000..10dd1a2 --- /dev/null +++ b/application/ship-simu/templates/de/game/building/base_building.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/application/ship-simu/templates/de/game/company/.htaccess b/application/ship-simu/templates/de/game/company/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/company/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/game/contract/.htaccess b/application/ship-simu/templates/de/game/contract/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/contract/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/game/merchant/.htaccess b/application/ship-simu/templates/de/game/merchant/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/merchant/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/game/research/.htaccess b/application/ship-simu/templates/de/game/research/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/research/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/game/resource/.htaccess b/application/ship-simu/templates/de/game/resource/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/resource/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/menu/base_menu.xml b/application/ship-simu/templates/de/menu/base_menu.xml index 8760e63..b859ba1 100644 --- a/application/ship-simu/templates/de/menu/base_menu.xml +++ b/application/ship-simu/templates/de/menu/base_menu.xml @@ -1,4 +1,26 @@ +
diff --git a/application/ship-simu/templates/de/menu/generic_menu_entries.xml b/application/ship-simu/templates/de/menu/generic_menu_entries.xml index beb9c48..eab5d44 100644 --- a/application/ship-simu/templates/de/menu/generic_menu_entries.xml +++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml @@ -1,5 +1,26 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!--@TODO Later versions: <menu extends="base_menu">//--> +<!-- +Generic menu entries. You should leave this template for smooth upgrades. + +@author Roland Haeder <webmaster@ship-simu.org> +@version 0.0.0 +@copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team +@license GNU GPL 3.0 or any newer version +@link http://www.ship-simu.org + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/> +//--> <menu> <header> <title id="home" class="menu_title_home"> diff --git a/docs/COPYING b/docs/COPYING index 23d0d15..05861e6 100644 --- a/docs/COPYING +++ b/docs/COPYING @@ -1,6 +1,6 @@ -For PHP scripts except templates and compileable templates see COPYING.software. +For PHP scripts and XML templates except compileable templates see COPYING.software. For documents see COPYING.documents. -The rest of the software (shell scripts, templates, code templates) are given away -"AS IS" and "WITHOUT ANY WARRANTY". So it shall be public domain. +The rest of the software (shell scripts, HTML templates, code templates) are +given away "AS IS" and "WITHOUT ANY WARRANTY". So it shall be public domain. diff --git a/docs/TODOs.txt b/docs/TODOs.txt index 4875c9c..e4c1031 100644 --- a/docs/TODOs.txt +++ b/docs/TODOs.txt @@ -170,7 +170,6 @@ ./inc/includes.php:36:// @TODO Find a nicer OOP-ed way for this ./inc/language.php:31:// @TODO Rewrite this ./inc/loader/class_ClassLoader.php:262: /* @todo: Do not die here. */ -./application/ship-simu/templates/de/menu/generic_menu_entries.xml:2:<!--@TODO Later versions: <menu extends="base_menu">//--> ### ### DEPRECATION FOLLOWS: ### ### ./application/ship-simu/main/personell/class_SimulatorPersonell.php:118: * @deprecated ./application/ship-simu/main/personell/class_SimulatorPersonell.php:319: * @deprecated -- 2.39.2