Getting ready for 1.2 & new site release

- improved support for serving static resources from the binary, now supporting images
- added new logo
- changed save button
- fixed footer attribution text, it is not true anymore that MicroBin is made by myself
- replaced footer GitHub link with microbin.eu link

templates/footer.html

@@ -1,17 +1,17 @@
-
 {% if !args.hide_footer %}
 
 <hr>
 <p style="font-size: smaller">
     {% if args.footer_text.as_ref().is_none() %}
-        MicroBin by Dániel Szabó. Fork me on <a href="https://github.com/szabodanika/microbin">GitHub</a>!
-        Let's keep the Web <b>compact</b>, <b>accessible</b> and <b>humane</b>!
+    <a href="https://microbin.eu">MicroBin</a> by Dániel Szabó and the FOSS Community.
+    Let's keep the Web <b>compact</b>, <b>accessible</b> and <b>humane</b>!
     {%- else %}
-        {{ args.footer_text.as_ref().unwrap() }}
+    {{ args.footer_text.as_ref().unwrap() }}
     {%- endif %}
 </p>
 
 {%- endif %}
 
 </body>
+
 </html>

templates/header.html

@@ -10,7 +10,7 @@
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
+    <link rel="icon" type="image/svg+xml" href="{{ args.public_path }}/static/favicon.svg">
     {% if !args.pure_html %}
     {% if args.custom_css.as_ref().is_none() %}
     <link rel="stylesheet" href="{{ args.public_path }}/static/water.css">
@@ -48,20 +48,17 @@
         <b style="margin-right: 0.5rem">
 
             {% if !args.hide_logo %}
-            <i><span style="font-size:2.2rem; margin-right:1rem">μ</span></i>
-            {%- endif %}
-
-            {% if args.title.as_ref().is_none() %}
-            MicroBin
-            {%- else %}
-            {{ args.title.as_ref().unwrap() }}
-            {%- endif %}
+            <!-- <i><span style="font-size:2.2rem; margin-right:1rem">μ</span></i> -->
+            <img width=26 style="margin-bottom: -6px; margin-right: 0.5rem;"
+                src="{{ args.public_path }}/static/logo.png">
+            {%- endif %} {% if args.title.as_ref().is_none() %}
+            MicroBin {%- else %} {{ args.title.as_ref().unwrap() }} {%- endif %}
         </b>
 
         <a href="{{ args.public_path }}/" style="margin-right: 0.5rem; margin-left: 0.5rem">New
-            Pasta</a>
+        </a>
 
-        <a href="{{ args.public_path }}/pastalist" style="margin-right: 0.5rem; margin-left: 0.5rem">Pasta List</a>
+        <a href="{{ args.public_path }}/pastalist" style="margin-right: 0.5rem; margin-left: 0.5rem">List</a>
 
         <a href="{{ args.public_path }}/info" style="margin-right: 0.5rem; margin-left: 0.5rem">Info</a>
 

templates/index.html

@@ -164,23 +164,27 @@
 
     </div>
     <label>Content</label>
-    <br>
-    <textarea style="width: 100%; min-height: 100px" name="content" autofocus></textarea>
-    {% if !args.no_file_upload %}
-    <div>
-        <label for="file" id="attach-file-button-label"><a role="button" id="attach-file-button">Attach File</a></label>
-        <br>
-        <input type="file" id="file" name="file" />
+    <textarea style="width: 100%; min-height: 100px; margin-bottom: 2em" name="content" autofocus></textarea>
+    <div style="overflow:auto;">
+        {% if !args.no_file_upload %}
+        <div style="float: left">
+            <label for="file" id="attach-file-button-label"><a role="button" id="attach-file-button">Attach
+                    File</a></label>
+            <br>
+            <input type="file" id="file" name="file" />
+        </div>
+        {% endif %}
+        {% if args.readonly %}
+        <b>
+            <input style="width: 140px; float: right; background-color: #0076d18f;" disabled type="submit"
+                value="Read Only" /></b>
+        {%- else %}
+        <b>
+            <input style="width: 140px; float: right; background-color: #0076d18f;" type="submit" value="Save" />
+        </b>
+        {%- endif %}
     </div>
-    {% endif %}
-    {% if args.readonly %}
-    <input style="width: 140px; background-color: limegreen" disabled type="submit" value="Read Only" />
-    {%- else %}
-    <input style="width: 140px; background-color: limegreen" type="submit" value="Save" />
-    {%- endif %}
-    </td>
 
-    <br>
 </form>
 
 <script>
@@ -199,7 +203,7 @@
 
     #settings {
         display: grid;
-        grid-gap: 4px;
+        grid-gap: 6px;
         grid-template-columns: repeat(auto-fit, 150px);
         grid-template-rows: repeat(1, 90px);
         margin-bottom: 0.5rem;

templates/info.html

@@ -4,13 +4,13 @@
 <div style="height: 200px;">
   <div style="float: left">
     <h4>Links</h4>
-    <a href="https://docs.microbin.eu" style="margin-right: 1rem">Documentation and Help</a>
+    <a href="https://microbin.eu/documentation" style="margin-right: 1rem">Documentation and Help</a>
     <br>
     <a href="https://github.com/szabodanika/microbin" style="margin-right: 1rem">Source Code</a>
     <br>
     <a href="https://github.com/szabodanika/microbin/issues" style="margin-right: 1rem">Feedback</a>
     <br>
-    <a href="microbin.eu/sponsor">Sponsor</a>
+    <a href="https://microbin.eu/donate">Donate and Sponsor</a>
   </div>
 
   <div style="float: right">

templates/pasta.html

@@ -45,7 +45,12 @@
 </div>
 {%- endif %}
 <div>
+  {% if pasta.read_count == 1 %}
+  <p style="font-size: small">Read {{pasta.read_count}} time, last {{pasta.last_read_time_ago_as_string()}}</p>
+  {%- else %}
   <p style="font-size: small">Read {{pasta.read_count}} times, last {{pasta.last_read_time_ago_as_string()}}</p>
+  {%- endif %}
+
 </div>
 
 <br>
@@ -86,7 +91,6 @@
   code-line::before {
     content: counter(listing);
     display: inline-block;
-    float: left;
     padding-left: auto;
     margin-left: auto;
     text-align: left;