Refactoring per feedback

Author: aksinha-nerdapplabs

app/Resources/FOSUserBundle/views/layout.html.twig

@@ -1,27 +1,7 @@
 {% extends 'base.html.twig' %}
-{% block body %}
-        <div>
-            {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
-                {{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }} |
-                <a href="{{ path('fos_user_security_logout') }}">
-                    {{ 'layout.logout'|trans({}, 'FOSUserBundle') }}
-                </a>
-            {% else %}
-                <a href="{{ path('fos_user_security_login') }}">{{ 'layout.login'|trans({}, 'FOSUserBundle') }}</a>
-            {% endif %}
-        </div>
-{# Duplicate Flash message block exists in base.html.twig
-        {% for type, messages in app.session.flashBag.all %}
-            {% for message in messages %}
-                <div class="{{ type }}">
-                    {{ message|trans({}, 'FOSUserBundle') }}
-                </div>
-            {% endfor %}
-        {% endfor %}
-#}
+{% block main %}
         <div>
             {% block fos_user_content %}
             {% endblock fos_user_content %}
         </div>
-
 {% endblock %}

app/Resources/views/base_bootstrap.html.twig

@@ -4,7 +4,7 @@
         <!-- Basic Page Needs
         –––––––––––––––––––––––––––––––––––––––––––––––––– -->
         <meta charset="UTF-8" />
-        <title>{% block title %}Welcome!{% endblock %}</title>
+        <title>{% block title %}{{ 'welcome_title'|trans }}{% endblock %}</title>
         <meta name="description" content="">
         <meta name="author" content="">
 

app/Resources/views/base_materialize.html.twig

@@ -4,7 +4,7 @@
         <!-- Basic Page Needs
         –––––––––––––––––––––––––––––––––––––––––––––––––– -->
         <meta charset="UTF-8" />
-        <title>{% block title %}Welcome!{% endblock %}</title>
+        <title>{% block title %}{{ 'welcome_title'|trans }}{% endblock %}</title>
         <meta name="description" content="">
         <meta name="author" content="">
 

app/Resources/views/base_skeleton.html.twig

@@ -4,7 +4,7 @@
         <!-- Basic Page Needs
         –––––––––––––––––––––––––––––––––––––––––––––––––– -->
         <meta charset="UTF-8" />
-        <title>{% block title %}Welcome!{% endblock %}</title>
+        <title>{% block title %}{{ 'welcome_title'|trans }}{% endblock %}</title>
         <meta name="description" content="">
         <meta name="author" content="">
 

app/Resources/views/default/index.html.twig

@@ -9,7 +9,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Nerd Project</a>
+      <a class="navbar-brand" href="/">{{ 'project_name'|trans }}</a>
     </div>
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">

app/Resources/views/default/users.html.twig

@@ -2,7 +2,7 @@
     <nav class="nav-extended">
         <div class="nav-wrapper">
             <div>
-              <a href="/">Nerd Project</a>
+              <a href="/">{{ 'project_name'|trans }}</a>
             </div>
             <div id="navbar">
               <ul>
@@ -45,7 +45,7 @@
                     </a>
                     <ul>
                         {% for locale in locales() %}
-                            <li role="menuitem"><a href="{{ path(app.request.get('_route', 'admin_client_index'), app.request.get('_route_params', [])|merge({ _locale: locale.code })) }}">{{ locale.name|capitalize }}</a></li>
+                            <li><a href="{{ path(app.request.get('_route', 'admin_client_index'), app.request.get('_route_params', [])|merge({ _locale: locale.code })) }}">{{ locale.name|capitalize }}</a></li>
                         {% endfor %}
                     </ul>
                 </li>

app/Resources/views/nav_bootstrap.html.twig

@@ -2,7 +2,7 @@
     <nav>
         <div>
             <div>
-              <a href="/">Nerd Project</a>
+              <a href="/">{{ 'project_name'|trans }}</a>
             </div>
             <div id="navbar">
               <ul>
@@ -45,7 +45,7 @@
                     </a>
                     <ul>
                       {% for locale in locales() %}
-                          <li role="menuitem"><a href="{{ path(app.request.get('_route', 'admin_client_index'), app.request.get('_route_params', [])|merge({ _locale: locale.code })) }}">{{ locale.name|capitalize }}</a></li>
+                          <li><a href="{{ path(app.request.get('_route', 'admin_client_index'), app.request.get('_route_params', [])|merge({ _locale: locale.code })) }}">{{ locale.name|capitalize }}</a></li>
                       {% endfor %}
                     </ul>
                 </li>

app/Resources/views/nav_materialize.html.twig

@@ -23,7 +23,7 @@ homepage:
         _locale: '%app_locales%'
     defaults:
         _controller: FrameworkBundle:Template:template
-        template:    default/index.html.twig
+        template:    base.html.twig
         _locale:     '%locale%'
 
 fos_user_security: