Author: olamy
Date: Mon Jan 23 16:21:33 2012
New Revision: 1234882
URL: http://svn.apache.org/viewvc?rev=1234882&view=rev
Log:
cleanup template loading
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
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/archiva/templates/topbar.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/apt/generics-js.apt
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/site.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/xdoc/index.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
Mon Jan 23 16:21:33 2012
@@ -74,7 +74,9 @@
.script("redback/permission.js").wait()
.script("redback/resource.js").wait()
.script("redback/roles.js").wait()
- .script("archiva/main.js");
+ .script("archiva/main.js").wait(function(){
+ //startArchivaApplication();
+ });
</script>
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=1234882&r1=1234881&r2=1234882&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
Mon Jan 23 16:21:33 2012
@@ -21,10 +21,10 @@ require(["text!archiva/templates/menu.ht
function(menu,topbar,message,modal,grids_generics,repositories) {
// template loading
- $.tmpl( menu, $.i18n.map ).appendTo("#html-fragments");
- $.tmpl( topbar, $.i18n.map ).appendTo("#html-fragments");
- $.tmpl( modal, $.i18n.map ).appendTo("#html-fragments");
+ $.tmpl( menu ).appendTo("#html-fragments");
+ $.tmpl( topbar ).appendTo("#html-fragments");
$("#html-fragments").append(message);
+ $.tmpl( modal ).appendTo("#html-fragments");
$("#html-fragments").append(grids_generics);
$("#html-fragments").append(repositories);
$.log("main-tmpl.js menu loaded");
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=1234882&r1=1234881&r2=1234882&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
Mon Jan 23 16:21:33 2012
@@ -160,14 +160,16 @@ $(function() {
}
});
- $('#topbar-menu-container').html($("#topbar-menu"));
- $('#sidebar-content').html($("#main-menu"));
-
-
- checkCreateAdminLink();
- hideElementWithKarma();
- checkSecurityLinks();
+ startArchivaApplication = function(){
+ $.log("startArchivaApplication");
+ $('#topbar-menu-container').html($("#topbar-menu"));
+ $('#sidebar-content').html($("#main-menu"));
+ checkCreateAdminLink();
+ hideElementWithKarma();
+ checkSecurityLinks();
+ }
+ startArchivaApplication();
})
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
Mon Jan 23 16:21:33 2012
@@ -38,7 +38,7 @@
</li>
<li id="logout-link" style="display: none">
<a href="#" onclick="logout();" id="logout-link-a">
- <span class="label important">${logout}</span>
+ <span class="label important">${$.i18n.prop('logout')}</span>
</a>
</li>
<li id="register-link" style="display: none">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
Mon Jan 23 16:21:33 2012
@@ -242,13 +242,14 @@ $.i18n.browserLang = function() {
loadAndParseFile = function (filename, settings) {
$.ajax({
url: filename,
- async: false,
+ async: true,
cache: settings.cache,
contentType:'text/plain;charset='+ settings.encoding,
dataType: 'text',
success: function(data, status) {
- parseData(data, settings.mode);
- }
+ parseData(data, settings.mode);
+ if(settings.callback){ settings.callback(); }
+ }
});
}
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=1234882&r1=1234881&r2=1234882&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
Mon Jan 23 16:21:33 2012
@@ -19,17 +19,25 @@
require(["text!redback/templates/user-edit.html",
"text!redback/templates/user-grids.html", "text!redback/templates/login.html"
,
"text!redback/templates/register-form.html","text!redback/templates/password-change-form.html"
,"text!redback/templates/user-edit-form.html","text!redback/templates/roles-tmpl.html"],
- function(usercreate, usergrids,
login,register,passwordchange,useredit,roles_tmpl) {
+ function(useredit, usergrids,
login,register,passwordchange,usereditform,roles) {
- $.tmpl( login, $.i18n.map ).appendTo("#html-fragments");
- $.tmpl( register, $.i18n.map ).appendTo("#html-fragments");
- $.tmpl( passwordchange, $.i18n.map ).appendTo("#html-fragments");
- $.tmpl( useredit, $.i18n.map ).appendTo("#html-fragments");
// template loading
- $("#html-fragments").append(usercreate);
+
+ $("#html-fragments").append(useredit);
+
$("#html-fragments").append(usergrids);
- $("#html-fragments").append(roles_tmpl);
+ $.tmpl(login).appendTo("#html-fragments");
+
+ $.tmpl(register).appendTo("#html-fragments");
+
+ $.tmpl(passwordchange).appendTo("#html-fragments");
+
+ $.tmpl(usereditform).appendTo("#html-fragments");
+
+ $("#html-fragments").append(roles);
+
+ $.log("redback-tmpl.js loaded");
}
);
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
Mon Jan 23 16:21:33 2012
@@ -26,13 +26,13 @@
<div id="modal-login-err-message" class="alert-message error"
style="display:none"></div>
<fieldset>
<div class="clearfix">
- <label for="user-login-form-username">${username}</label>
+ <label
for="user-login-form-username">${$.i18n.prop('username')}</label>
<div class="input">
<input type="text" id="user-login-form-username"
name="user-login-form-username" class="required" />
</div>
</div>
<div class="clearfix">
- <label for="user-login-form-password">${password}</label>
+ <label
for="user-login-form-password">${$.i18n.prop('password')}</label>
<div class="input">
<input type="password" id="user-login-form-password"
name="user-login-form-password" class="required" />
</div>
@@ -41,7 +41,7 @@
</form>
</div>
<div class="modal-footer" id="modal-login-footer">
- <button class="btn primary" onclick="login();"
id="modal-login-ok">${$.i18n.prop('login)}</button>
+ <button class="btn primary" onclick="return login();"
id="modal-login-ok">${$.i18n.prop('login')}</button>
</div>
</div>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
Mon Jan 23 16:21:33 2012
@@ -26,7 +26,7 @@
<div id="modal-register-err-message" class="alert-message error"
style="display:none"></div>
<fieldset>
<div class="clearfix">
- <label for="user-register-form-username">${username}</label>
+ <label
for="user-register-form-username">${$.i18n.prop('username')}</label>
<div class="input">
<input type="text" id="user-register-form-username"
name="user-register-form-username" class="required" />
</div>
@@ -38,7 +38,7 @@
</div>
</div>
<div class="clearfix">
- <label for="user-register-form-email">${email}</label>
+ <label
for="user-register-form-email">${$.i18n.prop('email')}</label>
<div class="input">
<input type="text" id="user-register-form-email"
name="user-register-form-email" class="required email" />
</div>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
Mon Jan 23 16:21:33 2012
@@ -33,7 +33,7 @@
<form id="user-create">
<fieldset id="user-create-fieldset">
<div class="clearfix">
- <label for="username">${i18n('username')}</label>
+ <label for="username">${$.i18n.prop('username')}</label>
<div class="input" id="username-div">
{{if $data.username.length>0}}
<span class="uneditable-input">${$data.username}</span>
@@ -43,50 +43,50 @@
</div>
</div>
<div class="clearfix">
- <label for="fullname">${i18n('full.name')}</label>
+ <label for="fullname">${$.i18n.prop('full.name')}</label>
<div class="input">
<input type="text" id="fullname" name="fullname" size="30"
class="required" data-bind="value: fullName"/>
</div>
</div>
<div class="clearfix">
- <label for="password">${i18n('password')}</label>
+ <label for="password">${$.i18n.prop('password')}</label>
<div class="input">
<input type="password" id="password" name="password"
class="required" data-bind="value: password"/>
</div>
</div>
<div class="clearfix">
- <label
for="confirmPassword">${i18n('confirm.password')}</label>
+ <label
for="confirmPassword">${$.i18n.prop('confirm.password')}</label>
<div class="input">
<input type="password" id="confirmPassword"
name="confirmPassword" data-bind="value: confirmPassword"/>
</div>
</div>
<div class="clearfix">
- <label for="email">${i18n('email.address')}</label>
+ <label for="email">${$.i18n.prop('email.address')}</label>
<div class="input">
<input type="text" id="email" name="email" class="required
email" data-bind="value: email"/>
</div>
</div>
<div class="clearfix">
- <label for="validated">${i18n('validated')}</label>
+ <label for="validated">${$.i18n.prop('validated')}</label>
<div class="input">
<input type="checkbox" id="validated" name="validated"
data-bind="checked: validated"/>
</div>
</div>
<div class="clearfix">
- <label for="locked">${i18n('locked')}</label>
+ <label for="locked">${$.i18n.prop('locked')}</label>
<div class="input">
<input type="checkbox" id="locked" name="locked"
data-bind="checked: locked"/>
</div>
</div>
<div class="clearfix">
- <label
for="passwordChangeRequired">${i18n('passwordChangeRequired')}</label>
+ <label
for="passwordChangeRequired">${$.i18n.prop('passwordChangeRequired')}</label>
<div class="input">
<input type="checkbox" id="passwordChangeRequired"
name="passwordChangeRequired" data-bind="checked: passwordChangeRequired"/>
</div>
</div>
</fieldset>
- <button data-bind="click: save" class="btn"
id="user-create-form-register-button">${i18n('save')}</button>
- <button class="btn"
id="user-create-form-cancel-button">${i18n('cancel')}</button>
+ <button data-bind="click: save" class="btn"
id="user-create-form-register-button">${$.i18n.prop('save')}</button>
+ <button class="btn"
id="user-create-form-cancel-button">${$.i18n.prop('cancel')}</button>
</form>
</div>
<div class="span8 columns" id="user-edit-roles">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/apt/generics-js.apt
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/apt/generics-js.apt?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/apt/generics-js.apt
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/apt/generics-js.apt
Mon Jan 23 16:21:33 2012
@@ -26,4 +26,4 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/guides/mini/guide-apt-format.html
-Generics Javascript functions
\ No newline at end of file
+Generics Javascript
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/site.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/site.xml?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/site.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/site.xml
Mon Jan 23 16:21:33 2012
@@ -39,7 +39,7 @@
<item name="JS Template loading" href="/template-loading.html"/>
<item name="i18n" href="/i18n.html"/>
<item name="Knockout Binding" href="/knockout-binding.html"/>
- <item name="Generic Javascipts" href="/generics-js"/>
+ <item name="Generic Javascipts" href="/generics-js.html"/>
</menu>
</body>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/xdoc/index.xml?rev=1234882&r1=1234881&r2=1234882&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/xdoc/index.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/site/xdoc/index.xml
Mon Jan 23 16:21:33 2012
@@ -10,6 +10,9 @@
<script type="text/javascript" src="js/fancy-box-activation.js"></script>
<script src="js/jquery.fancybox-1.3.4.pack.js"
type="text/javascript"></script>
<link rel="stylesheet" href="css/jquery.fancybox-1.3.4.css"
type="text/css" media="screen" />
+
+ <macro name="toc"/>
+
<section name="Archiva Javascript Web Application">
<subsection name="General design">
<p>
@@ -45,6 +48,28 @@
</ul>
</p>
</subsection>
+ <subsection name="Sources organisation">
+ <p>
+ Sources are located in src/main/webapp :
+ <ul>
+ <li>css</li>
+ <li>images</li>
+ <li>js</li>
+ </ul>
+ </p>
+ <subsection name="js directory">
+ <p>
+ Root directory contains external libraries.
+ </p>
+ <p>
+ archiva directory contains archiva js files with a subdirectory
templates which contains templates
+ </p>
+ <p>
+ redback directory contains redback js files with a subdirectory
templates which contains templates
+ </p>
+ </subsection>
+ </subsection>
+
<subsection name="Start page">
<p>
The main page will load javascript files, load <a
href="./i18n.html">i18n</a>, <a href="./template-loading.html">load
templates</a> and insert menu.
@@ -80,27 +105,7 @@ Support single value:
</p>
</p>
</subsection>
- <subsection name="Sources organisation">
- <p>
- Sources are located in src/main/webapp :
- <ul>
- <li>css</li>
- <li>images</li>
- <li>js</li>
- </ul>
- </p>
- <subsection name="js directory">
- <p>
- Root directory contains external libraries.
- </p>
- <p>
- archiva directory contains archiva js files with a subdirectory
templates which contains templates
- </p>
- <p>
- redback directory contains redback js files with a subdirectory
templates which contains templates
- </p>
- </subsection>
- </subsection>
+
</section>
</body>
</document>
