Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Spen
|
59f28342a4 | ||
 saurabhbhatia
|
14fea3638f |
No files matched your search
@@ -4,6 +4,7 @@ class Admin::UsersNewInterfaceController < OrbitMemberController
|
||||
helper OrbitBackendHelper
|
||||
|
||||
before_filter :set_attribute,:except => [:index,:show]
|
||||
open_for_user :only => [:setting_account, :edit_user_data, :update]
|
||||
open_for_visitor :only => [:index, :show]
|
||||
|
||||
def index
|
||||
@@ -182,6 +183,36 @@ class Admin::UsersNewInterfaceController < OrbitMemberController
|
||||
# @disable_all_field = false
|
||||
@user = User.find(params[:users_new_interface_id])
|
||||
end
|
||||
|
||||
def edit_user_data
|
||||
|
||||
if params[:users_new_interface_id].blank?
|
||||
redirect_to :action => :index
|
||||
else
|
||||
@user = User.find(params[:users_new_interface_id])
|
||||
|
||||
if current_user.id != @user.id
|
||||
redirect_to :action => :index
|
||||
end
|
||||
|
||||
@form_index = 0
|
||||
get_info_and_roles
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def setting_account
|
||||
|
||||
if params[:users_new_interface_id].blank?
|
||||
redirect_to :action => :index
|
||||
else
|
||||
@user = User.find(params[:users_new_interface_id])
|
||||
if current_user.id != @user.id
|
||||
redirect_to :action => :index
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def update
|
||||
|
||||
@@ -203,6 +234,37 @@ class Admin::UsersNewInterfaceController < OrbitMemberController
|
||||
render :action => :edit_passwd, :notice => flash.now[:error]
|
||||
end
|
||||
|
||||
elsif params[:edit_type] == 'edit_user_data'
|
||||
|
||||
if current_user.id != @user.id
|
||||
redirect_to :action => :index
|
||||
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.save
|
||||
|
||||
redirect_to :action => :show
|
||||
|
||||
elsif params[:edit_type] == 'setting_account'
|
||||
|
||||
if current_user.id != @user.id
|
||||
redirect_to :action => :index
|
||||
end
|
||||
|
||||
if !@user.valid_password?(params[:old_password])
|
||||
flash.now[:error] = t("users.valid_old_password")
|
||||
end
|
||||
|
||||
if !flash.now[:error] && @user.update_attributes(params[:user])
|
||||
redirect_to :action => :show
|
||||
else
|
||||
render :action => :setting_account, :notice => flash.now[:error]
|
||||
end
|
||||
|
||||
else
|
||||
|
||||
@user.update_attributes(params[:user])
|
||||
|
||||
@@ -140,21 +140,23 @@ class ApplicationController < ActionController::Base
|
||||
# update session if passed
|
||||
session[:locale] = params[:locale] if params[:locale]
|
||||
browser_locale = condition = nil
|
||||
default_locale = @site.default_locale if @site.default_locale.present?
|
||||
# check if locale is valid for non site pages
|
||||
default_locale = condition = nil
|
||||
|
||||
# check if locale is valid for non site pages
|
||||
if LIST[:forbidden_item_names].include?(env['PATH_INFO'].split('/')[1].to_s)
|
||||
condition = VALID_LOCALES.include?(session[:locale])
|
||||
elsif session[:locale]
|
||||
condition = @site.in_use_locales.include?(session[:locale])
|
||||
#check if the default locale is present or not
|
||||
elsif @site.default_locale.present?
|
||||
default_locale = @site.default_locale
|
||||
condition = @site.valid_locales.include?(default_locale)
|
||||
else
|
||||
condition = @site.in_use_locales.include?(default_locale)
|
||||
elsif !@site.enable_language_detection
|
||||
#check enable langauge detection
|
||||
browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil
|
||||
condition = @site.in_use_locales.include?(browser_locale)
|
||||
elsif session[:locale]
|
||||
condition = @site.in_use_locales.include?(session[:locale])
|
||||
end
|
||||
session[:locale] = condition ? ( browser_locale || session[:locale] || default_locale) : I18n.default_locale.to_s
|
||||
session[:locale] = condition ? (default_locale || browser_locale || session[:locale]) : I18n.default_locale.to_s
|
||||
I18n.locale = session[:locale].to_sym
|
||||
@site_in_use_locales = site_locales_default_head(@site.in_use_locales)
|
||||
@site_valid_locales = site_locales_default_head(@site.valid_locales)
|
||||
|
||||
@@ -7,6 +7,7 @@ class Site
|
||||
|
||||
field :in_use_locales, :type => Array
|
||||
field :valid_locales, :type => Array
|
||||
field :enable_locales, :type => Array
|
||||
|
||||
field :roaming_id
|
||||
field :private_key, :type => Binary
|
||||
@@ -17,6 +18,7 @@ class Site
|
||||
field :desktop_closed, :type => Boolean, :default => false
|
||||
field :sitemap_menu_in_header, :type => Boolean, :default => false
|
||||
field :enable_terms_of_use, :type => Boolean, :default => false
|
||||
field :enable_language_detection, :type => Boolean, :default => false
|
||||
|
||||
field :title_always_on, :type => Boolean, :default => false
|
||||
field :dashbroad_allow_visitor, :type => Boolean, :default => false
|
||||
@@ -44,6 +46,21 @@ class Site
|
||||
|
||||
belongs_to :design
|
||||
has_many :site_metas, :autosave => true, :dependent => :destroy
|
||||
validate :in_use_locales, :minimum_enabled_locales
|
||||
|
||||
def minimum_enabled_locales
|
||||
size = self.in_use_locales.length
|
||||
if size < 1
|
||||
errors.add(:size, "Needs at least one language in use")
|
||||
end
|
||||
end
|
||||
|
||||
def maximum_enabled_locales
|
||||
size = self.in_use_locales.length
|
||||
if size >= 2
|
||||
errors.add(:size, "Max 2 ")
|
||||
end
|
||||
end
|
||||
|
||||
def generate_keys
|
||||
private_key = OpenSSL::PKey::RSA.generate(2048)
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
<%= Rails.logger.info"@@@@@@@@@@@@@@@@"+design.inspect%>
|
||||
<tr class="with_action">
|
||||
<td class="span1"><%= check_box_tag 'to_delete[]', design.id, false, :class => "checkbox_in_list" %></td>
|
||||
<td class="span2">
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
<fieldset>
|
||||
|
||||
|
||||
<!-- Input Area -->
|
||||
<div class="input-area">
|
||||
<div class="nav-name"><strong>Classification</strong></div>
|
||||
@@ -127,7 +126,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label muted">Disable personal desktop</label>
|
||||
<label class="control-label muted"><%= I18n.t('site.enable_personal_desktop')%></label>
|
||||
<div class="controls">
|
||||
<%= f.check_box :desktop_closed , :class=>"toggle-check" %>
|
||||
</div>
|
||||
@@ -143,27 +142,33 @@
|
||||
<input type="checkbox" class="toggle-check" data-disabled="true">
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- Terms of Use -->
|
||||
<div class="control-group">
|
||||
<label class="control-label muted">Default Language</label>
|
||||
<label class="control-label muted">Enable User Language Detection
|
||||
</label>
|
||||
<div class="controls">
|
||||
<%= @site_in_use_locales %>
|
||||
|
||||
<% @site_in_use_locales.each do |locale| %>
|
||||
<%= check_box_tag :default_locale, locale, (@site.enabled_for.nil?), :class=>"toggle-check" %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<% end %>
|
||||
<%= f.check_box :enable_language_detection, :class => "toggle-check" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label muted">Enable Language</label>
|
||||
<div class="controls">
|
||||
<% @site_valid_locales.each do |valid_locale| %>
|
||||
<%= check_box_tag "site[in_use_locales][]", locale, @site.valid_locales.include?(locale), :class=>"toggle-check" %>
|
||||
<%= I18nVariable.from_locale(valid_locale) %>
|
||||
<%= check_box_tag "site[enable_locales][]", locale, @site.valid_locales.include?(locale), :class=>"toggle-check", :data => { :title => "#{I18nVariable.from_locale(locale)}" } %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label muted">Default Language</label>
|
||||
<div class="controls">
|
||||
<% @site_in_use_locales.each do |locale| %>
|
||||
<%= check_box_tag :default_locale, locale, (@site.default_locale.nil?), :class=>"toggle-check", :data => { :title => "#{I18nVariable.from_locale(locale)}" } %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- OrbitBar Them -->
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
|
||||
|
||||
<%= render :partial=>"infos"%>
|
||||
|
||||
<div id="roles-area" class="input-area">
|
||||
<%=render :partial=>"user_role_data",:collection=>Role.all.asc("_id")%>
|
||||
</div>
|
||||
|
||||
|
||||
<% content_for :page_specific_javascript do -%>
|
||||
|
||||
<% ( params[:users_new_interface_id].blank? ? @fname = 'new_attribute_values' : @fname = 'attribute_values' ) %>
|
||||
|
||||
<!-- Text -->
|
||||
<script id="template-text" type="text/x-tmpl">
|
||||
<div class="input-append">
|
||||
<input type="text" id="${roleType+'_text_'+appendIndex}" name="${'user[<%= @fname %>]['+nameNumber+'][value][]'}" class="input-medium" placeholder="">
|
||||
<a href="#" class="btn remove-input">
|
||||
<i class="icon-trash"></i>
|
||||
</a>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<!-- Text Language -->
|
||||
<script id="template-text-language" type="text/x-tmpl">
|
||||
<div class="input-append">
|
||||
<div class="tab-content">
|
||||
|
||||
<% VALID_LOCALES.collect do |locale| %>
|
||||
<% active = (locale == @site_valid_locales.first ? "active" : "") %>
|
||||
|
||||
<div class="tab-pane fade <%= active %> in" id="${roleType+'_text_language_<%= locale %>_'+appendIndex}">
|
||||
<input type="text" name="${'user[<%= @fname %>]['+nameNumber+'][value][][<%= locale %>]'}" placeholder="<%= I18nVariable.from_locale(locale) %>" value="">
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
<div class="btn-group" data-toggle="buttons-radio">
|
||||
<% VALID_LOCALES.collect do |locale| %>
|
||||
<% active = (locale == @site_valid_locales.first ? "active" : "") %>
|
||||
<a class="btn <%= active %>" href="${'#'+roleType+'_text_language_<%= locale %>_'+appendIndex}" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
|
||||
<% end %>
|
||||
<a href="#" class="btn remove-input"><i class="icon-trash"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<!-- Address -->
|
||||
<script id="template-address" type="text/x-tmpl">
|
||||
<div class="input-append">
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane fade active in" id="${roleType+'_address_en_'+appendIndex}">
|
||||
<input type="text" name="${'user[new_attribute_values]['+nameNumber+'][value][en]'}" placeholder="Address" value="">
|
||||
<input type="hidden" id="${roleType+'_street_address_en_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][en][street_address]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_cityarea_en_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][en][county]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_city_en_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][en][city]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_zip_en_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][en][zip]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_county_en_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][en][country]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_indicator_en_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][en][indicator]'}" value="">
|
||||
</div>
|
||||
<div class="tab-pane fade" id="${roleType+'_address_zh_tw_'+appendIndex}">
|
||||
<input type="text" name="${'user[new_attribute_values]['+nameNumber+'][value][zh_tw]'}" placeholder="地址" value="">
|
||||
<input type="hidden" id="${roleType+'_street_address_zh_tw_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][zh_tw][street_address]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_cityarea_zh_tw_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][zh_tw][county]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_city_zh_tw_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][zh_tw][city]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_zip_zh_tw_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][zh_tw][zip]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_county_zh_tw_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][zh_tw][country]'}" value="">
|
||||
<input type="hidden" id="${roleType+'_indicator_zh_tw_'+appendIndex}" name="${'user[new_attribute_values]['+nameNumber+'][address_ext][zh_tw][indicator]'}" value="">
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn-group" data-toggle="buttons-radio">
|
||||
<a class="btn active" href="${'#'+roleType+'_address_en_'+appendIndex}" data-toggle="tab">English</a>
|
||||
<a class="btn" href="${'#'+roleType+'_address_zh_tw_'+appendIndex}" data-toggle="tab">Chinese</a>
|
||||
<a class="btn" href="#address-field" role="button" data-toggle="modal"><i class="icon-edit"></i></a>
|
||||
<a href="#" class="btn remove-input"><i class="icon-trash"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<% end -%>
|
||||
@@ -0,0 +1,91 @@
|
||||
|
||||
|
||||
|
||||
<% role_disable = @user.roles.include?(user_role_data) ? false : true %>
|
||||
|
||||
<div class="attributes <%= role_disable ? 'disabled hide' : '' %>">
|
||||
<div class="attributes-header clearfix">
|
||||
|
||||
<%= hidden_field_tag("user[disable_role][id][#{user_role_data.id}]",role_disable,:for=>@form_index,:value=>role_disable)%>
|
||||
|
||||
<h4><%= user_role_data.title %><%= t(:role_info)%></h4>
|
||||
</div>
|
||||
|
||||
<div class="attributes-body">
|
||||
|
||||
<% @form_index = @form_index +1 %>
|
||||
|
||||
<div class="control-group">
|
||||
<%= label_tag t(:status), nil, {:func=>"field_label", :for=>"1", :class=>"control-label muted"} %>
|
||||
<div class="controls">
|
||||
<% user_role_data.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=>"checkbox inline") %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<% @form_index = @form_index +1 %>
|
||||
|
||||
<div class="control-group">
|
||||
<%= label_tag t(:category), nil, {:func=>"field_label", :for=>"1", :class=>"control-label muted"} %>
|
||||
<div class="controls">
|
||||
<% user_role_data.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=>"checkbox inline") %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<% user_role_data.attribute_fields.asc(:_id).each do |rf|%>
|
||||
|
||||
<%= rf.block_helper(@user,@form_index)%>
|
||||
<% @form_index = @form_index +1 %>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
|
||||
<% @form_index = @form_index +1 %>
|
||||
|
||||
<div class="input-area sub-role">
|
||||
|
||||
<% user_role_data.sub_roles.where(:disabled=>false).asc("_id").each do |sub_role| %>
|
||||
|
||||
<% sub_role_disable = @user.sub_roles.include?(sub_role) ? false : true %>
|
||||
|
||||
<div class="attributes <%= sub_role_disable ? 'disabled hide' : '' %>">
|
||||
|
||||
<div class="attributes-header clearfix">
|
||||
<%= hidden_field_tag("user[disable_sub_role][id][#{sub_role.id}]",sub_role_disable,:for=>@form_index,:value=>sub_role_disable)%>
|
||||
<h4><%= sub_role.title %><%= t(:role_info)%></h4>
|
||||
</div>
|
||||
|
||||
<div class="attributes-body">
|
||||
|
||||
<% sub_role.attribute_fields.asc(:_id).each do |af|%>
|
||||
<%= af.block_helper(@user,@form_index)%>
|
||||
<% @form_index = @form_index +1 %>
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
<%#= devise_error_messages! %>
|
||||
<%= flash_messages %>
|
||||
|
||||
<div class="attributes">
|
||||
<div class="attributes-header clearfix">
|
||||
<h4><%=t("users.user_basic_id_form")%></h4>
|
||||
</div>
|
||||
<div class="attributes-body">
|
||||
|
||||
<!-- Account -->
|
||||
<div class="control-group">
|
||||
<label class="control-label muted" for="account">
|
||||
<%= f.label t("users.user_id"),:class=>"control-label" %>
|
||||
|
||||
</label>
|
||||
<div class="controls add-input">
|
||||
<span><%= @user.user_id %></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Old Password -->
|
||||
<div class="control-group">
|
||||
<label class="control-label muted" for="password">
|
||||
<%= f.label t("password_current"),:class=>"control-label" %>
|
||||
</label>
|
||||
<div class="controls add-input">
|
||||
<%= password_field_tag "old_password",nil, :class=>"input-medium", :id=>"password" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Password -->
|
||||
<div class="control-group">
|
||||
<label class="control-label muted" for="password">
|
||||
<%= f.label t("users.new_password"),:class=>"control-label" %>
|
||||
</label>
|
||||
<div class="controls add-input">
|
||||
<%= f.password_field :password, :class=>"input-medium", :id=>"password" %>
|
||||
<span class="help-block"><%= t("users.new_password_note")%></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Confirm Password -->
|
||||
<div class="control-group">
|
||||
<label class="control-label muted" for="confirm_password">
|
||||
<%= f.label t("users.new_password_confirmation"),:class=>"control-label" %>
|
||||
</label>
|
||||
<div class="controls add-input">
|
||||
<%= f.password_field :password_confirmation, :class=>"input-medium", :id=>"confirm_password" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,43 @@
|
||||
<% content_for :side_bar do %>
|
||||
<%= render :partial => 'admin/users_new_interface/side_bar' %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :page_specific_css do -%>
|
||||
<%= stylesheet_link_tag "lib/wrap-nav.css" %>
|
||||
<%= stylesheet_link_tag "lib/pageslide.css" %>
|
||||
<%= stylesheet_link_tag "lib/main-forms.css" %>
|
||||
<%= stylesheet_link_tag "lib/fileupload.css" %>
|
||||
<%= stylesheet_link_tag "lib/togglebox.css" %>
|
||||
<% end -%>
|
||||
<% content_for :page_specific_javascript do -%>
|
||||
<%= javascript_include_tag "lib/jquery-ui-1.10.3.custom.min.js" %>
|
||||
<%= javascript_include_tag "lib/jquery.tmpl.min.js" %>
|
||||
<%= javascript_include_tag "lib/bootstrap-fileupload.js" %>
|
||||
<%= javascript_include_tag "lib/bootstrap-datetimepicker.js" %>
|
||||
<%= javascript_include_tag "lib/datetimepicker/date.time.picker.js" %>
|
||||
<%= javascript_include_tag "lib/member/textarea-lang-btn.js" %>
|
||||
<%= javascript_include_tag "lib/member/role-forms.js" %>
|
||||
<% end -%>
|
||||
|
||||
|
||||
<%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true , :class=>"form-horizontal main-forms", :id=>"user-forms"} do |f| %>
|
||||
|
||||
<fieldset>
|
||||
<div id="basic-area" class="input-area">
|
||||
|
||||
<%= f.error_messages %>
|
||||
<%= render :partial => 'user_basic', :locals => {:f => f}%>
|
||||
<%= render :partial => 'form_user_data', :locals => { :f => f } %>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-actions">
|
||||
<%= hidden_field_tag 'edit_type', 'edit_user_data' %>
|
||||
<%= link_to t(:update_), "#", :class=>"btn btn-primary returnDecide", :onclick=>"$('#user-forms').submit()" %>
|
||||
<%= link_back('btn') %>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
<% end -%>
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
<% content_for :side_bar do %>
|
||||
<%= render :partial => 'admin/users_new_interface/side_bar' %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :page_specific_css do -%>
|
||||
<%= stylesheet_link_tag "lib/wrap-nav.css" %>
|
||||
<%= stylesheet_link_tag "lib/pageslide.css" %>
|
||||
<%= stylesheet_link_tag "lib/main-forms.css" %>
|
||||
<%= stylesheet_link_tag "lib/fileupload.css" %>
|
||||
<%= stylesheet_link_tag "lib/togglebox.css" %>
|
||||
<% end -%>
|
||||
<% content_for :page_specific_javascript do -%>
|
||||
<%= javascript_include_tag "lib/jquery.tmpl.min.js" %>
|
||||
<%= javascript_include_tag "lib/bootstrap-fileupload.js" %>
|
||||
<%= javascript_include_tag "lib/member/role-forms.js" %>
|
||||
<%= javascript_include_tag "lib/member/textarea-lang-btn.js" %>
|
||||
<% end -%>
|
||||
|
||||
|
||||
<%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true , :class=>"form-horizontal main-forms"} do |f| %>
|
||||
|
||||
<fieldset>
|
||||
<div id="basic-area" class="input-area">
|
||||
|
||||
<%= f.error_messages %>
|
||||
<%= render :partial => 'user_setting_account', :locals => {:f => f}%>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-actions">
|
||||
<%= link_back('btn') %>
|
||||
<%= hidden_field_tag 'edit_type', 'setting_account' %>
|
||||
<%= link_to t(:update_), "#", :class=>"btn btn-primary returnDecide", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
<% end -%>
|
||||
@@ -20,7 +20,7 @@
|
||||
<small class="muted"><%= @user.email %></small>
|
||||
<div class="btn-group">
|
||||
<%= link_to("<i class='icon-edit'></i> #{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
|
||||
<%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
|
||||
<%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-mini" ) if is_admin? and current_user.id != @user.id %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -21,11 +21,13 @@
|
||||
</li>
|
||||
|
||||
<!-- Desktop -->
|
||||
<% if !@site.desktop_closed%>
|
||||
<li id="orbit-desktop">
|
||||
<a href="<%= desktop_path %>" role="button">
|
||||
<i class="icons-screen"></i> <span class="hide"><%= t(:desktop) %></span>
|
||||
</a>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
<% if @site.default_image.present?%>
|
||||
|
||||
@@ -31,8 +31,11 @@
|
||||
<span><%= current_user.name %></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="orbit-user">
|
||||
<li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' + t(:account_settings), desktop_path + "#settings-account", tabindex: '-1' %></li>
|
||||
<li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' + t("users.change_passwd"), admin_users_new_interface_setting_account_path(current_user), tabindex: '-1' %></li>
|
||||
<li><%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' + t("users.user_basic_data"), admin_users_new_interface_edit_user_data_path(current_user), tabindex: '-1' %></li>
|
||||
<% if @site.desktop_closed.blank? %>
|
||||
<li><%= link_to content_tag(:i, nil, class: 'icons-screen') + ' ' + t(:desktop), desktop_path, tabindex: '-1' %></li>
|
||||
<% end %>
|
||||
<li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' + t(:logout), destroy_user_session_path, tabindex: '-1' %></li>
|
||||
<li class="divider"></li>
|
||||
<li><a tabindex="-1" href="#"><i class="icons-lifebuoy"></i> <%= t(:help) %></a></li>
|
||||
|
||||
@@ -11,7 +11,6 @@ en:
|
||||
not_sub_manager: Access Denied for you are not SubManager for this app
|
||||
not_admin: Access Denied for you are not Admin
|
||||
object: Access Denied for you don't have permission for this object
|
||||
account_settings: Account settings
|
||||
academic_info: Academic Info.
|
||||
action: Action
|
||||
ad:
|
||||
@@ -391,6 +390,7 @@ en:
|
||||
footer_help: Footer Guide
|
||||
frontend_closed: Frontend Closed
|
||||
frontend_open: Frontend Open
|
||||
enable_personal_desktop: Enable Personal Desktop
|
||||
header: Site header
|
||||
info: Site information
|
||||
keywords: Site keywords
|
||||
@@ -486,12 +486,13 @@ en:
|
||||
users:
|
||||
admin_change_password: You cannot change your own password here!
|
||||
avatar: Profile Picture
|
||||
change_passwd: Change password
|
||||
change_passwd: Change Password
|
||||
email: Email
|
||||
first_name: First Name
|
||||
last_name: Last Name
|
||||
male: Male
|
||||
name: Name
|
||||
valid_old_password: Current password doesn't match confirmation
|
||||
new_password: New password
|
||||
new_password_note: At least 6 characters
|
||||
new_password_confirmation: Confirm new password
|
||||
@@ -507,6 +508,8 @@ en:
|
||||
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
|
||||
user_basic_id_form: Account Info.
|
||||
user_basic_data: Personal Profile
|
||||
version: Version
|
||||
vertical: Vertical
|
||||
view: View
|
||||
|
||||
@@ -11,7 +11,6 @@ zh_tw:
|
||||
not_sub_manager: 拒絕存取，因你不是此應用程式次管理員
|
||||
not_admin: 拒絕存取，因你不是系統管理者
|
||||
object: 拒絕存取，因你沒有權限
|
||||
account_settings: 帳號設定
|
||||
academic_info: 學術資訊
|
||||
action: 操作
|
||||
ad:
|
||||
@@ -385,8 +384,9 @@ zh_tw:
|
||||
thumbnail: 縮圖
|
||||
site:
|
||||
frontend_closed: 前台關閉？
|
||||
frontend_open: 前台關閉 ?
|
||||
frontend_open: 開啟前台
|
||||
backend_openness_on: 開啟開放式後台（訪客可遊覽）
|
||||
enable_personal_desktop: 開啟個人桌面
|
||||
default_image: 預設圖像
|
||||
description: 網站描述
|
||||
description_help: 網站描述說明
|
||||
@@ -492,6 +492,7 @@ zh_tw:
|
||||
first_name: 名字
|
||||
male: 男性
|
||||
name: 姓名
|
||||
valid_old_password: 目前的密碼不符合確認值
|
||||
new_password: 新密碼
|
||||
new_password_note: 至少6個字元
|
||||
new_password_confirmation: 確認新密碼
|
||||
@@ -508,6 +509,8 @@ zh_tw:
|
||||
user_id_not_null: 使用者帳號不能是空值
|
||||
user_id_length: 使用者帳號至少需要3個字元
|
||||
user_id_error: 該使用者帳號已被使用
|
||||
user_basic_id_form: 帳號資料
|
||||
user_basic_data: 個人資料
|
||||
version: 版本
|
||||
vertical: 垂直的
|
||||
view: 檢視
|
||||
|
||||
@@ -221,6 +221,8 @@ Orbit::Application.routes.draw do
|
||||
post 'update_order_list'
|
||||
end
|
||||
match "edit_passwd" => "users_new_interface#edit_passwd" ,:as => :edit_passwd
|
||||
match "edit_user_data" => "users_new_interface#edit_user_data" ,:as => :edit_user_data
|
||||
match "setting_account" => "users_new_interface#setting_account" ,:as => :setting_account
|
||||
end
|
||||
|
||||
resources :member_selects do
|
||||
|
||||
Reference in new issue
Block a user