From 24bef96b303b6a9ab93a91fc7795cd692b121ca2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 5 Apr 2009 09:15:22 +0000 Subject: [PATCH] Re-organized directory structure --- .gitattributes | 11 ++-- .gitignore | 1 - application/ship-simu/config.php | 3 ++ .../main/menu/class_ShipSimuLoginMenu.php | 50 +++++++++++++++++++ .../{images => }/de/image/base_code.xml | 2 +- .../image/code_captcha.img} | 12 ++--- .../templates/de/image/emergency_exit.img | 18 +++++++ .../ship-simu/templates/de/menu/base_menu.xml | 26 ++++++++++ .../ship-simu/templates/images/.htaccess | 1 - .../templates/images/_cache/.htaccess | 1 - .../ship-simu/templates/images/de/.htaccess | 1 - .../templates/images/de/image/.htaccess | 1 - 12 files changed, 109 insertions(+), 18 deletions(-) create mode 100644 application/ship-simu/main/menu/class_ShipSimuLoginMenu.php rename application/ship-simu/templates/{images => }/de/image/base_code.xml (94%) rename application/ship-simu/templates/{images/de/image/code_captcha.xml => de/image/code_captcha.img} (88%) create mode 100644 application/ship-simu/templates/de/image/emergency_exit.img create mode 100644 application/ship-simu/templates/de/menu/base_menu.xml delete mode 100644 application/ship-simu/templates/images/.htaccess delete mode 100644 application/ship-simu/templates/images/_cache/.htaccess delete mode 100644 application/ship-simu/templates/images/de/.htaccess delete mode 100644 application/ship-simu/templates/images/de/image/.htaccess diff --git a/.gitattributes b/.gitattributes index d50f5b2..b03d25c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -143,6 +143,7 @@ application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php -text application/ship-simu/main/menu/.htaccess -text application/ship-simu/main/menu/class_ShipSimu -text application/ship-simu/main/menu/class_ShipSimuHomeMenu.php -text +application/ship-simu/main/menu/class_ShipSimuLoginMenu.php -text application/ship-simu/main/parts/.htaccess -text application/ship-simu/main/parts/class_BaseShipPart.php -text application/ship-simu/main/parts/maschineroom/.htaccess -text @@ -224,13 +225,11 @@ application/ship-simu/templates/de/emails/text_resend_link.tpl -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 +application/ship-simu/templates/de/image/base_code.xml -text +application/ship-simu/templates/de/image/code_captcha.img -text +application/ship-simu/templates/de/image/emergency_exit.img -text application/ship-simu/templates/de/menu/.htaccess -text -application/ship-simu/templates/images/.htaccess -text -application/ship-simu/templates/images/_cache/.htaccess -text -application/ship-simu/templates/images/de/.htaccess -text -application/ship-simu/templates/images/de/image/.htaccess -text -application/ship-simu/templates/images/de/image/base_code.xml -text -application/ship-simu/templates/images/de/image/code_captcha.xml -text +application/ship-simu/templates/de/menu/base_menu.xml -text /clear-cache.sh -text db/.htaccess -text db/company/.htaccess -text diff --git a/.gitignore b/.gitignore index 9a129d4..702e40c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /.cache /.project /.settings -application/ship-simu/templates/images/_cache/*.* db/company/*.serialized db/company_user/*.serialized db/gov_user/*.serialized diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php index d775d46..7921c6c 100644 --- a/application/ship-simu/config.php +++ b/application/ship-simu/config.php @@ -406,5 +406,8 @@ $cfg->setConfigEntry('login_register_login_form', "index.php?app={?app_short_nam // CFG: HOME-MENU-CLASS $cfg->setConfigEntry('home_menu_class', "ShipSimuHomeMenu"); +// CFG: LOGIN-MENU-CLASS +$cfg->setConfigEntry('login_menu_class', "ShipSimuLoginMenu"); + // [EOF] ?> diff --git a/application/ship-simu/main/menu/class_ShipSimuLoginMenu.php b/application/ship-simu/main/menu/class_ShipSimuLoginMenu.php new file mode 100644 index 0000000..75212e6 --- /dev/null +++ b/application/ship-simu/main/menu/class_ShipSimuLoginMenu.php @@ -0,0 +1,50 @@ + + * @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 . + */ +class ShipSimuLoginMenu extends BaseMenu implements RenderableMenu { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this class + * + * @return $menuInstance An instance of this class + */ + public final static function createShipSimuLoginMenu () { + // Get a new instance + $menuInstance = new ShipSimuLoginMenu(); + + // Return the prepared instance + return $menuInstance; + } +} + +// [EOF] +?> diff --git a/application/ship-simu/templates/images/de/image/base_code.xml b/application/ship-simu/templates/de/image/base_code.xml similarity index 94% rename from application/ship-simu/templates/images/de/image/base_code.xml rename to application/ship-simu/templates/de/image/base_code.xml index 6501b56..5de71be 100644 --- a/application/ship-simu/templates/images/de/image/base_code.xml +++ b/application/ship-simu/templates/de/image/base_code.xml @@ -1,4 +1,4 @@ - + diff --git a/application/ship-simu/templates/images/de/image/code_captcha.xml b/application/ship-simu/templates/de/image/code_captcha.img similarity index 88% rename from application/ship-simu/templates/images/de/image/code_captcha.xml rename to application/ship-simu/templates/de/image/code_captcha.img index 2e28522..223e4fb 100644 --- a/application/ship-simu/templates/images/de/image/code_captcha.xml +++ b/application/ship-simu/templates/de/image/code_captcha.img @@ -1,8 +1,8 @@ setImageName("code_captcha"); -$helper->setBaseImage("base_code"); +$helper = ImageHelper::createImageHelper($this, 'png'); +$helper->setImageName('code_captcha'); +$helper->setBaseImage('base_code'); // Set image dimensions $helper->setWidth(100); @@ -55,14 +55,14 @@ $xRand = $helper->getRngInstance()->randomNumber(0, 45); $yRand = $helper->getRngInstance()->randomNumber(0, 25); // Add code -$helper->addTextLine("code"); +$helper->addTextLine('code'); $helper->setCoord((5 + $xRand), (5 + $yRand)); $helper->setFontSize('rand'); -$helper->setImageString("{?decrypted_code?}"); +$helper->setImageString('{?decrypted_code?}'); // Only for debug! /* -$helper->addTextLine("debug"); +$helper->addTextLine('debug'); $helper->setCoord(90, 35); $helper->setFontSize(3); $helper->setImageString($rand); diff --git a/application/ship-simu/templates/de/image/emergency_exit.img b/application/ship-simu/templates/de/image/emergency_exit.img new file mode 100644 index 0000000..bf67aa7 --- /dev/null +++ b/application/ship-simu/templates/de/image/emergency_exit.img @@ -0,0 +1,18 @@ +setImageName('emergency_exit'); +$helper->setBaseImage('base_exit'); + +// Set image dimensions +$helper->setWidth(100); +$helper->setHeight(50); + +// Flush content to the template engine +//$helper->flushContent(); + +// Comment this out if image is done +$this->debugInstance(); + +// [EOF] +?> diff --git a/application/ship-simu/templates/de/menu/base_menu.xml b/application/ship-simu/templates/de/menu/base_menu.xml new file mode 100644 index 0000000..5eb5c1e --- /dev/null +++ b/application/ship-simu/templates/de/menu/base_menu.xml @@ -0,0 +1,26 @@ + + +
+ + {?menu_title?} + +
+ + + + {?anchor_link_text?} + + + {?entry_design_text?} + + + + + diff --git a/application/ship-simu/templates/images/.htaccess b/application/ship-simu/templates/images/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/ship-simu/templates/images/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/ship-simu/templates/images/_cache/.htaccess b/application/ship-simu/templates/images/_cache/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/ship-simu/templates/images/_cache/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/ship-simu/templates/images/de/.htaccess b/application/ship-simu/templates/images/de/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/ship-simu/templates/images/de/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/ship-simu/templates/images/de/image/.htaccess b/application/ship-simu/templates/images/de/image/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/ship-simu/templates/images/de/image/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all -- 2.30.2