Fixed bugs with layout + cleaned the code

README.md

@@ -18,7 +18,6 @@ First you will need to [install Docker](https://docs.docker.com/engine/install/)
 1.  Clone this repository by running `git clone https://github.com/dkalpakchi/Textinator.git` or download one of the releases and unpack it.
 2.  Build and run container in either development or production mode, following the instructions in of the corresponding section below.
 
-
 ## Deployment guide
 
 The recommended way of deploying Textinator is through building a production version of the Docker container, as described in the [Deployment guidelines](https://github.com/dkalpakchi/Textinator/blob/master/notes/DEPLOYING.md). Note that the production version is most definitely more secure and reliable than the development version. However, it's not extremely scalable and hosts both database and Textinator instance on the same machine. The ultimate solution would be to use something like Kubernetes, but it is currently not supported out of the box.
@@ -31,7 +30,6 @@ A good starting place for familiarizing yourself with a codebase is via our [API
 
 Want to contribute to Textinator? Check out our [Contribution guidelines](https://github.com/dkalpakchi/Textinator/blob/master/notes/CONTRIBUTING.md).
 
-
 ## Internationalization
 
 The software is developed in English.

Textinator/jinja2/layout.html

@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="{{ static('@creativebulma/bulma-divider/dist/bulma-divider.min.css') }}">
     <link rel="stylesheet" href="{{ static('@loadingio/css-spinner/index.min.css') }}">
     <link rel="stylesheet" href="{{ static('styles/base_style.css') }}">
-    <link rel="shortcut icon" type="image/png" href="{{ static('images/favicon.ico' }}"/>
+    <link rel="shortcut icon" type="image/png" href="{{ static('images/favicon.ico') }}"/>
     {% block custom_styles %}{% endblock %}
 
     <script type="text/javascript" src="{{ url('javascript-catalog') }}"></script>

Textinator/postgres/exec_sql.sh

@@ -1 +1,2 @@
-cat $1 | docker exec -i textinator_db_1 psql -U textinator
+#!/bin/sh
+cat "$1" | docker exec -i textinator_db_1 psql -U textinator

Textinator/projects/model_helpers.py

@@ -3,7 +3,7 @@
 import copy
 import operator
 
-from django.db import models, transaction
+from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 

Textinator/templates/layout.html

@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="{% static '@fortawesome/fontawesome-free/css/all.min.css' %}">
     <link rel="stylesheet" href="{% static 'bulma/css/bulma.min.css' %}">
     <link rel="stylesheet" href="{% static 'styles/base_style.css' %}">
+    <link rel="shortcut icon" type="image/png" href="{% static 'images/favicon.ico' %}"/>
     <script type="text/javascript" src="{% static 'jquery/dist/jquery.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'scripts/labeler.js' %}"></script>
     <script type="text/javascript" src="{% static 'scripts/script.js' %}"></script>

notes/DEPLOYING.md

@@ -1,12 +1,12 @@
 ## Running in production mode
 
-The recommended solution is to use nginx-gunicorn-docker setup, which we provide for out of the box if you run the following command. 
+The recommended solution is to use nginx-gunicorn-docker setup, which we provide for out of the box if you run the following command.
 
 **NOTE** Before running the command, please replace the values within the angle brackets (<>) in the `.env.prod` file! Make sure none of those values are published anywhere, since they will compromise the security of your Textinator instance!
 
 The easiest way to start the server is by running `sh tools/start_prod.sh` after cloning the repository. This command will effectively do the following:
 
-```
+```bash
 cd Textinator
 docker-compose --env-file .env.prod -f docker-compose.yml -f docker-compose.prod.yml up
 ```

notes/DEVELOPING.md

@@ -3,7 +3,7 @@
 ## Running in development mode
 
 The development version will run the Django's built-in development server and will also map your local folder to that inside the Docker container, so that the changes in the code are immediately reflected without the need to restart the container. You can start Textinator in the dev mode by running `sh tools/start_dev.sh` after cloning the repo. This will effectively do the following:
-```
+```bash
 cd Textinator
 docker-compose --env-file .env.dev -f docker-compose.yml -f docker-compose.dev.yml up
 ```

tools/start_dev.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 cd Textinator
-docker-compose --env-file .env.dev -f docker-compose.yml -f docker-compose.dev.yml up $1
+docker-compose --env-file .env.dev -f docker-compose.yml -f docker-compose.dev.yml up "$1"