Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb

Conflicts:
	vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb

app/controllers/admin/plugins_controller.rb

@@ -4,19 +4,19 @@ class Admin::PluginsController < ApplicationController
   
   def index
   
-	@plugins = OrbitApp::Plugin::Registration.all
+  	@plugins = OrbitApp::Plugin::Registration.all
 
     if(!params[:show_plugin_profile].nil?)
 	
-      @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).admin_partial_path
+      @right_partial = OrbitApp::Plugin::Registration.find_by_app_name(params[:show_plugin_profile]).admin_partial_path
 
-	  if !@right_partial.blank?
-	    respond_to do |format|
-	      format.html { redirect_to( @right_partial ) }
-        end
-      else
-	    @right_partial = ""
-	  end
+      if !@right_partial.blank?
+        respond_to do |format|
+          format.html { redirect_to( @right_partial ) }
+          end
+        else
+        @right_partial = ""
+      end
 	  
     else
       @right_partial = ""

app/controllers/admin/users_new_interface_controller.rb

@@ -83,9 +83,18 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
   end
   
   def show
+    
     @user = User.find(params[:id])
+
     @plugins = OrbitApp::Plugin::Registration.all
 
+    @ppname = Array.new
+    @plugins.each do |aa|
+      @ppname << [aa.sort_number.to_i, [aa.name, aa.app_name, aa.intro_app_name, aa.front_partial_path]]
+    end
+    @plugin_shows = @ppname.sort.collect {|v| {"name"=>v[1][0],"app_name"=>v[1][1],"intro_app_name"=>v[1][2],"front_partial_path"=>v[1][3]} }
+
+
     @profile_data = []
     @teacher_data = []
     @student_data = []

app/helpers/application_helper.rb

@@ -271,11 +271,7 @@ module ApplicationHelper
   end
 
   def show_avatar(user)
-    if (user.avatar? rescue false)
-      image_tag(user.avatar.thumb.url)
-    else
-      image_tag "person.png"
-    end
+    image_tag(user.avatar.thumb.url)
   end
 
   # NTU link

app/uploaders/avatar_uploader.rb

@@ -21,6 +21,9 @@ class AvatarUploader < CarrierWave::Uploader::Base
   # def default_url
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
+  def default_url
+    [version_name, (Site.first.default_image.file.url rescue "person.png")].compact.join('_')
+  end
 
   # Process files as they are uploaded:
   # process :scale => [200, 300]

app/views/admin/plugins/_plugin_list.html.erb

@@ -7,8 +7,8 @@
                             <%= link_to t(: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, admin_plugins_path(:show_plugin_profile => plugin.name) %>
+                            <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.app_name ? "active" : nil) do %>
+                                <%= link_to plugin.name, admin_plugins_path(:show_plugin_profile => plugin.app_name) %>
                             <% end -%>    
                         <% end -%>
 

app/views/admin/users_new_interface/_user_for_summary.html.erb

@@ -15,7 +15,7 @@
         <%= link_to(content_tag(:i, nil, :class => 'icon-key'),'#',:class=>"key" ) if is_admin?%>
         <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_summary, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %>
       </div>
-      <%= show_avatar(user_for_summary) %>
+      <%= image_tag(user_for_summary.avatar) %>
     </div>
     <div class="member-info">
       <h4 class="member-name"><%= link_to user_for_summary.name,admin_users_new_interface_path(user_for_summary)%></h4>

app/views/admin/users_new_interface/_user_for_thumbnail.html.erb

@@ -16,7 +16,7 @@
         <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_thumbnail, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %>
         
       </div>
-      <%= show_avatar(user_for_thumbnail) %>
+      <%= image_tag(user_for_thumbnail.avatar) %>
     </div>
     <h4 class="member-name text-center"><%= link_to user_for_thumbnail.name,admin_users_new_interface_path(user_for_thumbnail)%></h4>
   </li>

app/views/admin/users_new_interface/show.html.erb

@@ -50,9 +50,9 @@
                           <a data-toggle="dropdown" class="dropdown-toggle" href="#">Module List <b class="caret"></b></a>
                           <ul class="dropdown-menu">
 
-                            <% @plugins.each do |plugin| %>
-                                <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.app_name ? "active" : nil) do %>
-                                    <%= link_to plugin.name, :show_plugin_profile => plugin.app_name %>
+                            <% @plugin_shows.each do |plugin| %>
+                                <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin["app_name"] ? "active" : nil) do %>
+                                    <%= link_to plugin["name"], :show_plugin_profile => plugin["app_name"] %>
                                 <% end -%>    
                             <% end -%>