zmiany w sablonach i poprawki w ocr

templates/list.html

@@ -118,26 +118,26 @@
     </div>
 
     <div class="btn-group btn-group-sm" role="group">
-      {% if item.not_purchased %}
-      <button type="button" class="btn btn-outline-success" {% if list.is_archived %}disabled{% else
-        %}onclick="unmarkNotPurchased({{ item.id }})" {% endif %}>
-        ✅ Przywróć
+      {% if not is_share %}
+      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else %}
+        onclick="editItem({{ item.id }}, '{{ item.name }}', {{ item.quantity or 1 }})" {% endif %}>
+        ✏️
       </button>
-      {% else %}
-      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else
-        %}onclick="markNotPurchasedModal(event, {{ item.id }})" {% endif %}>
-        ⚠️
+      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else %}
+        onclick="deleteItem({{ item.id }})" {% endif %}>
+        🗑️
       </button>
       {% endif %}
 
-      {% if not is_share %}
-      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else
-        %}onclick="editItem({{ item.id }}, '{{ item.name }}', {{ item.quantity or 1 }})" {% endif %}>
-        ✏️
+      {% if item.not_purchased %}
+      <button type="button" class="btn btn-outline-light me-auto" {% if list.is_archived %}disabled{% else %}
+        onclick="unmarkNotPurchased({{ item.id }})" {% endif %}>
+        ✅ Przywróć
       </button>
-      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else
-        %}onclick="deleteItem({{ item.id }})" {% endif %}>
-        🗑️
+      {% elif not item.not_purchased %}
+      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else %}
+        onclick="markNotPurchasedModal(event, {{ item.id }})" {% endif %}>
+        ⚠️
       </button>
       {% endif %}
     </div>

templates/list_share.html

@@ -53,21 +53,23 @@
 
     <div class="btn-group btn-group-sm" role="group">
       {% if item.not_purchased %}
-      <button type="button" class="btn btn-outline-success" {% if list.is_archived %}disabled{% else
-        %}onclick="unmarkNotPurchased({{ item.id }})" {% endif %}>
+      <button type="button" class="btn btn-outline-light me-auto" {% if list.is_archived %}disabled{% else %}
+        onclick="unmarkNotPurchased({{ item.id }})" {% endif %}>
         ✅ Przywróć
       </button>
       {% else %}
-      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else
-        %}onclick="markNotPurchasedModal(event, {{ item.id }})" {% endif %}>
+      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else %}
+        onclick="markNotPurchasedModal(event, {{ item.id }})" {% endif %}>
         ⚠️
       </button>
-      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else
-        %}onclick="openNoteModal(event, {{ item.id }})" {% endif %}>
+      {% endif %}
+
+      <button type="button" class="btn btn-outline-light" {% if list.is_archived %}disabled{% else %}
+        onclick="openNoteModal(event, {{ item.id }})" {% endif %}>
         📝
       </button>
-      {% endif %}
     </div>
+
   </li>
   {% else %}
   <li id="empty-placeholder" class="list-group-item bg-dark text-secondary text-center w-100">

templates/user_expenses.html

@@ -34,29 +34,32 @@
           <div class="card-body">
 
             <div class="d-flex flex-wrap gap-2 mb-3">
-              <button class="btn btn-outline-light btn-sm filter-btn active" data-range="all">Wszystko</button>
-              <button class="btn btn-outline-light btn-sm filter-btn" data-range="day">🗓️ Dzień</button>
-              <button class="btn btn-outline-light btn-sm filter-btn" data-range="week">📆 Tydzień</button>
-              <button class="btn btn-outline-light btn-sm filter-btn" data-range="month">📅 Miesiąc</button>
-              <button class="btn btn-outline-light btn-sm filter-btn" data-range="year">📈 Rok</button>
+              <button class="btn btn-outline-light btn-sm range-btn active" data-range="all">🌐 Wszystko</button>
+              <button class="btn btn-outline-light btn-sm range-btn" data-range="day">🗓️ Dzień</button>
+              <button class="btn btn-outline-light btn-sm range-btn" data-range="week">📆 Tydzień</button>
+              <button class="btn btn-outline-light btn-sm range-btn" data-range="month">📅 Miesiąc</button>
+              <button class="btn btn-outline-light btn-sm range-btn" data-range="year">📈 Rok</button>
             </div>
 
-            <div class="row g-2 mb-3">
-              <div class="col-6 col-md-3">
-                <input type="date" id="customStart" class="form-control bg-dark text-white border-secondary rounded"
-                  placeholder="Data od">
-              </div>
-              <div class="col-6 col-md-3">
-                <input type="date" id="customEnd" class="form-control bg-dark text-white border-secondary rounded"
-                  placeholder="Data do">
-              </div>
-              <div class="col-12 col-md-3">
-                <button class="btn btn-outline-light w-100" id="applyCustomRange">📊 Zastosuj zakres</button>
-              </div>
-            </div>
-            <div class="form-check mb-3">
+            <!-- Tu: checkbox w jednej linii lub wycentrowany -->
+            <div class="form-check form-switch mb-3">
               <input class="form-check-input" type="checkbox" id="onlyWithExpenses">
-              <label class="form-check-label ms-2" for="onlyWithExpenses">Pokaż tylko listy z wydatkami</label>
+              <label class="form-check-label ms-2 text-white" for="onlyWithExpenses">Pokaż tylko listy z
+                wydatkami</label>
+            </div>
+
+            <div class="input-group input-group-sm mb-3 w-100" style="max-width: 570px;">
+              <span class="input-group-text bg-secondary text-white border-secondary">Od</span>
+              <input type="date" class="form-control bg-dark text-white border-secondary flex-grow-1" id="customStart">
+              <span class="input-group-text bg-secondary text-white border-secondary">Do</span>
+              <input type="date" class="form-control bg-dark text-white border-secondary flex-grow-1" id="customEnd">
+              <button class="btn btn-outline-success" id="applyCustomRange">📊 Zastosuj zakres</button>
+            </div>
+
+            <div class="d-flex justify-content-end mb-2">
+              <button id="toggleAllCheckboxes" class="btn btn-outline-light btn-sm">
+                ✅ Zaznacz wszystkie
+              </button>
             </div>
             <div class="table-responsive">
               <table class="table table-dark table-striped align-middle">
@@ -106,29 +109,29 @@
           </div>
         </div>
 
-        <div class="d-flex flex-wrap gap-2 mb-4">
+        <!-- Przyciski zakresu czasu -->
+        <div class="d-flex flex-wrap gap-2 mb-3">
           <button class="btn btn-outline-light btn-sm range-btn active" data-range="monthly">📅 Miesięczne</button>
-          <button class="btn btn-outline-light btn-sm range-btn" data-range="quarterly">📆 Kwartalne</button>
+          <button class="btn btn-outline-light btn-sm range-btn" data-range="quarterly">📊 Kwartalne</button>
           <button class="btn btn-outline-light btn-sm range-btn" data-range="halfyearly">🗓️ Półroczne</button>
           <button class="btn btn-outline-light btn-sm range-btn" data-range="yearly">📈 Roczne</button>
         </div>
 
-        <div class="row g-2 mb-4">
-          <div class="col-6 col-md-3">
-            <input type="date" id="startDate" class="form-control bg-dark text-white border-secondary rounded">
-          </div>
-          <div class="col-6 col-md-3">
-            <input type="date" id="endDate" class="form-control bg-dark text-white border-secondary rounded">
-          </div>
-          <div class="col-12 col-md-3">
-            <button class="btn btn-outline-light w-100" id="customRangeBtn">📊 Zakres własny</button>
-          </div>
+        <!-- Picker daty w formie input-group -->
+        <div class="input-group input-group-sm mb-4 w-100" style="max-width: 570px;">
+          <span class="input-group-text bg-secondary text-white border-secondary">Od</span>
+          <input type="date" class="form-control bg-dark text-white border-secondary flex-grow-1" id="startDate">
+          <span class="input-group-text bg-secondary text-white border-secondary">Do</span>
+          <input type="date" class="form-control bg-dark text-white border-secondary flex-grow-1" id="endDate">
+          <button class="btn btn-outline-success" id="customRangeBtn">📊 Pokaż dane z zakresu</button>
         </div>
-      </div>
 
+      </div>
     </div>
+
   </div>
 </div>
+</div>
 {% endblock %}
 
 {% block scripts %}