Merge branch 'master' of ssh://willipink.eu:3456/moritz/coinmanager

coinmanager/coinc/static/coinc/main.js

@@ -149,7 +149,7 @@ function render_response(data, td, set) {
     /* add or update marker (and name) if found */
     if (set['found'] && set['found_by'] && set['exists']) {
         div_class = set['found_by'];
-        $(td).find('div.coin span').html('').html('✔'); }
+        $(td).find('div.coin span').html('').html('✓'); }
 
     /* add/update name */
     if ([201, 202, 203].includes(data['value'])) {
@@ -163,7 +163,7 @@ function render_response(data, td, set) {
             if (div_special_name.length == 0) {
 
                 /* append div if not found */
-                $(td).append('<div class="special' + c + '_name three_lines">' + name + '</div>');
+                $(td).append('<div class="special_name special' + c + '_name three_lines">' + name + '</div>');
 
             } else if (div_special_name.length == 1) {
 
@@ -173,7 +173,7 @@ function render_response(data, td, set) {
 
         /* remove name */
         } else if (!set['exists']) {
-            $(td).find('div.special' + c + '_name').html();
+            $(td).find('div.special_name').html('');
         }
     }
 
@@ -306,7 +306,7 @@ $(document).ready(function() {
                             $(td).css('cursor', 'cell');
                             if (response.status === 0) {
                                 render_response(data, this.td, settings);
-                                detach('add_coin_name');
+                                detach('#add_coin_name');
                             } else {
                                 alert(response.message);
                             }
@@ -409,7 +409,7 @@ $(document).ready(function() {
 
                     if (response.status === 0) {
                         render_login(name, color);
-                        detach('add_user');
+                        detach('#add_user');
                     } else {
                         $('#response').html(response.message);
                         $('#response').css('color', 'red');

coinmanager/coinc/static/coinc/styles.css

@@ -257,10 +257,13 @@ td > * {
 
 td.coin {
     background-color: #cec6ca;
-    font-size: 1.1rem;
     border: 2px solid white;
+    font-size: 1.3rem;
+    font-family: sans-serif;
 }
 
+
+
 .brass {
     background-color: #dec1a8 !important;
 }
@@ -293,13 +296,18 @@ td.coin {
 /* coin div text style */
 
 .ec {
-    color: #dc3545;
+    color: #dc3545 !important;
-    font-weight: bold;
+    font-weight: bold !important;
+}
+@-moz-document url-prefix() {
+    td.ec, td.checked {
+        font-size: 1.7rem !important;
+    }
 }
 
 .checked {
-    color: #28a745;
+    color: #28a745 !important;
-    font-weight: bold;
+    font-weight: bold !important;
 }
 
 
@@ -315,7 +323,7 @@ div.coin {
     z-index: 1000;
     height: 40px;
     width: 40px;
-    text-align: inherit;
+    text-align: center;
     line-height: 40px;
     float: left;
 }

coinmanager/coinc/templates/coinc/coin.html

@@ -1,9 +1,7 @@
-<td class="coin {{ td_class }}" value="{{ value }}" title="{{ name }}">
+          <td class="coin {{ td_class }}" value="{{ value }}" title="{{ name }}">
             <div class="coin">
               <span>{{ marker }}</span>
               <div class="{{ div_class }}" type="overlay"></div>
-  </div>
+            </div>{% if name %}
-{% if name %}
+            <div class="special_name {{ special_name }} {{ special_class }}">{{ name }}</div>{% endif %}
-  <div class="special_name {{ special_name }} {{ special_class }}">{{ name }}</div>
+          </td>
-{% endif %}
-</td>

coinmanager/coinc/templates/coinc/controlbar.html

@@ -1,4 +1,4 @@
-<style type="text/css">{% for user in users %}
+    <style type="text/css">{% for user in users %}
       div.{{ user.name }} { background-color: {{ user.color }} !important; }{% endfor %}
     </style>
 

coinmanager/coinc/templates/coinc/country.html

@@ -1,16 +1,16 @@
-{% if single_country %}
+{% if single_country %}{% include 'header.html' with title=country.name %}
-	{% include 'header.html' with title=country.name %}
+{% include 'coinc/controlbar.html' with users=users %}{% endif %}
-	{% include 'coinc/controlbar.html' with users=users %}
-{% endif %}
     <div class="container-fluid">
       <table name="{{ country.name_iso }}">
         <thead>
           <tr>
             <th colspan="12" title="Zurück zur Länderübersicht">
-            <img src="/static/coinc/images/{{ country.name_iso }}.png" />
+              <div class="float-left">
+                <img src="/static/coinc/images/{{ country.name_iso }}.png">
                 {{ country.name }}{% if country.comment %}
                 <small> - {{ country.comment }}</small>{% endif %}
-            <div class="total_coins">{{ total_coins }}</div>
+              </div>
+              <div class="float-right">{{ total_coins }}</div>
             </th>
           </tr>
           <tr>
@@ -35,6 +35,4 @@
 {% for year in country.years %}{% show_year country year %}{% endfor %}      </tbody>
       </table>
     </div>
-{% if single_country %}
+{% if single_country %}{% include "footer.html" with title="Münzsammlung" %}{% endif %}
-	{% include "footer.html" with title="Münzsammlung" %}
-{% endif %}

coinmanager/coinc/templates/coinc/index.html

@@ -3,4 +3,5 @@
       {% include 'coinc/filter_country.html' with countrys=countrys %}
     {% else %}
     <p>Trage zuerst Länder im Adminbereich ein.</p>{% endif %}
+    <small>Version 200531</small>
 {% include 'footer.html' with title='Münzsammlung' %}

coinmanager/coinc/views.py

@@ -193,7 +193,7 @@ def show_coin(country, year, stamp, value):
     marker = ''
     if coin.found_by:
         div_class = f"found {coin.found_by}"
-        marker = '✔'
+        marker = '✓'
 
     name = coin.name if coin.name else ''
     special_class = ''