Merge pull request #196 from gm3dmo/titlecase

Set appropriate values to titlecase
gm3dmo · Jun 4, 2024 · fdd155b · fdd155b
2 parents 8a4e270 + 6f88968
commit fdd155b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/cmp/static/cmp/css/base.css b/cmp/static/cmp/css/base.css
@@ -106,7 +106,7 @@
 
       .content-table th, 
       .content-table td {
-        padding: 12px;
+        padding: 4px;
       }
 
       .content-table tbody tr {
@@ -145,6 +145,10 @@
           position: relative;
           overflow: hidden;
       }
+
+      .small-font {
+      font-size: 6.2em;
+      }
 
       .glossy-button:after {
           content: "";

diff --git a/templates/cmp/edit-cemeteries.html b/templates/cmp/edit-cemeteries.html
@@ -11,8 +11,14 @@ <h3>Edit Cemetery</h3>
             {{ form.management_form }}
             {{ form.errors }}
             {{form | crispy}}
-            <button type="submit" class="btn btn-primary">Save</button>
+            <button type="submit" class="btn btn-primary">SAVE</button>
         </form>
     </div>
+    <div>
+      <form method="POST" action="{% url 'delete-cemetery' cemetery.id %}">
+        {% csrf_token %}
+        <button type="submit">DELETE</button>
+      </form>
+    </div>
     {% endblock %}
 </div>
diff --git a/templates/cmp/search-cemeteries.html b/templates/cmp/search-cemeteries.html
@@ -16,7 +16,7 @@ <h3> Search Cemeteries</h3>
 
    <div>
     <table class="content-table">
-      <thead class="">
+      <thead class="small-font">
         <tr>
           <th></th>
           <th>NAME</th>
@@ -27,8 +27,8 @@ <h3> Search Cemeteries</h3>
    {% for cemetery in page_obj %}
    <tr>
     <td><button class="glossy-button" onclick="location.href='{% url 'edit-cemeteries' cemetery.id %}'" type="button">EDIT</button></td>
-    <td><span class="soldier-info">{{ cemetery.name }}</span></td>
-    <td><span class="soldier-info">{{ cemetery.country.name }} {{cemetery.country.flag}} </span></td>
+    <td><span class="soldier-info">{{ cemetery.name|title }}</span></td>
+    <td><span class="soldier-info">{{ cemetery.country.name|title }} {{cemetery.country.flag}} </span></td>
   </tr>
    {% endfor %}
   </table>

diff --git a/templates/cmp/search-companies.html b/templates/cmp/search-companies.html
@@ -25,7 +25,7 @@ <h3>Search Companies</h3>
    {% for company in page_obj %}
    <tr>
     <td><button class="glossy-button" onclick="location.href='{% url 'edit-companies' company.id %}'" type="button">EDIT</button></td>
-    <td><span class="soldier-info">{{ company.name }}</span></td>
+    <td><span class="soldier-info">{{ company.name|title }}</span></td>
   </tr>
 
    {% endfor %}

diff --git a/templates/cmp/search-countries.html b/templates/cmp/search-countries.html
@@ -26,7 +26,7 @@ <h3>Search Countries</h3>
 {% for country in page_obj %}
     <tr>
       <td><button class="glossy-button" onclick="location.href='{% url 'edit-countries' country.id %}'" type="button">EDIT</button></td>
-      <td><span class="soldier-info">{{ country.name }}</span></td>
+      <td><span class="soldier-info">{{ country.name|title }}</span></td>
       <td><span class="soldier-info">{{ country.flag }}</span></td>
     </tr>
 {% endfor %}

diff --git a/templates/cmp/search-decorations.html b/templates/cmp/search-decorations.html
@@ -26,8 +26,8 @@ <h3>Search Decorations</h3>
 {% for decoration in page_obj %}
 <tr>
   <td><button class="glossy-button" onclick="location.href='{% url 'edit-decorations' decoration.id %}'" type="button">EDIT</button></td>
-  <td><span class="soldier-info">{{ decoration.name }}</span></td>
-  <td><span class="soldier-info">{{ decoration.country.flag }} {{ decoration.country.name }} </span></td>
+  <td><span class="soldier-info">{{ decoration.name}}</span></td>
+  <td><span class="soldier-info">{{ decoration.country.flag }} {{ decoration.country.name|title }} </span></td>
 </tr>
 {% endfor %}
 </table>

diff --git a/templates/cmp/search-prisoner-of-war-camps.html b/templates/cmp/search-prisoner-of-war-camps.html
@@ -25,8 +25,8 @@ <h3>Search Prisoner of War Camps</h3>
 {% for powcamp in page_obj %}
     <tr>
       <td><button class="glossy-button" onclick="location.href='{% url 'edit-prisoner-of-war-camps' powcamp.id %}'" type="button">EDIT</button></td>
-      <td><span class="soldier-info">{{ powcamp.name }}</span></td>
-      <td><span class="soldier-info">{{ powcamp.country.flag }} {{ powcamp.country.name }}</span></td>
+      <td><span class="soldier-info">{{ powcamp.name|title }}</span></td>
+      <td><span class="soldier-info">{{ powcamp.country.flag }} {{ powcamp.country.name|title }}</span></td>
     </tr>
 {% endfor %}
   </table>