Skip to content

Commit

Permalink
closed #90 (IGB map not working) jsPlumb v2.0.5 downgraded to v1.7.6
Browse files Browse the repository at this point in the history
#84 renamed "landingpage" view to "login" view
#84 added some basic CREST API data mappers
#84 added "isNPC" flag t Corporation table (WIP)
#84  added CREST API settings to environment.ini
  • Loading branch information
exodus4d committed Feb 6, 2016
1 parent 18cb3a7 commit 27c0698
Show file tree
Hide file tree
Showing 61 changed files with 38,995 additions and 139 deletions.
10 changes: 9 additions & 1 deletion app/environment.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ DB_CCP_NAME = eve_parallax_min
DB_CCP_USER = root
DB_CCP_PASS =

; SMTP settings
; CCP SSO settings
SSO_CCP_CLIENT_ID =
SSO_CCP_SECRET_KEY =

; SMTP settings. see: https://developers.eveonline.com/applications
SMTP_HOST = localhost
SMTP_PORT = 25
SMTP_SCHEME = ""
Expand Down Expand Up @@ -53,6 +57,10 @@ DB_CCP_NAME =
DB_CCP_USER =
DB_CCP_PASS =

; CCP SSO settings
SSO_CCP_CLIENT_ID =
SSO_CCP_SECRET_KEY =

; SMTP settings
SMTP_HOST = localhost
SMTP_PORT = 25
Expand Down
10 changes: 5 additions & 5 deletions app/main/controller/appcontroller.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
class AppController extends Controller {

/**
* show the main landing page
* show main login (index) page
* @param $f3
*/
public function showLandingpage($f3) {
public function init($f3) {
// page title
$f3->set('pageTitle', 'Login');

// main page content
$f3->set('pageContent', $f3->get('PATHFINDER.VIEW.LANDINGPAGE'));
$f3->set('pageContent', $f3->get('PATHFINDER.VIEW.LOGIN'));

// body element class
$f3->set('bodyClass', 'pf-body pf-landing');
Expand All @@ -29,7 +29,7 @@ public function showLandingpage($f3) {
$f3->set('trusted', 1);

// JS main file
$f3->set('jsView', 'landingpage');
$f3->set('jsView', 'login');
}

}
}
Loading

0 comments on commit 27c0698

Please sign in to comment.