hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove one of two lang menus; add l10n message

Browse Source
This commit is contained in:
Ivan Masár
2014-10-21 01:11:30 +02:00
parent 182e79ea96
commit 0f66539ee4
4 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace-api/src/main/resources/Messages.properties
View File

@@ -626,6 +626,7 @@ jsp.layout.navbar-default.help = Help
jsp.layout.navbar-default.home = Home jsp.layout.navbar-default.home = Home
jsp.layout.navbar-default.loggedin = Logged in as {0} jsp.layout.navbar-default.loggedin = Logged in as {0}
jsp.layout.navbar-default.logout = Logout jsp.layout.navbar-default.logout = Logout
jsp.layout.navbar-default.language = Language
jsp.layout.navbar-default.receive = Receive email<br/>updates jsp.layout.navbar-default.receive = Receive email<br/>updates
jsp.layout.navbar-default.search = Search&nbsp;DSpace jsp.layout.navbar-default.search = Search&nbsp;DSpace
jsp.layout.navbar-default.sign = Sign on to: jsp.layout.navbar-default.sign = Sign on to:

20
dspace-jspui/src/main/webapp/home.jsp
View File

@@ -40,7 +40,6 @@
<% <%
Community[] communities = (Community[]) request.getAttribute("communities"); Community[] communities = (Community[]) request.getAttribute("communities");
Locale[] supportedLocales = I18nUtil.getSupportedLocales();
Locale sessionLocale = UIUtil.getSessionLocale(request); Locale sessionLocale = UIUtil.getSessionLocale(request);
Config.set(request.getSession(), Config.FMT_LOCALE, sessionLocale); Config.set(request.getSession(), Config.FMT_LOCALE, sessionLocale);
String topNews = NewsManager.readNewsFile(LocaleSupport.getLocalizedMessage(pageContext, "news-top.html")); String topNews = NewsManager.readNewsFile(LocaleSupport.getLocalizedMessage(pageContext, "news-top.html"));
@@ -60,25 +59,6 @@
<dspace:layout locbar="nolink" titlekey="jsp.home.title" feedData="<%= feedData %>"> <dspace:layout locbar="nolink" titlekey="jsp.home.title" feedData="<%= feedData %>">
<% if (supportedLocales != null && supportedLocales.length > 1)
{
%>
<form method="get" name="repost" action="">
<input type ="hidden" name ="locale"/>
</form>
<%
for (int i = supportedLocales.length-1; i >= 0; i--)
{
%>
<a class ="langChangeOn"
onclick="javascript:document.repost.locale.value='<%=supportedLocales[i].toString()%>';
document.repost.submit();">
<%= supportedLocales[i].getDisplayLanguage(supportedLocales[i])%>
</a> &nbsp;
<%
}
}
%>
<div class="jumbotron"> <div class="jumbotron">
<%= topNews %> <%= topNews %>
</div> </div>

2
dspace-jspui/src/main/webapp/layout/navbar-default.jsp
View File

@@ -121,7 +121,7 @@
<div class="nav navbar-nav navbar-right"> <div class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">LANG<b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><fmt:message key="jsp.layout.navbar-default.language"/><b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<% <%
for (int i = supportedLocales.length-1; i >= 0; i--) for (int i = supportedLocales.length-1; i >= 0; i--)

10
dspace-jspui/src/main/webapp/styles.css
View File

@@ -66,16 +66,6 @@ UL { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-family: "verdana", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt } font-size: 10pt }
.langChangeOff { text-decoration: none;
color : #bbbbbb;
cursor : default;
font-size: 10pt }
.langChangeOn { text-decoration: underline;
color: #336699;
cursor: pointer;
font-size: 10pt }
.pageBanner { width: 100%; .pageBanner { width: 100%;
border: 0; border: 0;
margin: 0; margin: 0;