Commit 2da44182 authored by Lukasz Waskiewicz's avatar Lukasz Waskiewicz
Browse files

refs #1454 ikony, alt dla img, zbędne tagi, lang na html

parent 3f8c717f
......@@ -13,7 +13,7 @@
<div class="middle-line" >
<div class="container">
<div class="navbar-header">
<a style="line-height: 50px;" th:href="@{/}" ><img th:src="@{/images/logo.png}" th:height="35px"/></a>
<a style="line-height: 50px;" th:href="@{/}" ><img th:src="@{/images/logo.png}" th:height="35px" alt="CoCoS Logo"/></a>
</div>
<div class="" id="navbar">
......
......@@ -42,7 +42,7 @@
</div>
<div class="col-sm-6">
<th:block th:if="*{media.type.mimeType == 'image'}">
<img th:src="@{/media/__*{media.name}__}" width="100%" />
<img th:src="@{/media/__*{media.name}__}" width="100%" alt="Media image"/>
</th:block>
<th:block th:if="*{media.type.mimeType == 'video'}">
<video controls="controls" th:src="@{/media/__*{media.name}__}" style="max-width: 100%; max-height: 100%;" />
......
<!DOCTYPE html >
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" lang="en">
<head>
<title th:text="#{cocos.portal.mainPage.title}">TITLE</title>
......
......@@ -11,24 +11,22 @@
<div class="middle-line">
<div class="container">
<div class="logo col-sm-3">
<a th:href="@{/}"><img th:src="@{/images/logo.png}" /></a>
<a th:href="@{/}"><img th:src="@{/images/logo.png}" alt="CoCoS logo"/></a>
</div>
<div th:if="${!#lists.contains(loginPages,#httpServletRequest.pathInfo)}">
<ul class="nav navbar-nav ">
<li>
<a th:classappend="${userSettingsHolder.currentSimulationData}?'dropdown-has-value':''" class="btn btn-default dropdown-toggle dropdown" type="button"
id="simulationDropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<a th:classappend="${userSettingsHolder.currentSimulationData}?'dropdown-has-value':''" class="btn btn-default dropdown-toggle dropdown" id="simulationDropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span
th:text="${userSettingsHolder.currentSimulationData}?${userSettingsHolder.currentSimulationData.name}:#{cocos.portal.mainMenu.simulation.select}">Select
simulation</span><span>&nbsp;</span> <icon class="fa fa-sm fa-caret-down "></icon>
simulation</span><span>&nbsp;</span> <i class="fa fa-sm fa-caret-down "/>
</a>
<ul class="dropdown-menu" aria-labelledby="simulationDropdownMenu">
<li th:each="simulation : ${avalibleSimulations}" th:with="isCurrentSimulation = ${userSettingsHolder.currentSimulationData} and ${simulation.businessId}==${userSettingsHolder.currentSimulationData.businessId}"
th:disabled="${isCurrentSimulation}"
th:classappend="${isCurrentSimulation}?'disabled':''">
<a th:if="${!isCurrentSimulation}" th:disabled="${isCurrentSimulation}" href="#" th:href="@{/simulation(simulationId=${simulation.businessId})}" th:text="${simulation.name}">simulation</a>
<a th:if="${isCurrentSimulation}" th:disabled="${isCurrentSimulation}" th:text="${simulation.name}">simulation</a>
<a th:if="${!isCurrentSimulation}" href="#" th:href="@{/simulation(simulationId=${simulation.businessId})}" th:text="${simulation.name}">simulation</a>
<a th:if="${isCurrentSimulation}" th:classappend="${isCurrentSimulation}?'disabled':''" th:text="${simulation.name}">simulation</a>
</li>
</ul>
<div class='simulation-tooltip' th:if="${userSettingsHolder.currentSimulationData} == null" th:text="#{cocos.portal.mainMenu.simulation.select}">Select
......@@ -45,7 +43,7 @@
<a aria-expanded="false" aria-haspopup="true" role="button" data-toggle="dropdown" class="dropdown-toggle" href="#"> <span
th:classappend="${requestURI == contextPath + '/simulation/tables/creation' || requestURI == contextPath + '/simulation/tables/explore' ? 'active':''}"
th:text="#{cocos.portal.mainMenu.simulation.options.tables}">User tables</span> <span>&nbsp;</span> <icon class="fa fa-sm fa-caret-down "></icon>
th:text="#{cocos.portal.mainMenu.simulation.options.tables}">User tables</span> <span>&nbsp;</span> <i class="fa fa-sm fa-caret-down "/>
</a>
<ul class="dropdown-menu">
......
......@@ -8,7 +8,7 @@
<body>
<div layout:fragment="modalTemplate(modalId)" th:assert="${!#strings.isEmpty(modalId)}">
<div class="modal fade" th:id="${modalId}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal fade" th:id="${modalId}" tabindex="-1" role="dialog" >
<div class="modal-dialog" role="document">
<div class="modal-content" layout:fragment="modalNestedContent">
<!-- CONTENT -->
......
......@@ -9,9 +9,7 @@
<div layout:fragment="body">
<article>
<h1 class="page-header">
<div th:text="#{cocos.portal.aboutProject.title}" />
</h1>
<h1 class="page-header" th:text="#{cocos.portal.aboutProject.title}"/>
<div th:include="conf:cocos.portal.about.text" />
</article>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment