Skip to content

Commit

Permalink
correction validateHTML and index.html
Browse files Browse the repository at this point in the history
  • Loading branch information
@aablatov
aablatov committed Mar 15, 2023
1 parent 818b0d4 commit 7af2d11
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 69 deletions.
148 changes: 80 additions & 68 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<link rel="shortcut icon" id="gameIcon" type="image/x-icon" href="resources/favicon-normal.png">
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>1255: Rise of Teutonics</title>
<link rel="stylesheet" type="text/css" href="./css/normalize.min.css"/>
<link rel="stylesheet" type="text/css" href="./css/game.css"/>
<link rel="stylesheet" type="text/css" href="./css/hire.css"/>
<link rel="stylesheet" type="text/css" href="./css/inn.css" />
<link rel="stylesheet" type="text/css" href="./css/normalize.min.css">
<link rel="stylesheet" type="text/css" href="./css/game.css">
<link rel="stylesheet" type="text/css" href="./css/hire.css">
<link rel="stylesheet" type="text/css" href="./css/inn.css">
<script src="https://browser.sentry-cdn.com/5.1.2/bundle.min.js" crossorigin="anonymous"></script>
<script>
'use strict';
Expand Down Expand Up @@ -95,11 +95,13 @@ <h3><div id="labelSettings">Settings</div></h3>
<option id="optionLngFr" value="fr-FR">Français</option>
</select>
<table>
<tbody>
<tr>
<td width="40%"><label id="labelAutosave">Autosave</label><img id="autosaveImg" onclick="changeAutosave()" src="resources/button_red.png" style="margin-left: 20px;"></td>
<td><button id="buttonExportGame" onclick="exportGame()" type="button">Export Game</button></td>
<td><button id="buttonImportGame" onclick="importGame()" type="button">Import Game</button></td>
</tr>
</tbody>
</table>
<button id="buttonSaveToCloud" onclick="cloudQuickSave()" style="margin-bottom:20px; margin-top:15px;" type="button">Save to Cloud</button>
<button id="buttonLoadFromCloud" onclick="cloudQuickLoad()" style="margin-left:30px; margin-bottom:20px; margin-top:15px;" type="button">Load save from Cloud</button>
Expand Down Expand Up @@ -131,52 +133,53 @@ <h3><div id="labelSettings">Settings</div></h3>
<label id="lblSoundMenu">Sound effects and music</label><br>
<!--Note, those above overwrite those below-->
<table border="0" width="100%">
<tbody>
<tr>
<td width="60%"><label id="lblOption">Option</label></td>
<td width="20%"><label id="lblOn">On</label></td>
<td width="20%"><label id="lblOff">Off</label></td>
</tr>
<tr>
<td width="60%"><label id="lblSfxAll">All sound effects</label></td>
<td width="20%"><input type = "radio"
name = "sfx"
id = "sfx_on"
value = "on"
onchange="game.setupAudio('sfx','all',1)"/></td>
<td width="20%"><input type = "radio"
name = "sfx"
id = "sfx_off"
value = "off"
<td width="20%"><input type="radio"
name="sfx"
id="sfx_on"
value="on"
onchange="game.setupAudio('sfx','all',1)"></td>
<td width="20%"><input type="radio"
name="sfx"
id="sfx_off"
value="off"
onchange="game.setupAudio('sfx','all',0)"
checked = "checked" /></td>
checked="checked"></td>
</tr>
<tr>
<td width="60%"><label id="lblSfxEvt">Effects on all events</label></td>
<td width="20%"><input type = "radio"
name = "sfx_events"
id = "sfx_events_on"
value = "on"
onchange="game.setupAudio('sfx','events',1)"/></td>
<td width="20%"><input type = "radio"
name = "sfx_events"
id = "sfx_events_off"
value = "off"
<td width="20%"><input type="radio"
name="sfx_events"
id="sfx_events_on"
value="on"
onchange="game.setupAudio('sfx','events',1)"></td>
<td width="20%"><input type="radio"
name="sfx_events"
id="sfx_events_off"
value="off"
onchange="game.setupAudio('sfx','events',0)"
checked = "checked" /></td>
checked="checked"></td>
</tr>
<tr>
<td width="60%"><label id="lblSfxEvtAR">Effects on action required events</label></td>
<td width="20%"><input type = "radio"
name = "sfx_actions"
id = "sfx_actions_on"
value = "on"
onchange="game.setupAudio('sfx','actions',1)"/></td>
<td width="20%"><input type = "radio"
name = "sfx_actions"
id = "sfx_actions_off"
value = "off"
<td width="20%"><input type="radio"
name="sfx_actions"
id="sfx_actions_on"
value="on"
onchange="game.setupAudio('sfx','actions',1)"></td>
<td width="20%"><input type="radio"
name="sfx_actions"
id="sfx_actions_off"
value="off"
onchange="game.setupAudio('sfx','actions',0)"
checked = "checked" /></td>
checked="checked"></td>
</tr>
<tr>
<td width="60%">-----</td>
Expand All @@ -185,32 +188,33 @@ <h3><div id="labelSettings">Settings</div></h3>
</tr>
<tr>
<td width="60%"><label id="lblMscAll">Music all</label></td>
<td width="20%"><input type = "radio"
name = "music_all"
id = "music_on"
value = "on"
onchange="game.setupAudio('music','all',1)"/></td>
<td width="20%"><input type = "radio"
name = "music_all"
id = "music_off"
value = "off"
<td width="20%"><input type="radio"
name="music_all"
id="music_on"
value="on"
onchange="game.setupAudio('music','all',1)"></td>
<td width="20%"><input type="radio"
name="music_all"
id="music_off"
value="off"
onchange="game.setupAudio('music','all',0)"
checked = "checked" /></td>
checked="checked"></td>
</tr>
<tr>
<td width="60%"><label id="lblMscScr">Lore and scenery music</label></td>
<td width="20%"><input type = "radio"
name = "music_script"
id = "music_scripts_on"
<td width="20%"><input type="radio"
name="music_script"
id="music_scripts_on"
onchange="game.setupAudio('music','scripts',1)"
value = "on" /></td>
<td width="20%"><input type = "radio"
name = "music_script"
id = "music_scripts_off"
value = "off"
value="on"></td>
<td width="20%"><input type="radio"
name="music_script"
id="music_scripts_off"
value="off"
onchange="game.setupAudio('music','scripts',0)"
checked = "checked" /></td>
checked="checked"></td>
</tr>
</tbody>
</table>
<br>
<hr>
Expand All @@ -220,6 +224,7 @@ <h3><div id="labelSettings">Settings</div></h3>
<h3><div id="labelGarrison">Garrison</div></h3>
<div id="divtreasuryGuard">
<table border="1">
<tbody>
<tr>
<td>
<div id="treasury_guard_div" align="center">
Expand All @@ -234,31 +239,34 @@ <h3><div id="labelGarrison">Garrison</div></h3>
<button id="buttonHireGuard" onclick="game.hireTreasuryGuard()" style="width:100px" type="button">Hire</button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div id="tabFirebrigade" class="tab">
<h3><label id="lblFirebrigade">Fire brigade</label></h3>
<table border="0" width="100%">
<tbody>
<tr>
<td width="60%"><label id="lblFBOption">The fire service is</label></td>
<td width="20%"><label id="lblFBOn">on duty</label></td>
<td width="20%"><label id="lblFBOff">off duty</label></td>
</tr>
<tr>
<td width="60%"></td>
<td width="20%"><input type = "radio"
name = "inp_fb"
id = "fb_on"
value = "on"
onchange="game.setupFirebrigade(1)"/></td>
<td width="20%"><input type = "radio"
name = "inp_fb"
id = "fb_off"
value = "off"
<td width="20%"><input type="radio"
name="inp_fb"
id="fb_on"
value="on"
onchange="game.setupFirebrigade(1)"></td>
<td width="20%"><input type="radio"
name="inp_fb"
id="fb_off"
value="off"
onchange="game.setupFirebrigade(0)"
checked = "checked" /></td>
checked="checked"></td>
</tr>
</tbody>
</table>
<br>
<label id="lblFBUpKeepPrice">The price of sustain of the service is:</label><label id="lblFBUpkeepPriceValue" style="margin-left:20px;">0</label>
Expand Down Expand Up @@ -457,14 +465,17 @@ <h3 id="lblTabInn">Welcome to Inn!</h3>
<div id="hireHeroBlock">
<label id="lblAvailableForHire">Hero for hire</label>
<table>
<tbody>
<tr>
<td style="width: 300px;">
<!-- <td class="heroPhoto"> -->
<td width="39%">
<!--HRP-->
<img id="imgPrevHero" src="resources/pointer_l.png" onclick="prevHero()">
<img id="imgHeroForHire" src="resources/hero-knight.png">
<img id="imgNextHero" src="resources/pointer_r.png" onclick="nextHero()">
</td>
<td style="width: 455px;">
<td width="61%">
<!-- <td class="heroInfo"></td> -->
<div>
<label id="lblClassForHire">Knight</label>
<label>, </label>
Expand All @@ -479,6 +490,7 @@ <h3 id="lblTabInn">Welcome to Inn!</h3>
</div>
</td>
</tr>
</tbody>
</table>
<button id="btnHireHero" class="btn" onclick="game.heroHire()" style="width:160px; margin-left: 70px" type="button">Hire hero %arg1 level</button>
</div>
Expand Down Expand Up @@ -693,7 +705,7 @@ <h3 id="lblTabInn">Welcome to Inn!</h3>
<div id="chatForm" class="info-panel__form">
<label id="inp_nickname"></label>
<div class="info-panel__form-msg">
<input type="text" id="msg_out"/>
<input type="text" id="msg_out">
</div>
<button id="btnSend" onclick="sendOnClick2()" class="btn" type="button">Send</button>
</div>
Expand Down Expand Up @@ -767,7 +779,7 @@ <h3 id="lblTabInn">Welcome to Inn!</h3>
gtag('config', 'UA-111661515-1');
</script>
<!-- Yandex.Metrika counter. The same -->
<script type="text/javascript" >
<script>
(function (d, w, c) {
(w[c] = w[c] || []).push(function() {
try {
Expand All @@ -793,7 +805,7 @@ <h3 id="lblTabInn">Welcome to Inn!</h3>
</script>
<noscript>
<div>
<img src="https://mc.yandex.ru/watch/47225574" style="position:absolute; left:-9999px;" alt="" />
<img src="https://mc.yandex.ru/watch/47225574" style="position:absolute; left:-9999px;" alt="">
</div>
</noscript>
<!-- /Yandex.Metrika counter -->
Expand Down
3 changes: 2 additions & 1 deletion tests/tests_cypress/validateHTML/cypress/e2e/validateHTML.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ describe("validate", () => {
'attribute-boolean-style':'warn',
'no-inline-style':'warn',
'valid-id':'warn',
'void-style':'warn'
'void-style':'warn',
'no-dup-id':'warn'

}
},
Expand Down

0 comments on commit 7af2d11

Please sign in to comment.