Merged master into ui-updates-1

This commit is contained in:
Remi S
2013-08-07 13:30:39 -04:00
23 changed files with 112 additions and 64 deletions

View File

@ -17,7 +17,7 @@ class ControllerGroupEmail extends Controller {
$this->load->model('group/group');
//$this->document->title = $language->get('text_group_management');
$this->document->title = '';
$this->data['page'] = 0;
$this->data['page_len'] = get_page_length();

View File

@ -32,7 +32,7 @@ class ControllerLoginLogin extends Controller {
$this->load->model('saas/customer');
}
$this->document->title = $this->data['text_login'];
$this->data['title'] = $this->data['text_login'];
if($this->request->server['REQUEST_METHOD'] == 'POST' && $this->validate() == true) {