# HG changeset patch # User Mike Becker # Date 1771677701 -3600 # Node ID 1f1bce90127e835262ac64d5f054f23c1f7122b5 # Parent 0523585f17425628d223ad3385ee2d16c51aa2a2 merge all stylesheets into one diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/AbstractServlet.kt --- a/src/main/kotlin/de/uapcore/lightpit/AbstractServlet.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/AbstractServlet.kt Sat Feb 21 13:41:41 2026 +0100 @@ -192,7 +192,6 @@ // if this is an error path, bypass the normal flow if (fullPath.startsWith("/error/")) { val http = HttpRequest(null, req, resp) - http.styleSheets = listOf("error") http.render("error") return } diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/Constants.kt --- a/src/main/kotlin/de/uapcore/lightpit/Constants.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/Constants.kt Sat Feb 21 13:41:41 2026 +0100 @@ -29,7 +29,7 @@ /** * A date in yyyy-mm-dd format to identify the release. */ - const val VERSION_DATE = "2026-02-20" + const val VERSION_DATE = "2026-02-21" /** * The path where the JSP files reside. @@ -92,11 +92,6 @@ const val REQ_ATTR_VIEWMODEL = "viewmodel" /** - * Key for the name of the additional stylesheet used by a module. - */ - const val REQ_ATTR_STYLESHEET = "extraCss" - - /** * Key for the name of the optional java script file. */ const val REQ_ATTR_JAVASCRIPT = "javascriptFile" diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/RequestMapping.kt --- a/src/main/kotlin/de/uapcore/lightpit/RequestMapping.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/RequestMapping.kt Sat Feb 21 13:41:41 2026 +0100 @@ -85,19 +85,6 @@ /** * A list of additional style sheets. - * TODO: remove this unnecessary attribute and merge all style sheets into one global - * @see Constants#REQ_ATTR_STYLESHEET - */ - var styleSheets = emptyList() - set(value) { - field = value - request.setAttribute(Constants.REQ_ATTR_STYLESHEET, - value.map { "$it.css" } - ) - } - - /** - * A list of additional style sheets. * * @see Constants#REQ_ATTR_JAVASCRIPT */ diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/logic/IssueLogic.kt --- a/src/main/kotlin/de/uapcore/lightpit/logic/IssueLogic.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/logic/IssueLogic.kt Sat Feb 21 13:41:41 2026 +0100 @@ -209,7 +209,6 @@ if (pathInfos is PathInfosFull) { navigationMenu = projectNavMenu(dao.listProjects(), pathInfos) } - styleSheets = listOf("projects") javascript = "issue-editor" render("issue-view") } diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/servlet/AboutServlet.kt --- a/src/main/kotlin/de/uapcore/lightpit/servlet/AboutServlet.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/servlet/AboutServlet.kt Sat Feb 21 13:41:41 2026 +0100 @@ -38,9 +38,6 @@ } private fun viewAboutPage(http: HttpRequest, dao: DataAccessObject) { - with(http) { - styleSheets = listOf("about") - render("about") - } + http.render("about") } } \ No newline at end of file diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/servlet/IssuesServlet.kt --- a/src/main/kotlin/de/uapcore/lightpit/servlet/IssuesServlet.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/servlet/IssuesServlet.kt Sat Feb 21 13:41:41 2026 +0100 @@ -39,7 +39,6 @@ with(http) { pageTitle = i18n("issues") view = IssueOverview(issues, filter) - styleSheets = listOf("projects") javascript = "issue-overview" render("issues") } @@ -131,7 +130,6 @@ issue.project, PathInfosSimple() ) - styleSheets = listOf("projects") javascript = "issue-editor" render("issue-form") } diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt --- a/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt Sat Feb 21 13:41:41 2026 +0100 @@ -90,7 +90,6 @@ with(http) { view = ProjectsView(projectInfos) navigationMenu = projectNavMenu(projects) - styleSheets = listOf("projects") render("projects") } } @@ -129,7 +128,6 @@ pageTitle = project.name view = ProjectDetails(path, issues, filter) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") javascript = "issue-overview" render("project-details") } @@ -137,7 +135,6 @@ } private fun projectForm(http: HttpRequest, dao: DataAccessObject) { - http.styleSheets = listOf("projects") if (!http.pathParams.containsKey("project")) { http.view = ProjectEditView(Project(-1), dao.listUsers()) http.navigationMenu = projectNavMenu(dao.listProjects()) @@ -202,7 +199,6 @@ dao.listVersionSummaries(path.project) ) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") javascript = "issue-overview" render("versions") } @@ -220,7 +216,6 @@ with(http) { view = VersionEditView(path.projectInfo, version, returnLink) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") render("version-form") } } @@ -289,7 +284,6 @@ pageTitle = "${project.name} - ${i18n("version.planning.title")} ${versionInfo.elem.name}" view = VersionPlanning(path.projectInfo, versionInfo.elem, issues, filter) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") javascript = "issue-overview" render("version-plan") } @@ -327,7 +321,6 @@ dao.listComponentSummaries(path.project) ) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") javascript = "issue-overview" render("components") } @@ -345,7 +338,6 @@ with(http) { view = ComponentEditView(path.projectInfo, component, dao.listUsers(), returnLink) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") render("component-form") } } @@ -390,7 +382,6 @@ dao.listVariantSummaries(path.project) ) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") javascript = "issue-overview" render("variants") } @@ -408,7 +399,6 @@ with(http) { view = VariantEditView(path.projectInfo, variant, returnLink) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") render("variant-form") } } @@ -554,7 +544,6 @@ path ) navigationMenu = projectNavMenu(dao.listProjects(), path) - styleSheets = listOf("projects") javascript = "issue-editor" render("issue-form") } diff -r 0523585f1742 -r 1f1bce90127e src/main/kotlin/de/uapcore/lightpit/servlet/SettingsServlet.kt --- a/src/main/kotlin/de/uapcore/lightpit/servlet/SettingsServlet.kt Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/servlet/SettingsServlet.kt Sat Feb 21 13:41:41 2026 +0100 @@ -49,7 +49,6 @@ request.locale, sessionTimezone(http) ) - styleSheets = listOf("settings") render("settings") } } diff -r 0523585f1742 -r 1f1bce90127e src/main/webapp/WEB-INF/jsp/about.jsp --- a/src/main/webapp/WEB-INF/jsp/about.jsp Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/webapp/WEB-INF/jsp/about.jsp Sat Feb 21 13:41:41 2026 +0100 @@ -26,6 +26,7 @@ <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +

LightPIT

@@ -65,3 +66,4 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +
diff -r 0523585f1742 -r 1f1bce90127e src/main/webapp/WEB-INF/jsp/site.jsp --- a/src/main/webapp/WEB-INF/jsp/site.jsp Fri Feb 20 16:30:17 2026 +0100 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Sat Feb 21 13:41:41 2026 +0100 @@ -51,9 +51,6 @@ <%-- Define an alias for the optional redirect location --%> -<%-- Define an alias for the additional stylesheet --%> - - <%-- Define an alias for the optional JS file --%> @@ -80,11 +77,6 @@ - - - - -