Tighten question and answer spacing

README.md

@@ -22,6 +22,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.7.1).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.8.3).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/sql/updates/mysql/1.8.0.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.8.0.

administrator/components/com_testquestions/sql/updates/mysql/1.8.1.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.8.1.

administrator/components/com_testquestions/sql/updates/mysql/1.8.2.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.8.2.

administrator/components/com_testquestions/sql/updates/mysql/1.8.3.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.8.3.

com_testquestions.xml

@@ -4,7 +4,7 @@
     <creationDate>2026-10-14</creationDate>
     <author>Komponent</author>
     <license>GNU General Public License version 2 or later</license>
-    <version>1.7.1</version>
+    <version>1.8.3</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>
@@ -13,6 +13,9 @@
         <folder>tmpl</folder>
         <folder>language</folder>
     </files>
+    <media destination="com_testquestions" folder="components/com_testquestions/media">
+        <filename>egzamin.css</filename>
+    </media>
     <administration>
         <menu link="index.php?option=com_testquestions&amp;view=questions">COM_TESTQUESTIONS</menu>
         <files folder="administrator/components/com_testquestions">

components/com_testquestions/media/egzamin.css

@@ -0,0 +1,186 @@
+.com-testquestions {
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .testquestion {
+    display: block;
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .timer-container {
+    position: relative;
+    width: 120px;
+    height: 120px;
+    margin: auto;
+}
+
+.com-testquestions .timer-text {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 24px;
+    color: #003366;
+    font-weight: bold;
+}
+
+.com-testquestions .progress-ring__circle {
+    transition: stroke-dashoffset 1s linear;
+    transform: rotate(-90deg);
+    transform-origin: 50% 50%;
+}
+
+.com-testquestions .foto_pyt {
+    margin: 5px auto;
+    border: 2px #d4d4d4 none;
+    border-radius: 4px;
+    width: 98%;
+    padding: 5px;
+    text-align: center;
+}
+
+.com-testquestions .foto_pyt img {
+    max-width: 100%;
+    height: auto;
+}
+
+.com-testquestions .pyt {
+    background-color: #4a86cf;
+    font-size: 18px;
+    margin: 25px 5px 11px;
+    border: 1px #dfe3e7 solid;
+    border-radius: .25rem;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px;
+    text-align: left;
+    color: white;
+    box-shadow: 4px 4px 4px rgba(0, 0, 0, .4);
+}
+
+.com-testquestions .pyt h2 {
+    margin: 0;
+    color: inherit;
+    font-size: inherit;
+}
+
+.com-testquestions .question-header {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+}
+
+.com-testquestions .question-number {
+    flex: 0 0 auto;
+    white-space: nowrap;
+    font-weight: 700;
+}
+
+.com-testquestions .question-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.com-testquestions .question-text > :first-child {
+    margin-top: 0;
+}
+
+.com-testquestions .question-text > :last-child {
+    margin-bottom: 0;
+}
+
+.com-testquestions .odp,
+.com-testquestions .odpp,
+.com-testquestions .odpu,
+.com-testquestions .odpup {
+    font-size: 16px;
+    margin: 5px;
+    border: 1px #dfe3e7 solid;
+    border-radius: .25rem;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px;
+    text-align: left;
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, .2);
+}
+
+.com-testquestions .odp {
+    color: #4a86cf;
+}
+
+.com-testquestions .odpp {
+    background-color: #dfdfdf;
+    border-color: #777;
+    color: #0000ff;
+}
+
+.com-testquestions .odpu {
+    background-color: #ff0000;
+    color: #fff;
+}
+
+.com-testquestions .odpup {
+    background-color: #02f002;
+    color: #000;
+}
+
+.com-testquestions .odp p,
+.com-testquestions .odpp p,
+.com-testquestions .odpu p,
+.com-testquestions .odpup p,
+.com-testquestions .odp input,
+.com-testquestions .odpp input,
+.com-testquestions .odpu input,
+.com-testquestions .odpup input {
+    margin: 0;
+}
+
+.com-testquestions .answer-list {
+    padding: 0;
+    list-style: none;
+}
+
+.com-testquestions .answer-list label {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+    cursor: pointer;
+}
+
+.com-testquestions .answer-list label input {
+    flex: 0 0 auto;
+    margin-top: .25rem;
+}
+
+.com-testquestions .answer-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.com-testquestions select.egzamin {
+    color: #4a86cf;
+    padding: 5px;
+    border: solid 1px #dfe3e7;
+    border-radius: .25rem;
+    width: 100%;
+    margin-bottom: 3px;
+    box-shadow: 4px 4px 4px rgba(0, 0, 0, .4);
+}
+
+.com-testquestions input.egzamin {
+    color: white;
+    background: #4a86cf;
+    padding: 5px;
+    border: solid 1px #dfe3e7;
+    border-radius: .25rem;
+    margin: 3px 10px 5px 0;
+    box-shadow: 4px 4px 4px rgba(0, 0, 0, .4);
+}
+
+.com-testquestions .test-result {
+    margin: 15px 5px;
+}

components/com_testquestions/src/View/Questions/HtmlView.php

@@ -42,6 +42,10 @@ class HtmlView extends BaseHtmlView
 
     public function display($tpl = null)
     {
+        $this->getDocument()->getWebAssetManager()->registerAndUseStyle(
+            'com_testquestions.exam',
+            'media/com_testquestions/egzamin.css'
+        );
         $this->items = $this->get('Items');
         $this->symbol = $this->get('State')->get('filter.test_symbol');
         $this->symbols = $this->get('TestSymbols');

components/com_testquestions/tmpl/questions/default.php

@@ -4,18 +4,18 @@ defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 ?>
-<div class="com-testquestions">
+<div class="com-testquestions egzamin">
     <h1><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS'); ?></h1>
     <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="get" class="mb-4">
         <label for="test-symbol" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TEST_SYMBOL'); ?></label>
         <div class="input-group">
-            <select id="test-symbol" name="test_symbol" class="form-select" required>
+            <select id="test-symbol" name="test_symbol" class="form-select egzamin" required>
                 <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_TEST_SYMBOL'); ?></option>
                 <?php foreach ($this->symbols as $symbol) : ?>
                     <option value="<?php echo htmlspecialchars($symbol->test_symbol, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $this->symbol === $symbol->test_symbol ? 'selected' : ''; ?>><?php echo htmlspecialchars($this->formatSheetLabel($symbol), ENT_QUOTES, 'UTF-8'); ?></option>
                 <?php endforeach; ?>
             </select>
-            <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SHOW_TEST'); ?></button>
+            <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SHOW_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
         </div>
     </form>
 
@@ -24,7 +24,7 @@ use Joomla\CMS\HTML\HTMLHelper;
     <?php elseif ($this->symbol !== '') : ?>
         <h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TEST_SHEET'); ?>: <?php echo htmlspecialchars($this->symbol, ENT_QUOTES, 'UTF-8'); ?></h2>
         <?php if ($this->results) : ?>
-            <div class="alert alert-success">
+            <div class="alert alert-success test-result">
                 <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT'); ?>:</strong>
                 <?php echo (int) $this->results['correct']; ?> / <?php echo (int) $this->results['total']; ?>
                 (<?php echo htmlspecialchars((string) $this->results['percentage'], ENT_QUOTES, 'UTF-8'); ?>%)
@@ -36,22 +36,30 @@ use Joomla\CMS\HTML\HTMLHelper;
     <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post">
     <?php foreach ($this->items as $number => $item) : ?>
         <article class="testquestion mb-4">
-            <h2><?php echo ($number + 1) . '. '; ?><?php echo $item->question; ?></h2>
+            <div class="pyt">
+                <div class="question-header">
+                    <span class="question-number"><?php echo ($number + 1) . '.'; ?></span>
+                    <div class="question-text"><?php echo $item->question; ?></div>
+                </div>
+            </div>
             <?php if ($item->image) : ?>
-                <img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy">
+                <div class="foto_pyt"><img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
             <?php endif; ?>
             <?php if ($item->question_type === 'open') : ?>
+                <div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
                     <label for="answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
                     <input type="text" id="answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $item->id; ?>]" class="form-control" value="<?php echo $this->results ? htmlspecialchars($this->results['items'][$item->id]['selected'], ENT_QUOTES, 'UTF-8') : ''; ?>">
+                </div>
             <?php else : ?>
-            <ol type="A" class="list-unstyled">
+            <ol type="A" class="answer-list">
                 <?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
                     <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
                     <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
-                    <li class="mb-2">
+                    <li class="<?php echo $isSelected && $this->results['items'][$item->id]['correct'] ? 'odpup' : ($isSelected ? 'odpu' : ($isCorrectAnswer ? 'odpp' : 'odp')); ?>">
                         <label>
                             <input type="radio" name="answers[<?php echo (int) $item->id; ?>]" value="<?php echo $answerIndex + 1; ?>" <?php echo $isSelected ? 'checked' : ''; ?>>
-                            <strong><?php echo chr(65 + $answerIndex); ?>.</strong> <?php echo $item->$answerField; ?>
+                            <strong><?php echo chr(65 + $answerIndex); ?>.</strong>
+                            <span class="answer-text"><?php echo $item->$answerField; ?></span>
                             <?php if ($isSelected) : ?>
                                 <span class="badge bg-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?></span>
                             <?php endif; ?>
@@ -77,7 +85,7 @@ use Joomla\CMS\HTML\HTMLHelper;
     <?php endforeach; ?>
         <input type="hidden" name="task" value="check">
         <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
-        <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'); ?></button>
+        <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
     </form>
     <?php endif; ?>
 </div>

egzamin.css

@@ -0,0 +1,177 @@
+.timer-container {
+	position: relative;
+	width: 120px;
+	height: 120px;
+	margin: auto;
+  }
+  
+  .timer-text {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	font-size: 24px;
+	color: #003366;
+	font-weight: bold;
+  }
+  
+  .progress-ring__circle {
+	transition: stroke-dashoffset 1s linear;
+	transform: rotate(-90deg);
+	transform-origin: 50% 50%;
+  }
+div.foto_pyt
+	{
+	  margin:5px;
+	  margin-left:auto;
+	  margin-right:auto;
+	  border:2px #d4d4d4 none;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 5px;
+	  
+	}
+div.pyt
+	{
+	  background-color:#4a86cf;
+	  font-size: 18px;
+	  margin:25px 5px 11px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius: .25rem;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  color:white;
+	  box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+	}
+div.odp
+	{
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius: .25rem;;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  color: #4a86cf;
+	  box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+	
+div.pyt p, div.odp p,div.odpp p, div.odp input,div.odpp input,div.odpup input{
+  margin: 0px;
+}
+
+div.odpp
+	{
+	  background-color:#dfdfdf;
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #777 solid;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  color:blue;
+	box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+div.odpu
+	{
+	  background-color:#ff0000;
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+div.odpup
+	{
+	  background-color:#02f002;
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+
+	select.egzamin
+	{
+		color:#4a86cf;
+		padding:5px;
+		border: solid 1px #dfe3e7;
+		border-radius: .25rem; 
+		width: -moz-available;
+		width: -webkit-fill-available;
+		margin-bottom: 3px;
+		box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+	}
+	input.egzamin
+	{
+		color: white;
+		background: #4a86cf;
+		padding:5px;
+		border: solid 1px #dfe3e7;
+		border-radius: .25rem; 
+		margin-top: 3px;
+		margin-bottom:5px;
+		margin-right:10px;
+		box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+	}
+	input#login{
+		box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+		margin-right:10px;
+	    
+	}
+.com-testquestions {
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .testquestion {
+    display: block;
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .pyt,
+.com-testquestions .odp,
+.com-testquestions .odpp,
+.com-testquestions .odpu,
+.com-testquestions .odpup {
+    box-sizing: border-box;
+}
+
+.com-testquestions .question-header {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+}
+
+.com-testquestions .question-number {
+    flex: 0 0 auto;
+    white-space: nowrap;
+    font-weight: 700;
+}
+
+.com-testquestions .question-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.com-testquestions .answer-list label {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+}
+
+.com-testquestions .answer-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}