Merge APP_V2/main: Combine quality updates with league features

- Merged remote changes: Liga krog3 and league state management
- Resolved merge conflicts in locale files and templates
- Kept local v1.0.1 version and styling improvements
- Added league combine functionality from remote
- Preserved new league_state.json and tournament_results.json
- Integrated i18n improvements

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-02-08 19:35:27 +01:00
17 changed files with 2913 additions and 49 deletions
+25 -2
View File
@@ -767,14 +767,22 @@
font-weight: bold;
transition: all 0.2s ease;
min-width: 200px;
text-decoration: none;
text-decoration: none !important;
font-family: Arial, sans-serif;
display: inline-block;
}
.action-btn:hover {
background: #1e7e34;
transform: translateY(-1px);
box-shadow: 0 4px 8px rgba(0, 123, 255, 0.3);
text-decoration: none !important;
}
.action-btn:focus,
.action-btn:active,
.action-btn:visited {
text-decoration: none !important;
}
.action-btn:disabled {
@@ -800,6 +808,16 @@
background: #c82333;
}
.action-btn.info {
background: #007bff;
border-color: #0056b3;
}
.action-btn.info:hover {
background: #0056b3;
box-shadow: 0 4px 8px rgba(0, 123, 255, 0.4);
}
.player-count {
margin: 20px 0;
font-size: 1.2rem;
@@ -1606,7 +1624,7 @@
<input type="checkbox"
class="joker-checkbox"
id="joker_{{ player_id }}"
{% if participant.joker_used %}disabled{% endif %}
{% if participant.joker_used %}disabled checked{% endif %}
data-player-id="{{ player_id }}">
</div>
{% endfor %}
@@ -1614,6 +1632,11 @@
</div>
<div class="action-buttons">
{% if league_state.completed_tournaments|length > 0 %}
<a href="/results" class="action-btn info">
📊 <span data-i18n="tournament.view_current_results">View Current Standings</span>
</a>
{% endif %}
<button class="action-btn success" onclick="startNextTournament()">
🚀 <span data-i18n="league.start_tournament_number">Začni Turnir</span> {{ league_state.current_tournament + 1 }}
</button>