Refactored code, many fixes and improvements in chat backend+frontend

2 files changed, 28 insertions, 27 deletions

diff --git a/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig b/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig
index e95e302..b905013 100644
--- a/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig
+++ b/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig
@@ -1,4 +1,4 @@
 <ol class="breadcrumb">
-    <li><a href="{{site.uri.public}}"><i class="fa fa-home"></i> {{site.title}}</a></li>
+    <li><a href="{{ site.uri.public }}"><i class="fa fa-home"></i> {{ site.title }}</a></li>
     <li class="active">{{ page_title | raw }}</li>
 </ol>
\ No newline at end of file
diff --git a/main/app/sprinkles/core/templates/navigation/main-nav.html.twig b/main/app/sprinkles/core/templates/navigation/main-nav.html.twig
index 3acbb87..c17d3c6 100644
--- a/main/app/sprinkles/core/templates/navigation/main-nav.html.twig
+++ b/main/app/sprinkles/core/templates/navigation/main-nav.html.twig
@@ -1,31 +1,32 @@
 <nav class="navbar navbar-static-top">
-  <div class="container">
-    <div class="navbar-header">
-      {% block navbar_logo %}<a href="{{site.uri.public}}" class="navbar-brand">{{site.title}}</a>{% endblock %}
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
-        <i class="fa fa-bars"></i>
-      </button>
-    </div>
+    <div class="container">
+        <div class="navbar-header">
+            {% block navbar_logo %}<a href="{{ site.uri.public }}"
+                                      class="navbar-brand">{{ site.title }}</a>{% endblock %}
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
+                <i class="fa fa-bars"></i>
+            </button>
+        </div>
 
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-      <ul class="nav navbar-nav">
-        {% block main_nav %}
-            <li>
-                <a href="{{site.uri.public}}/about">{{translate("ABOUT")}}</a>
-            </li>
-        {% endblock %}
-      </ul>
-    </div>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+            <ul class="nav navbar-nav">
+                {% block main_nav %}
+                    <li>
+                        <a href="{{ site.uri.public }}/about">{{ translate("ABOUT") }}</a>
+                    </li>
+                {% endblock %}
+            </ul>
+        </div>
 
-    <!-- /.navbar-collapse -->
-    <!-- Navbar Right Menu -->
-    <div class="navbar-custom-menu">
-      <ul class="nav navbar-nav">
-        {% block secondary_nav %}{% endblock %}
-      </ul>
+        <!-- /.navbar-collapse -->
+        <!-- Navbar Right Menu -->
+        <div class="navbar-custom-menu">
+            <ul class="nav navbar-nav">
+                {% block secondary_nav %}{% endblock %}
+            </ul>
+        </div>
+        <!-- /.navbar-custom-menu -->
     </div>
-    <!-- /.navbar-custom-menu -->
-  </div>
-  <!-- /.container-fluid -->
+    <!-- /.container-fluid -->
 </nav>
\ No newline at end of file