solved conflict for member_new_ui

app/views/layouts/member.html.erb

@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+	<title><%= @title || APP_CONFIG['orbit'] %></title>
+	<%= render 'layouts/meta' %>
+	<%= render 'layouts/google_font' %>
+	<%= stylesheet_link_tag "member" %>
+	<%= stylesheet_link_tag params[:controller] %>
+  <%= yield :page_specific_css %>
+	<%= render 'layouts/ie_html5_fix' %>
+	<%= javascript_include_tag "member" %>
+	<%= javascript_include_tag params[:controller] %>
+	<%= yield :page_specific_javascript %>
+	<%= csrf_meta_tag %>
+</head>
+<body id="users">
+	<%= render 'layouts/orbit_bar' unless @no_orbit_bar %>
+  <% if !(yield :side_bar).blank? %>
+    <%= yield :side_bar %>
+  <% else %>
+    <%= render 'layouts/side_bar' %>
+  <% end unless @no_side_bar %>
+	<section id="main-wrap">
+    <div class="wrap-inner">
+      <div id="filter" class="topnav clearfix">
+        <ul class="breadcrumb pull-left">
+          <li><a href="/orbit_4.0.1/admin/dashboards/dashboards.shtml">Dashboard</a> <span class="divider">/</span></li>
+          <li class="active">All</li>
+        </ul>
+        <%= yield :right_nav %>
+      </div>
+    	<%= yield %>
+      <div id="pageslide">
+      	<div id="view-page" class="nano" style="display:none">
+  			  <div class="content">
+  			  </div>
+  			</div>
+      </div>
+			<%= javascript_include_tag "lib/jquery.pageslide.js" %>
+    </div>
+  </section>
+</body>
+</html>