usman 0.1.6dev2 → 0.2.0

data/app/views/usman/{admin/features → features}/_index.html.erb

@@ -12,20 +12,20 @@
 	  <tbody>
 	  	<% @features.each_with_index do |feature, i| %>
 	  		
-	  		<% edit_link = edit_admin_feature_path(id: feature.id) %>
-				<% delete_link = admin_feature_path(id: feature.id) %>
+	  		<% edit_link = edit_feature_path(id: feature.id) %>
+				<% delete_link = feature_path(id: feature.id) %>
 				
 		    <tr id="tr_feature_<%= feature.id %>">
 		      
 		      <td class="feature-image"></td>
 		      
 		      <td class="feature-image">
-		        <%= link_to(admin_feature_path(feature), remote: true) do %>
+		        <%= link_to(feature_path(feature), remote: true) do %>
 		        	<%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
 		        <% end %>
 		      </td>
 
-					<td class="feature-name"><%= link_to feature.name, admin_feature_path(feature), remote: true %></td>
+					<td class="feature-name"><%= link_to feature.name, feature_path(feature), remote: true %></td>
 
 					<td>
 						<% if feature.unpublished? %>
@@ -42,20 +42,20 @@
 		        <% case feature.status %>
 					  <% when "published" %>
 					    <!-- Un-Publish -->
-					    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+					    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
 					    
 					    <!-- Disable -->
-					    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+					    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
 					  <% when "unpublished" %>
 					    <!-- Approve -->
-					    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+					    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
 					    <!-- Disable -->
-					    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+					    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
 					  <% when "disabled" %>
 					    <!-- Un-Publish -->
-					    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+					    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
 					    <!-- Approve -->
-					    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"feature_status" %>
+					    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"feature_status" %>
 					  <% end %>
 		        
 		      </td>

data/app/views/usman/{admin/features → features}/_row.html.erb

@@ -1,15 +1,15 @@
-<% edit_link = edit_admin_feature_path(id: feature.id) %>
-<% delete_link = admin_feature_path(id: feature.id) %>
+<% edit_link = edit_feature_path(id: feature.id) %>
+<% delete_link = feature_path(id: feature.id) %>
 
 <tr id="tr_feature_<%= feature.id %>">
 
   <td class="feature-image">
-    <%= link_to(admin_feature_path(feature), remote: true) do %>
+    <%= link_to(feature_path(feature), remote: true) do %>
       <%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
     <% end %>
   </td>
 
-  <td class="feature-name"><%= link_to feature.name, admin_feature_path(feature), remote: true %></td>
+  <td class="feature-name"><%= link_to feature.name, feature_path(feature), remote: true %></td>
 
   <td>
     <% if feature.unpublished? %>
@@ -26,20 +26,20 @@
     <% case feature.status %>
     <% when "published" %>
       <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
       
       <!-- Disable -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
     <% when "unpublished" %>
       <!-- Approve -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
       <!-- Disable -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_admin_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Disable"), update_status_feature_path(:id =>feature.id, :status =>'disabled'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
     <% when "disabled" %>
       <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
+      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_feature_path(:id =>feature.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"feature_status" %>
       <!-- Approve -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"feature_status" %>
+      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"feature_status" %>
     <% end %>
 
   </td>

data/app/views/usman/{admin/features → features}/_show.html.erb

@@ -38,8 +38,8 @@
 
 <div>
 	<% 
-		edit_link = edit_admin_feature_url(id: @feature.id)
-		delete_link = admin_feature_url(id: @feature.id) 
+		edit_link = edit_feature_url(id: @feature.id)
+		delete_link = feature_url(id: @feature.id) 
 	%>
 	
 	<%= link_to raw("<i class=\"fa fa-close mr-5\"></i> <span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "btn btn-white pull-left" %>

data/app/views/usman/{admin/features → features}/index.html.erb

@@ -11,9 +11,9 @@
           <div class="row">
             <div class="col-md-6">
 
-              <%= theme_button('Add a Feature', 'plus', new_admin_feature_path(), classes: "pull-left", btn_type: "success") %>
+              <%= theme_button('Add a Feature', 'plus', new_feature_path(), classes: "pull-left", btn_type: "success") %>
 
-              <%= theme_button('Refresh', 'refresh', admin_features_path(), classes: "pull-left ml-10", btn_type: "white") %>
+              <%= theme_button('Refresh', 'refresh', features_path(), classes: "pull-left ml-10", btn_type: "white") %>
 
               <!-- Single button -->
               <div class="ml-10 btn-group hidden">
@@ -30,14 +30,14 @@
 
             </div>
             <div class="col-md-6">
-              <%= search_form_kuppayam(Feature, admin_features_path, text: @filters[:query]) %>
+              <%= search_form_kuppayam(Feature, features_path, text: @filters[:query]) %>
             </div>
           </div>
         </div>
         <%= clear_tag(10) %>
 
         <div id="div_feature_index">
-          <%= render :partial=>"usman/admin/features/index" %>
+          <%= render :partial=>"usman/features/index" %>
         </div>
         <%= clear_tag(10) %>
 

data/app/views/usman/my_account/index.html.erb

@@ -0,0 +1 @@
+My Account - yet to be done

data/app/views/usman/{admin/permissions → permissions}/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:admin, @permission], :html => {:id=>"form_permission", :class=>"mb-0 form-horizontal", :role => "form", :method => (@permission.new_record? ? :post : :put), :remote=>true}) do |f| %>
+<%= form_for([@permission], :html => {:id=>"form_permission", :class=>"mb-0 form-horizontal", :role => "form", :method => (@permission.new_record? ? :post : :put), :remote=>true}) do |f| %>
 
       <div id="permission_form_error">
         <%= @permission.errors[:base].to_sentence %>

data/app/views/usman/{admin/permissions → permissions}/_index.html.erb

@@ -16,8 +16,8 @@
 		</thead>
 	  <tbody>
 	  	<% @permissions.each_with_index do |permission, i| %>
-	  	<% edit_link = edit_admin_permission_path(id: permission.id) %>
-			<% delete_link = admin_permission_path(id: permission.id) %>
+	  	<% edit_link = edit_permission_path(id: permission.id) %>
+			<% delete_link = permission_path(id: permission.id) %>
 
 		    <tr id="tr_permission_<%= permission.id %>">
 		      

data/app/views/usman/{admin/permissions → permissions}/_row.html.erb

@@ -1,5 +1,5 @@
-<% edit_link = edit_admin_permission_path(id: permission.id) %>
-<% delete_link = admin_permission_path(id: permission.id) %>
+<% edit_link = edit_permission_path(id: permission.id) %>
+<% delete_link = permission_path(id: permission.id) %>
 
 <tr id="tr_permission_<%= permission.id %>">
 

data/app/views/usman/{admin/permissions → permissions}/_show.html.erb

@@ -26,8 +26,8 @@
 
 <div>
 	<% 
-		edit_link = edit_admin_permission_url(id: @permission.id)
-		delete_link = admin_permission_url(id: @permission.id) 
+		edit_link = edit_permission_url(id: @permission.id)
+		delete_link = permission_url(id: @permission.id) 
 	%>
 	
 	<%= link_to raw("<i class=\"fa fa-close mr-5\"></i> <span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "btn btn-white pull-left" %>

data/app/views/usman/{admin/permissions → permissions}/index.html.erb

@@ -11,9 +11,9 @@
           <div class="row">
             <div class="col-md-6">
 
-              <%= theme_button('Add a Permission', 'plus', new_admin_permission_path(), classes: "pull-left", btn_type: "success") %>
+              <%= theme_button('Add a Permission', 'plus', new_permission_path(), classes: "pull-left", btn_type: "success") %>
 
-              <%= theme_button('Refresh', 'refresh', admin_permissions_path(), classes: "pull-left ml-10", btn_type: "white") %>
+              <%= theme_button('Refresh', 'refresh', permissions_path(), classes: "pull-left ml-10", btn_type: "white") %>
 
               <!-- Single button -->
               <div class="ml-10 btn-group hidden">
@@ -30,14 +30,14 @@
 
             </div>
             <div class="col-md-6">
-              <%= search_form_kuppayam(Permission, admin_permissions_path, text: @filters[:query]) %>
+              <%= search_form_kuppayam(Permission, permissions_path, text: @filters[:query]) %>
             </div>
           </div>
         </div>
         <%= clear_tag(10) %>
 
         <div id="div_permission_index">
-          <%= render :partial=>"usman/admin/permissions/index" %>
+          <%= render :partial=>"usman/permissions/index" %>
         </div>
         <%= clear_tag(10) %>
 

data/app/views/usman/{admin/roles → roles}/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:admin, @role], :html => {:id=>"form_role", :class=>"mb-0 form-horizontal", :role => "form", :method => (@role.new_record? ? :post : :put), :remote=>true}) do |f| %>
+<%= form_for([@role], :html => {:id=>"form_role", :class=>"mb-0 form-horizontal", :role => "form", :method => (@role.new_record? ? :post : :put), :remote=>true}) do |f| %>
 
       <div id="role_form_error">
         <%= @role.errors[:base].to_sentence %>

data/app/views/usman/{admin/roles → roles}/_index.html.erb

@@ -11,8 +11,8 @@
 	  <tbody>
 	  	<% @roles.each_with_index do |role, i| %>
 	  		
-	  		<% edit_link = edit_admin_role_path(id: role.id) %>
-				<% delete_link = admin_role_path(id: role.id) %>
+	  		<% edit_link = edit_role_path(id: role.id) %>
+				<% delete_link = role_path(id: role.id) %>
 				
 		    <tr id="tr_role_<%= role.id %>">
 		      
@@ -24,7 +24,7 @@
 						<% end %>
 					</th>
 
-		      <td class="role-name"><%= link_to role.name, admin_role_path(role), remote: true %></td>
+		      <td class="role-name"><%= link_to role.name, role_path(role), remote: true %></td>
 
 					<td class="action-links" style="width:10%">
 

data/app/views/usman/{admin/roles → roles}/_row.html.erb

@@ -1,5 +1,5 @@
-<% edit_link = edit_admin_role_path(id: role.id) %>
-<% delete_link = admin_role_path(id: role.id) %>
+<% edit_link = edit_role_path(id: role.id) %>
+<% delete_link = role_path(id: role.id) %>
 
 <tr id="tr_role_<%= role.id %>">
 
@@ -11,7 +11,7 @@
     <% end %>
   </th>
 
-  <td class="role-name"><%= link_to role.name, admin_role_path(role), remote: true %></td>
+  <td class="role-name"><%= link_to role.name, role_path(role), remote: true %></td>
 
   <td class="action-links" style="width:10%">
 

data/app/views/usman/{admin/roles → roles}/_show.html.erb

@@ -18,8 +18,8 @@
 
 	  <div class="col-md-3 col-sm-12 col-xs-12">
 
-	  	<% edit_link = edit_admin_role_path(id: @role.id) %>
-			<% delete_link = admin_role_path(id: @role.id) %>
+	  	<% edit_link = edit_role_path(id: @role.id) %>
+			<% delete_link = role_path(id: @role.id) %>
 
 			<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Role"), edit_link, :remote=>true, class: "btn btn-block btn-success" if @current_user.super_admin? and @role.can_be_edited? %>
 
@@ -60,19 +60,19 @@
         <div class="row">
           <div class="col-md-6">
 
-            <%= theme_button('Add a User', 'plus', new_admin_role_user_path(@role), classes: "pull-left", btn_type: "success") %>
+            <%= theme_button('Add a User', 'plus', new_role_user_path(@role), classes: "pull-left", btn_type: "success") %>
 
-            <%= theme_button('Refresh', 'refresh', admin_role_users_path(@role), classes: "pull-left ml-10", btn_type: "white") %>
+            <%= theme_button('Refresh', 'refresh', role_users_path(@role), classes: "pull-left ml-10", btn_type: "white") %>
           </div>
           <div class="col-md-6">
-            <%= search_form_kuppayam(User, admin_role_users_path(@role), text: "") %>
+            <%= search_form_kuppayam(User, role_users_path(@role), text: "") %>
           </div>
         </div>
       </div>
       <%= clear_tag(10) %>
 
       <div id="div_user_index">
-      	<%= render :partial=>"usman/admin/user_roles/index" %>
+      	<%= render :partial=>"usman/user_roles/index" %>
       </div>
 	  </div>
 

data/app/views/usman/{admin/roles → roles}/index.html.erb

@@ -11,11 +11,11 @@
           <div class="row">
             <div class="col-md-6">
               
-              <%= theme_button('Add a Role', 'plus', new_admin_role_path(), classes: "pull-left", btn_type: "success") if @current_user.super_admin? %>
+              <%= theme_button('Add a Role', 'plus', new_role_path(), classes: "pull-left", btn_type: "success") if @current_user.super_admin? %>
 
-              <%= theme_button('Refresh', 'refresh', admin_roles_path(), classes: "pull-left ml-10", btn_type: "white") %>
+              <%= theme_button('Refresh', 'refresh', roles_path(), classes: "pull-left ml-10", btn_type: "white") %>
 
-              <%= theme_button('Manage Users', 'nothing linecons-graduation-cap', admin_users_path(), classes: "pull-left ml-10", btn_type: "white", remote: false) %>
+              <%= theme_button('Manage Users', 'nothing linecons-graduation-cap', users_path(), classes: "pull-left ml-10", btn_type: "white", remote: false) %>
 
               <!-- Single button -->
               <div class="ml-10 btn-group hidden">
@@ -32,14 +32,14 @@
 
             </div>
             <div class="col-md-6">
-              <%= search_form_kuppayam(Role, admin_roles_path, text: @filters[:query]) %>
+              <%= search_form_kuppayam(Role, roles_path, text: @filters[:query]) %>
             </div>
           </div>
         </div>
         <%= clear_tag(10) %>
 
         <div id="div_role_index">
-          <%= render :partial=>"usman/admin/roles/index" %>
+          <%= render :partial=>"usman/roles/index" %>
         </div>
         <%= clear_tag(10) %>
 

data/app/views/usman/sessions/_form.html.erb

@@ -20,7 +20,7 @@
 
   <div class="row pt-10">
     <div class="col-sm-offset-3 col-sm-4">
-      <img src="/assets/kuppayam/logo.png" alt="" width="180" />
+      <img src="/assets/logo-on-white.png" alt="" width="180" />
     </div>
   </div>
 

data/app/views/usman/{admin/user_roles → user_roles}/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:admin, @role, @user], :html => {:id=>"form_user", :class=>"mb-0 form-horizontal", :user => "form", :method => (@user.new_record? ? :post : :put), :remote=>true}) do |f| %>
+<%= form_for([@role, @user], :html => {:id=>"form_user", :class=>"mb-0 form-horizontal", :user => "form", :method => (@user.new_record? ? :post : :put), :remote=>true}) do |f| %>
 
       <div id="user_form_error">
         <%= @user.errors[:base].to_sentence %>

data/app/views/usman/{admin/user_roles → user_roles}/_index.html.erb

@@ -13,7 +13,7 @@
 	  <tbody>
 	  	<% @users.each_with_index do |user, i| %>
 	  			
-	  		<% delete_link = admin_role_user_path(@role, user) %>
+	  		<% delete_link = role_user_path(@role, user) %>
 				
 		    <tr id="tr_user_<%= user.id %>">
 		      
@@ -26,7 +26,7 @@
 					</th>
 
 					<td class="user-image">
-		        <%= link_to(admin_user_path(user), remote: true) do %>
+		        <%= link_to(user_path(user), remote: true) do %>
 		        	<%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
 		        <% end %>
 		      </td>

data/app/views/usman/{admin/user_roles → user_roles}/_row.html.erb

@@ -1,5 +1,5 @@
-<% edit_link = edit_admin_role_user_path(@role, user) %>
-<% delete_link = admin_role_user_path(@role, user) %>
+<% edit_link = edit_role_user_path(@role, user) %>
+<% delete_link = role_user_path(@role, user) %>
 
 <tr id="tr_user_<%= user.id %>">
 
@@ -12,7 +12,7 @@
   </th>
 
   <td class="user-image">
-    <%= link_to(admin_user_path(user), remote: true) do %>
+    <%= link_to(user_path(user), remote: true) do %>
       <%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
     <% end %>
   </td>

data/app/views/usman/{admin/users → users}/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:admin, @user], :html => {:id=>"form_user", :class=>"mb-0 form-horizontal", :role => "form", :method => (@user.new_record? ? :post : :put), :remote=>true}) do |f| %>
+<%= form_for([@user], :html => {:id=>"form_user", :class=>"mb-0 form-horizontal", :role => "form", :method => (@user.new_record? ? :post : :put), :remote=>true}) do |f| %>
 
       <div id="user_form_error">
         <%= @user.errors[:base].to_sentence %>

data/app/views/usman/{admin/users → users}/_index.html.erb

@@ -15,8 +15,8 @@
 	  <tbody>
 	  	<% @users.each_with_index do |user, i| %>
 	  		
-	  		<% edit_link = edit_admin_user_path(id: user.id) %>
-				<% delete_link = admin_user_path(id: user.id) %>
+	  		<% edit_link = edit_user_path(id: user.id) %>
+				<% delete_link = user_path(id: user.id) %>
 				
 		    <tr id="tr_user_<%= user.id %>">
 		      
@@ -33,16 +33,16 @@
 					</th>
 
 					<td class="user-image">
-		        <%= link_to(admin_user_path(user), remote: true) do %>
+		        <%= link_to(user_path(user), remote: true) do %>
 		        	<%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
 		        <% end %>
 		      </td>
 
-					<td class="user-name"><%= link_to user.name, admin_user_path(user), remote: true %></td>
+					<td class="user-name"><%= link_to user.name, user_path(user), remote: true %></td>
 
-					<td class="hidden-xs hidden-sm"><%= link_to user.username, admin_user_path(user), remote: true %></td>
+					<td class="hidden-xs hidden-sm"><%= link_to user.username, user_path(user), remote: true %></td>
 
-					<td class="hidden-xs hidden-sm"><%= link_to user.email, admin_user_path(user), remote: true, class: "email" %></td>
+					<td class="hidden-xs hidden-sm"><%= link_to user.email, user_path(user), remote: true, class: "email" %></td>
 					
 					<% if @current_user.super_admin? %>
 						<td class="hidden-xs hidden-sm">
@@ -83,13 +83,13 @@
 		      <td class="action-links" style="width:15%">
 
 		      	<!-- Approve -->
-				    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_admin_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? && (@current_user != user) %>
+				    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? && (@current_user != user) %>
 
 				    <!-- Mark as Pending -->
-				    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_admin_user_path(:id =>user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_marked_as_pending? && (@current_user != user) %>
+				    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_user_path(:id =>user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_marked_as_pending? && (@current_user != user) %>
 				      
 				    <!-- Suspend -->
-				    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_admin_user_path(:id =>user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_suspended? && (@current_user != user) %>
+				    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_user_path(:id =>user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_suspended? && (@current_user != user) %>
 
 		      </td>
 

data/app/views/usman/{admin/users → users}/_row.html.erb

@@ -1,5 +1,5 @@
-<% edit_link = edit_admin_user_path(id: user.id) %>
-<% delete_link = admin_user_path(id: user.id) %>
+<% edit_link = edit_user_path(id: user.id) %>
+<% delete_link = user_path(id: user.id) %>
 
 <tr id="tr_user_<%= user.id %>">
 
@@ -16,16 +16,16 @@
   </th>
 
   <td class="user-image hidden-xs hidden-sm">
-    <%= link_to(admin_user_path(user), remote: true) do %>
+    <%= link_to(user_path(user), remote: true) do %>
               <%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
             <% end %>
   </td>
 
-  <td class="user-name"><%= link_to user.name, admin_user_path(user), remote: true %></td>
+  <td class="user-name"><%= link_to user.name, user_path(user), remote: true %></td>
 
-  <td class="hidden-xs hidden-sm"><%= link_to user.username, admin_user_path(user), remote: true %></td>
+  <td class="hidden-xs hidden-sm"><%= link_to user.username, user_path(user), remote: true %></td>
 
-  <td class="hidden-xs hidden-sm"><%= link_to user.email, admin_user_path(user), remote: true, class: "email" %></td>
+  <td class="hidden-xs hidden-sm"><%= link_to user.email, user_path(user), remote: true, class: "email" %></td>
 
   <% if @current_user.super_admin? %>
   <td class="hidden-xs hidden-sm">
@@ -58,13 +58,13 @@
   <td class="action-links" style="width:15%">
 
   	<!-- Approve -->
-    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_admin_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? && (@current_user != user) %>
+    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? && (@current_user != user) %>
 
     <!-- Mark as Pending -->
-    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_admin_user_path(:id =>user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_marked_as_pending? && (@current_user != user) %>
+    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_user_path(:id =>user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_marked_as_pending? && (@current_user != user) %>
       
     <!-- Suspend -->
-    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_admin_user_path(:id =>user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_suspended? && (@current_user != user) %>
+    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_user_path(:id =>user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_suspended? && (@current_user != user) %>
 
   </td>
   

data/app/views/usman/{admin/users → users}/_show.html.erb

@@ -41,8 +41,8 @@
 
 	  <div class="col-md-3 col-sm-12 col-xs-12">
 
-	  	<% edit_link = edit_admin_user_path(id: @user.id) %>
-			<% delete_link = admin_user_path(id: @user.id) %>
+	  	<% edit_link = edit_user_path(id: @user.id) %>
+			<% delete_link = user_path(id: @user.id) %>
 
 			<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), edit_link, :remote=>true, class: "btn btn-block btn-success" if @user.can_be_edited? %>
 
@@ -50,24 +50,24 @@
 
 	    <% if @current_user.super_admin? %>
 	      
-	      <%= link_to raw("<i class=\"linecons-paper-plane\"></i> Masquerade"), masquerade_admin_user_path(@user), method: :put, data: { confirm: "Are you sure? Do you really want to logout current session and login as #{@user.name}?" }, class: "btn btn-block btn-gray btn-only-hover" if @current_user != @user %>
+	      <%= link_to raw("<i class=\"linecons-paper-plane\"></i> Masquerade"), masquerade_user_path(@user), method: :put, data: { confirm: "Are you sure? Do you really want to logout current session and login as #{@user.name}?" }, class: "btn btn-block btn-gray btn-only-hover" if @current_user != @user %>
 
 	      <!-- Remove Super Admin -->
-		    <%= link_to raw("<i class=\"fa fa-remove mr-5\"></i> Remove Super Admin"), remove_super_admin_admin_user_path(id: @user.id), method: :put, :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @user.super_admin? && (@current_user != @user) %>
+		    <%= link_to raw("<i class=\"fa fa-remove mr-5\"></i> Remove Super Admin"), remove_super_admin_user_path(id: @user.id), method: :put, :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @user.super_admin? && (@current_user != @user) %>
 
 		    <!-- Make Super Admin -->
-		    <%= link_to raw("<i class=\"fa fa-plus-square mr-5\"></i> Make Super Admin"), make_super_admin_admin_user_path(id: @user.id), method: :put, remote: true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-gray btn-only-hover" unless @user.super_admin? %>
+		    <%= link_to raw("<i class=\"fa fa-plus-square mr-5\"></i> Make Super Admin"), make_super_admin_user_path(id: @user.id), method: :put, remote: true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-gray btn-only-hover" unless @user.super_admin? %>
 
 	    <% end %>
 
 	    <!-- Approve -->
-	    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_admin_user_path(:id =>@user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" if @user.can_be_approved? && (@current_user != @user) %>
+	    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_user_path(:id =>@user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" if @user.can_be_approved? && (@current_user != @user) %>
 
 	    <!-- Mark as Pending -->
-	    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_admin_user_path(:id =>@user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-gray btn-only-hover" if @user.can_be_marked_as_pending? && (@current_user != @user) %>
+	    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_user_path(:id =>@user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-gray btn-only-hover" if @user.can_be_marked_as_pending? && (@current_user != @user) %>
 	    	
 	    <!-- Suspend -->
-	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_admin_user_path(:id =>@user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @user.can_be_suspended? && (@current_user != @user) %>
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_user_path(:id =>@user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @user.can_be_suspended? && (@current_user != @user) %>
 
 	    <div class="visible-sm visible-xs mb-50"></div>
 

data/app/views/usman/{admin/users → users}/index.html.erb

@@ -6,14 +6,14 @@
       <%# Show Admin tab only for admins %>
       <% if @current_user.super_admin? %>
         <li class="<%= @super_admin == false ? 'active' : '' %>">
-          <%= link_to "Users", admin_users_path(sa: '0') %>
+          <%= link_to "Users", users_path(sa: '0') %>
         </li>
         <li class="<%= @super_admin == true ? 'active' : '' %>">
-          <%= link_to "Administrators", admin_users_path(sa: '1') %>
+          <%= link_to "Administrators", users_path(sa: '1') %>
         </li>
       <% else %>
         <li class="active">
-          <%= link_to "Users", admin_users_path(sa: '0') %>
+          <%= link_to "Users", users_path(sa: '0') %>
         </li>
       <% end %>
 
@@ -26,11 +26,11 @@
           <div class="row">
             <div class="col-md-6">
               
-              <%= theme_button('Add a User', 'plus', new_admin_user_path(), classes: "pull-left", btn_type: "success") %>
+              <%= theme_button('Add a User', 'plus', new_user_path(), classes: "pull-left", btn_type: "success") %>
 
-              <%= theme_button('Refresh', 'refresh', admin_users_path(), classes: "pull-left ml-10", btn_type: "white") %>
+              <%= theme_button('Refresh', 'refresh', users_path(), classes: "pull-left ml-10", btn_type: "white") %>
 
-              <%= theme_button('Manage Roles', 'nothing linecons-graduation-cap', admin_roles_path(), classes: "pull-left ml-10", btn_type: "white", remote: false) %>
+              <%= theme_button('Manage Roles', 'nothing linecons-graduation-cap', roles_path(), classes: "pull-left ml-10", btn_type: "white", remote: false) %>
 
               <!-- Single button -->
               <div class="ml-10 btn-group hidden">
@@ -47,14 +47,14 @@
 
             </div>
             <div class="col-md-6">
-              <%= search_form_kuppayam(User, admin_users_path, text: @filters[:query]) %>
+              <%= search_form_kuppayam(User, users_path, text: @filters[:query]) %>
             </div>
           </div>
         </div>
         <%= clear_tag(10) %>
 
         <div id="div_user_index">
-          <%= render :partial=>"usman/admin/users/index" %>
+          <%= render :partial=>"usman/users/index" %>
         </div>
         <%= clear_tag(10) %>
 

data/config/locales/usman/mobile_registration.ar.yml

@@ -0,0 +1,14 @@
+en:
+  mobile_registration:
+    device_blocked:
+      heading: "This device is blocked."
+      message: "You must have done some mal-practices."
+    invalid_inputs:
+      heading: "Registring new mobile number FAILED."
+      message: "Check if all mandatory details are passed. Refer the error details for technical information."
+    otp_sent:
+      heading: "An OTP has been sent to you"
+      message: "Check your mobile for new message from us."
+    otp_not_sent:
+      heading: "OTP was not sent"
+      message: "There was some technical glitch and OTP was not sent. Try after some time."