View | Details | Raw Unified | Return to bug 44718
Collapse All | Expand All

(-)a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/www/login/LoginDialog.js (-4 / +4 lines)
 Lines 42-55    Link Here 
42 
	"dojo/query",
 42 
	"dojo/query",
43 
	"dojo/dom-attr",
 43 
	"dojo/dom-attr",
44 
	"dojo/dom-class",
 44 
	"dojo/dom-class",
45 
	"dojo/fx",
46 
	"dojo/Deferred",
45 
	"dojox/html/styles",
 47 
	"dojox/html/styles",
46 
	"dojo/fx",
 48 
	"dojox/html/entities",
47 
	"dojox/encoding/base64",
 49 
	"dojox/encoding/base64",
48 
	"dojo/Deferred",
49 
	"dijit/Dialog",
 50 
	"dijit/Dialog",
50 
	"dijit/_WidgetBase",
 51 
	"dijit/_WidgetBase",
51 
	"dijit/DialogUnderlay",
 52 
	"dijit/DialogUnderlay",
52 
	"dojox/html/entities",
53 
	"umc/tools",
 53 
	"umc/tools",
54 
	"umc/widgets/Text",
 54 
	"umc/widgets/Text",
55 
	"umc/widgets/StandbyMixin",
 55 
	"umc/widgets/StandbyMixin",
 Lines 56-62    Link Here 
56 
	"umc/i18n!login",
 56 
	"umc/i18n!login",
57 
	"dojo/domReady!",
 57 
	"dojo/domReady!",
58 
	"dojo/NodeList-dom"
 58 
	"dojo/NodeList-dom"
59 
], function(declare, lang, array, win, aspect, when, has, on, dom, domConstruct, query, attr, domClass, styles, fx, base64, Deferred, Dialog, _WidgetBase, DialogUnderlay, entities, tools, Text, StandbyMixin, _) {
 59 
], function(declare, lang, array, win, aspect, when, has, on, dom, domConstruct, query, attr, domClass, fx, Deferred, styles, entities, base64, Dialog, _WidgetBase, DialogUnderlay, tools, Text, StandbyMixin, _) {
60 

          60
          

        

        

          61
          
	_('Username');

          61
          
	_('Username');

        

        

          62
          
	_('Password');

          62
          
	_('Password');

        



(-)a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/config.js
      (-2 / +3 lines)




  

    

    

       Lines 105-111
       
    
  Link Here 
    

  

        

          105
          
}, _customUmcConfig);

          105
          
}, _customUmcConfig);

        

        

          106
          

          106
          

        

        

          107
          
// prepare all needed dependencies and evaluate umcConfig settings

          107
          
// prepare all needed dependencies and evaluate umcConfig settings

        

          
            

              108
              
var _deps = ["dojo/parser", "login", "umc/tools", "umc/json!/univention/get/meta", "umc/menu/Button", "umc/widgets/LoginButton"];


              108
              
var _deps = ["dojo/parser", "login", "umc/tools", "umc/json!/univention/get/meta", "umc/i18n/tools", "umc/menu/Button", "umc/widgets/LoginButton"];

            

        

          109
          
_deps.push("dojo/domReady!");

          109
          
_deps.push("dojo/domReady!");

        

        

          110
          
var _ndeps = _deps.length; // save current number of dependencies

          110
          
var _ndeps = _deps.length; // save current number of dependencies

        

        

          111
          

          111
          

        

  

    

    

       Lines 136-143
       
    
  Link Here 
    

  

        

          136
          
	}],

          136
          
	}],

        

        

          137
          
	map: {},

          137
          
	map: {},

        

        

          138
          
	deps: _deps,

          138
          
	deps: _deps,

        

          
            

              139
              
	callback: function(parser, login, tools, meta) {


              139
              
	callback: function(parser, login, tools, meta, i18nTools) {

            

        

          140
          
		mixin(tools._status, meta.result);

          140
          
		mixin(tools._status, meta.result);

        

            

              
              
              141
              
		i18nTools.saveLangCookie(i18nTools.defaultLang());

            

        

          141
          
		if (umcConfig.loadHooks) {

          142
          
		if (umcConfig.loadHooks) {

        

        

          142
          
			require(["umc/hooks!", "umc/piwik"]);

          143
          
			require(["umc/hooks!", "umc/piwik"]);

        

        

          143
          
		}

          144
          
		}

        



(-)a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/i18n/tools.js
      (-1 / +5 lines)




  

    

    

       Lines 94-100
       
    
  Link Here 
    

  

        

          94
          
			// reload the page when a different language is selected

          94
          
			// reload the page when a different language is selected

        

        

          95
          
			var query = ioQuery.queryToObject(window.location.search.substring(1));

          95
          
			var query = ioQuery.queryToObject(window.location.search.substring(1));

        

        

          96
          
			query.lang = locale;

          96
          
			query.lang = locale;

        

          
            

              97
              
			cookie('UMCLang', query.lang, { expires: 100, path: '/univention/' });


              97
              
			i18nTools.saveLangCookie(query.lang);

            

        

          98
          
			if (window.location.pathname.indexOf('/univention/management/') === 0) {

          98
          
			if (window.location.pathname.indexOf('/univention/management/') === 0) {

        

        

          99
          
				require('umc/tools').renewSession();

          99
          
				require('umc/tools').renewSession();

        

        

          100
          
			}

          100
          
			}

        

  

    

    

       Lines 102-107
       
    
  Link Here 
    

  

        

          102
          
		}

          102
          
		}

        

        

          103
          
	};

          103
          
	};

        

        

          104
          

          104
          

        

            

              
              
              105
              
	i18nTools.saveLangCookie = function(lang) {

            

            

              106
              
		cookie('UMCLang', lang, { expires: 100, path: '/univention/' });

            

            

              107
              
	};

            

            

              108
              

            

        

          105
          
	i18nTools.defaultLang = function () {

          109
          
	i18nTools.defaultLang = function () {

        

        

          106
          
		// summary:

          110
          
		// summary:

        

        

          107
          
		//		Returns the default Language

          111
          
		//		Returns the default Language

        






  

  Return to bug 44718