Merge branch 'various_bugs' into nccu_master

Conflicts: Gemfile.lock app/assets/javascripts/ajax_form.js.erb app/assets/stylesheets/style.css.erb app/controllers/application_controller.rb app/controllers/sessions_controller.rb app/helpers/admin/web_link_helper.rb app/views/admin/attributes/_attribute_field.html.erb app/views/admin/designs/_form.html.erb app/views/admin/pages/_form.html.erb app/views/admin/sites/_side_bar.html.erb app/views/layouts/_orbit_bar.html.erb app/views/layouts/_side_bar.html.erb config/locales/en.yml config/locales/zh_tw.yml config/mongoid.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
commit 65ac6980c4
@@ -0,0 +1,16 @@
+  <div class="quick-edit">
+                            <ul class="nav nav-pills hide">
+                                <li><a href="#"><%= t("admin.new_admin.action.edit")%> </a></li>
+                                <li class="dropdown">
+                                    <a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t("admin.new_admin.action.quick_edit")%><b class="caret"></b></a>
+                                    <ul class="dropdown-menu" id="menu1">
+                                        <li><a href="#"># TODO:Basic</a></li>
+                                        <li><a href="#"># TODO:Picture</a></li>
+                                        <li><a href="#"># TODO:Tags</a></li>
+                                        <li><a href="#"># TODO:Link</a></li>
+                                        <li><a href="#"># TODO:File</a></li>
+                                    </ul>
+                                </li>
+                                <li><a href="#"><%= t("admin.new_admin.action.delete")%></a></li>
+                            </ul>
+                        </div>
@@ -0,0 +1,78 @@
+        <div class="subnav">
+            <div class="btn-group pull-right view-mode">
+                <form action="" method="get">
+                <button class="btn <%= "active" if params[:at].blank? %>"><i class="icon-align-justify"></i> <%= t("admin.new_admin.show_mode.index")%></button>
+                <button name="at" value="summary" class="btn <%= "active" if params[:at] == "summary" %>"><i class="icon-th-list"></i> <%= t("admin.new_admin.show_mode.summary")%></button>
+                <button name="at" value="thumbnail" class="btn <%= "active" if params[:at] == "thumbnail" %>"><i class="icon-th-large"></i> <%= t("admin.new_admin.show_mode.thumbnail")%></button>
+            </form>
+            </div>
+            <ul class="nav nav-pills filter">
+                <li class="accordion-group">
+                    <div class="accordion-heading">
+                        <a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.status")%> <b class="web-symbol"></b></a>
+                    </div>
+                </li>
+                <li class="accordion-group">
+                    <div class="accordion-heading">
+                        <a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.category")%> <b class="web-symbol"></b></a>
+                    </div>
+                </li>
+                <li class="accordion-group">
+                    <div class="accordion-heading">
+                        <a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.tags")%> <b class="web-symbol"></b></a>
+                    </div>
+                </li>
+            </ul>
+            <div class="filters">
+                <div class="accordion-body collapse" id="collapse-status">
+                    <div class="accordion-inner" data-toggle="buttons-checkbox">
+                        <a href="#" class="btn">Full-Time</a>
+                        <a href="#" class="btn">Part-time</a>
+                        <a href="#" class="btn">Adjunct</a>
+                        <a href="#" class="btn">Distinguished</a>
+                    </div>
+                    <div class="filter-clear">
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                    </div>
+                </div>
+                <div class="accordion-body collapse" id="collapse-category">
+                    <div class="accordion-inner" data-toggle="buttons-checkbox">
+                        <% @sub_roles.each do |sr|%>
+                            <a href="#" class="btn"><%= sr.title%></a>
+                        <% end -%>
+                    </div>
+                    <div class="filter-clear">
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                    </div>
+                </div>
+                <div class="accordion-body collapse" id="collapse-tags">
+                    <div class="accordion-inner" data-toggle="buttons-checkbox">
+                        <% @sub_role_tags.each do |sr_tag|%>
+                            <a href="#" class="btn"><%= sr_tag[I18n.locale] %></a>
+                        <% end -%>
+                    </div>
+                    <div class="filter-clear">
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                    </div>
+                </div>
+                <% if params[:at].blank?  #header for index%>
+                    <div class="table-label">
+                        <table class="table main-list">
+                            <thead>
+                                <tr>
+                                    <th class="span1">
+                                        <input type="checkbox">
+                                        <a href class="list-remove"><i class="icon-minus-sign"></i></a>
+                                    </th>
+                                <th id="sort-roles" class="sort span3"><%= t("admin.new_admin.attributes.roles")%><b class="web-symbol"></b></th>
+                                <th id="sort-name" class="sort span1-2 select active"><%= t("admin.new_admin.attributes.name")%><b class="web-symbol"></b></th>
+                                <th id="sort-email" class="sort span2"><%= t("admin.new_admin.attributes.publications")%><b class="web-symbol"></b></th>
+                                <th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.courses")%><b class="web-symbol"></b></th>
+                                <th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.followers")%><b class="web-symbol"></b></th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+                <% end -%>
+            </div>
+        </div>
@@ -0,0 +1,107 @@
+  <div class="user-info">
+      <div class="user-avatar pull-left">
+          <p class="reflective"></p>
+            <% if @user.avatar? %>
+              <%= image_tag(@user.avatar.thumb.url) %>
+            <% else %>
+              <%= image_tag "person.png" %>
+            <% end %>
+            <%= file_field_tag 'file' %>
+            <%= hidden_field_tag :avatar_cache %>
+      </div>
+      <label>
+    <%= f.check_box :admin %>
+  <span><%= t(:admin) %>：</span>
+  </label>
+  </div>
+
+<%= render :partial=>"infos"%>
+<%= render :partial=>"roles"%>
+
+<% content_for :page_specific_javascript do -%>
+<script>
+        // $('.site-map').masonry({
+        //     itemSelector: '.map-block',
+        //     columnWidth: 450,
+        //     isAnimated: true
+        // });
+  $(document).ready(function(){
+        function subrole_disable_field( triggled_object, switch_value_str){
+          var switch_field = triggled_object.attr("for");
+          $("input.subrole_disable_field[for="+switch_field+"]").val(switch_value_str)
+        }
+
+       function checkSwitch() {
+           $(".groups").each(function() {
+               $(this).find('.form-horizontal > .hide').length < $(this).find('.form-horizontal > div').length ? $(this).removeClass("disabled") : $(this).addClass("disabled")
+           });
+       }
+        function checkMultipleInput() {
+            $(".multipleInput").each(function() {
+                $(this).find('.controls').length==1 ? $(this).addClass("plural") : $(this).removeClass("plural")
+            });
+        }
+        function removeInput(){
+            $(".removeInput").click(function (){
+                $(this).parents(".controls").remove();
+                checkMultipleInput();
+                return false;
+            });
+        }
+        checkSwitch();
+        checkMultipleInput();
+        removeInput();
+        $(".help-block a").click(function (){
+            var $CloneTarget = $(this).parents(".controls").prev(".multipleInput").find('.controls:last');
+            $(this).parents(".controls").prev(".multipleInput").append($CloneTarget.clone());
+            $(this).parents(".controls").prev(".multipleInput").find('.controls:last input').val("");
+            removeInput();
+            checkMultipleInput();
+            return false;
+        })
+        $(".status select").each(function (i) {
+            $(this).change(function () {
+                $(".status option:selected").eq(i).each(function () {
+                    if($(this).attr("value")=="alumna") {
+                        $(this).parents(".status").nextAll(".graduated").removeClass("hide");
+                        $(this).parents(".status").nextAll(".graduated").find("select").removeAttr("disabled");
+                    }else{
+                        $(this).parents(".status").nextAll(".graduated").addClass("hide");
+                        $(this).parents(".status").nextAll(".graduated").find("select").attr({disabled:''});
+                    }
+                });
+            })
+        })
+        $('.onoff').click(function () {
+            if($(this).parents("h4").length==1) {
+                $(this).parents(".map-block").toggleClass("disabled");
+                $(this).parents(".map-block").find(".form-horizontal").toggleClass("hide");
+                if($(this).parents(".map-block").hasClass("disabled")){
+                    $(this).text("OFF");
+                    // console.log("LV1");
+                    // console.log($(this));
+                }else{
+                    $(this).text("ON");
+                    // console.log("LV1");
+                    // console.log($(this));
+                }
+            }
+            if($(this).parents("legend").length==1) {
+                $(this).toggleClass("disabled");
+                $(this).parents("legend").next("div").toggleClass("hide");
+                if($(this).parents("legend").next("div").hasClass("hide")){
+                    $(this).text("OFF");
+                    console.log("LV2");
+                    subrole_disable_field($(this),"true");
+                }else{
+                    $(this).text("ON");
+                    console.log("LV2");
+                    subrole_disable_field($(this),"false");
+                }
+                checkSwitch();
+            }
+           return false;
+        });
+      })
+    </script>
+<% end -%>
@@ -0,0 +1,8 @@
+       <div class="form-actions form-fixed pagination-right">
+            <%= link_to(new_admin_users_new_interface_path,:class=> "btn btn-primary pull-right") do%>
+                <i class="icon-plus icon-white"></i><%= t("admin.new_admin.action.add")%>
+            <% end -%>
+            <div class="paginationFixed" id="user_pagination">
+               <%= paginate @users, :params => {:inner => false}%>
+            </div>
+        </div>
@@ -0,0 +1,12 @@
+<div class="map-block back">
+  <h4><span><%= info.title %></span></h4>
+  <div class="form-horizontal">
+      
+    <% info.attribute_fields.each  do |af|%>
+        <%= af.block_helper(@user,@form_index)%>
+        <% @form_index = @form_index +1 %>
+    <% end %>
+
+
+  </div>
+</div>
@@ -0,0 +1,4 @@
+  <!--<span><%#= t(:email) %>：</span> -->
+  <%#= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
+
+<%=render :partial=>"info",:collection=>Info.all%>
@@ -0,0 +1,7 @@
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "item"%>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%#= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+<% end -%>
@@ -0,0 +1,46 @@
+                <div class="item element">
+                    <h3><i class="icons-content"></i>Module Name</h3>
+                    <div class="detail w-a h-a">
+                        <table class="table table-striped">
+                            <thead>
+                                <tr>
+                                    <th>模組</th>
+                                    <th class="span2">數量</th>
+                                </tr>
+                            </thead>
+                        </table>
+                        <div class="detal-list my_scroll">
+                            <div class="scrollbar">
+                                <div class="track">
+                                    <div class="thumb">
+                                        <div class="end"></div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="viewport">
+                                <div class="overview">
+                                    <table class="table table-striped">
+                                        <tbody>
+                                            <tr>
+                                                <td>University</td>
+                                                <td class="span2">2,304</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Master</td>
+                                                <td class="span2">783</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Doctor</td>
+                                                <td class="span2">45</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Staff</td>
+                                                <td class="span2">62</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
@@ -0,0 +1,25 @@
+<div class="groups map-block back">
+  <h4><span><%= role.title %></span></h4>
+  <div class="form-horizontal">
+
+
+
+  <% role.sub_roles.each do |sub_role| %>  
+      <% sub_role_disable = @user.sub_roles.include?(sub_role) ?   false : true    %>
+      <%= hidden_field_tag("user[disable_sub_role][id][#{sub_role.id}]",sub_role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>sub_role_disable)%>
+      <%#= hidden_field_tag("[user][new_attribute_values][sub_role][disable][#{sub_role.id}]",sub_role_disable)%>
+      <legend>
+        <button  for=<%=@form_index%> class="onoff pull-right  <%= sub_role_disable ? 'disabled' : '' %> ">ON</button><%= sub_role.title %>
+      </legend>
+    <div class="controls-block <%= sub_role_disable ? 'hide' : '' %>" >
+    <% sub_role.attribute_fields.each  do |af|%>
+        <%= af.block_helper(@user,@form_index)%>
+        <% @form_index = @form_index +1 %>
+    <% end %>
+    </div>
+
+  <% end %>
+
+    
+  </div>
+</div>
@@ -0,0 +1 @@
+<%=render :partial=>"role",:collection=>Role.all%>
@@ -0,0 +1,10 @@
+<div class="roles <%= show_roles.key %>">
+    <div class="label-line">
+        <hr />
+    </div>
+    <table class="table">
+        <tbody>
+                <%= render :partial => 'show_sub_role',:collection=> @user.get_sub_roles_by_role(show_roles)%>
+        </tbody>
+    </table>
+</div>
@@ -0,0 +1,7 @@
+<tr><td class="span1"><%= show_sub_role.title %></td></tr>
+<% show_sub_role.attribute_fields.each do |item|%>
+  <tr>
+      <td class="span1"><%= item.title %></td>
+      <td><%= show_attribute_value(@user.get_attribute_value(item).get_value_by_locale(I18n.locale)) %></td>
+  </tr>
+<% end %>
@@ -0,0 +1,16 @@
+<%= content_tag :li, :class => active_for_controllers('users_new_interface')  do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t('admin.new_admin.user')), admin_users_new_interface_index_path %>
+    <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
+    <% end -%>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t('admin.plugins')), admin_plugins_path %>
+    <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('plugins')) do -%>
+      <%= content_tag :li, link_to((t('admin.all_plugins') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
+    <% end -%>
+<% end -%>
@@ -0,0 +1,7 @@
+<%#= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
+ ['title', 'title','span4', 'admin.title'],
+                          ['description', 'description', 'span1-2', 'admin.data'],
+                          ['intro', 'intro', 'span1-2', 'admin.file_type'],
+                          ['intro', 'intro', 'span1-2', 'admin.file_length'],
+                          ['intro', 'intro', 'span1-2', 'admin.description'],
+                          ['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>
@@ -0,0 +1,31 @@
+<div id="person" class="clear">
+  <% if @user.avatar? %>
+    <%= image_tag(@user.avatar.thumb.url) %>
+  <% else %>
+    <%= image_tag "person.png" %>
+  <% end %>
+  <%= file_field_tag 'file' %>
+  <%= hidden_field_tag :avatar_cache %>
+  <label>
+  <span><%= t('admin.email') %>：</span>
+  <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+  </label>
+  <label>
+    <%= f.check_box :admin %>
+  <span><%= t('admin.admin') %>：</span>
+  </label>
+  <label>
+  
+  </label>
+  <table>
+    <tr>
+    <%=render :partial=>"temp_profile",:collection=>Info.all%>
+    <tr>
+    <tr> <span><%= t('admin.role') %>：</span> </tr>
+    <tr>
+  <%= render :partial=>"temp_sub_role_from",:collection=>@user.sub_roles %>
+</tr>
+</table>
+</div>
+
+
@@ -0,0 +1,7 @@
+<td>
+<%= temp_profile.title %>
+<% temp_profile.attribute_fields.each  do |af|%>
+  <%= af.block_helper(@user,@form_index)%>
+  <% @form_index = @form_index +1 %>
+<% end %>
+</td>
@@ -0,0 +1,10 @@
+<td>
+<%= temp_sub_role_from.title%>
+
+<ul>
+<% temp_sub_role_from.attribute_fields.each do |af| %>
+    <li><%= af.block_helper(@user,@form_index) %></li>
+    <% @form_index = @form_index +1 %>
+<% end %>
+</ul>
+</td>
@@ -0,0 +1,32 @@
+  <%#= devise_error_messages! %>
+
+  <div class="map-block back">
+                <h4><span><%=t('admin.user_new_interface.sys_basic_form')%></span></h4>
+
+                <div class="form-horizontal">
+                    <div class="control-group">
+                        <%= f.label t('admin.user_new_interface.email'),:class=>"control-label" %><br />
+                        <div class="controls">
+                            <%= f.email_field :email %>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-horizontal">
+                    <div class="control-group">
+                        <%= f.label t('admin.user_new_interface.password'),:class=>"control-label" %>
+                        <div class="controls">
+                            <%= f.password_field :password %>
+                        </div>
+                    </div>
+                  </div>
+
+                  <div class="form-horizontal">
+                    <div class="control-group">
+                      <%= f.label t('admin.user_new_interface.password_confirmation'),:class=>"control-label" %>
+                          <div class="controls">
+                              <%= f.password_field :password_confirmation %>
+                        </div>
+                    </div>
+                </div>
+            </div>
@@ -0,0 +1,22 @@
+                <tr class="with_action">
+                    <td class="span1"><input type="checkbox"></td>
+                    <td class="span3">
+                        <div class="label-group">
+                            <div class="label-td"><!-- 
+                                <span class="label label-teacher"># TODO:Teacher</span>
+                                <span class="label label-student"># TODO:Student</span>
+                                <span class="label label-staff"># TODO:Staff</span> -->
+                            </div>
+                        </div>
+                    </td>
+                    <td class="span1-2">
+                        <%= link_to user_for_listing.name,admin_users_new_interface_path(user_for_listing) %>
+                        <%#= render "deled_quick_edit"%>
+                    </td>
+                    <td class="span2"><%= Random.rand(1000)%></td>
+                    <td class="span2"><%= Random.rand(10)%></td>
+                    <td class="span2">
+                        <%= Random.rand(10000)%>
+                        <p class="gender male"></p>
+                    </td>
+                </tr>
@@ -0,0 +1,30 @@
+                <li class="pull-left">
+                    <table class="rolesTag">
+                        <tbody>
+                            <tr>
+                                <td class="teacher"></td>
+                                <td class="staff"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div class="clear user">
+                        <p class="gender male"></p>
+                        <div class="user-avatar pull-left">
+                            <p class="reflective"></p>
+                            <%= show_avatar(user_for_summary) %>
+                        </div>
+                        <div class="user-meta">
+                            <p class="user-name">
+                                <%= link_to user_for_summary.name,admin_users_new_interface_path(user_for_summary)%>
+                            </p>
+                            <div class="user-title">
+                                <span>#TODO 教授兼系主任</span><span>#TODO 大學部校友</span>
+                            </div>
+                            <ul class="user-itemborder clear">
+                                <li class="pull-left"><span>#TODO 258</span>Publications</li>
+                                <li class="pull-left"><span>#TODO 16</span>Courses</li>
+                                <li class="pull-left"><span>#TODO 10,578</span>Followers</li>
+                            </ul>
+                        </div>
+                    </div>
+                </li>
@@ -0,0 +1,22 @@
+                <li class="pull-left">
+                    <table class="rolesTag">
+                        <tbody>
+                            <tr>
+                                <td class="teacher"></td>
+                                <td class="staff"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div class="user">
+                        <p class="gender male"></p>
+                        <div class="user-avatar">
+                            <p class="reflective"></p>
+                            <%= show_avatar(user_for_thumbnail) %>
+                        </div>
+                        <div class="user-meta">
+                            <p class="user-name">
+                                <%= link_to user_for_thumbnail.name,admin_users_new_interface_path(user_for_thumbnail)%>
+                            </p>
+                        </div>
+                    </div>
+                </li>
@@ -0,0 +1,16 @@
+                        <div class="roles <%= role_class %>">
+                            <div class="label-line">
+                                <hr />
+                                <span><%= t(i18n)%></span>
+                            </div>
+                            <table class="table">
+                                <tbody>
+                                    <% items.each do |item| %>
+                                        <tr>
+                                            <td class="span1"><%= item[:name] %></td>
+                                            <td><%= show_attribute_value(item[:value]) %></td>
+                                        </tr>
+                                    <% end -%>
+                                </tbody>
+                            </table>
+                        </div>
@@ -0,0 +1,28 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "site-map" %>
+    <%= stylesheet_link_tag "isotope" %>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+    <%= javascript_include_tag "inc/modal-preview" %>
+    <%= javascript_include_tag "lib/contenteditable" %>
+<% end -%>
+
+
+<%= content_tag :div,:class=>"user-role site-map"  do%>
+
+    <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
+      <%= f.error_messages %>
+      <%= render :partial => 'form', :locals => { :f => f } %>
+      <div class="button_bar">
+        <%= link_back %>
+      <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      </div>
+    <% end -%>
+
+<% end -%>
@@ -0,0 +1,24 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+<%= render :partial => "filter"%>
+  <table class="table main-list member-list">
+    <thead>
+      <tr>
+        <th class="span1"></th>
+        <th class="span3"></th>
+        <th class="span1-2"></th>
+        <th class="span2"></th>
+        <th class="span2"></th>
+        <th class="span2"></th>
+      </tr>
+    </thead>
+    <tbody id="tbody_users">
+      <%= render :partial => "user_for_listing",:collection=> @users%>
+    </tbody>
+  </table>
+
+<%= render :partial=> "index_paginator" %>
@@ -0,0 +1,3 @@
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#tbody_users").html("<%= j render :partial => 'user_for_listing', :collection => @users %>");
+$("#user_pagination").html("<%= j paginate @users, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");
@@ -0,0 +1,13 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+<%= render :partial => "filter"%>
+    <div class="member-abstract">
+        <ul class="clear" id="summary_block_users">
+                <%= render :partial=>"user_for_summary",:collection=> @users%>
+        </ul>
+    </div>
+<%= render :partial=> "index_paginator" %>
@@ -0,0 +1,3 @@
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#summary_block_users").html("<%= j render :partial => 'user_for_summary', :collection => @users %>");
+$("#user_pagination").html("<%= j paginate @users, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");
@@ -0,0 +1,12 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+<%= render :partial => "filter"%>
+    <div class="member-large">
+        <ul class="clear" id="thumbnail_block_users">
+            <%= render :partial=>"user_for_thumbnail",:collection=> @users%>
+        </div>
+<%= render :partial=> "index_paginator" %>
@@ -0,0 +1,3 @@
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#thumbnail_block_users").html("<%= j render :partial => 'user_for_thumbnail', :collection => @users %>");
+$("#user_pagination").html("<%= j paginate @users, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");
@@ -0,0 +1,30 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "site-map" %>
+    <%= stylesheet_link_tag "isotope" %>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+    <%= javascript_include_tag "inc/modal-preview" %>
+    <%= javascript_include_tag "lib/contenteditable" %>
+<% end -%>
+
+
+<%= content_tag :div,:class=>"user-role site-map"  do%>
+    <%= form_for @user, :url =>  admin_users_new_interface_index_path, :html => { :multipart => true },:method => :post do |f| %>
+
+      <%= f.error_messages %>
+      <%= render :partial => 'user_basic', :locals => {:f => f}%>
+      <%= render :partial => 'form', :locals => { :f => f } %>
+      <div class="button_bar">
+        <%#= link_back %>
+      <%#= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      <%= f.submit%>
+      </div>
+    <% end -%>
+
+<% end -%>
@@ -0,0 +1,10 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+            <div class="member-plugin">
+                <% #binding.pry%>
+                <%= render :partial=> 'plugin_summary'%>
+                <%= render :partial=> 'plugin_summary'%>
+                <%= render :partial=> 'plugin_summary'%>
+            </div>
@@ -0,0 +1,63 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+        <div id="isotope" class="user-data">
+            <div id="module-nav">
+                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
+                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
+                <div class="module-nav-view">
+                    <ul class="nav nav-pills">
+                        <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
+                            <%= link_to t("admin.new_admin.users.all_plugin_summary")%>
+                        <% end -%>
+                        <% @plugins.each do |plugin| %>
+                            <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
+                                <%= link_to plugin.name, :show_plugin_profile => plugin.name %>
+                            <% end -%>    
+                        <% end -%>
+
+
+                    </ul>
+                </div>
+            </div>
+            <%=render :partial => @right_partial %>
+        </div>
+        <div class="user-info">
+            <div id="brand" class="clear">
+                <p class="gender male"></p>
+                <div class="user-avatar pull-left">
+                    <p class="reflective"></p>
+                   <%= show_avatar(@user) %>
+                </div>
+                <p class="user-name">
+                    <%= @user.name%>
+                </p>
+                <p class="user-mail">
+                    <%= @user.email %>
+                </p>
+                <%= link_to "<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small"%>
+            </div>
+            <div class="user-roles my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <%= render :partial=> "user_role",:locals=>{:role_class=>"basic",:i18n=>"admin.new_admin.users.profile",:items=>@profile_data} %>
+                        <%= render :partial=> "show_roles",:collection=>@user.roles %>
+                        <%# @user.sub_roles.each{|sr| render :partial=> "user_role",:locals=>{:role_class=>sr.key.to_s,:i18n=>"admin.new_admin.users.roles.#{sr.key.to_s}",:items=>sr} }%>
+
+                        <%#= render :partial=> "user_role",:locals=>{:role_class=>"teacher",:i18n=>"admin.new_admin.users.roles.teacher",:items=>@teacher_data} %>
+                        <%#= render :partial=> "user_role",:locals=>{:role_class=>"student",:i18n=>"admin.new_admin.users.roles.student",:items=>@student_data}%>
+                        <%#= render :partial=> "user_role",:locals=>{:role_class=>"staff",:i18n=>"admin.new_admin.users.roles.staff",:items=>@staff_data} %>
+                    </div>
+                <div>
+            </div>
+        </div>
@@ -0,0 +1,27 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "site-map" %>
+    <%= stylesheet_link_tag "isotope" %>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+    <%= javascript_include_tag "inc/modal-preview" %>
+    <%= javascript_include_tag "lib/contenteditable" %>
+<% end -%>
+
+<%= content_tag :div,:class=>"user-role site-map"  do%>
+
+    <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
+      <%= f.error_messages %>
+      <%= render :partial => 'temp_form', :locals => { :f => f } %>
+      <div class="button_bar">
+        <%= link_back %>
+      <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      </div>
+    <% end -%>
+
+<% end -%>
				`@@ -0,0 +1 @@`
				`<%=render :partial=>"role",:collection=>Role.all%>`