From e21d07ec9dd5bbfd9cca4c150989688bbae4d252 Mon Sep 17 00:00:00 2001 From: max-dev Date: Sat, 13 Sep 2014 18:52:44 +0300 Subject: [PATCH] Added Web Logger Configurer from https://github.com/la-team/light-logging-configurer --- lightadmin-core/pom.xml | 2 +- .../resources/images/ukraine-peace.png | Bin 0 -> 3486 bytes .../views/includes/common-scripts-include.jsp | 4 +++ .../views/sections/top-navigation-section.jsp | 1 + lightadmin-demo/pom.xml | 8 +++++ .../src/main/resources/logback.xml | 30 +++++++++++------- .../src/main/webapp/WEB-INF/web.xml | 10 ++++++ 7 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 lightadmin-core/src/main/resources/META-INF/resources/images/ukraine-peace.png diff --git a/lightadmin-core/pom.xml b/lightadmin-core/pom.xml index 6c5aeffe..830c3f90 100644 --- a/lightadmin-core/pom.xml +++ b/lightadmin-core/pom.xml @@ -26,7 +26,7 @@ The Apache Software License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 - Copyright 2010-2014 the original author or authors. + Copyright 2012-2014 the original author or authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/lightadmin-core/src/main/resources/META-INF/resources/images/ukraine-peace.png b/lightadmin-core/src/main/resources/META-INF/resources/images/ukraine-peace.png new file mode 100644 index 0000000000000000000000000000000000000000..5c1afee11388cd0fcda1d9660edcb2f650c45010 GIT binary patch literal 3486 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 M07*qoM6N<$f~{1Ph5!Hn literal 0 HcmV?d00001 diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/includes/common-scripts-include.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/includes/common-scripts-include.jsp index 6c14e90d..66c39584 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/includes/common-scripts-include.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/includes/common-scripts-include.jsp @@ -75,6 +75,10 @@ $(function () { $.ajaxSetup({ cache: false }); + $("#support-ukraine").click(function() { + document.location.href = "http://wings-phoenix.org.ua/en/donate-instructions"; + }); + $("a.not-implemented").click(function () { jAlert('Sorry mate, but this feature is not yet implemented.', 'Coming soon...'); }); diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/sections/top-navigation-section.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/sections/top-navigation-section.jsp index ebfe5180..71cef65f 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/sections/top-navigation-section.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/sections/top-navigation-section.jsp @@ -45,6 +45,7 @@
+ diff --git a/lightadmin-demo/pom.xml b/lightadmin-demo/pom.xml index 7a99c6d5..27e0d2ec 100644 --- a/lightadmin-demo/pom.xml +++ b/lightadmin-demo/pom.xml @@ -22,7 +22,10 @@ 4.1.0.RELEASE 4.3.6.Final 1.1.2 + 1.0.1.BUILD-SNAPSHOT + 1.0.0.BUILD-SNAPSHOT + 1.0.0.Final 5.0.3.Final 1.1.0.Final @@ -39,6 +42,11 @@ lightadmin ${lightadmin.version} + + org.lightadmin + light-logging-configurer + ${light-logging-configurer.version} + org.springframework diff --git a/lightadmin-demo/src/main/resources/logback.xml b/lightadmin-demo/src/main/resources/logback.xml index cf0708fd..567334c9 100644 --- a/lightadmin-demo/src/main/resources/logback.xml +++ b/lightadmin-demo/src/main/resources/logback.xml @@ -1,22 +1,28 @@ - - + + utf-8 - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - - + - + + - + - - - + + + + true + + + + + \ No newline at end of file diff --git a/lightadmin-demo/src/main/webapp/WEB-INF/web.xml b/lightadmin-demo/src/main/webapp/WEB-INF/web.xml index d3945827..405fe87a 100644 --- a/lightadmin-demo/src/main/webapp/WEB-INF/web.xml +++ b/lightadmin-demo/src/main/webapp/WEB-INF/web.xml @@ -7,6 +7,16 @@ LightAdmin - Administration framework for Java web applications. [DEMO] + + light:configurer:base-url + /logger + + + + light:configurer:back-to-site-url + http://lightadmin.org + + light:administration:base-url /admin