Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

This commit is contained in:
Martin Konecny 2013-01-25 11:31:05 -05:00
parent 7b3850fac6 1873022a13
commit a14d99d87b
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/controllers/LocaleController.php
View File

@ -4,10 +4,6 @@ class LocaleController extends Zend_Controller_Action
{ {
public function init() public function init()
{ {
$ajaxContext = $this->_helper->getHelper("AjaxContext");
$ajaxContext->addActionContext("general-translation-table", "json")
->addActionContext("datatables-translation-table", "json")
->initContext();
} }
public function datatablesTranslationTableAction() public function datatablesTranslationTableAction()
@ -26,7 +22,7 @@ class LocaleController extends Zend_Controller_Action
$locale.".txt") $locale.".txt")
); );
} }
public function generalTranslationTableAction() public function generalTranslationTableAction()
{ {
$translations = array ( $translations = array (

2
airtime_mvc/application/controllers/plugins/Acl_plugin.php
View File

@ -110,7 +110,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
{ {
$controller = strtolower($request->getControllerName()); $controller = strtolower($request->getControllerName());
if (in_array($controller, array("api", "auth"))) { if (in_array($controller, array("api", "auth", "locale"))) {
$this->setRoleName("G"); $this->setRoleName("G");
} elseif (!Zend_Auth::getInstance()->hasIdentity()) { } elseif (!Zend_Auth::getInstance()->hasIdentity()) {

2
airtime_mvc/public/js/airtime/login/login.js
View File

@ -1,6 +1,6 @@
$(window).load(function(){ $(window).load(function(){
$("#username").focus(); $("#username").focus();
$("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):'en_CA'); $("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):$.cookie("default_airtime_locale"));
}); });
$(document).ready(function() { $(document).ready(function() {

1
airtime_mvc/public/js/airtime/preferences/preferences.js
View File

@ -111,6 +111,7 @@ $(document).ready(function() {
$.post(url, {format: "json", data: data}, function(data){ $.post(url, {format: "json", data: data}, function(data){
var json = $.parseJSON(data); var json = $.parseJSON(data);
$('#content').empty().append(json.html); $('#content').empty().append(json.html);
$.cookie("default_airtime_locale", $('#locale').val(), {path: '/'});
setTimeout(removeSuccessMsg, 5000); setTimeout(removeSuccessMsg, 5000);
showErrorSections(); showErrorSections();
}); });