From cb3f77a573bb8bcc727b492c3de3b736462f5f45 Mon Sep 17 00:00:00 2001 From: mathieu Date: Mon, 25 May 2015 07:35:40 -0400 Subject: [PATCH] Design for facebook login. Refs #20 --- application/core/MY_Controller.php | 2 +- application/views/header.php | 16 ++++++-- application/views/modal/login.php | 10 ++++- application/views/modal/sign-up.php | 2 + assets/js/facebook.js | 60 +++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 assets/js/facebook.js diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 4a7c2f68..99e609d6 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -12,7 +12,7 @@ public function __construct() parent::__construct(); $this->_headerData['userIsLoggedIn'] = $this->user->isLoggedIn(); $this->_headerData['styleSheets'] = array('main'); - $this->_headerData['javaScripts'] = array('jquery.min', 'bootstrap.min', 'application', 'MediaElement/mediaelement-and-player.min'); + $this->_headerData['javaScripts'] = array('jquery.min', 'bootstrap.min', 'application', 'MediaElement/mediaelement-and-player.min', 'facebook'); $this->_headerData['headerClass'] = ''; if($this->_needLoggedIn && !$this->user->isLoggedIn()) diff --git a/application/views/header.php b/application/views/header.php index 0e647175..ca25bea2 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -27,19 +27,27 @@ - '; } - foreach($javaScripts as $js) { echo ''; } - ?> + '; } + foreach($javaScripts as $js) { echo ''; } + ?>