Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

Conflicts:
	config/environments/development.rb

app/assets/javascripts/orbit-1.0.js

@@ -1,77 +1,97 @@
-var viewportwidth,
-	viewportheight;
-function resize() {
-	viewportheight=$(window).height();
-	viewportwidth=$(window).width();
-	if(window.navigator.userAgent.indexOf("MSIE")>0){
-		windH=document.clientHeight;
-		windW=document.clientWidht;
-	}
-}
-$(document).ready(function(){
-	$(document).on('click', '.orbit-bar-member', function(){
-		$(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open');
-		$('.bar-login .dropdown-menu').toggle();
-		return false;
-	});
-
-	$(document).click(function() {
-		$('.orbit-bar-member').removeClass("open");
-		$('.bar-login .dropdown-menu').hide();
-	});
-
-	$(document).on('click', '.bar-login .dropdown-menu', function(e) {
-		e.stopPropagation();
-		$('.bar-login .dropdown-menu').show();
-	});
-	
-	$('.tip').tooltip({
-		placement: "left"
-	});
-	
-	$(document).on('click', '.privacy', function() {
-		switch ($(this).val()) {
-			case 'true':
-			$(this).parents('.controls').children('.select-role').slideUp(300);
-			break;
-			case 'false':
-			$(this).parents('.controls').children('.select-role').slideDown(300);
-			break;
-		}
-	});
-	
-	$(document).on('click', '.toggle-tr-edit', function() {
-		$(this).parents('tr').next('.qe-block').removeClass('hide');
-		$(this).parents('tr').next('.qe-block').find('.qe-edit-div').addClass('hide');
-		$(this).parents('tr').next('.qe-block').find('#qe-' + $(this).attr('rel')).toggleClass('hide');
-	});
-
-	$(document).on('click', '.sort-header > .sort', function() {
-		$.getScript($(this).attr('rel'));
-	});
-
-	/*tinyscrollbar&windows-Size*/
-	resize();
-	$('#main-sidebar').css("height", viewportheight-40);
-	$('#main-sidebar .viewport').css("height", viewportheight-40);
-	$('.post-title').css("width", viewportwidth-495);
-	$('#main-sidebar').tinyscrollbar();
-	$('.detal-list').tinyscrollbar();
-	$('#main-sidebar').tinyscrollbar({size:(viewportheight-44)});
-
-	/*isotope*/
-  var $container = $('#isotope');
-  $container.isotope({
-      itemSelector : '.item',
-      layoutMode : 'masonry',
-  });
-	
-	
-});
-$(window).resize(function(){
-	resize();
-	$('#main-sidebar').css("height", viewportheight-40);
-	$('#main-sidebar .viewport').css("height", viewportheight-40);
-	$('.post-title').css("width", viewportwidth-495);
-	$('#main-sidebar').tinyscrollbar({ size:(viewportheight-44)});
-});
+var viewportwidth,
+	viewportheight;
+function resize() {
+	viewportheight=$(window).height();
+	viewportwidth=$(window).width();
+	if(window.navigator.userAgent.indexOf("MSIE")>0){
+		windH=document.clientHeight;
+		windW=document.clientWidht;
+	}
+}
+$(document).ready(function(){
+	$(document).on('click', '.orbit-bar-member', function(){
+		$(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open');
+		$('.bar-login .dropdown-menu').toggle();
+		return false;
+	});
+
+	$(document).click(function() {
+		$('.orbit-bar-member').removeClass("open");
+		$('.bar-login .dropdown-menu').hide();
+	});
+
+	$(document).on('click', '.bar-login .dropdown-menu', function(e) {
+		e.stopPropagation();
+		$('.bar-login .dropdown-menu').show();
+	});
+	
+	$('.tip').tooltip({
+		placement: "left"
+	});
+	
+	$(document).on('click', '.privacy', function() {
+		switch ($(this).val()) {
+			case 'true':
+			$(this).parents('.controls').children('.select-role').slideUp(300);
+			break;
+			case 'false':
+			$(this).parents('.controls').children('.select-role').slideDown(300);
+			break;
+		}
+	});
+	
+	$(document).on('click', '.toggle-tr-edit', function() {
+		$(this).parents('tr').next('.qe-block').removeClass('hide');
+		$(this).parents('tr').next('.qe-block').find('.qe-edit-div').addClass('hide');
+		$(this).parents('tr').next('.qe-block').find('#qe-' + $(this).attr('rel')).toggleClass('hide');
+	});
+
+	$(document).on('click', '.sort-header > .sort', function() {
+		$.getScript($(this).attr('rel'));
+	});
+
+	/*tinyscrollbar&windows-Size*/
+	resize();
+	$('#main-sidebar').css("height", viewportheight-40);
+	$('#main-sidebar .viewport').css("height", viewportheight-40);
+	$('.post-title').css("width", viewportwidth-495);
+	$('#main-sidebar').tinyscrollbar();
+	$('.detal-list').tinyscrollbar();
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-44)});
+
+	/*isotope*/
+  var $container = $('#isotope');
+  $container.isotope({
+      itemSelector : '.item',
+      layoutMode : 'masonry',
+  });
+	
+	
+});
+$(window).resize(function(){
+	resize();
+	var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
+	$('#main-sidebar').css("height", viewportheight-30);
+	$('#main-sidebar .viewport').css("height", viewportheight-30);
+	$('.post-title').css("width", viewportwidth-495);
+	$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
+	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
+	mainTablePosition()
+});
+/*main-table position*/
+function mainTablePosition() {
+	var $height = $('#main-wrap > .subnav').height()
+	var $table = $('#main-wrap > .table')
+	//alert ($table.height())
+	$table.stop().animate({marginTop:$height},500)
+	//$table.css({marginTop : $height})
+}
+$(window).scroll(function () {
+	//var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-1;
+	//var $subnavWidth = parseInt($('#main-wrap > .subnav').css("width"));
+	var $winLeft = $(window).scrollLeft()
+	$(".table-label").css({left:$winLeft*-1} );
+	//$(".table-label").css({left:$mainWrapMarginLeft+($winLeft*-1)} );
+	//$("#main-wrap > .subnav").css({width:$subnavWidth+($winLeft)} );
+	//console.log($mainWrapMarginLeft+($winLeft*-1)+5);
+});

app/assets/stylesheets/bootstrap.css.erb

@@ -2642,8 +2642,8 @@ button.btn.small, input[type="submit"].btn.small {
   color: #333333;
 }
 .pagination {
-  height: 36px;
-  margin: 18px 0;
+    height: 36px;
+    margin: 18px 0;
 }
 .pagination ul {
   display: inline-block;
@@ -2663,7 +2663,8 @@ button.btn.small, input[type="submit"].btn.small {
 .pagination li {
   display: inline;
 }
-.pagination a {
+
+.pagination .page{
   float: left;
   padding: 0 14px;
   line-height: 34px;
@@ -2671,6 +2672,28 @@ button.btn.small, input[type="submit"].btn.small {
   border: 1px solid #ddd;
   border-left-width: 0;
 }
+.pagination a {
+  float: left;
+}
+.pagination .next{
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination .last{
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination .current{
+  border-left-width: 1px;
+}
 .pagination a:hover, .pagination .active a {
   background-color: #f5f5f5;
 }

app/controllers/admin/app_auths_controller.rb

@@ -21,7 +21,10 @@ class Admin::AppAuthsController < ApplicationController
 
   def create
     app_auth = AppAuth.find_or_create_by(module_app_id: params[:module_app_id])
-    params[:new].each do |item|
+    auth_all = params[:auth_all] || false
+    app_auth.update_attribute(:all,auth_all)
+    new_array = params[:new] || []
+    new_array.each do |item|
       field = item[0]
       field_value = item[1]
       if field_value!=''
@@ -66,6 +69,8 @@ class Admin::AppAuthsController < ApplicationController
     @module_app = ModuleApp.find(params[:id])
   end
   
-  
+  def show
+    @module_app = ModuleApp.find(params[:id])
+  end
 
 end

app/controllers/admin/module_apps_controller.rb

@@ -21,6 +21,10 @@ class Admin::ModuleAppsController < ApplicationController
     @module_app = ModuleApp.find(params[:id])
   end
   
+  def show
+    @module_app = ModuleApp.find(params[:id])
+    
+  end
   
   def update
     @module_app = ModuleApp.find(params[:id])
@@ -97,7 +101,7 @@ class Admin::ModuleAppsController < ApplicationController
     end
       #user is not permited to do that
       flash[:notice] = t('admin.app_auth.operation_not_permitted')
-      redirect_to :action => "edit"   # [TODO] maybe need to redirect to some other page
+      render :nothing => true, :status => 403 
   end
   
   
@@ -109,7 +113,7 @@ class Admin::ModuleAppsController < ApplicationController
     end
       #user is not permited to do that
       flash[:notice] = t('admin.app_auth.operation_not_permitted')
-      redirect_to :action => "edit"   # [TODO] maybe need to redirect to some other page
+      render :nothing => true, :status => 403 
   end
   
 end

app/controllers/admin/object_auths_controller.rb

@@ -1,8 +1,12 @@
 class Admin::ObjectAuthsController < ApplicationController
+  include OrbitCoreLib::PermissionUnility
   layout "admin"
   before_filter :authenticate_user!
+  before_filter :check_if_user_can_do_object_auth
 #  before_filter :is_admin? ,:only => :index
   
+
+  
   def index
     # if current_user.admin?
       @object_auths = ObjectAuth.all
@@ -14,6 +18,7 @@ class Admin::ObjectAuthsController < ApplicationController
   def new
     obj = eval(params[:type]).find params[:obj_id]
     @object_auth=obj.object_auths.build
+    @object_auth_title_option = eval(params[:type]+"::ObjectAuthTitlesOptions")
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @post }
@@ -22,13 +27,21 @@ class Admin::ObjectAuthsController < ApplicationController
   
   def create
     obj = eval(params[:object_auth][:type]).find params[:object_auth][:obj_id]
-    @object_auth=obj.object_auths.create :title=> params[:object_auth][:title]
-    redirect_to edit_admin_object_auth_path(@object_auth)
+    @object_auth=obj.object_auths.build :title=> params[:object_auth][:title]
+    if @object_auth.save
+      redirect_to edit_admin_object_auth_path(@object_auth)
+    else
+      flash[:error] = t('admin.object.a_object_must_have_only_one_object_auth_profile_for_each_action')
+      redirect_to (:back)
+    end
   end
 
   def create_role
     object_auth = ObjectAuth.find(params[:id])
-    params[:new].each do |item|
+    auth_all = params[:auth_all] || false
+    object_auth.update_attribute(:all,auth_all)
+    new_array = params[:new] || []
+    new_array.each do |item|
       field = item[0]
       field_value = item[1]
       if field_value!=''
@@ -69,7 +82,11 @@ class Admin::ObjectAuthsController < ApplicationController
   def edit
     @object_auth = ObjectAuth.find(params[:id])
   end
-  
-
 
+private
+  def check_if_user_can_do_object_auth
+    unless  check_permission(:manager)
+      render :nothing => true, :status => 403 
+    end
+  end
 end

app/controllers/obit_frontend_controller.rb

@@ -1,3 +0,0 @@
-class ObitFrontendController< ObitFrontendComponentController
-
-end

app/controllers/obit_widget_controller.rb

@@ -1,3 +0,0 @@
-class ObitWidgetController< ObitFrontendComponentController
-
-end

app/controllers/orbit_backend_controller.rb

@@ -0,0 +1,23 @@
+class OrbitBackendController< ApplicationController
+  before_filter :authenticate_user!
+  before_filter :setup_vars
+ # before_filter {|c| c.front_end_available(@app_title)}
+  before_filter :check_user_can_use,:except => [:public]
+  include OrbitCoreLib::PermissionUnility
+  
+  layout 'admin'
+  
+  def setup_vars
+    @app_title = request.fullpath.split('/')[2]
+    @module_app = ModuleApp.first(conditions: {:key => @app_title} )
+  end
+  
+  private
+  
+  def check_user_can_use 
+    unless check_permission
+      redirect_to polymorphic_path(['panel',@app_title,'back_end','public'])
+    end
+  end
+  
+end

app/controllers/orbit_frontend_component_controller.rb

@@ -1,4 +1,4 @@
-class ObitFrontendComponentController< ApplicationController
+class OrbitFrontendComponentController< ApplicationController
   before_filter :setup_vars
   before_filter {|c| c.front_end_available(@app_title)}
   layout 'module_widget'

app/controllers/orbit_frontend_controller.rb

@@ -0,0 +1,3 @@
+class OrbitFrontendController< OrbitFrontendComponentController
+
+end

app/controllers/orbit_widget_controller.rb

@@ -0,0 +1,3 @@
+class ObitWidgetController< OrbitFrontendComponentController
+
+end

app/helpers/admin/app_auth_helper.rb

@@ -3,4 +3,9 @@ module Admin::AppAuthHelper
     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' 
     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'
   end
+  
+  def if_permitted_to(user,role)
+    
+  end
+  
 end

app/helpers/admin_helper.rb

@@ -5,4 +5,17 @@ module AdminHelper
     link_to('/' , admin_items_path) + ( @parent_items.map{ |i| link_to(i.name, admin_items_path(:parent_id=>i.id) ) } << @parent_item.name ).join("/").html_safe
   end
   
+  # Check if the current_user is manager in current module app
+  def is_manager?
+    @module_app.is_manager?(current_user) || is_admin?
+  end
+
+  # Check if the current_user is sub manager in current module app
+  def is_sub_manager?
+    @module_app.is_sub_manager?(current_user)|| is_admin?
+  end
+  
+  def is_admin?
+    current_user.admin?
+  end
 end

app/models/app_auth.rb

@@ -2,4 +2,5 @@ class AppAuth < PrototypeAuth
 
   belongs_to :module_app
   
+  
 end

app/models/module_app.rb

@@ -1,6 +1,7 @@
 class ModuleApp
   include Mongoid::Document
   include Mongoid::Timestamps
+  include OrbitCoreLib::ObjectTokenUnility
 
   field :key
 	field :title
@@ -14,7 +15,7 @@ class ModuleApp
   
   field :app_pages ,type: Array
   field :widgets ,type: Array
-  
+    
   has_many :managers,as: :managing_app ,:class_name => "AppManager" #,:dependent => :destroy,:foreign_key => "managing_app_id",:inverse_of => :managing_app
   has_many :sub_managers,as: :sub_managing_app ,:class_name => "AppManager"#, :dependent => :destroy,:foreign_key => "sub_managing_app_id",:inverse_of => :sub_managing_app
   
@@ -26,6 +27,14 @@ class ModuleApp
   
   before_save :set_key
   
+  def is_manager?(user)
+    managing_users.include?(user)
+  end
+  
+  def is_sub_manager?(user)
+    sub_managing_users.include?(user) || is_manager?(user)
+  end
+  
   def managing_users
     self.managers.collect{ |t| t.user }
   end
@@ -73,5 +82,6 @@ class ModuleApp
   def set_key
     self.key = self.title.underscore if self.title
   end
+
   
 end

app/models/object_auth.rb

@@ -1,5 +1,6 @@
 class ObjectAuth  < PrototypeAuth
-
+  include OrbitCoreLib::ObjectTokenUnility
+  validates_uniqueness_of :obj_authable_type,:scope => :title #{ |c| }
   belongs_to :obj_authable, polymorphic: true
   # > - Something.find_with_auth(query)
   # > - or Something.find(query).auth

app/models/prototype_auth.rb

@@ -4,7 +4,6 @@ class PrototypeAuth
  # after_save :update_block_list,:update_privilage_list
   
   field :title
-  field :token
   field :all ,type: Boolean,default: false
   
   belongs_to :users
@@ -12,11 +11,12 @@ class PrototypeAuth
   has_and_belongs_to_many :blocked_users,  :inverse_of => nil, :class_name => "User"
   has_and_belongs_to_many :privilege_users,  :inverse_of => nil, :class_name => "User"
 
-
   has_and_belongs_to_many :roles
   has_and_belongs_to_many :sub_roles
   
-  attr_protected :roles,:sub_roles,:privilege_users,:blocked_users,:users
+  attr_protected :roles,:sub_roles,:privilege_users,:blocked_users
+
+
 
   def add_role role
     add_operation(:roles,role)
@@ -68,7 +68,7 @@ class PrototypeAuth
     end
   end
   
-  def auth_users
+  def auth_users_before_block_list
     if self.all?
       User.all.entries
     else
@@ -83,11 +83,10 @@ class PrototypeAuth
     end
   end
   
-  def auth_users_after_block_list
-    auth_users - self.blocked_users
+  def auth_users
+    auth_users_before_block_list - self.blocked_users
   end
   
- # protected
   
 
 end

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 -%>