From 2c8705ac3e0c64c6e996a699688bbab3b2182c16 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Mon, 4 Nov 2013 17:36:22 +0800
Subject: [PATCH] fixed site structure and also member roles side bar problem.

---
 app/assets/javascripts/lib/items/items.js.erb        | 12 ++++++------
 .../admin/users_new_interface/_side_bar.html.erb     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/lib/items/items.js.erb b/app/assets/javascripts/lib/items/items.js.erb
index 6e03b4ad4..304d21b3c 100644
--- a/app/assets/javascripts/lib/items/items.js.erb
+++ b/app/assets/javascripts/lib/items/items.js.erb
@@ -286,7 +286,6 @@ function getView(module_id, id) {
         cache: false,
       });
 }
-
 $(function() {
   $pageModule = null,
   $pageF2E = null,
@@ -322,11 +321,12 @@ $(function() {
     disableNesting: 'no-nest',
     update: function(event, ui) {
       var position = null;
-      if($(ui.item).closest('ol').hasClass('item-groups')) {
-        position = $(ui.item).index() - 1;
-      } else {
-        position = $(ui.item).index();
-      };
+      // if($(ui.item).closest('ol').hasClass('item-groups')) {
+      //   position = $(ui.item).index() - 1;
+      // } else {
+      //   position = $(ui.item).index();
+      // };
+      position = $(ui.item).index();
       $.post("<%= Rails.application.routes.url_helpers.update_position_admin_items_path %>", { id: ui.item.attr('id'), parent_id: (ui.item.parent().closest('li').attr('id') || ui.item.parent().closest('ol').attr('id')), position: position } );
     }
   });
diff --git a/app/views/admin/users_new_interface/_side_bar.html.erb b/app/views/admin/users_new_interface/_side_bar.html.erb
index 1f43a0268..fbeedd3c7 100644
--- a/app/views/admin/users_new_interface/_side_bar.html.erb
+++ b/app/views/admin/users_new_interface/_side_bar.html.erb
@@ -6,7 +6,7 @@
   <div id="sidebar-menu">
     <div class="scroller">
       <%= content_tag :ul, :class => "sidebar-nav" do -%>
-        <%= content_tag :li, :class => active_for_controllers('users_new_interface') do -%>
+        <%= content_tag :li, :class => active_for_controllers('users_new_interface','roles') do -%>
           <%= link_to( ( content_tag(:span, content_tag(:i, nil, :class => 'icons-user'))), admin_users_new_interface_index_path) %>
         <% end -%>
         <%= content_tag :li, :class => active_for_controllers('plugins') do -%>
@@ -30,7 +30,7 @@
         <%= content_tag :li, link_to((content_tag(:span, t(:add_member))), new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') if (is_admin? rescue nil) %>
         <%= content_tag :li, link_to((content_tag(:span, t(:member_authorization))), '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
         <%= content_tag :li, link_to((content_tag(:span, t(:member_registration))), '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
-        <%= content_tag :li, link_to((content_tag(:span, t(:member_role))),admin_roles_path ), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+        <%= content_tag :li, link_to((content_tag(:span, t(:member_role))),admin_roles_path ), :class => active_for_action('roles', 'index')  if (is_admin? rescue nil) %>
         <%= content_tag :li, link_to((content_tag(:span, t(:member_info))), edit_admin_info_path(Info.first.id.to_s)), :class => active_for_action('users_new_interfacexx', 'index') if (is_admin? rescue nil) and Info.first %>
       <% end -%>
     </div>