Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E9DBD39E for ; Fri, 14 Sep 2012 21:52:18 +0000 (UTC) Received: (qmail 57666 invoked by uid 500); 14 Sep 2012 21:52:18 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 57636 invoked by uid 500); 14 Sep 2012 21:52:18 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 57628 invoked by uid 99); 14 Sep 2012 21:52:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2012 21:52:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2012 21:52:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D4AC238897F for ; Fri, 14 Sep 2012 21:51:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1384939 - in /archiva/site/src/site: apt/jsui/template-loading.apt xdoc/jsui/index.xml Date: Fri, 14 Sep 2012 21:51:31 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120914215131.3D4AC238897F@eris.apache.org> Author: olamy Date: Fri Sep 14 21:51:30 2012 New Revision: 1384939 URL: http://svn.apache.org/viewvc?rev=1384939&view=rev Log: update doc with how it works now :-) Modified: archiva/site/src/site/apt/jsui/template-loading.apt archiva/site/src/site/xdoc/jsui/index.xml Modified: archiva/site/src/site/apt/jsui/template-loading.apt URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/jsui/template-loading.apt?rev=1384939&r1=1384938&r2=1384939&view=diff ============================================================================== --- archiva/site/src/site/apt/jsui/template-loading.apt (original) +++ archiva/site/src/site/apt/jsui/template-loading.apt Fri Sep 14 21:51:30 2012 @@ -3,7 +3,7 @@ ----- Olivier Lamy ----- - 2012-01-19 + 2012-09-14 ----- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -35,20 +35,25 @@ Html/Javascript templates loading archiva templates are loaded as it <<>> +------------------------- -require(["text!archiva/templates/menu.html?"+timestampNoCache(),"text!archiva/templates/topbar.html?"+timestampNoCache(), - "text!archiva/templates/message.html?"+timestampNoCache(),"text!archiva/templates/modal.html?"+timestampNoCache(), - "text!archiva/templates/grids-generics.html?"+timestampNoCache(), - "text!archiva/templates/repositories.html?"+timestampNoCache()], - function(menu,topbar,message,modal,grids_generics,repositories) { - - // template loading - $.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"); +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,i18n,utils,menu,generics,modal,repositories, + search,general_admin) { + 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"); + } } ); +------------------------- Modified: archiva/site/src/site/xdoc/jsui/index.xml URL: http://svn.apache.org/viewvc/archiva/site/src/site/xdoc/jsui/index.xml?rev=1384939&r1=1384938&r2=1384939&view=diff ============================================================================== --- archiva/site/src/site/xdoc/jsui/index.xml (original) +++ archiva/site/src/site/xdoc/jsui/index.xml Fri Sep 14 21:51:30 2012 @@ -65,9 +65,9 @@