Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

Conflicts:
	config/environments/development.rb

app/views/admin/attributes/_app_selector.html.erb

@@ -0,0 +1 @@
+<%= f.select :module_app_id, @apps.collect { |t| [t.title.capitalize, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path }  %>

app/views/admin/components/_user_role_management.html.erb

@@ -1,3 +1,10 @@
+<div id="open_for_all_user">
+	<h1>All User</h1>
+	<%= form_tag(submit_url) do %>
+	<%= check_box_tag 'auth_all',true,(auth.all rescue true)  %><%= submit_tag 'Add Role' %><br/>
+	<% end %>
+</div>
+
 <div id="user_role_management">
 	<h1>User Role</h1>
 	<%= form_tag(submit_url) do %>
@@ -10,7 +17,6 @@
 		<%= collection_select(:new,:blocked_user, User.all, :id, :name, :prompt => true) %>
 		<%= submit_tag 'Add BlockedList' %><br/>
 	<% end %>
-	<ul>Roles </ul>
 	<% unless auth.nil? %>
 		<% auth.roles.each do |role| %>
 			<li> <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %>

app/views/admin/module_apps/_app_selector.html.erb

@@ -1 +0,0 @@
-<%= f.select :module_app_id, @apps.collect { |t| [t.title.capitalize, t.id] }, {}, {:rel => admin_module_apps_path } %>

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

@@ -0,0 +1,37 @@
+<br /><br /><br /><br />
+<%=@module_app.key %><br />
+<%=@module_app.title %><br />
+<%=@module_app.version %><br />
+<%=@module_app.organization %><br />
+<%=@module_app.author %><br />
+<%=@module_app.intro %><br />
+<%=@module_app.update_info %><br />
+<%=@module_app.create_date %><br />
+<%=@module_app.enable_frontend%><br />
+<%=@module_app.app_pages%><br />
+<%=@module_app.widgets%><br />
+
+Mangers:
+<ul>
+	<% @module_app.managers.each do |manager|%>
+		<li><%= manager.user.name %></li>
+	<%end%>
+</ul>
+
+
+SubManagers:
+<div>
+	<% @module_app.sub_managers.each do |manager|%>
+		<%= manager.user.name %>
+	<%end%>
+</div>
+<br />
+
+All User?:<%= @module_app.app_auth.all %><br />
+Blocked Users:<%= @module_app.app_auth.blocked_users.collect{|t| t.name} %><br />
+Privilege Users:<%= @module_app.app_auth.privilege_users.collect{|t| t.name}%><br />
+User Roles:<%= @module_app.app_auth.roles.collect{|t| t.key} %><br />
+User Sub Roles:<%= @module_app.app_auth.sub_roles.collect{|t| t.key} %><br />
+
+Available users after calculation:
+<%= @module_app.app_auth.auth_users.collect{|user| user.name}.join(',') %>

app/views/admin/object_auths/edit.html.erb

@@ -11,4 +11,4 @@
 <%= render :partial => "admin/components/user_role_management", :locals => { 
 	:object => @object_auth.auth_obj ,:auth=>@object_auth,:submit_url=>create_role_admin_object_auth_path(@object_auth),:ploy_route_ary=>['remove',:admin,@object_auth] } %>
 
-
+<%= link_to 'Back to object',eval(@object_auth.obj_authable.class.to_s+"::AfterObjectAuthUrl")  %>

app/views/admin/object_auths/new.html.erb

@@ -12,7 +12,8 @@
 <h1><%= t('object_auth.new_object_auth') %></h1>
 <%= form_for @object_auth, :url => admin_object_auths_path do |f| %>
 	<%= f.label :title   %>
-	<%= f.text_field :title, :class => 'text'   %>
+	<%= f.select :title,@object_auth_title_option  %>
+	
 	<%= f.hidden_field :obj_id, :value => params[:obj_id]   %>
 	<%= f.hidden_field :type, :value => params[:type]   %>
 

app/views/layouts/_orbit_bar.html.erb

@@ -26,10 +26,10 @@
           </ul>
         </li>
 				<% if user_signed_in? %>
-					<li class="dropdown active clear">
+					<li class="dropdown active">
 						<a class="orbit-bar-account" href="#" data-toggle="dropdown">
-							<!-- <img src="images/menber-pic.png" /> -->
-							<%= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
+							<img class="member-img" src="/assets/menber-pic.png" />
+							<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
 							<span class="member-name"><%= current_user.name %></span>
 						</a>
 						<ul class="dropdown-menu account-menu">
@@ -45,7 +45,7 @@
 									<%= t(:desktop) %>
 								</a>
 							</li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + t(:logout), destroy_user_session_path %></li>
+							<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + ' ' +  t(:logout), destroy_user_session_path %></li>
 							
 							<li class="divider"></li>
 							<li>
@@ -95,7 +95,7 @@
 				<% end %>
 			</ul>
 			<form class="navbar-search span6" action="">
-          <input class="search-query span4" type="text" placeholder="Search NCCU">
+          <input class="search-query span4" type="text" placeholder="<%= t(:search_nccu) %>">
       </form>
 		</div>
 	</div>

app/views/layouts/_side_bar.html.erb

@@ -13,7 +13,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('users') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), panel_web_resource_back_end_web_links_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
@@ -25,7 +25,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), nil %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>