Author: olamy
Date: Fri Aug 24 08:11:52 2012
New Revision: 1376855
URL: http://svn.apache.org/viewvc?rev=1376855&view=rev
Log:
fix i18n loading for templates loading on start
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js?rev=1376855&r1=1376854&r2=1376855&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
Fri Aug 24 08:11:52 2012
@@ -51,8 +51,8 @@ $.ajax({
urlArgs: ""+appendJsNoCacheUrl(),
shim: {
'sammy':['jquery','jquery.tmpl'],
-
'archiva.main':['jquery','jquery.ui','sammy','jquery.tmpl'],
- 'utils':['jquery','jquery.tmpl'],
+
'archiva.main':['jquery','jquery.ui','sammy','jquery.tmpl','utils','i18n'],
+ 'utils':['jquery','jquery.tmpl','i18n'],
'archiva.templates': ['jquery','jquery.tmpl','utils'],
'redback.templates': ['jquery','jquery.tmpl','utils']
},
@@ -97,9 +97,9 @@ $.ajax({
}
});
-
requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils',"archiva.main",'domReady!'],
function (domReady) {
- loadi18n(function () {
- $.ajax({
+
requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils','domReady!','archiva.main'],
function () {
+ loadi18n(function () {
+ $.ajax({
url:
"restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
dataType: 'json',
success:function(data){
@@ -107,14 +107,14 @@ $.ajax({
window.archivaJavascriptLog=data.javascriptLog;
window.archivaRuntimeInfo=data;
-
require(['sammy','jquery','jquery.tmpl','archiva.main','utils','domReady!'],function
() {
+
require(['sammy','jquery','i18n','jquery.tmpl','archiva.main','utils','domReady!'],function
() {
startArchivaApplication();
$("#loadingDiv").hide();
drawQuickSearchAutocomplete();
})
}
})
+ });
})
- });
}
})
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js?rev=1376855&r1=1376854&r2=1376855&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
Fri Aug 24 08:11:52 2012
@@ -16,23 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-require(['jquery',"jquery.tmpl","utils","text!templates/archiva/menu.html",
+require(['jquery',"jquery.tmpl",'i18n',"utils","text!templates/archiva/menu.html",
"text!templates/archiva/generics.html",
"text!templates/archiva/modal.html",
"text!templates/archiva/repositories.html",
"text!templates/archiva/search.html",
"text!templates/archiva/general-admin.html"],
- function(jquery,jqueryTmpl,utils,menu,generics,modal,repositories,
+ function(jquery,jqueryTmpl,i18n,utils,menu,generics,modal,repositories,
search,general_admin) {
-
- var htmlFragment=$("#html-fragments");
- // template loading
- htmlFragment.append(menu);
- htmlFragment.append(generics);
- $.tmpl( modal ).appendTo(htmlFragment);
- htmlFragment.append(repositories);
- htmlFragment.append(search);
- htmlFragment.append(general_admin);
- $.log("main-tmpl.js loaded");
+ loadArchivaTemplate=function(){
+ var htmlFragment=$("#html-fragments");
+ // template loading
+ htmlFragment.append(menu);
+ htmlFragment.append(generics);
+ $.tmpl( modal ).appendTo(htmlFragment);
+ htmlFragment.append(repositories);
+ htmlFragment.append(search);
+ htmlFragment.append(general_admin);
+ $.log("main-tmpl.js loaded");
+ }
}
);
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1376855&r1=1376854&r2=1376855&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Fri Aug 24 08:11:52 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.main",["jquery","jquery.ui","sammy","jquery.tmpl","jquery.cookie","bootstrap","archiva.search",
+define("archiva.main",["jquery","jquery.ui","sammy","jquery.tmpl",'i18n',"jquery.cookie","bootstrap","archiva.search",
"jquery.validate","jquery.json","knockout","redback.templates","archiva.templates",
"redback.roles","redback","archiva.general-admin","archiva.repositories",
"archiva.network-proxies","archiva.proxy-connectors","archiva.repository-groups","archiva.artifacts-management"],
@@ -581,6 +581,8 @@ function(jquery,ui,sammy,tmpl) {
startArchivaApplication=function(){
$.log("startArchivaApplication");
+ loadRedbackTemplate();
+ loadArchivaTemplate();
$('#topbar-menu-container').html($("#topbar_menu_tmpl" ).tmpl());
$('#sidebar-content').html($("#main_menu_tmpl").tmpl());
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js?rev=1376855&r1=1376854&r2=1376855&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
Fri Aug 24 08:11:52 2012
@@ -16,15 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-require(['jquery',"jquery.tmpl","utils","text!templates/redback/user-edit.html",
+require(['jquery',"jquery.tmpl",'i18n',"utils","text!templates/redback/user-edit.html",
"text!templates/redback/login.html"],
- function(jquery,jqueryTmpl,utils,useredit, login) {
+ function(jquery,jqueryTmpl,i18n,utils,useredit, login) {
- var htmlFragment=$("#html-fragments");
+ loadRedbackTemplate=function(){
- // template loading
- htmlFragment.append(useredit);
- $.tmpl(login).appendTo("#html-fragments");
- $.log("redback-tmpl.js loaded");
+ var htmlFragment=$("#html-fragments");
+
+ // template loading
+ htmlFragment.append(useredit);
+ //$.tmpl(useredit).appendTo("#html-fragments");
+ $.tmpl(login).appendTo("#html-fragments");
+ //htmlFragment.append(login);
+ $.log("redback-tmpl.js loaded");
+ }
}
);
\ No newline at end of file
