Home Explore Help
Sign In
joker
/
packagist
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

All my changes in one commit!

xaav 13 years ago
parent
41d3ec095a
commit
ebf8a91e42
4 changed files with 13 additions and 23 deletions
Split View Show Diff Stats
  1. 4 21
      app/Resources/FOSUserBundle/views/layout.html.twig
  2. 1 0
      app/config/config.yml
  3. 4 0
      src/Packagist/WebBundle/Resources/public/css/main.css
  4. 4 2
      src/Packagist/WebBundle/Resources/views/layout.html.twig

+ 4 - 21
app/Resources/FOSUserBundle/views/layout.html.twig
View File 

@@ -1,31 +1,14 @@
 
 {% extends 'PackagistWebBundle::layout.html.twig' %}
 
 
 {% block content %}
 
-    <div style="margin-bottom: 10px;">
 
-        {% 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>
 
 
     {% for key, flash in app.session.getFlashes() %}
 
-    <div class="{{ flash }}" style="margin-bottom: 5px;">
 
-        {{ key|trans({}, 'FOSUserBundle') }}
 
-    </div>
 
+	    <div class="{{ flash }}" style="margin-bottom: 5px;">
 
+	        {{ key|trans({}, 'FOSUserBundle') }}
 
+	    </div>
 
     {% endfor %}
 
 
     <div>
 
         {% block fos_user_content %}{% endblock %}
 
-    </div>
 
-
 
-    <ul>
 
-        <li><a href="{{ path('fos_user_registration_register') }}">Create a new account</a></li>
 
-        <li><a href="{{ path('fos_user_profile_show') }}">See your profile</a></li>
 
-        <li><a href="{{ path('fos_user_security_logout') }}">Log out</a></li>
 
-    </ul>
 
+    </div>    
 {% endblock %}

+ 1 - 0
app/config/config.yml
View File 

@@ -9,6 +9,7 @@ framework:
 
     form:            true
 
     csrf_protection: true
 
     validation:      { enable_annotations: true }
 
+    translator: { fallback: en }
 
     templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
 
     session:
 
         default_locale: %locale%

+ 4 - 0
src/Packagist/WebBundle/Resources/public/css/main.css
View File 

@@ -148,6 +148,10 @@ header {
 
   border-radius: 5px;
 
 }
 
 
+.user {
 
+  text-align: right;
 
+}
 
+
 
 .submit, .submit:active, .submit:visited, input[type="submit"] {
 
   font-size: 22px;
 
   font-family: "Neuton";

+ 4 - 2
src/Packagist/WebBundle/Resources/views/layout.html.twig
View File 

@@ -38,11 +38,13 @@
 
     </head>
 
     <body>
 
         <div class="container">
 
-            <div>
 
+            <div class="user">
 
                 {% if app.user %}
 
                     {{ app.user.username }} | <a href="{{ path('fos_user_security_logout') }}">logout</a>
 
                 {% else %}
 
-                    <a href="{{ path('fos_user_security_login') }}">login</a> | <a href="{{ path('fos_user_registration_register') }}">register</a>
 
+		            <a href="{{ path('fos_user_registration_register') }}">Create a new account</a>
 
+		            |
 
+		            <a href="{{ path('fos_user_security_login') }}">Login</a>
 
                 {% endif %}
 
             </div>
 
             <div class="betawarn">WARNING - This is an experimental site, packages may come and go, this is not ready yet.</div>