Skip to content

merge 2025.06.x into 2025.12.x #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kkrebs wants to merge 1 commit into
base: 2025.12.x
Choose a base branch
from
+14 −14
Open

merge 2025.06.x into 2025.12.x #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion mir-layout/src/main/resources/META-INF/resources/mir-layout/scss/common/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,12 @@

#header_box {
margin: 20px auto 20px auto;
display:flex;
justify-content: space-between;
}
#project_logo_box {
float: left;
display: flex;
align-items: center;
a {
font-size: 18px;
&:hover,
Expand Down
4 changes: 1 addition & 3 deletions mir-layout/src/main/resources/META-INF/resources/mir-layout/scss/common/mir_top_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@
border: none;
margin: 0;
padding: 0;
float: right;

// navigation container
nav
{
padding-left: 0px; // align to left
padding-right: 0px; // align to right
padding: 0;

// right menu
ul.float-end > li {
Expand Down
18 changes: 9 additions & 9 deletions mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@

<xsl:template name="mir.navigation">

<div id="header_box" class="clearfix container">
<div id="options_nav_box" class="mir-prop-nav">
<nav>
<ul class="navbar-nav ms-auto flex-row">
<xsl:call-template name="mir.loginMenu" />
<xsl:call-template name="mir.languageMenu" />
</ul>
</nav>
</div>
<div id="header_box" class="container">
<div id="project_logo_box">
<a href="{concat($WebApplicationBaseURL,substring($loaded_navigation_xml/@hrefStartingPage,2))}">
<span id="logo_mir">mir</span>
<span id="logo_modul">mycore</span>
<span id="logo_slogan">mods institutional repository</span>
</a>
</div>
<div id="options_nav_box" class="mir-prop-nav">
<nav class="navbar navbar-light navbar-expand-sm">
<ul class="navbar-nav">
<xsl:call-template name="mir.loginMenu" />
<xsl:call-template name="mir.languageMenu" />
</ul>
</nav>
</div>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
Expand Down
1 change: 0 additions & 1 deletion mir-module/src/main/resources/xsl/layout/mir-common-layout.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<xsl:variable xmlns:encoder="xalan://java.net.URLEncoder" name="loginURL"
select="concat( $ServletsBaseURL, 'MCRLoginServlet?url=', encoder:encode( string( $RequestURL ) ) )" />
<xsl:choose>
<xsl:when test="contains($RequestURL, 'MCRLoginServlet') and mcrxsl:isCurrentUserGuestUser()"></xsl:when>
<xsl:when test="mcrxsl:isCurrentUserGuestUser()">
<li class="nav-item">
<a id="loginURL" class="nav-link" href="{$loginURL}">
Expand Down
Loading