Author: bpoussin Date: 2013-01-26 16:57:49 +0100 (Sat, 26 Jan 2013) New Revision: 2476 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2476 Log: - NuitonTrace a un main qui permet de lancer le serveur web - ajout du favicon.ico - meilleur recherche des ressources web (fonctionne mieux) - 404 est bien renvoyer maintenant - on est plus oblig?\195?\169 de mettre /index.html - petit changement d'icone - import des css/js en relatif (ce qui permettra de mettre les ressources web en static sur un serveur) Added: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/favicon.ico Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2013-01-26 15:57:49 UTC (rev 2476) @@ -590,9 +590,11 @@ if (requestMethod.equalsIgnoreCase("GET")) { String path = exchange.getRequestURI().getPath(); String file = StringUtils.substringAfterLast(path, "/"); - URL resource = getClass().getClassLoader().getResource(filepath + file); + file = StringUtils.defaultIfBlank(file, "index.html"); + URL resource = getClass().getResource(filepath + file); if (resource == null) { exchange.sendResponseHeaders(404, 0); + exchange.close(); } else { String type = "text/" + StringUtils.substringAfterLast(file, "."); Headers responseHeaders = exchange.getResponseHeaders(); @@ -685,6 +687,7 @@ responseBody.close(); } else { exchange.sendResponseHeaders(404, 0); + exchange.close(); } } Modified: trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties =================================================================== --- trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties 2013-01-26 15:57:49 UTC (rev 2476) @@ -1,4 +1,4 @@ debug=false -preProcessors=cssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr +preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr postProcessors=cssVariables,jsMin uriLocators=uri,classpath Added: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/favicon.ico =================================================================== (Binary files differ) Property changes on: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/favicon.ico ___________________________________________________________________ Added: svn:mime-type + image/x-icon Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-26 15:57:49 UTC (rev 2476) @@ -7,8 +7,8 @@ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> <meta charset="UTF-8"/> - <link href="/profiling-ui-web.css" rel="stylesheet" type="text/css"/> - <script type="text/javascript" src="/profiling-ui-web.js"></script> + <link type="text/css" rel="stylesheet" href="profiling-ui-web.css"/> + <script type="text/javascript" src="profiling-ui-web.js"></script> </head> <body> @@ -24,8 +24,8 @@ <input type="text" id="profilingUrl" placeholder="profiling url" value="http://[::1]:4488/"/> </form> <form class="navbar-form pull-left" action="#"> - <button id="addStat"><i class="icon-picture"></i> Add</button> - <button id="clearStat"><i class="icon-remove"></i> Clear</button> + <button id="addStat"><i class="icon-picture icon-large"></i> Add</button> + <button id="clearStat"><i class="icon-trash icon-large"></i> Clear</button> </form> <ul class="nav"> Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-26 15:57:49 UTC (rev 2476) @@ -173,7 +173,7 @@ var date = title || new Date(); var a = createLinkToLoad(date); - var edit = $('<li class="icon-pencil"></li>').click(function() { + var edit = $('<li class="icon-pencil icon-large blue"></li>').click(function() { var a = $(this).parent().children("a"); var text = a.text(); @@ -208,7 +208,7 @@ input.select(); return false; // false pour que le menu, ne se referme pas }); - var remove = $('<li class="icon-remove"></li>').click(function() { + var remove = $('<li class="icon-trash icon-large red"></li>').click(function() { $(this).parent().remove(); saveDatabase(); });