user id set & user fields set & role set & member frontend list & user translation & create new member bug fix

2013-04-25 17:57:34 +08:00 · 2013-04-25 17:57:34 +08:00 · 697944a029
parent 12e39b4d77
commit 697944a029
172 changed files with 3631 additions and 96 deletions
--- a/app/controllers/admin/role_categorys_controller.rb
+++ b/app/controllers/admin/role_categorys_controller.rb
@ -0,0 +1,9 @@
+class Admin::RoleCategorysController < Admin::RoleFiltersController
+
+  def initialize
+    super
+    @app_type = 'role_category'
+    @app_type_name = 'category'
+  end
+  
+end
--- a/app/controllers/admin/role_filters_controller.rb
+++ b/app/controllers/admin/role_filters_controller.rb
@ -0,0 +1,144 @@
+class Admin::RoleFiltersController < OrbitBackendController
+     
+  include OrbitControllerLib::DivisionForDisable
+
+  layout "new_admin"
+  
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+  # before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+  helper Admin::AttributeValuesViewHelper
+  
+  def index
+	  get_types
+	  @role = Role.find(params[:role_id])
+    @role_filters =  @types.where(:role_id=>params[:role_id])
+    @role_filter = @types.new(:display => 'List')
+	
+	# @url = admin_role_filter_role_filters_path
+
+    if @app_type == 'role_statuses'
+      @url = eval("admin_#{@app_type}_path")
+    else
+	    @url = eval("admin_#{@app_type}s_path")
+	  end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.js
+    end
+
+  end
+
+
+  def show
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.js
+    end
+  end
+
+
+  def new
+  
+	  get_types
+	
+    @role_filter = @types.new(:display => 'List')
+	
+	  @verb = :post
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.js
+    end
+  end
+  
+
+  def edit
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+	
+	  @url = polymorphic_path([:admin, @role_filter])
+	
+	  @verb = :put
+
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+
+  def create
+    
+	  get_types
+	
+    @role_filter = @types.new(params[:role_filter])
+
+    respond_to do |format|
+      if @role_filter.save
+        format.html { redirect_to(admin_role_filter_url(params[:role_filter][:role_id])) }
+        format.js
+      end
+    end
+
+  end
+
+
+  def update
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+	# debugger
+	# @url = admin_role_filter_role_filter_path(@role_filter)
+	# @url = eval("admin_role_filter_#{@app_type}_path(#{@role_filter})")
+	  @url = polymorphic_path([:admin, @role_filter])
+
+    respond_to do |format|
+      if @role_filter.update_attributes(params[:role_filter])
+        format.html { redirect_to(admin_role_filter_role_filters_url(params[:role_id]), :notice => t('role_filter.update_role_filter_success')) }
+        # format.xml  { head :ok }
+        format.js
+      else
+        format.html { render :action => "edit" }
+        format.js { render :action => "edit" }
+      end
+    end
+  end
+
+
+  def destroy
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+    @role_filter.disable = @role_filter.disable ? false : true
+
+    if @role_filter.save!
+      respond_to do |format|
+        format.html { redirect_to(admin_role_filter_role_filters_url) }
+        # format.xml  { head :ok }
+        format.js
+      end      
+    else
+      flash[:error] = t("role_filter.update_failed")
+      format.html { render :action => "index" }
+    end
+
+  end
+  
+  protected
+  
+  def get_types
+    @types = @app_type.classify.constantize
+  end
+  
+end
--- a/app/controllers/admin/role_statuses_controller.rb
+++ b/app/controllers/admin/role_statuses_controller.rb
@ -0,0 +1,9 @@
+class Admin::RoleStatusesController < Admin::RoleFiltersController
+
+  def initialize
+    super
+    @app_type = 'role_statuses'
+    @app_type_name = 'status'
+  end
+  
+end
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@ -17,35 +17,34 @@ class Admin::RolesController < OrbitBackendController
  
  def role_field
  
-	@field_name = 'role'
+	  @field_name = 'role'
 	
-	@attribute = Role.find(params[:role_id])
+	  @attribute = Role.find(params[:role_id])
 	
  end
  
  def sub_role
 	
-	@attribute = Role.find(params[:role_id])
-	@attribute_fields_upper_object = @attribute.sub_roles
-	
+	  @attribute = Role.find(params[:role_id])
+	  @attribute_fields_upper_object = @attribute.sub_roles
 	
  end
  
  def add_sub_role
 	
-	@attribute = Role.find(params[:role_id])
-	# @sub_attribute = Role.find(params[:role_id])
+	  @attribute = Role.find(params[:role_id])
+	  # @sub_attribute = Role.find(params[:role_id])
 	
-	@sub_attribute = SubRole.new
+	  @sub_attribute = SubRole.new
    @sub_attribute.role_id = params[:role_id]
  
  end
  
  def edit_sub_role
 	
-	@sub_attribute = SubRole.find(params[:role_id])
+	  @sub_attribute = SubRole.find(params[:role_id])
 	
-	@attribute = Role.find(@sub_attribute.role_id)
+	  @attribute = Role.find(@sub_attribute.role_id)
 	
    @sub_attribute.role_id = @sub_attribute.role_id
  
@ -55,53 +54,52 @@ class Admin::RolesController < OrbitBackendController
  
    @field_name = 'sub_role'
 	
-	@sub_attribute = SubRole.find(params[:role_id])
+	  @sub_attribute = SubRole.find(params[:role_id])
 	
-	@attribute = Role.find(@sub_attribute.role_id)
+	  @attribute = Role.find(@sub_attribute.role_id)
 	
  end
  
  def add_attribute_field
 	
-	if params[:sub_role]
+	  if params[:sub_role]
 	
-	@field_name = 'sub_role'
+	    @field_name = 'sub_role'
 	
-	attribute = SubRole.find(params[:sub_role][:id]) rescue nil
-    @attribute_field_counter = attribute.attribute_fields.count
-    @attribute_field = attribute.attribute_fields.build
-    @attribute_field.save
+	    attribute = SubRole.find(params[:sub_role][:id]) rescue nil
+      @attribute_field_counter = attribute.attribute_fields.count
+      @attribute_field = attribute.attribute_fields.build
+      @attribute_field.save
 	
-    @attribute_field[:af_count] = @attribute_field_counter
+      @attribute_field[:af_count] = @attribute_field_counter
 	
-    @attribute = SubRole.find(params[:sub_role][:id])
+      @attribute = SubRole.find(params[:sub_role][:id])
 	
-	else
+	  else
 	
-	@field_name = 'role'
+	    @field_name = 'role'
 	
-    attribute = Role.find(params[:role_id]) rescue nil
-    @attribute_field_counter = attribute.attribute_fields.count
-    @attribute_field = attribute.attribute_fields.build
-    @attribute_field.save
+      attribute = Role.find(params[:role_id]) rescue nil
+      @attribute_field_counter = attribute.attribute_fields.count
+        @attribute_field = attribute.attribute_fields.build
+      @attribute_field.save
 	
-    @attribute_field[:af_count] = @attribute_field_counter
+      @attribute_field[:af_count] = @attribute_field_counter
 	
-    @attribute = Role.find(params[:role_id])
+      @attribute = Role.find(params[:role_id])
 	
-	end
+	  end
 	
-	respond_to do |format|
+	  respond_to do |format|
      format.js  { render 'add_attribute_field' }
-    end
-	
+    end	

  end
  
  def new
    @attribute = Role.new
 	
-	if !params[:parent_id]
+	  if !params[:parent_id]
      render :template => 'admin/attributes/new'
    end
 	
@ -165,17 +163,17 @@ class Admin::RolesController < OrbitBackendController
  
  def destroy
    
-	if params[:sub_role]
+	  if params[:sub_role]
 	
-	  @sub_role = SubRole.find(params[:sub_role][:id])
+	    @sub_role = SubRole.find(params[:sub_role][:id])
 	  
      respond_to do |format|
        if @sub_role.destroy
-		  format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
+		      format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
        end
      end
 	  
-	else
+	  else
 	
      @attribute = Role.find(params[:id])
      @attribute.destroy
--- a/app/controllers/admin/users_new_interface_controller.rb
+++ b/app/controllers/admin/users_new_interface_controller.rb
@ -1,4 +1,6 @@
 class Admin::UsersNewInterfaceController <  OrbitBackendController
+
+  helper MemberHelper
  
  layout "new_admin"
  # before_filter :authenticate_user!
@ -23,13 +25,13 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
    
    render case params[:at]
      when 'summary'
-        @users=User.not_guest_user.page(page_num).per(12).includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(12).asc("_id").includes('avatar')
        "index_summary"
      when 'thumbnail'
-        @users=User.not_guest_user.page(page_num).per(36).includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(36).asc("_id").includes('avatar')
        "index_thumbnail"
      else
-        @users=User.not_guest_user.page(page_num).per(10).includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(10).asc("_id").includes('avatar')
        "index"
    end
  end
@ -43,7 +45,7 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
    @student_data = []
    @staff_data = []

-    attribute_values = @user.attribute_values
+    attribute_values = @user.attribute_values.asc("_id")
    attribute_values.each{|att_val|
      @profile_data.push({:name => att_val.attribute_field.title,:value =>att_val.get_value_by_locale(I18n.locale.to_s)}) if att_val.attribute_field.attribute.key=="profile" rescue false
    }
@ -80,21 +82,29 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
  end
  
  def create
-    puts params.to_yaml
+    # puts params.to_yaml
    # attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
    # attribute_values = params[:user].delete(attribute_values_key)
    @user = User.new(params["user"])
+
+    @checkuser = User.where(:user_id => params[:user][:user_id]).first
+
+    if !@checkuser.blank?
+      flash.now[:error] = t("users.user_id_error")
+    end
+    
      # attribute_values.to_hash.each{|key,value|
      #   @user.attribute_values.build(value)
      # }
    # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
    # binding.pry
-    if @user.save
+    if !flash.now[:error] && @user.save
      flash[:notice] = t('create.success.user')
      redirect_to :action => :index
    else
+      @user.attribute_values = nil
      @form_index = 0
-      render :action => :new      
+      render :action => :new , :notice => flash.now[:error]   
    end
  end
  
@ -110,16 +120,46 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
    @form_index = 0
    get_info_and_roles
  end
+
+  def edit_passwd
+    # @disable_all_field = false
+    @user = User.find(params[:users_new_interface_id])
+  end
  
  def update
+
    @user = User.find(params[:id])
+
+    if params[:edit_type] == 'edit_passwd'
+
+      @checkuser = User.where(:user_id => params[:user][:user_id]).first
+
+      if !@checkuser.blank? &&  @checkuser.id != @user.id
+        flash.now[:error] = t("users.user_id_error")
+      elsif @user.admin && current_user.id == @user.id
+        flash.now[:error] = t("users.admin_change_password")
+      end
+
+      if !flash.now[:error] && @user.update_attributes(params[:user])
+        redirect_to :action => :show
+      else
+        render :action => :edit_passwd, :notice => flash.now[:error]
+      end
+
+    else
+
+      @user.update_attributes(params[:user])
+
+      attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
+      attribute_values = params[:user].delete(attribute_values_key)
+      # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
+      @user.save
+
+      redirect_to :action => :show
+
+    end
+    
    
-    @user.update_attributes(params[:user])
-    attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
-    attribute_values = params[:user].delete(attribute_values_key)
-    # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
-    @user.save
-    redirect_to :action => :show
    # # Update changes to the avatar
    # @user.remove_avatar! if params[:file]
    # @user.avatar = params[:file] if params[:file]
--- a/app/helpers/member_helper.rb
+++ b/app/helpers/member_helper.rb
@ -0,0 +1,5 @@
+module MemberHelper
+  def nl2br(val)
+    val.gsub(/\r\n/, '<br />').html_safe
+  end
+end
--- a/app/models/user/role.rb
+++ b/app/models/user/role.rb
@ -11,9 +11,14 @@ class Role < Attribute
  
  has_many :sub_roles, :autosave => true, :dependent => :destroy
  has_many :users
-  has_many :statuses, :autosave => true, :dependent => :destroy
+  # has_many :statuses, :autosave => true, :dependent => :destroy
  # has_many :attribute_fields, :autosave => true, :dependent => :destroy
+  has_many :role_statuses, :autosave => true, :dependent => :destroy
+  has_many :role_categorys, :autosave => true, :dependent => :destroy
+  
  accepts_nested_attributes_for :sub_roles, :allow_destroy => true
+  accepts_nested_attributes_for :role_statuses, :allow_destroy => true
+  accepts_nested_attributes_for :role_categorys, :allow_destroy => true
  
  def is_built_in?
    self.built_in
--- a/app/models/user/role_category.rb
+++ b/app/models/user/role_category.rb
@ -0,0 +1,14 @@
+class RoleCategory < RoleFilter
+
+  has_and_belongs_to_many :users
+  belongs_to :role
+
+  def self.get_role_data(role_key)
+
+  	@role = Role.where(:key =>role_key).first
+
+  	return @role.id
+  	
+  end
+  
+end
--- a/app/models/user/role_filter.rb
+++ b/app/models/user/role_filter.rb
@ -0,0 +1,26 @@
+class RoleFilter
+  
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  # include OrbitCoreLib::ObjectAuthable
+  include OrbitCoreLib::ObjectDisable
+
+
+  field :key
+  field :title, localize: true
+  
+  # belongs_to :role
+
+  def pp_object
+    title
+  end
+
+  def self.from_id(id)
+    RoleFilter.find(id) rescue nil
+  end
+
+  def self.is_localized?(field_name)
+    self.fields[field_name.to_s].localized?
+  end
+  
+end
--- a/app/models/user/role_status.rb
+++ b/app/models/user/role_status.rb
@ -0,0 +1,16 @@
+class RoleStatus < RoleFilter
+
+  has_and_belongs_to_many :users
+  belongs_to :role
+
+  scope :can_display,where(disable: false)
+
+  def self.get_role_data(role_key)
+
+  	@role = Role.where(:key =>role_key).first
+
+  	return @role.id
+  	
+  end
+  
+end
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@ -9,7 +9,13 @@ class User
  
  field :admin, :type => Boolean, :default => true
  field :active_role
+  field :user_id
+  field :sid
+  field :first_name, localize: true
+  field :last_name, localize: true
  field :email
+  field :sex, :default => 'unknown'
+  field :office_tel
  field :cache_dept,type: Hash
  field :status_record,type: Hash

@ -25,9 +31,11 @@ class User
  # has_many :papers, :autosave => true, :dependent => :destroy
  has_and_belongs_to_many :sub_role_tags

-  has_and_belongs_to_many :statuses
+#  has_and_belongs_to_many :statuses
  has_and_belongs_to_many :roles
  has_and_belongs_to_many :sub_roles
+  has_and_belongs_to_many :role_statuses
+  has_and_belongs_to_many :role_categorys
  accepts_nested_attributes_for :attribute_values, :allow_destroy => true 

  before_create :initialize_desktop
@ -36,6 +44,9 @@ class User
  scope :remote_account, where(:nccu_id.ne => nil)
  scope :not_guest_user, all_of(:name.ne => "guest")

+  validates :user_id,
+            :presence => { :message => I18n.t("users.user_id_not_null") } , 
+            :length => {:minimum => 3, :maximum => 50, :message => I18n.t("users.user_id_length") }
  # validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
  
  # def new_attribute_values=(vars)
@ -101,6 +112,24 @@ class User
    end
  end

+  def role_status=(var)
+    self.role_statuses = []
+    var[:id].each do |id,val|  
+      if (val=="true")
+        self.role_statuses << RoleStatus.find(id)
+      end
+    end
+  end
+
+  def role_category=(var)
+    self.role_categorys = []
+    var[:id].each do |id,val|  
+      if (val=="true")
+        self.role_categorys << RoleCategory.find(id)
+      end
+    end
+  end
+


  def set_sub_role(sub_role_id,status_id)
@ -144,6 +173,17 @@ class User
    }.uniq!
  end

+  def self.get_member_list_attribute_field_name(role_type,field_key)
+    @attribute = ::Attribute.where(:key => role_type).first
+    return ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first.title
+  end
+
+  def self.get_member_list_attribute_value(user_id,role_type,field_key)
+    @attribute = ::Attribute.where(:key => role_type).first
+    @AttributeField = ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first
+    return ::AttributeValue.where(attribute_field_id: @AttributeField.id, :user_id => user_id).first[I18n.locale.to_s]
+  end
+
  def create_dept_cache
    dept_hash = {}

@ -170,12 +210,30 @@ class User
    (query1 + query2).uniq
  end
  
+  # def name
+  #   info = Class::Info.first(:conditions => {:key => 'profile'})
+  #   if info
+  #     first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
+  #     last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
+  #     full_name = "#{last_name} #{first_name}"
+
+  #     if full_name.strip.empty?
+  #       full_name = email
+  #     end
+
+  #     return full_name
+  #   else
+  #     return nil
+  #   end
+  # end
+  
  def name
    info = Class::Info.first(:conditions => {:key => 'profile'})
    if info
-      first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
-      last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
-      full_name = "#{last_name} #{first_name}"
+      # first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
+      # last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
+      # full_name = (I18n.locale != 'zh_tw') ? "#{self.last_name} #{self.first_name}" : "#{self.first_name} #{self.last_name}"
+      full_name = (I18n.locale.to_s == 'zh_tw') ? "#{self.last_name} #{self.first_name}" : "#{self.first_name} #{self.last_name}"

      if full_name.strip.empty?
        full_name = email
@ -211,7 +269,6 @@ class User
      self.roles = self.roles.uniq
    end

-
  def rebuild_status_record
    self.status_record = {}
    self.attribute_values.reject{|t| t.key!='status'}.each do |status|
--- a/app/views/admin/attributes/index.html.erb
+++ b/app/views/admin/attributes/index.html.erb
@ -37,6 +37,8 @@
 						<% if @attribute_type == 'role' %>
 						<li><%= link_to t(:role_field), eval("admin_#{@attribute_type}_role_field_path(attribute)") %></li>
 						<li><%= link_to t(:sub_role), eval("admin_#{@attribute_type}_sub_role_path(attribute)") %></li>
+						<li><%= link_to t(:status), eval("admin_role_statuses_path(:role_id=>attribute)") %></li>
+						<li><%= link_to t(:category), eval("admin_role_categorys_path(:role_id=>attribute)") %></li>
 						<% end %>
 						<li><%= link_to t(:enable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? 'none' : ''}", :class => 'switch' %></li>
 						<li><%= link_to t(:disable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? '' : 'none'}", :class => 'switch' %></li>
--- a/app/views/admin/role_filters/_form.html.erb
+++ b/app/views/admin/role_filters/_form.html.erb
@ -0,0 +1,31 @@
+<% # encoding: utf-8 %>
+
+<%= form_for(:role_filter, :remote => true, :url => @url, :method => @verb, :html => { :id => 'form_role_filter' } ) do |f| %>
+
+	<h2><%= (@role_filter.new_record? ? 'Add' : 'Edit') %></h2>
+
+	<div id="widget-title">
+		<%= f.label :key %>
+		<%= f.text_field :key %>
+	</div>
+	
+	<div id="widget-title">
+		<%= f.fields_for :title_translations do |f| %>
+		  <% @site_valid_locales.each do |locale| %>
+				<div class="control-group">
+					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<div class="controls">
+						<%= f.text_field locale, :class =>' input-xxlarge', :value => (@role_filter.title_translations[locale] rescue nil) %>
+					</div>
+				</div>
+		  <% end %>
+		<% end %>
+	</div>
+  
+  <div class="form-actions">
+		<%= f.hidden_field :role_id, :value => params[:role_id] if !params[:role_id].blank? %>
+    <%= f.submit 'Submit/送出', :class=>'btn btn-primary' %>
+  </div>
+  
+<% end %>
+ 
--- a/app/views/admin/role_filters/_role_filter.html.erb
+++ b/app/views/admin/role_filters/_role_filter.html.erb
@ -0,0 +1,23 @@
+
+	<tr id="<%= dom_id role_filter %>" class="with_action">
+		<td>
+			<%= role_filter.key %>
+			<div class="quick-edit">
+				<ul class="nav nav-pills hide">
+					<% if is_admin?%>
+						<li><%= link_to t('role_filter.edit'), 
+						polymorphic_path([:admin, role_filter], {:action => :edit}), :remote => true %></li>
+						<li><%= link_to show_toggle_archive_btn(role_filter), 
+						polymorphic_path([:admin, role_filter]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
+					<% end %>
+				</ul>
+			</div>
+		</td>
+		<% if @types.is_localized?(:title) %>
+		<% @site_valid_locales.each do |locale| %>
+		<td><%= role_filter.title_translations[locale] rescue nil %></td>
+		<% end %>
+		<% else %>
+		<td><%= role_filter.title %></td>
+		<% end %>
+	</tr>
--- a/app/views/admin/role_filters/create.js.erb
+++ b/app/views/admin/role_filters/create.js.erb
@ -0,0 +1,2 @@
+$('<%= j render :partial => 'role_filter', :collection => [@role_filter] %>').appendTo('#role_filters').hide().fadeIn();
+$("#form_role_filter")[0].reset();
--- a/app/views/admin/role_filters/destroy.js.erb
+++ b/app/views/admin/role_filters/destroy.js.erb
@ -0,0 +1 @@
+$("#<%= dom_id @role_filter %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@role_filter) %>  ");
--- a/app/views/admin/role_filters/edit.js.erb
+++ b/app/views/admin/role_filters/edit.js.erb
@ -0,0 +1 @@
+$("#form > form").replaceWith("<%= j render "form" %>");
--- a/app/views/admin/role_filters/index.html.erb
+++ b/app/views/admin/role_filters/index.html.erb
@ -0,0 +1,49 @@
+
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+	<ul class="breadcrumb">
+		<li><%= link_to( t("role"), admin_roles_path ) %> <span class="divider">/</span></li>
+		<li class="active">( <%= @role.title %> ) <%= t(@app_type_name) %></li>
+	</ul>
+	<div id="accordion">
+		<div class="accordion-group filters">
+			<div class="table-label">
+				<table class="table main-list">
+					<thead>
+						<tr class="sort-header">
+
+							<th id="sort-name" class="sort span1-2 select"><span><a href="#"><%= t('role_filters.key') %><b class="web-symbol"></b></a></span></th>
+							<% @site_valid_locales.each do |locale| %>
+							<th id="sort-name" class="sort span1-2 select"><span><a href="#"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><b class="web-symbol"></b></a></span></th>
+							<% end %>
+
+						</tr>
+					</thead>
+				</table>
+			</div> 
+		</div>
+	</div>
+</div>
+
+<table id="role_filters" class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1-2"></th>
+			<% @site_valid_locales.each do |locale| %>
+			<th class="span1-2"></th>
+			<% end %>
+		</tr>
+	</thead>
+	<tbody>
+
+	<%= render :partial => 'role_filter', :collection => @role_filters %>
+	
+	</tbody>
+</table>
+
+<div id="form"><%= render :partial => "form" %></div>
+
+
--- a/app/views/admin/role_filters/new.js.erb
+++ b/app/views/admin/role_filters/new.js.erb
@ -0,0 +1 @@
+$("#form > form").replaceWith("<%= j render "form" %>");
--- a/app/views/admin/role_filters/update.js.erb
+++ b/app/views/admin/role_filters/update.js.erb
@ -0,0 +1,4 @@
+$("#<%= dom_id @role_filter %>").replaceWith("<%= j render :partial => 'role_filter', :collection => [@role_filter] %>");
+<% @role_filter = @types.new(:display => 'List') # reset for new form %>
+$("#form_role_filter").replaceWith("<%= j render "form" %>")
+$("#form_role_filter")[0].reset();
--- a/app/views/admin/roles/add_sub_role.html.erb
+++ b/app/views/admin/roles/add_sub_role.html.erb
@ -1,3 +1,9 @@
+
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
            <%= form_for @sub_attribute,:url => eval("admin_#{@attribute_type}s_path") ,:class=> "form-horizontal" do |f| %>
            <div class="site-map role-block">
                <div class="map-block back">
--- a/app/views/admin/roles/edit_sub_role.html.erb
+++ b/app/views/admin/roles/edit_sub_role.html.erb
@ -1,3 +1,9 @@
+
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
            <%= form_for @sub_attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>
            <div class="site-map role-block">
                <div class="map-block back">
--- a/app/views/admin/users_new_interface/_role.html.erb
+++ b/app/views/admin/users_new_interface/_role.html.erb
@ -4,12 +4,34 @@

 <div class="groups map-block back <%= role_disable ? 'disabled' : '' %>">
  <h4>
-  <button  for=<%=@form_index%> class="onoff pull-right"><%= role_disable ? 'OFF' : 'ON' %></button><span><%= role.title %></span>
+  <button  for=<%=@form_index%> class="onoff pull-right"><%= role_disable ? 'OFF' : 'ON' %></button><span><%= role.title %><%= t(:role_info)%></span>
  <%= hidden_field_tag("user[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>role_disable)%>
  </h4>
  
  <div class="form-horizontal <%= role_disable ? 'hide' : '' %>">
-  
+
+  <% @form_index = @form_index +1 %>
+
+  <div class="control-group">
+
+  <%= label_tag t(:status), nil, {:func=>"field_label", :for=>"1", :class=>"control-label"} %>
+  <% role.role_statuses.where(:disable => false).each_with_index do |rrs, i|%>
+    <%= hidden_field_tag("user[role_status][id][#{rrs.id}]", false,:for=>"#{@form_index}")%>
+    <%= label_tag(i,check_box_tag( "user[role_status][id][#{rrs.id}]", true, @user.role_statuses.include?(rrs))+rrs.title,:class=>"control-label") %>
+  <% end %>
+  </div>
+
+  <% @form_index = @form_index +1 %>
+
+  <div class="control-group">
+  <%= label_tag t(:category), nil, {:func=>"field_label", :for=>"1", :class=>"control-label"} %>
+  <% role.role_categorys.where(:disable => false).each_with_index do |rrcg, i|%>
+    <%= hidden_field_tag("user[role_category][id][#{rrcg.id}]", false,:for=>"#{@form_index}")%>
+    <%= label_tag(i,check_box_tag( "user[role_category][id][#{rrcg.id}]", true, @user.role_categorys.include?(rrcg))+rrcg.title,:class=>"control-label") %>
+  <% end %>
+  </div>
+
+
  <% role.attribute_fields.each  do |rf|%>
  
 	<%= rf.block_helper(@user,@form_index)%>
--- a/app/views/admin/users_new_interface/_show_roles.html.erb
+++ b/app/views/admin/users_new_interface/_show_roles.html.erb
@ -1,14 +1,22 @@
 <div class="roles <%= show_roles.key %>">
-    <%= show_roles.title %>
+    <%= show_roles.title %><%= t(:role_info)%>
    <div class="label-line">
        <hr />
    </div>
    <table class="table">
        <tbody>
+            <tr>
+              <td class="span1"><%= t('status') %></td>
+              <td><%= show_attribute_value(@user.role_statuses.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
+            </tr>
+            <tr>
+              <td class="span1"><%= t('category') %></td>
+              <td><%= show_attribute_value(@user.role_categorys.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
+            </tr>
 			<% show_roles.attribute_fields.where(:disabled=>false).each do |rf| %>
 				<tr>
 				  <td class="span1"><%= rf.title %></td>
-				  <td><%= show_attribute_value(@user.get_attribute_value(rf).get_value_by_locale(I18n.locale)) rescue '' %></td>
+				  <td><%= nl2br(show_attribute_value(@user.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
 				</tr>
 			<% end -%>
                <%= render :partial => 'show_sub_role',:collection=> @user.get_sub_roles_by_role(show_roles)%>
--- a/app/views/admin/users_new_interface/_show_sub_role.html.erb
+++ b/app/views/admin/users_new_interface/_show_sub_role.html.erb
@ -2,6 +2,6 @@
 <% 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)) rescue '' %></td>
+      <td><%= nl2br(show_attribute_value(@user.get_attribute_value(item).get_value_by_locale(I18n.locale))) rescue '' %></td>
  </tr>
 <% end %>
--- a/app/views/admin/users_new_interface/_user_basic.html.erb
+++ b/app/views/admin/users_new_interface/_user_basic.html.erb
@ -1,32 +1,120 @@
  <%#= devise_error_messages! %>

  <div class="map-block back">
-                <h4><span><%=t(:sys_basic_form)%></span></h4>
+    <h4><span><%=t(:sys_basic_form)%></span></h4>

-                <div class="form-horizontal">
-                    <div class="control-group">
-                        <%= f.label t(: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(:password),:class=>"control-label" %>
-                        <div class="controls">
-                            <%= f.password_field :password %>
-                        </div>
-                    </div>
+     <div class="form-horizontal">
+      <div class="controls-block" >
+        <div class="control-group language-swich">
+            <%= f.label t("users.first_name"),{:class=>"control-label", :func=>"field_label"} %>
+            <div class="controls">
+              <div class="tabbable">
+                <div class="tab-content">
+                  <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <div class="tab-pane fade <%= locale %> user-attribute_values-first_name <%= ( i == 0 ) ? "in active" : '' %>">
+                      <%= f.fields_for :first_name_translations do |f| %>
+                        <%= f.text_field locale, :func=>'input_unit', :value => (@user.first_name_translations[locale] rescue nil) %>
+                      <% end %>
                  </div>
+                  <% end %>
+               </div>
+                <ul class="nav nav-pills">
+                  <% @site_valid_locales.each_with_index do |locale, i| %>
+                    <li <%= ( i == 0 ) ? "class=active" : '' %> for="<%= locale %>">
+                      <a data-toggle="tab" href=".user-attribute_values-first_name.<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
+                  <% end %>
+                </ul> 
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>

-                  <div class="form-horizontal">
-                    <div class="control-group">
-                      <%= f.label t(:password_confirmation),:class=>"control-label" %>
-                          <div class="controls">
-                              <%= f.password_field :password_confirmation %>
-                        </div>
-                    </div>
-                </div>
-            </div>
+     <div class="form-horizontal">
+      <div class="controls-block" >
+        <div class="control-group language-swich">
+            <%= f.label t("users.last_name"),{:class=>"control-label", :func=>"field_label"} %>
+            <div class="controls">
+              <div class="tabbable">
+                <div class="tab-content">
+                  <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <div class="tab-pane fade <%= locale %> user-attribute_values-last_name <%= ( i == 0 ) ? "in active" : '' %>">
+                      <%= f.fields_for :last_name_translations do |f| %>
+                        <%= f.text_field locale, :func=>'input_unit', :value => (@user.last_name_translations[locale] rescue nil) %>
+                      <% end %>
+                  </div>
+                  <% end %>
+               </div>
+                <ul class="nav nav-pills">
+                  <% @site_valid_locales.each_with_index do |locale, i| %>
+                    <li <%= ( i == 0 ) ? "class=active" : '' %> for="<%= locale %>">
+                      <a data-toggle="tab" href=".user-attribute_values-last_name.<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
+                  <% end %>
+                </ul> 
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-horizontal">
+        <div class="control-group">
+            <%= f.label t("users.email"),:class=>"control-label" %>
+            <div class="controls">
+                <%= f.email_field :email %>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-horizontal">
+        <div class="control-group">
+            <%= f.label t("users.sid"),:class=>"control-label" %>
+            <div class="controls">
+              <%= f.text_field :sid %>
+              <span>( <%= t("users.sid_note")%> )</span>
+            </div>
+
+        </div>
+    </div>
+
+    <div class="form-horizontal">
+        <div class="control-group">
+            <%= f.label t("users.office_tel"),:class=>"control-label" %>
+            <div class="controls">
+              <%= f.text_field :office_tel %>
+              <span>( <%= t("users.office_tel_note")%> )</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-horizontal">
+        <div class="control-group">
+            <%= f.label t("users.avatar"),:class=>"control-label" %>
+            <div class="controls">
+              <%= f.file_field :avatar %>
+              <% if @user.avatar.file %>
+                <%= f.check_box :remove_avatar %>
+                <%= t('delete.file') %>
+              <% end %>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-horizontal">
+        <div class="control-group">
+            <%= f.label t("users.sex"),:class=>"control-label" %>
+            <div class="controls">
+              <label func="input_unit" for="0" class=" radio inline">
+                <%= f.radio_button :sex, "male" %><%= t('users.male')%>
+              </label>
+              <label func="input_unit" for="1" class=" radio inline">
+                <%= f.radio_button :sex, "female" %><%= t('users.female')%>
+              </label>
+              <label func="input_unit" for="2" class=" radio inline">
+                <%= f.radio_button :sex, "unknown" %><%= t('users.unknown')%>
+              </label>
+            </div>
+        </div>
+    </div>
+
+</div>
--- a/app/views/admin/users_new_interface/_user_basic_passwd.html.erb
+++ b/app/views/admin/users_new_interface/_user_basic_passwd.html.erb
@ -0,0 +1,36 @@
+  <%#= devise_error_messages! %>
+  <%= flash_messages %>
+
+  <div class="map-block back">
+    <h4><span><%=t(:sys_basic_id_form)%></span></h4>
+
+    <div class="form-horizontal">
+        <div class="control-group">
+            <%= f.label t("users.user_id"),:class=>"control-label" %>
+            <%#= f.label t(:user_id),:class=>"control-label" %>
+            <div class="controls">
+                <%= f.text_field :user_id %>
+                <span>( <%= t("users.user_id_note")%> )</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-horizontal">
+        <div class="control-group">
+            <%= f.label t("users.new_password"),:class=>"control-label" %>
+            <div class="controls">
+                <%= f.password_field :password %>
+                <span>( <%= t("users.new_password_note")%> )</span>
+            </div>
+        </div>
+      </div>
+
+      <div class="form-horizontal">
+        <div class="control-group">
+          <%= f.label t("users.new_password_confirmation"),:class=>"control-label" %>
+              <div class="controls">
+                  <%= f.password_field :password_confirmation %>
+            </div>
+        </div>
+    </div>
+</div>
--- a/app/views/admin/users_new_interface/_user_for_summary.html.erb
+++ b/app/views/admin/users_new_interface/_user_for_summary.html.erb
@ -18,7 +18,10 @@
                                <%= 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>
+                                <% user_for_summary.roles.each do |rf| %>
+                                <% @roledata = Role.find(rf.id) %>
+                                <span><%= @roledata.title %></span>
+                                <% end %>
                            </div>
                            <ul class="user-itemborder clear">
                                <li class="pull-left"><span>#TODO 258</span>Publications</li>
--- a/app/views/admin/users_new_interface/_user_role.html.erb
+++ b/app/views/admin/users_new_interface/_user_role.html.erb
@ -5,6 +5,32 @@
                            </div>
                            <table class="table">
                                <tbody>
+                                    <tr>
+                                        <td class="span1"><%= t('users.first_name')%></td>
+                                        <td><%= @user.first_name %></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="span1"><%= t('users.last_name')%></td>
+                                        <td><%= @user.last_name %></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="span1"><%= t('users.email')%></td>
+                                        <td><%= @user.email %></td>
+                                    </tr>
+                                    <% if !@user.sid.blank? %>
+                                    <tr>
+                                        <td class="span1"><%= t('users.sid')%></td>
+                                        <td><%= @user.sid %></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="span1"><%= t('users.office_tel')%></td>
+                                        <td><%= @user.office_tel %></td>
+                                    </tr>
+                                    <% end %>
+                                    <tr>
+                                        <td class="span1"><%= t('users.sex')%></td>
+                                        <td><%= t("users.#{@user.sex}") %></td>
+                                    </tr>
                                    <% items.each do |item| %>
                                        <tr>
                                            <td class="span1"><%= item[:name] %></td>
--- a/app/views/admin/users_new_interface/edit_passwd.html.erb
+++ b/app/views/admin/users_new_interface/edit_passwd.html.erb
@ -0,0 +1,32 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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" %>
+<% 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" %>
+    <%= javascript_include_tag "inc/ploy_input_field" %>
+    <%= javascript_include_tag "inc/input_module" %>
+    <%= javascript_include_tag "inc/attribute_panel_select" %>
+    <%= javascript_include_tag "inc/attribute_onoff" %>
+<% end -%>
+
+
+<%= content_tag :div,:class=>"user-role site-map role-block"  do%>
+
+    <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
+      <%= f.error_messages %>
+      <%= render :partial => 'user_basic_passwd', :locals => {:f => f}%>
+      <div class="button_bar">
+        <%= link_back %>
+        <%= hidden_field_tag 'edit_type', 'edit_passwd' %>
+        <%= link_to t(:update_), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      </div>
+    <% end -%>
+
+<% end -%>
--- a/app/views/admin/users_new_interface/new.html.erb
+++ b/app/views/admin/users_new_interface/new.html.erb
@ -21,6 +21,7 @@
    <%= form_for @user, :url =>  admin_users_new_interface_index_path, :html => { :multipart => true },:method => :post do |f| %>

      <%= f.error_messages %>
+      <%= render :partial => 'user_basic_passwd', :locals => {:f => f}%>
      <%= render :partial => 'user_basic', :locals => {:f => f}%>
      <%= render :partial => 'form', :locals => { :f => f } %>
      <div class="button_bar">
--- a/app/views/admin/users_new_interface/show.html.erb
+++ b/app/views/admin/users_new_interface/show.html.erb
@ -39,6 +39,7 @@
                    <%= @user.email %>
                </p>
                <%= link_to("<i class='icon-pencil'></i>#{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
+                <%= link_to("<i class='icon-pencil'></i>#{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-small" ) if is_admin?%>
            </div>
            <div class="user-roles my_scroll">
                <div class="scrollbar">
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@ -11,8 +11,8 @@
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">
-					<%= f.label :email ,t(:email)%>
-					<%= f.text_field :email, :placeholder => t(:email), :style => "width: 330px;" %>
+					<%= f.label :user_id ,t(:user_id)%>
+					<%= f.text_field :user_id, :placeholder => t(:email), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
 				</div>
 				<div class="control-group clear">
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@ -74,7 +74,7 @@
              <li>
              <div class="input-prepend">
                <span class="add-on"><i class="icon-user"></i></span>
-                <%= f.text_field :email, :class => 'span2', :placeholder => t(:email), :size => 16 %>
+                <%= f.text_field :user_id, :class => 'span2', :placeholder => t(:email), :size => 16 %>
              </div>
              </li>
              <li>
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@ -21,7 +21,7 @@ Devise.setup do |config|
  # parameters are used only when authenticating and not when retrieving from
  # session. If you need permissions, you should implement that in a before filter.
  # config.authentication_keys = [ :email ]
-  config.authentication_keys = [ :email ]
+  config.authentication_keys = [ :user_id ]
  

  # Tell if authentication through request.params is enabled. True by default.
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -53,7 +53,7 @@ en:
    zip: ZIP
  addthis_tools:
    add_to_bookmark: Add this to bookmark
-  admin: Admin
+  admin: Super Admin
  all: All
  all_content: All Content
  all_file: All File
@ -347,6 +347,7 @@ en:
  related_links: Related Links
  role: Role
  role_field: Role Field
+  role_info: " Role Info."
  roles: Roles
  ruling_site: Ruling Site
  rulingcom:
@ -427,7 +428,8 @@ en:
    module_page_lang_not_support: "We are sorry, this page is not available for English"
    not_previewable: "Preview not support"
    preview_only_for_img: "Preview only supprt with file type: jpg, png, gif, bmp"
-  sys_basic_form: User system info
+  sys_basic_form: System Default Basic Field
+  sys_basic_id_form: System Account Info.
  system_info: System information
  tag_cloud: Tag cloud
  tags: Tags
@ -462,6 +464,30 @@ en:
  url: URL
  use_status: Use Statue
  user: User
+  users:
+    admin_change_password: You cannot change your own password here!
+    avatar: Profile Picture
+    change_passwd: Change password
+    email: Email
+    first_name: First Name
+    last_name: Last Name
+    male: Male
+    name: Name
+    new_password: New password
+    new_password_note: At least 6 characters
+    new_password_confirmation: Confirm new password
+    female: Female
+    unknown: Information Not Available 
+    office_tel: Office Tel No.
+    office_tel_note: Public available
+    sid: ID No.
+    sid_note: Faculty ID No. or Student ID No.
+    sex: Gender
+    user_id: User Account
+    user_id_note: Should be more than 3 characters and less than 50 characters
+    user_id_not_null: User account cannot be null 
+    user_id_length: User account should be more than 3 characters 
+    user_id_error: Someone already use that user account 
  version: Version
  vertical: Vertical
  view: View
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@ -53,7 +53,7 @@ zh_tw:
    zip: 郵遞區號
  addthis_tools:
    add_to_bookmark: 加入書籤
-  admin: 管理員
+  admin: 系統管理者
  all: 全部
  all_content: 所有內容
  all_file: 所有檔案
@ -347,6 +347,7 @@ zh_tw:
  related_links: 相關連結
  role: 身份
  role_field: 身份欄位
+  role_info: 身份資料
  Roles: 身份
  ruling_site: 銳綸網站
  rulingcom:
@ -427,7 +428,8 @@ zh_tw:
    module_page_lang_not_support: "很抱歉，此頁面沒有開放中文版本"
    not_previewable: "不支援預覽"
    preview_only_for_img: "預覽僅支援：jpg,png,gif,bmp等圖片格式"
-  sys_basic_form: 系統使用者資訊
+  sys_basic_form: 系統預設基本欄位
+  sys_basic_id_form: 系統帳號資料
  system_info: 系統資訊
  tag_cloud: 標籤雲
  tags: 標籤
@ -462,6 +464,30 @@ zh_tw:
  url: 網址
  use_status: 使用狀態
  user: 使用者
+  users:
+    admin_change_password: 您不能在此處修改自己的密碼！
+    avatar: 大頭貼照
+    change_passwd: 變更密碼
+    email: 電子郵件
+    first_name: 名字
+    male: 男性
+    name: 姓名
+    new_password: 新密碼
+    new_password_note: 至少6個字元
+    new_password_confirmation: 確認新密碼
+    female: 女性
+    unknown: 未知
+    last_name: 姓氏
+    office_tel: 辦公室電話 
+    office_tel_note: 將公開於網頁
+    sid: 編號
+    sid_note: 教職員工編號或學生學號
+    sex: 性別
+    user_id: 使用者帳號
+    user_id_note: 需介於3個字元至50個字元之間
+    user_id_not_null: 使用者帳號不能是空值
+    user_id_length: 使用者帳號至少需要3個字元
+    user_id_error: 該使用者帳號已被使用
  version: 版本
  vertical: 垂直的
  view: 檢視
--- a/config/routes.rb
+++ b/config/routes.rb
@ -135,12 +135,18 @@ Orbit::Application.routes.draw do
    resources :roles do
      get 'role_field'
      get 'sub_role_field'
+      get 'role_status'
+      get 'role_category'
      get 'sub_role'
      get 'add_sub_role'
      get 'edit_sub_role'
      get 'add_attribute_field'
    end

+    resources :role_filters
+    resources :role_statuses
+    resources :role_categorys
+
    resources :sites do
      get 'mail_setting'
      get 'site_info'
@ -159,6 +165,7 @@ Orbit::Application.routes.draw do
      member do
        get 'temp_edit'
      end
+      match "edit_passwd" => "users_new_interface#edit_passwd" ,:as => :edit_passwd
    end

    resources :member_selects do
--- a/lib/tasks/member_user_id.rake
+++ b/lib/tasks/member_user_id.rake
@ -0,0 +1,34 @@
+# encoding: utf-8 
+
+namespace :member_user_id do
+  task :member_user_id_copy => :environment do
+	
+    puts 'start'
+
+    @users = User.all
+
+    @users.each do |user|
+
+      if user.user_id.blank?
+
+        @ids = []
+
+        @ids = user.email.split("@")
+
+        user.user_id = @ids[0]
+
+        user.save
+
+      else
+        puts 'no data'
+      end
+
+    end
+
+    puts 'end'
+
+    puts @users.count
+
+  end
+
+end
--- a/vendor/built_in_modules/member/.gitignore
+++ b/vendor/built_in_modules/member/.gitignore
@ -0,0 +1,7 @@
+.bundle/
+log/*.log
+pkg/
+test/dummy/db/*.sqlite3
+test/dummy/log/*.log
+test/dummy/tmp/
+test/dummy/.sass-cache
--- a/vendor/built_in_modules/member/Gemfile
+++ b/vendor/built_in_modules/member/Gemfile
@ -0,0 +1,17 @@
+source "http://rubygems.org"
+
+# Declare your gem's dependencies in member.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# jquery-rails is used by the dummy application
+gem "jquery-rails"
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'debugger'
--- a/vendor/built_in_modules/member/MIT-LICENSE
+++ b/vendor/built_in_modules/member/MIT-LICENSE
@ -0,0 +1,20 @@
+Copyright 2013 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/vendor/built_in_modules/member/README.rdoc
+++ b/vendor/built_in_modules/member/README.rdoc
@ -0,0 +1,3 @@
+= Member
+
+This project rocks and uses MIT-LICENSE.
--- a/vendor/built_in_modules/member/Rakefile
+++ b/vendor/built_in_modules/member/Rakefile
@ -0,0 +1,40 @@
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Member'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task :default => :test
--- a/vendor/built_in_modules/member/app/assets/images/member/.gitkeep
+++ b/vendor/built_in_modules/member/app/assets/images/member/.gitkeep
--- a/vendor/built_in_modules/member/app/assets/javascripts/member/.gitkeep
+++ b/vendor/built_in_modules/member/app/assets/javascripts/member/.gitkeep
--- a/vendor/built_in_modules/member/app/assets/stylesheets/member/.gitkeep
+++ b/vendor/built_in_modules/member/app/assets/stylesheets/member/.gitkeep
--- a/vendor/built_in_modules/member/app/assets/stylesheets/member/members.css
+++ b/vendor/built_in_modules/member/app/assets/stylesheets/member/members.css
@ -0,0 +1,95 @@
+.o-members {}
+.o-members-category {
+	border-left: solid 8px #EEE;
+	border-bottom: solid 1px #EEE;
+	margin: 32px 0;
+	padding: 0 0 0 16px;
+}
+.o-members-category:first-child {
+	margin-top: 0;
+}
+.o-members-list {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+.o-members-list > li {
+	margin: 24px 0 0 0;
+}
+.o-members-list > li.odd {}
+.o-members-list > li:after {
+	display: table;
+	width: 100%;
+	content: "";
+	clear: both;
+}
+.o-members-list > li:first-child {
+	margin: 0;
+}
+.o-members-pic {
+	float: left;
+	margin: 0 16px 0 0;
+}
+.o-members-pic img {
+	display: block;
+	width: 150px;
+	height: auto;
+}
+.o-members-info {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	float: left;
+}
+.o-members-info li {}
+.o-members-label {}
+.o-members-label:after {
+	display: inline-block;
+	width: 20px;
+	content: ":";
+}
+.o-members-link {
+	font-weight: bold;
+}
+
+/* columns view */
+.view-columns.o-members.view-columns {}
+.view-columns .o-members-category {}
+.view-columns .o-members-list {}
+.view-columns .o-members-list:after {
+	display: table;
+	width: 100%;
+	content: "";
+	clear: both;
+}
+.view-columns .o-members-list > li {
+	border: solid 1px #eee;
+	float: left;
+	width: 48%;
+	margin: 0 0 4% 4%;
+	
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+			box-sizing: border-box;
+}
+.view-columns .o-members-list > li.odd {
+	margin: 0;
+}
+.view-columns .o-members-pic {
+	margin: 16px;
+}
+.view-columns .o-members-pic img {
+	width: 100px;
+}
+.view-columns .o-members-info {
+	padding: 12px;
+	padding-left: 0;
+	float: none;
+}
+.view-columns .o-members-info li {}
+.view-columns .o-members-label {
+	display: none;
+}
+.view-columns .o-members-link {
+	font-size: 1.2em;
+}
--- a/vendor/built_in_modules/member/app/controllers/.gitkeep
+++ b/vendor/built_in_modules/member/app/controllers/.gitkeep
--- a/vendor/built_in_modules/member/app/controllers/application_controller.rb
+++ b/vendor/built_in_modules/member/app/controllers/application_controller.rb
@ -0,0 +1,23 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+  before_filter :set_locale
+  
+  # Set I18n.locale
+  def set_locale
+    # update session if passed
+    session[:locale] = params[:locale] if params[:locale]
+
+    # set locale based on session or default
+    begin
+      # check if locale is valid for non site pages
+      if !VALID_LOCALES.include?(session[:locale])
+        I18n.locale = I18n.default_locale
+      else
+        I18n.locale = session[:locale]
+      end
+     rescue
+       I18n.locale = I18n.default_locale
+     end    
+  end
+  
+end
--- a/vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb
+++ b/vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb
@ -0,0 +1,57 @@
+class Panel::Member::FrontEnd::MemberListsController < OrbitWidgetController
+
+  helper MemberHelper
+  
+  def initialize
+    super
+    @app_title = 'member'
+  end
+  
+  # GET /member_lists
+  # GET /member_lists.xml
+  
+  def index
+    
+    @item = Page.find(params[:page_id])
+    @title = @item.title
+    if !@item.frontend_data_count.blank?
+      @page_num = @item.frontend_data_count
+    else
+      @page_num = 10
+    end
+  
+    date_now = Time.now
+
+    @role_id = RoleStatus.get_role_data("teacher")
+      
+    @member_role = Role.where(:_id => @role_id)
+
+    @member_subroles = SubRole.where(:role_id => @role_id, :disabled => false)
+
+    if !params[:category_id].blank?
+      @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
+
+      @member_lists = User.where(:role_ids => @role_id)
+
+    else
+      @member_status = RoleStatus.can_display.where(:role_id => @role_id).asc("key")
+
+      @member_lists = User.where(:role_ids => @role_id)
+
+    end
+
+  end
+  
+  def show
+    @member_list = User.find(params[:id])
+	  # get_categorys
+  end
+  
+  
+  protected
+  
+  # def get_categorys
+  #   @member_list_categorys = MemberListCategory.excludes('disable' => true)
+  # end
+  
+end
--- a/vendor/built_in_modules/member/app/controllers/panel/member/widget/web_links_controller.rb
+++ b/vendor/built_in_modules/member/app/controllers/panel/member/widget/web_links_controller.rb
@ -0,0 +1,81 @@
+class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
+  def initialize
+    super
+    @app_title = 'web_resource'
+  end
+  
+  # GET /web_links
+  # GET /web_links.xml
+  
+
+  def index
+
+    @part = PagePart.find(params[:part_id])
+  
+    if @part.widget_data_count
+      @page_num = @part.widget_data_count
+    else
+      @page_num = 4
+    end
+  
+    if @part.widget_field
+      @widget_fields = @part.widget_field
+    else
+      @widget_fields = []
+    end
+  
+    @widget_style = @part.widget_style
+  
+    @category_id = @part.category
+
+    date_now = Time.now
+
+    if !params[:category_id].blank?
+      @web_links = WebLink.all.can_display.available_for_lang(I18n.locale).any_in(:web_link_category => params[:category_id]).merge(WebLinkCategory.excludes('disable' => true)).desc( :is_top, :postdate ).page( params[:page_main] ).per(@page_num)
+      @web_link_categorys = WebLinkCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
+    elsif !params[:tag_id].blank?
+      @tag = WebResourceTag.find(params[:tag_id]) rescue nil
+      @tag = WebResourceTag.where(key: params[:tag_id])[0] unless @tag
+      get_categorys
+    else
+      @web_links = WebLink.all.can_display.available_for_lang(I18n.locale).merge(WebLinkCategory.excludes('disable' => true)).desc( :is_top, :postdate ).page( params[:page_main] ).per(@page_num)
+      get_categorys
+    end
+
+  end
+
+
+
+  def home_list
+    @title = params[:part_title]
+	
+	# deadline
+  
+    # @web_link = WebLink.where( :is_hidden => false ).desc(:is_top, :title).first
+
+    @web_links = WebLink.widget_datas.available_for_lang(I18n.locale).page(params[:page]).per(5)
+	
+	# get_categorys
+  	
+  	module_app = ModuleApp.first(:conditions => {:key => 'web_resource'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+	
+  end
+
+  def reload_web_links
+    @web_links = WebLink.widget_datas.available_for_lang(I18n.locale).page(params[:page]).per(5)
+  end
+  
+  
+  protected
+  
+  def get_categorys
+    @web_link_categorys = WebLinkCategory.all
+  end
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'web_resource'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}) rescue []
+  end
+  
+end
--- a/vendor/built_in_modules/member/app/helpers/.gitkeep
+++ b/vendor/built_in_modules/member/app/helpers/.gitkeep
--- a/vendor/built_in_modules/member/app/mailers/.gitkeep
+++ b/vendor/built_in_modules/member/app/mailers/.gitkeep
--- a/vendor/built_in_modules/member/app/views/.gitkeep
+++ b/vendor/built_in_modules/member/app/views/.gitkeep
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb
@ -0,0 +1,76 @@
+<% # encoding: utf-8 %>
+
+	<% if @item.frontend_style == 'Single' %>
+
+			<section> 
+
+				<div class="side"></div>
+				<div class="main">
+					<div class="o-members">
+						
+						<%  @member_status.each do |ms| %>
+						
+						<h3 class="o-members-category h3"><%= ms.title %></h3>
+						<ul class="o-members-list">
+
+							<% @member_lists.where(:role_status_ids=>ms.id).each do |member| %>
+
+							<li class="odd">
+								<div class="o-members-pic"><%= show_avatar(member) %></div>
+								<ul class="o-members-info">
+									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
+									<li><b class="o-members-label">Title</b><%= show_attribute_value(member.role_categorys.map{|t|t.title.to_s}.join(',')) rescue '' %></li>
+									<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
+									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
+								</ul>
+							</li>
+
+							<% end %>
+								
+						</ul>
+						
+						<% end %>
+
+					</div>
+				</div>
+			</section>
+
+	<% elsif @item.frontend_style == 'Two' %>
+
+			<section> 
+				
+				<div class="side"></div>
+				<div class="main">
+					<div class="o-members view-columns">
+
+						<%  @member_status.each do |ms| %>
+
+						<h3 class="o-members-category h3"><%= ms.title %></h3>
+						<ul class="o-members-list">
+
+							<% @member_lists.where(:role_status_ids=>ms.id).each_with_index do |member, i| %>
+
+							<li <%= ( (i + 1) % 2 != 0 ) ? "class=odd" : '' %>>
+								<div class="o-members-pic"><%= show_avatar(member) %></div>
+								<ul class="o-members-info">
+									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
+									<li><b class="o-members-label">Title</b><%= show_attribute_value(member.role_categorys.map{|t|t.title.to_s}.join(',')) rescue '' %></li>
+									<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
+									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
+								</ul>
+							</li>
+
+							<% end %>
+
+						</ul>
+
+						<% end %>
+
+					</div>
+				</div>
+			</section>
+
+	<% end %>
+
+
+		<%= stylesheet_link_tag "member/members" %>
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.js.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.js.erb
@ -0,0 +1 @@
+alert('bob');
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
--- a/vendor/built_in_modules/member/config/locales/en.yml
+++ b/vendor/built_in_modules/member/config/locales/en.yml
@ -0,0 +1,8 @@
+en:
+
+  member:
+    member: Teacher
+    frontend:
+      member: Teacher Front－end
+    widget:
+      index: Teacher Widget
--- a/vendor/built_in_modules/member/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/member/config/locales/zh_tw.yml
@ -0,0 +1,8 @@
+zh_tw:
+
+  member:
+    member: 教師
+    frontend:
+      member: 教師前台
+    widget:
+      index: 教師Widget
--- a/vendor/built_in_modules/member/config/routes.rb
+++ b/vendor/built_in_modules/member/config/routes.rb
@ -0,0 +1,21 @@
+Rails.application.routes.draw do
+  namespace :panel do
+    namespace :member do
+      namespace :back_end do
+        resources :member_lists do
+          collection do
+            get 'delete'
+          end
+        end
+      end
+      namespace :front_end do
+        match "member_lists" => "member_lists#index"
+        resources :member_lists
+      end
+      namespace :widget do
+        match "index" => "member_lists#index"
+      end
+    end
+  end
+  match "/appfront/*path" => redirect("/panel/*path")
+end
--- a/vendor/built_in_modules/member/init.rb
+++ b/vendor/built_in_modules/member/init.rb
@ -0,0 +1,74 @@
+module Member
+  OrbitApp.registration "Member",:type=> 'ModuleApp' do
+    module_label 'member.member'
+    base_url File.expand_path File.dirname(__FILE__)    
+    # personal_plugin :enable => true,:path=>"panel/member/plugin/profile",:i18n=>'admin.member'
+    
+    version "0.1"
+    organization "Rulingcom"
+    author "RD dep"
+    intro "I am intro"
+    update_info 'some update_info'
+
+    front_end do
+      app_page 'member_lists'  do 
+        frontend_i18n "member.frontend.member"
+        style ["Single","Two"]
+      end
+    end
+
+
+    widgets do
+    #   default_widget do
+    #     query 'User.all'
+    #     enable ['typeA']
+    #     link_field :member_list_category_with_title,{:method => 'panel_member_front_end_member_lists_path',:args=>{:category_id => [:member_list_category,:id]}}
+    #     link_field :last_name,{:method => 'panel_member_front_end_member_list_path',:args=>:self}
+    #     link_field :first_name,{:method => 'panel_member_front_end_member_list_path',:args=>:self}
+    #     link_to_more 'panel_member_front_end_qas_path',:title_i18n=> 'member.default_widget.to_more'
+    #   end
+
+      categories_query 'RoleStatus.where(:role_id=> RoleStatus.get_role_data("teacher") )'
+      # tags_query 'FaqTag.all'
+
+
+      # customize_widget "index" do 
+      #   widget_i18n "member.widget.index"
+      #   style ["1"]
+      # end
+    end
+    
+    # side_bar do
+    #   head_label_i18n  'member.member',:icon_class=>"icons-help"
+    #   available_for [:admin,:guest,:manager,:sub_manager]
+    #   active_for_controllers ({:private=>['member_lists', 'member_list_categorys']})
+    #   active_for_object_auth ['MemberListCategory'] 
+
+    #   head_link_path "panel_member_back_end_qas_path"
+
+    #   context_link 'list_',
+    #                         :link_path=>"panel_member_back_end_qas_path" ,
+    #                         :priority=>1,
+    #                         :active_for_action=>{:member_lists=>:index},
+    #                         :available_for => [:all]
+
+    #   context_link 'add', 
+    #                         :link_path=>"new_panel_member_back_end_qa_path" ,
+    #                         :priority=>2,
+    #                         :active_for_action=>{:member_lists=>:new},
+    #                         :available_for => [:sub_manager]
+      
+    #   context_link 'categories',
+    #                         :link_path=>"panel_member_back_end_qa_categorys_path" ,
+    #                         :priority=>3,
+    #                         :active_for_action=>{:qa_categorys=>:index},
+    #                         :available_for => [:manager]
+
+    #   context_link 'tags',
+    #                         :link_path=>"panel_member_back_end_tags_path" ,
+    #                         :priority=>4,
+    #                         # :active_for_action=>{:bulletin_categorys=>:index},
+    #                         :available_for => [:manager]
+    # end
+  end
+end
--- a/vendor/built_in_modules/member/lib/member.rb
+++ b/vendor/built_in_modules/member/lib/member.rb
@ -0,0 +1,4 @@
+require "member/engine"
+
+module Member
+end
--- a/vendor/built_in_modules/member/lib/member/engine.rb
+++ b/vendor/built_in_modules/member/lib/member/engine.rb
@ -0,0 +1,4 @@
+module Member
+  class Engine < ::Rails::Engine
+  end
+end
--- a/vendor/built_in_modules/member/lib/member/version.rb
+++ b/vendor/built_in_modules/member/lib/member/version.rb
@ -0,0 +1,3 @@
+module Member
+  VERSION = "0.0.1"
+end
--- a/vendor/built_in_modules/member/lib/tasks/member_tasks.rake
+++ b/vendor/built_in_modules/member/lib/tasks/member_tasks.rake
@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :member do
+#   # Task goes here
+# end
--- a/vendor/built_in_modules/member/member.gemspec
+++ b/vendor/built_in_modules/member/member.gemspec
@ -0,0 +1,23 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "member/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "member"
+  s.version     = Member::VERSION
+  s.authors     = ["TODO: Your name"]
+  s.email       = ["TODO: Your email"]
+  s.homepage    = "TODO"
+  s.summary     = "TODO: Summary of Member."
+  s.description = "TODO: Description of Member."
+
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.test_files = Dir["test/**/*"]
+
+  s.add_dependency "rails", "~> 3.2.12"
+  # s.add_dependency "jquery-rails"
+
+  s.add_development_dependency "sqlite3"
+end
--- a/vendor/built_in_modules/member/script/rails
+++ b/vendor/built_in_modules/member/script/rails
@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/member/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
--- a/vendor/built_in_modules/member/test/dummy/README.rdoc
+++ b/vendor/built_in_modules/member/test/dummy/README.rdoc
@ -0,0 +1,261 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+       <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+       "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.all
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8
+          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+       #<Post:0x14a6620
+          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+  made to the database.
+* Passing an environment name as an argument will load the corresponding
+  environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.org/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+  |-- app
+  |   |-- assets
+  |       |-- images
+  |       |-- javascripts
+  |       `-- stylesheets
+  |   |-- controllers
+  |   |-- helpers
+  |   |-- mailers
+  |   |-- models
+  |   `-- views
+  |       `-- layouts
+  |-- config
+  |   |-- environments
+  |   |-- initializers
+  |   `-- locales
+  |-- db
+  |-- doc
+  |-- lib
+  |   `-- tasks
+  |-- log
+  |-- public
+  |-- script
+  |-- test
+  |   |-- fixtures
+  |   |-- functional
+  |   |-- integration
+  |   |-- performance
+  |   `-- unit
+  |-- tmp
+  |   |-- cache
+  |   |-- pids
+  |   |-- sessions
+  |   `-- sockets
+  `-- vendor
+      |-- assets
+          `-- stylesheets
+      `-- plugins
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/assets
+  Contains subdirectories for images, stylesheets, and JavaScript files.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from
+  ApplicationController which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb. Models descend from
+  ActiveRecord::Base by default.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use
+  eRuby syntax by default.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the
+  common header/footer method of wrapping views. In your views, define a layout
+  using the <tt>layout :default</tt> and create a file named default.html.erb.
+  Inside default.html.erb, call <% yield %> to render the view using this
+  layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are
+  generated for you automatically when using generators for controllers.
+  Helpers can be used to wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database,
+  and other dependencies.
+
+db
+  Contains the database schema in schema.rb. db/migrate contains all the
+  sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when
+  generated using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that
+  doesn't belong under controllers, models, or helpers. This directory is in
+  the load path.
+
+public
+  The directory available for the web server. Also contains the dispatchers and the
+  default HTML files. This should be set as the DOCUMENT_ROOT of your web
+  server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate
+  command, template test files will be generated for you and placed in this
+  directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins
+  subdirectory. If the app has frozen rails, those gems also go here, under
+  vendor/rails/. This directory is in the load path.
--- a/vendor/built_in_modules/member/test/dummy/Rakefile
+++ b/vendor/built_in_modules/member/test/dummy/Rakefile
@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks
--- a/vendor/built_in_modules/member/test/dummy/app/assets/javascripts/application.js
+++ b/vendor/built_in_modules/member/test/dummy/app/assets/javascripts/application.js
@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
--- a/vendor/built_in_modules/member/test/dummy/app/assets/stylesheets/application.css
+++ b/vendor/built_in_modules/member/test/dummy/app/assets/stylesheets/application.css
@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */
--- a/vendor/built_in_modules/member/test/dummy/app/controllers/application_controller.rb
+++ b/vendor/built_in_modules/member/test/dummy/app/controllers/application_controller.rb
@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end
--- a/vendor/built_in_modules/member/test/dummy/app/helpers/application_helper.rb
+++ b/vendor/built_in_modules/member/test/dummy/app/helpers/application_helper.rb
@ -0,0 +1,2 @@
+module ApplicationHelper
+end
--- a/vendor/built_in_modules/member/test/dummy/app/mailers/.gitkeep
+++ b/vendor/built_in_modules/member/test/dummy/app/mailers/.gitkeep
--- a/vendor/built_in_modules/member/test/dummy/app/models/.gitkeep
+++ b/vendor/built_in_modules/member/test/dummy/app/models/.gitkeep
--- a/vendor/built_in_modules/member/test/dummy/app/views/layouts/application.html.erb
+++ b/vendor/built_in_modules/member/test/dummy/app/views/layouts/application.html.erb
@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>
--- a/vendor/built_in_modules/member/test/dummy/config.ru
+++ b/vendor/built_in_modules/member/test/dummy/config.ru
@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application
--- a/vendor/built_in_modules/member/test/dummy/config/application.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/application.rb
@ -0,0 +1,59 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require
+require "member"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+  end
+end
+
--- a/vendor/built_in_modules/member/test/dummy/config/boot.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/boot.rb
@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)
--- a/vendor/built_in_modules/member/test/dummy/config/database.yml
+++ b/vendor/built_in_modules/member/test/dummy/config/database.yml
@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
--- a/vendor/built_in_modules/member/test/dummy/config/environment.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/environment.rb
@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!
--- a/vendor/built_in_modules/member/test/dummy/config/environments/development.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/environments/development.rb
@ -0,0 +1,37 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end
--- a/vendor/built_in_modules/member/test/dummy/config/environments/production.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/environments/production.rb
@ -0,0 +1,67 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Defaults to nil and saved in location specified by config.assets.prefix
+  # config.assets.manifest = YOUR_PATH
+
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+end
--- a/vendor/built_in_modules/member/test/dummy/config/environments/test.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/environments/test.rb
@ -0,0 +1,37 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end
--- a/vendor/built_in_modules/member/test/dummy/config/initializers/backtrace_silencers.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/initializers/backtrace_silencers.rb
@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
--- a/vendor/built_in_modules/member/test/dummy/config/initializers/inflections.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/initializers/inflections.rb
@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end
--- a/vendor/built_in_modules/member/test/dummy/config/initializers/mime_types.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/initializers/mime_types.rb
@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone
--- a/vendor/built_in_modules/member/test/dummy/config/initializers/secret_token.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/initializers/secret_token.rb
@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Dummy::Application.config.secret_token = '2890f31358baf5a8e131be5b7176ebc8d0558045962f88782a827c735b602744b430f409491ac4d7b5a2f011c8b0d532680609711bd0e091122fe1c0a36b3c28'
--- a/vendor/built_in_modules/member/test/dummy/config/initializers/session_store.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/initializers/session_store.rb
@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# Dummy::Application.config.session_store :active_record_store
--- a/vendor/built_in_modules/member/test/dummy/config/initializers/wrap_parameters.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/initializers/wrap_parameters.rb
@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
--- a/vendor/built_in_modules/member/test/dummy/config/locales/en.yml
+++ b/vendor/built_in_modules/member/test/dummy/config/locales/en.yml
@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"
--- a/vendor/built_in_modules/member/test/dummy/config/routes.rb
+++ b/vendor/built_in_modules/member/test/dummy/config/routes.rb
@ -0,0 +1,58 @@
+Dummy::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => 'welcome#index'
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id))(.:format)'
+end
--- a/vendor/built_in_modules/member/test/dummy/lib/assets/.gitkeep
+++ b/vendor/built_in_modules/member/test/dummy/lib/assets/.gitkeep
--- a/vendor/built_in_modules/member/test/dummy/log/.gitkeep
+++ b/vendor/built_in_modules/member/test/dummy/log/.gitkeep
--- a/vendor/built_in_modules/member/test/dummy/public/404.html
+++ b/vendor/built_in_modules/member/test/dummy/public/404.html
@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+</body>
+</html>
--- a/vendor/built_in_modules/member/test/dummy/public/422.html
+++ b/vendor/built_in_modules/member/test/dummy/public/422.html
@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>
--- a/vendor/built_in_modules/member/test/dummy/public/500.html
+++ b/vendor/built_in_modules/member/test/dummy/public/500.html
@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+  </div>
+</body>
+</html>
--- a/vendor/built_in_modules/member/test/dummy/public/favicon.ico
+++ b/vendor/built_in_modules/member/test/dummy/public/favicon.ico
--- a/vendor/built_in_modules/member/test/dummy/script/rails
+++ b/vendor/built_in_modules/member/test/dummy/script/rails
@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`$("#<%= dom_id @role_filter %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@role_filter) %> ");`
				`@ -0,0 +1 @@`
				`$("#form > form").replaceWith("<%= j render "form" %>");`