Merged in aksinhanerd/auth/user_management (pull request nerdapplabs#9)

User management

Author: aksinha-nerdapplabs

app/Resources/views/base.html.twig

@@ -4,4 +4,4 @@
    bootstrap, material and skeleton. Just change the below line to select the other desired
    theme.
 #}
-{% extends 'base_bootstrap.html.twig' %}
+{% extends "base_#{frontend_theme}.html.twig" %}

app/Resources/views/nav_bootstrap.html.twig

@@ -39,10 +39,8 @@
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ 'action.admin_menu'|trans }}<span class="caret"></span></a>
               <ul class="dropdown-menu locales" role="menu" aria-labelledby="locales">
-                <li><a href="#">{{ 'action.role_management'|trans }}</a></li>
-                <li><a href="#">{{ 'action.user_management'|trans }}</a></li>
+                <li><a href="{{ path('admin_user_index') }}">{{ 'action.user_management'|trans }}</a></li>
                 <li><a href="{{ path('admin_client_index') }}">{{ 'action.client_management'|trans }}</a></li>
-                <li><a href="{{ path('admin_client_new') }}">{{ 'action.create_new_client'|trans }}</a></li>
               </ul>
             </li>
         {% endif %}

app/Resources/views/nav_materialize.html.twig

@@ -31,10 +31,8 @@
                     <li>
                       <a href="#">{{ 'action.admin_menu'|trans }}<span></span></a>
                       <ul>
-                        <li><a href="#">{{ 'action.role_management'|trans }}</a></li>
-                        <li><a href="#">{{ 'action.user_management'|trans }}</a></li>
+                        <li><a href="{{ path('admin_user_index') }}">{{ 'action.user_management'|trans }}</a></li>
                         <li><a href="{{ path('admin_client_index') }}">{{ 'action.client_management'|trans }}</a></li>
-                        <li><a href="{{ path('admin_client_new') }}">{{ 'action.create_new_client'|trans }}</a></li>
                       </ul>
                     </li>
                 {% endif %}

app/Resources/views/nav_skeleton.html.twig

@@ -31,10 +31,8 @@
                     <li>
                       <a href="#">{{ 'action.admin_menu'|trans }}<span></span></a>
                       <ul>
-                        <li><a href="#">{{ 'action.role_management'|trans }}</a></li>
-                        <li><a href="#">{{ 'action.user_management'|trans }}</a></li>
+                        <li><a href="{{ path('admin_user_index') }}">{{ 'action.user_management'|trans }}</a></li>
                         <li><a href="{{ path('admin_client_index') }}">{{ 'action.client_management'|trans }}</a></li>
-                        <li><a href="{{ path('admin_client_new') }}">{{ 'action.create_new_client'|trans }}</a></li>
                       </ul>
                     </li>
                 {% endif %}

app/config/config.yml

@@ -44,7 +44,9 @@ assetic:
 twig:
     debug:            "%kernel.debug%"
     strict_variables: "%kernel.debug%"
-
+    globals:
+            frontend_theme: "%frontend_theme%"
+        
 # Doctrine Configuration
 doctrine:
     dbal:

app/config/routing.yml

@@ -46,12 +46,6 @@ fos_user_change_password:
     resource: "@FOSUserBundle/Resources/config/routing/change_password.xml"
     prefix: /{_locale}/profile
 
-users:
-    resource: "@ApiBundle/Resources/config/user_routes.yml"
-    type:     rest
-    prefix: /api
-    methods: GET|POST
-
 NelmioApiDocBundle:
     resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
     prefix:   /api/doc

src/ApiBundle/Controller/Admin/ClientController.php

@@ -3,7 +3,7 @@
 namespace ApiBundle\Controller\Admin;
 
 use ApiBundle\Entity\Client;
-use ApiBundle\Form\ClientType;
+
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
@@ -60,7 +60,6 @@ public function newAction(Request $request)
                 ->add('name', 'text', array('label' => 'label.client_name', 'data' => $clientName ))
                 ->add('redirect_url', 'text', array('label' => 'label.admin_redirecturl', 'data' => $redirectUrl ))
                 ->add('password', 'password', array('label' => 'label.admin_password' ))
-                ->add('send', 'submit', array('label' => 'label.create_client' ))
                 ->getForm();
         $form->handleRequest($request);