changeset
#104 changes base layout from fixed to grid
Mon, 09 Aug 2021 16:57:56 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Mon, 09 Aug 2021 16:57:56 +0200
- changeset 217
- a5ad7cd5d000
- parent 216
- 6357d2fd84f2
- child 218
- 0e4a9b6f7a12
#104 changes base layout from fixed to grid
1.1 --- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Mon Aug 09 16:28:42 2021 +0200 1.2 +++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Mon Aug 09 16:57:56 2021 +0200 1.3 @@ -32,6 +32,7 @@ 1.4 <li>Im Vorgangseditor kann nun direkt ein Kommentar hinterlassen werden.</li> 1.5 <li>Verbesserte Vorgangsansicht.</li> 1.6 <li>Sortierreihenfolge der Versionen in der Übersicht an die Sortierreihenfolge im Seitenmenü angeglichen.</li> 1.7 + <li>Das Seitenmenü benutzt nur noch so viel Platz, wie es braucht.</li> 1.8 <li>Duplikate in Komponenten- und Versionslisten behoben.</li> 1.9 <li>Fehler beim Laden der Versionsinformationen für bestehende Vorgänge behoben.</li> 1.10 <li>Fehler behoben, bei dem vorbereitete Datenbankabfragen nicht geschlossen wurden.</li>
2.1 --- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf Mon Aug 09 16:28:42 2021 +0200 2.2 +++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf Mon Aug 09 16:57:56 2021 +0200 2.3 @@ -32,6 +32,7 @@ 2.4 <li>Adds possibility to leave a comment when editing an issue.</li> 2.5 <li>Improves Issue View.</li> 2.6 <li>Changes sort order of versions in the versions overview to be the same as in the left menu.</li> 2.7 + <li>Removes unused width from the left menu.</li> 2.8 <li>Fixes duplicates in the components and versions lists.</li> 2.9 <li>Fixes issue form not loaded with the correct version info.</li> 2.10 <li>Fixes leaking prepared statements.</li>
3.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Mon Aug 09 16:28:42 2021 +0200 3.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Mon Aug 09 16:57:56 2021 +0200 3.3 @@ -31,7 +31,7 @@ 3.4 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> 3.5 3.6 <%-- Version suffix for forcing browsers to update the CSS / JS files --%> 3.7 -<c:set scope="page" var="versionSuffix" value="20210809"/> 3.8 +<c:set scope="page" var="versionSuffix" value="20210809b"/> 3.9 3.10 <%-- Make the base href easily available at request scope --%> 3.11 <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/> 3.12 @@ -90,41 +90,41 @@ 3.13 </c:if> 3.14 </head> 3.15 <body> 3.16 -<div id="mainMenu"> 3.17 - <div class="menuEntry" 3.18 - <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> > 3.19 - <a href="projects/"> 3.20 - <fmt:message key="menu.projects"/> 3.21 - </a> 3.22 + <div id="body-area"> 3.23 + <div id="mainMenu"> 3.24 + <div class="menuEntry" 3.25 + <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> > 3.26 + <a href="projects/"> 3.27 + <fmt:message key="menu.projects"/> 3.28 + </a> 3.29 + </div> 3.30 + <div class="menuEntry" 3.31 + <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> > 3.32 + <a href="users/"> 3.33 + <fmt:message key="menu.users"/> 3.34 + </a> 3.35 + </div> 3.36 + <div class="menuEntry" 3.37 + <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> > 3.38 + <a href="language/"> 3.39 + <fmt:message key="menu.languages"/> 3.40 + </a> 3.41 + </div> 3.42 + <div class="menuEntry" 3.43 + <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> > 3.44 + <a href="about/"> 3.45 + <fmt:message key="menu.about"/> 3.46 + </a> 3.47 + </div> 3.48 + </div> 3.49 + <c:if test="${not empty navMenu}"> 3.50 + <div id="sideMenu"> 3.51 + <%@include file="../jspf/navmenu.jspf" %> 3.52 + </div> 3.53 + </c:if> 3.54 + <div id="content-area"> 3.55 + <c:import url="${contentPage}"/> 3.56 + </div> 3.57 </div> 3.58 - <div class="menuEntry" 3.59 - <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> > 3.60 - <a href="users/"> 3.61 - <fmt:message key="menu.users"/> 3.62 - </a> 3.63 - </div> 3.64 - <div class="menuEntry" 3.65 - <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> > 3.66 - <a href="language/"> 3.67 - <fmt:message key="menu.languages"/> 3.68 - </a> 3.69 - </div> 3.70 - <div class="menuEntry" 3.71 - <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> > 3.72 - <a href="about/"> 3.73 - <fmt:message key="menu.about"/> 3.74 - </a> 3.75 - </div> 3.76 -</div> 3.77 -<div> 3.78 - <c:if test="${not empty navMenu}"> 3.79 - <div id="sideMenu"> 3.80 - <%@include file="../jspf/navmenu.jspf" %> 3.81 - </div> 3.82 - </c:if> 3.83 - <div id="content-area" <c:if test="${not empty navMenu}">class="sidebar-spacing"</c:if>> 3.84 - <c:import url="${contentPage}"/> 3.85 - </div> 3.86 -</div> 3.87 </body> 3.88 </html>
4.1 --- a/src/main/webapp/lightpit.css Mon Aug 09 16:28:42 2021 +0200 4.2 +++ b/src/main/webapp/lightpit.css Mon Aug 09 16:57:56 2021 +0200 4.3 @@ -64,6 +64,7 @@ 4.4 color: #1c204e; 4.5 margin: 0; 4.6 padding: 0; 4.7 + height: 100vh; 4.8 } 4.9 4.10 body { 4.11 @@ -83,9 +84,16 @@ 4.12 text-decoration: none; 4.13 } 4.14 4.15 +#body-area { 4.16 + display: grid; 4.17 + grid-template-columns: max-content auto; 4.18 + grid-template-rows: max-content 1fr; 4.19 + height: 100%; 4.20 +} 4.21 + 4.22 #mainMenu { 4.23 - position: fixed; 4.24 - z-index: 2; 4.25 + grid-row: 1; 4.26 + grid-column: 1 / span 2; 4.27 width: 100%; 4.28 display: flex; 4.29 flex-flow: row wrap; 4.30 @@ -93,35 +101,21 @@ 4.31 border-image-slice: 1; 4.32 border-bottom-style: solid; 4.33 border-bottom-width: thin; 4.34 + font-size: 1.2rem; 4.35 + background: #e0e0e5; 4.36 } 4.37 4.38 #sideMenu { 4.39 + grid-row: 2; 4.40 + grid-column: 1; 4.41 display: flex; 4.42 - z-index: 1; 4.43 flex-flow: column; 4.44 - position: fixed; 4.45 - height: 100%; 4.46 - width: 40ch; /* adjust with sidebar-spacing.margin-left */ 4.47 - padding-top: 2.25rem; 4.48 color: #3060f8; 4.49 border-image-source: linear-gradient(to bottom, #606060, rgba(60, 60, 60, .25)); 4.50 border-image-slice: 1; 4.51 border-right-style: solid; 4.52 border-right-width: thin; 4.53 -} 4.54 - 4.55 -#content-area.sidebar-spacing { 4.56 - margin-left: 40ch; /* adjust with sideMenu.width */ 4.57 -} 4.58 - 4.59 -#mainMenu { 4.60 - font-size: 1.2rem; 4.61 - background: #e0e0e5; 4.62 -} 4.63 - 4.64 -#sideMenu { 4.65 background: #f7f7ff; 4.66 - overflow-x: scroll; 4.67 } 4.68 4.69 #mainMenu .menuEntry { 4.70 @@ -132,6 +126,7 @@ 4.71 } 4.72 4.73 #sideMenu .menuEntry { 4.74 + padding-right: 1em; 4.75 padding-top: .25em; 4.76 padding-bottom: .25em; 4.77 border-bottom-style: solid; 4.78 @@ -160,7 +155,9 @@ 4.79 } 4.80 4.81 #content-area { 4.82 - padding: 2.75rem 1em 1em; 4.83 + grid-row: 2; 4.84 + grid-column: 2; 4.85 + padding: 1.5em; 4.86 } 4.87 4.88 button, a.button {
