backup

2013-08-27 10:26:11 +08:00
74 changed files with 1343 additions and 948 deletions
@@ -14,9 +14,7 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-config/*.god
-log/*.gz
-tmp/restart.txt
+
 *.swp
 *.pid
 *.lck
@@ -1,8 +1,6 @@
 source 'http://rubygems.org'
 gem 'rails', "~> 3.2.9"

-gem 'savon', '~> 2.2.0'
-
 gem "brakeman"
 gem 'mime-types'

@@ -16,12 +14,11 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'

-
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"

@@ -41,7 +38,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip','0.9.9'
+gem 'rubyzip'

 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -5,4 +5,3 @@
 *= require_self
 *= require social-share-button 
 */
-
@@ -101,8 +101,8 @@ div[data-role="page"] {
 	border: none;
 	z-index: 50;
 	/*background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c));*/
-	background-image: -webkit-linear-gradient(top, #F7F1E0, #E0C77E);
-	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8),inset 0 1px 0 #F6EAA5,0 -1px 0 #F7F1E0 inset;
+	background-image: -webkit-linear-gradient(top, #5282A6, #133757);
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
 }
 .header h1.ui-title {
 	margin: 8px 30%;
@@ -116,14 +116,13 @@ div[data-role="page"] {
 	margin-left: -15px;
 	font-size: 20px;
 	/*color: #727272;*/
-	color: #FCF2D2;
+	color: #7CA6C5;
 	/*background-color: #252525;*/
-	background-color: #E4CF91;
+	background-color: #144366;
 	border-radius: 0 0 5px 5px;
 	height: 15px;
 	line-height: 16px;
 	box-shadow: 1px 2px 2px rgba(0, 0, 0, .5);
-	text-shadow: 0 -1px 1px #6D6C6C;
 }
 .header .language .ui-btn-text {
 	left: 0;
@@ -136,14 +135,14 @@ div[data-role="page"] {
 	background-image: none;
 }
 .header .ui-btn-up-a {
-	border: 1px solid #949494;
+	border: 1px solid #133547;
 	background-color: #0C4C64;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #ECE0BC ), to( #BD9932 ));
-	background-image: -webkit-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: -moz-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: -ms-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: -o-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: linear-gradient( #ECE0BC , #BD9932 );
+	background-image: -webkit-gradient(linear, left top, left bottom, from( #0D6691 ), to( #0E3A4B ));
+	background-image: -webkit-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -moz-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -ms-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -o-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: linear-gradient( #0D6691 , #0E3A4B );
 }
 .header h1 img {
 	height: 30px;
@@ -11,21 +11,23 @@ class DefaultWidgetController< OrbitWidgetController
  end

  def query_for_default_widget
-    @ori_class_name =  @default_widget["query"].split('.')[0]
-    @result =  eval(@default_widget["query"])
+
+    @ori_class_name = @default_widget["query"].split('.')[0]
+    result = nil
+    result_objects = nil
+
    if !params["tag_id"].blank?
      if params["category_id"].blank? #has tag no cate
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
      else #has tag and cate
-        @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
-        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
      end
    elsif params["category_id"].blank?  #no tag no cate
+      result = eval(@default_widget["query"])
    else #no tag has cate
-      
-      @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+      result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
    end
-    eval("@result.#{@default_widget[:sorting_query]}")
+    result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
  end

  def search_result
@@ -93,9 +95,9 @@ class DefaultWidgetController< OrbitWidgetController
  end
  
  def get_category_field_name
-    @ori_class_name = @ori_class_name.constantize unless @ori_class_name.is_a? Class
+    @ori_class_name = @ori_class_name.constantize
    @ori_class_name.fields.each_key do |key|
-      return key.to_s if key.include?('category_id')
+      return key if key.include?('category_id')
    end
    nil
  end
@@ -73,7 +73,7 @@ class FrontController < ApplicationController
    res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page))
    res << "'>"
    root = "/"
-    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}' target=#{(page.class.to_s.eql?('Page') ? '_self' : '_blank')} ><span>#{page.title}</span></a>"
+    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}'><span>#{page.title}</span></a>"
    if page.visible_children.size > 0 && current < menu.levels
      res << "<span class='dot'></span>"
      res << menu_level(page, current_page, current + 1, menu)
@@ -1,111 +0,0 @@
-# encoding: utf-8
-
-class SessionsController < Devise::SessionsController
-	prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
-
-  require 'savon'
-
-  def create 
-
-
-    @SYS_USER = "rulingcom"
-    @SYS_PASS = "pxm87912tkx"
-    @LDAP_USER = params[:user][:user_id]
-    @LDAP_PASS = params[:user][:password]
-
-    if @LDAP_USER == 'rulingcom'
-
-      resource = User.first(conditions:{user_id: @LDAP_USER})
-      
-      if !resource.blank?
-
-        resource_name = resource.class.to_s.downcase
-        sign_in(resource_name, resource)
-        redirect_to after_sign_in_path_for(resource)
-
-      else
-
-        flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
-        redirect_to :root
-        
-      end
-
-    else
-
-      client = Savon.client(wsdl: 'http://ap.ydu.edu.tw/LDAP_WS/RulingcomDataService.asmx?wsdl',filters: [:SYS_USER, :SYS_PASS, :LDAP_USER, :LDAP_PASS])
-
-      client.operations
-      
-      response = client.call(:login_chk, message: { 
-        "SYS_USER" => @SYS_USER, 
-        "SYS_PASS" =>  @SYS_PASS,
-        "LDAP_USER" => @LDAP_USER, 
-        "LDAP_PASS" => @LDAP_PASS, 
-        "User_IP" => request.remote_ip
-      })
-
-      @datas = response.body[:login_chk_response][:login_chk_result][:string]
-
-      if !@datas[0].blank? and ( @datas[0] == 'P' or @datas[0] == 'U' ) #使用者帳號回傳P，單位帳號回傳U
-
-        resource = User.first(conditions:{user_id: @LDAP_USER})
-        
-        if !resource.blank?
-
-          resource_name = resource.class.to_s.downcase
-          sign_in(resource_name, resource)
-          redirect_to after_sign_in_path_for(resource)
-
-        else #認證通過無帳號要新增
-
-          @new_user = User.new
-
-          @new_user.user_id = @LDAP_USER
-          @new_user.admin = false
-          @new_user.email = "#{@LDAP_USER}@ydu.edu.tw"
-          @new_user.password = "#{@LDAP_USER}@ydu.edu.tw"
-          @new_user.created_at = DateTime.now
-          @new_user.updated_at = DateTime.now
-          
-          @new_user.cache_dept = { "zh_tw" => ( @datas[1] ? @datas[1] : nil ), "en" => ( @datas[1] ? @datas[1] : nil ) }
-
-          @new_user.first_name_translations = {}
-        
-          @new_user.first_name_translations["zh_tw"] = ( @datas[1] ? @datas[1] : nil )
-        
-          @new_user.first_name_translations["en"] = ( @datas[1] ? @datas[1] : nil )
-
-          # @new_user.first_name = ( @datas[1] ? @datas[1] : nil )
-
-          if @datas[0] == 'P'
-          
-            @new_user.last_name_translations = {}
-          
-            @new_user.last_name_translations["zh_tw"] = ( @datas[2] ? @datas[2] : nil )
-          
-            @new_user.last_name_translations["en"] = ( @datas[2] ? @datas[2] : nil )
-
-            # @new_user.last_name = ( @datas[2] ? @datas[2] : nil )
-
-          end
-
-          @new_user.save
-
-          resource_name = @new_user.class.to_s.downcase
-          sign_in(resource_name, @new_user)
-          redirect_to after_sign_in_path_for(@new_user)
-
-        end
-
-
-      else
-        flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
-        redirect_to :root
-      end
-
-    end
-
-  end
-
-
-end
@@ -9,7 +9,8 @@ module ApplicationHelper

  def delayed_impressionist(item)
    user_id = current_user.nil? ? nil : current_user.id
-    Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
+    request = DelayImpressionistRequest.new(request)
+    Resque.enqueue(DelayedImpressionist,:request=>request,:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
  end

  def check_user_role_enable(attribute_fields)
@@ -2,24 +2,16 @@ class BackupServer
  @queue = :high

  def self.perform()
+    #CronMail.time_check("Going to backup Orbit").deliver
    dbhost = Mongoid.config.database.connection.primary.join ':'
    dbname = Mongoid.config.database.name
    archive_db_list_path = OrbitSystemPreference::ArchiveDbListPath
    dbdirectory = "#{Rails.root}/tmp/#{dbname}-"+Time.now.strftime("%Y-%m-%d-%H-%M")
    %x[mongodump -h #{dbhost} -d #{dbname} -o #{dbdirectory} ]

-    Dir.foreach('tmp') do |item|
-      date_str = item.to_s.gsub("#{dbname}-",'')
-      next if not date_str.match(/\d{4}-\d{2}-\d{2}-\d{2}-\d{2}/)
-      if Date.parse(date_str).to_time < Site.first.backup_keep_for_days.days.ago
-        OrbitLogger.info  "Deleting #{date_str}"
-        %x[rm -rf tmp/#{item}] 
-      end
-    end
-
-
-    %x[rm -f #{archive_db_list_path}]
-    %x[cd tmp ; ls -l |grep #{dbname} | awk '{print $8}'|xargs  du -h --block-size=1M --max-depth=0 |sort -h >> #{archive_db_list_path}]
+    %x[rm #{archive_db_list_path}]
+    %x[ls #{Rails.root}/tmp/#{dbname}* | du -h --max-depth=1 --block-size=1M |sort -h >> #{archive_db_list_path}]
    OrbitLogger.info "DB backup done Path:#{dbdirectory}"
+    
  end
 end
@@ -17,16 +17,10 @@ class DelayedImpressionist
    arg = args[0]
    @request= DelayImpressionistRequest.new
    @request.restore(arg["request"])
+    request = @request
    obj = eval("#{arg["class"]}.find '#{arg['obj']['_id']}'")
    # imp = new(@request,arg["controller_name"],arg["action_name"],arg["user"],obj)
    new_impression = obj.impressions.build(:user_id=>arg["user"],:controller_name=>arg["controller_name"],:action_name=>arg["action_name"],:ip_address=>@request.remote_ip,:referrer=>@request.referer)
-    @try = 1
-    loop do
-        result = new_impression.save rescue false
-        break if (result || @try >= 10)
-        @try = @try + 1
-        puts "trying:#{@try}"
-    end
    new_impression.save
    obj.update_attribute(:view_count,obj.impression_count)
  end
@@ -29,11 +29,10 @@ class Site
  mount_uploader :default_image, ImageUploader

  field :search,:type => Hash
-  field :resque_namespace,:type => String, :default=>APP_CONFIG['orbit']
+
  field :title, localize: true
  field :footer, localize: true
  field :sub_menu, localize: true
-  field :backup_keep_for_days,:type=>Integer,:default=> APP_CONFIG['backup_keep_for_days']

  field :mobile_on, :type => Boolean, :default => false
  
@@ -42,6 +42,7 @@ class User

  before_create :initialize_desktop
  before_save :rebuild_status_record
+  before_save :save_roles
  scope :remote_account, where(:nccu_id.ne => nil)
  scope :not_guest_user, all_of(:name.ne => "guest")

@@ -88,9 +89,9 @@ class User
    var[:id].each do |id,val|  
      # binding.pry if id == '5052c5b22b5c49ab02000004'
      if (val=="true")
-        self.role_ids.reject!{|t| t.to_s == id}
+        self.roles = self.roles.reject{|t| t.id.to_s==id}
      elsif(val=="false")
-        self.role_ids += Array(id)
+        self.roles << Role.find(id)
      end
    end
  end
@@ -105,9 +106,9 @@ class User
      # binding.pry if id == '5052c5b22b5c49ab02000004'
 	  
      if ( self.roles.include?(@roid) == false or val=="true")
-        self.sub_role_ids.reject!{|t| t.to_s == id}
+        self.sub_roles = self.sub_roles.reject{|t| t.id.to_s==id}
      elsif(val=="false")
-        self.sub_role_ids += Array(id)
+        self.sub_roles << SubRole.find(id)
      end
 	  
    end
@@ -272,6 +273,10 @@ class User
  end
  
  protected
+    def save_roles
+      # self.roles = self.sub_roles.collect{|t| t.role}.uniq
+      self.roles = self.roles.uniq
+    end

  def rebuild_status_record
    self.status_record = {}
@@ -1,19 +1,26 @@
+<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>
+<script type='text/javascript'>
+  jQuery(function( $ ){     
+
+      $('#slideshow-<%= @ad_banner.title.dehumanize %>').cycle({
+        delay: -1000,
+        fx: "<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
+        timeoutFn: getTimeout,
+        pager: '.banner_nav-<%= @ad_banner.title.dehumanize %>',
+        pagerAnchorBuilder: function(idx, slide) {
+          return "<li><a href='#'></a></li>";
+        }
+      });
+  });
+</script>
+
 <div style='position:relative'>
  <ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul>
  <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
    <% (images = @ad_banner.ad_images).shuffle.each do |ad_image| %>
      <% if ad_image.display? %>
-        <img src='<%= ad_image.file %><%= "?update=".to_s << Time.now().to_i.to_s %>' alt='<%= ad_image.title || ' ' %>' title='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= ad_image_link(ad_image) %>' style=' <%= 'cursor:pointer;' if !ad_image_link(ad_image).blank? %>'/>  
+        <img src='<%= ad_image.file %>' alt='<%= ad_image.title || ' ' %>' title='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= ad_image_link(ad_image) %>' style=' <%= 'cursor:pointer;' if !ad_image_link(ad_image).blank? %>'/>  
      <% end %>
    <% end %>
  </div>
-</div>
-<script type='text/javascript'>
-  var banner = {"banner_name":"#slideshow-<%= @ad_banner.title.dehumanize %>",
-                "banner_fx":"<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
-                "banner_pager":".banner_nav-<%= @ad_banner.title.dehumanize %>",
-                "image_count":"<%= @ad_banner.ad_images.length %>",
-                "image_loaded":0
-              };
-  banners.push(banner);
-</script>
+</div>
@@ -3,7 +3,6 @@ defaults: &defaults
  store_ip: 'redmine.rulingcom.com:3001'
  orbit: 'Orbit'
  ruling_digital: 'RulingDigital'
-  backup_keep_for_days: 30
  
 development:
  <<: *defaults
@@ -3,7 +3,7 @@ require 'resque_scheduler/server'
 # require 'yaml'

 Resque.redis = 'localhost:6379'
-Resque.redis.namespace = Site.first.resque_namespace rescue APP_CONFIG['orbit']
+Resque.redis.namespace = "resque"

 # If you want to be able to dynamically change the schedule,
 # uncomment this line.  A dynamic schedule can be updated via the
@@ -4,32 +4,33 @@ user_home = ENV['HOME'] || File.dirname(__FILE__) + '/../..'
 development_uid = ''
 development_gid = ''

-num_workers = rails_env == 'production' ? <%= @resque_workers %> : 1
+num_workers = rails_env == 'production' ? 5 : 2

 num_workers.times do |num|
  God.watch do |w|

    w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>resque-worker-#{num}"
-    w.group   = 'rulingcom'
+    w.name    = "worker-#{num}"
+    w.group   = 'resque'

    w.interval = 30.seconds

    queue = case num
-        when 0..2
+        when 0
+                'critical'
+        when 1..2
                'high,low'
        when 3..num_workers
                'low'
    end

-    w.pid_file = "#{rails_root}/tmp/#{w.name}.pid"
-    w.env       = {"RAILS_ENV"=>rails_env,"PIDFILE" => w.pid_file ,"HOME"=>user_home, "QUEUE"=>queue, "RAILS_ENV"=>rails_env }
-    w.start     = "rake -f #{rails_root}/Rakefile resque:work"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
+    w.env       = {"QUEUE"=>queue, "RAILS_ENV"=>rails_env}
+    w.start     = "HOME=#{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:work"
+
    w.uid = (rails_env == 'production' )? "root" : development_uid
    w.gid = (rails_env == 'production' )? "root" : development_gid
  
-     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev_resque-#{w.name}.log"

    # restart if memory gets too high
    w.transition(:up, :restart) do |on|
@@ -6,19 +6,16 @@ development_gid = ''

  God.watch do |w|
    w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>sunspot-solr"
-    w.group   = 'rulingcom'
-    w.pid_file = "#{rails_root}/solr/pids/production/sunspot-solr-production.pid"
+    w.name    = "scheduler"
+    w.group   = 'resque'
    w.interval = 30.seconds
-    w.env       = {"RAILS_ENV"=>rails_env,"HOME"=>user_home ,"RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile sunspot:solr:start"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.keepalive
+    w.env       = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
+    w.start     = "HOME= #{user_home} QUEUE=* RAILS_ENV=#{rails_env} rake -f #{rails_root}/Rakefile resque:scheduler"

    w.uid = (rails_env == 'production' )? "root" : development_uid
    w.gid = (rails_env == 'production' )? "root" : development_gid
-    
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
+  
+     w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev_resque-#{w.name}.log"

    # restart if memory gets too high
    w.transition(:up, :restart) do |on|
@@ -4,12 +4,6 @@ dashboard_counter_cache:
  args:
  description: DashboardCounterCache

-backup_server:
-  cron: 0 0 2 * * *
-  class: BackupServer
-  args:
-  description: BackupServer and remove old backups
-
 update_tag_cloud:
  cron: 0 0 [0,12] * * *
  class: UpdateTagCloud
@@ -2,7 +2,6 @@ Orbit::Application.routes.draw do
  # get "robots.txt" => 'robots#index'


-  devise_for :users,:controllers => {:sessions => 'sessions'}

  devise_for :users do
    match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
@@ -0,0 +1,6 @@
+[{"old_id":1,"key":"administrative","title_translations":{"en":"Official","zh_tw":"行政公告"}}
+,{"old_id":2,"key":"events","title_translations":{"en":"Activities","zh_tw":"活動"}}
+,{"old_id":3,"key":"intern_opportunities","title_translations":{"en":"Internship","zh_tw":"實習機會"}}
+,{"old_id":4,"key":"scholarship_and_exchange_student","title_translations":{"en":"Scholarship","zh_tw":"獎學金與交換生資訊"}}
+,{"old_id":5,"key":"news","title_translations":{"en":"Newsletter","zh_tw":"新聞"}}
+,{"old_id":6,"key":"enrollments","title_translations":{"en":"Admission","zh_tw":"招生資訊"}}]
@@ -4,33 +4,24 @@ module OrbitApp
        Version = "0.1"

        def display_visitors(options={})
-            map = "function(){ emit( this.referrer,{session_hash: this.session_hash,created_at: this.created_at}); };"
-            reduce = "function(key, values){ var sum = 0; values.forEach(function(doc){sum += doc.amount; }); return {amount: sum};};"
-            if options.blank?
-              impressions = Impression.collection.map_reduce(map, reduce,read: :primary, out: "vr")
-            else
-              query = Impression.where(options).selector
-              impressions = Impression.where(options).collection.map_reduce(map, reduce,read: :primary, out: "vr",:query=>query)
-            end
-          impressions.count            
+            impressions = Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
        end

        def display_visitors_today
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day , '$lte' => DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
        end

        def display_visitors_this_week
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 7.days, '$lte' => DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
        end

        def display_visitors_this_month
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.month, '$lte' => DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
        end

        def display_visitors_this_year
-          display_visitors(created_at: {'$gte' => Date.today.beginning_of_day - 1.year, '$lte' =>DateTime.now})
+          display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
        end
      end # end of VisitorCounterEval
  end # of Module
 end # of OrbitApp
-
@@ -102,17 +102,12 @@ module OrbitApp
          def  initialize(&block)
            @query = nil
            @image = nil
-	      @sorting_query = 'desc(:created_at)'
            @more_link = {}
            @fields = []
            @enabled_styles = STYLE
             block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
          end

-	  def sorting(query)
-	    @sorting_query = query
-	  end
-
          def enable(args)
            @enabled_styles = args
          end
@@ -127,7 +122,7 @@ module OrbitApp
          end

          def to_module_app_format
-            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles,:sorting_query=>@sorting_query} rescue nil
+            {"query"=>@query,"image"=>@image,"more_link"=>@more_link,"enabled_styles"=>@enabled_styles} rescue nil
          end

          def link_field(field_name,setting)
@@ -32,7 +32,13 @@ module ParserFrontEnd
        ret = ''
        part = PagePart.find(front['part_id']) if front['part_id']
        ret << eval("\"#{front['path']}\"") rescue ''
-        ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args
+        args.each do |index,arg|
+          if index=="tag_id" || index=="category_id"
+            ret << (ret.include?("?") ? "&#{index}[]=#{arg}": "?#{index}[]=#{arg}" )
+            else
+            ret << (ret.include?("?") ? "&#{index}=#{arg}": "?#{index}=#{arg}" )    
+          end
+        end if args
        fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
      end
      front.swap(fragment)
@@ -0,0 +1,55 @@
+# encoding: utf-8 
+require 'pry'
+namespace :import do
+  task :ntu_mb_news_report => :environment do
+
+    jfile = File.new("#{Rails.root}/lib/import_data/news_report.json").read
+    jdata = JSON.parse(jfile)    
+
+  end
+
+  task :ntu_mb => :environment do
+    DEPARTMENTS = %w[Management BA Acc Fin IB IM EMBA GMBA]
+    print 'Enter the numer of department you want to import'
+    puts DEPARTMENTS.map.with_index{|t,i| "#{i}.#{t}" }.to_s
+    num = STDIN.gets.gsub("\n",'').to_i
+
+    puts "Destroy all BulletinCategory? (Default No)"
+    if STDIN.gets.gsub("\n",'').downcase == 'yes'
+      BulletinCategory.destroy_all
+    else
+      puts "Did not destroy"
+    end
+    jfile = File.new("#{Rails.root}/lib/import_data/announce_categories.json").read
+    jdata = JSON.parse(jfile)
+    jdata.each do |data|
+        a = BulletinCategory.new data
+        a.save
+    end
+    news_report_category = BulletinCategory.new {"key":"news_report","title_translations":{"en":"NewsReport","zh_tw":"新聞報導"}}
+    puts "Imported #{jdata.count}+1(NewsReport)"
+
+
+    puts "Destroy all Bulletin? (Default No)"
+    if STDIN.gets.gsub("\n",'').downcase == 'yes'
+      Bulletin.destroy_all
+    else
+      puts "Did not destroy"
+    end
+    counter = 0
+    jfile = File.new("#{Rails.root}/lib/import_data/announcements.json").read
+    jdata = JSON.parse(jfile)
+    jdata.each do |data|
+      # puts data
+      # puts DEPARTMENTS[num]
+      if data["department"] == DEPARTMENTS[num]
+        a = Bulletin.new data
+        a.bulletin_category = BulletinCategory.where(:key=>data["category_key"]).first
+        a.save
+        counter = counter +1
+      end
+    end
+    puts "Imported #{counter}"
+
+  end
+end
@@ -326,44 +326,4 @@ namespace :migrate do
    `mongo #{Mongoid.config.database.name} --eval "db.tags.remove({_type: {$ne: 'Tag'}})"`
  end

-  task :add_missing_user_link => :environment do
-    User.all.each do |user|
-      user.role_ids.uniq!
-      user.sub_role_ids.uniq!
-      user.save
-      user.roles.each do |role|
-        unless role.user_ids.include?(user.id)
-          role.user_ids << user.id
-          role.save
-        end
-      end
-      user.sub_roles.each do |sub_role|
-        unless sub_role.user_ids.include?(user.id)
-          sub_role.user_ids << user.id
-          sub_role.save
-        end
-      end
-    end
-    Role.all.each do |role|
-      role.user_ids.uniq!
-      role.save
-      role.users.each do |user|
-        unless user.role_ids.include?(role.id)
-          user.role_ids << role.id
-          user.save
-        end
-      end
-    end
-    SubRole.all.each do |sub_role|
-      sub_role.user_ids.uniq!
-      sub_role.save
-      sub_role.users.each do |user|
-        unless user.sub_role_ids.include?(sub_role.id)
-          user.sub_role_ids << sub_role.id
-          user.save
-        end
-      end
-    end
-  end
-
 end
@@ -1,5 +1,4 @@
 # encoding: utf-8 
-require 'erb'

 namespace :site do
  
@@ -10,26 +9,21 @@ namespace :site do
    Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ]) 
    User.create!(:email=>'chris@rulingcom.com',:admin=>true,:user_id=>'chris',:password=>'password')
    `mongo #{Mongoid.config.database.name} --eval "db.fs.chunks.ensureIndex({files_id: 1, n: 1})"`
-
    puts  "Congres you can now login within url"
    puts 'Please upload design package (/admin/designs/upload_package ) and run rake site:necessary_data'
    I18nVariable.create!( :document_class => 'language', :key => 'en', :en => 'English', :zh_tw => '英文' )
    I18nVariable.create!( :document_class => 'language', :key => 'zh_tw', :en => 'Chinese', :zh_tw => '中文' )
-    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)  
+    Info.create!(key: "profile", built_in: true, disabled: false, title: {"zh_tw"=>"基本欄位", "en"=>"Basic Info"}, to_search: false)
  end
  
-  task :create_logrotate => :environment do #Can remove after all products update
-    create_rulingcom_logrotate
-  end
-
  task :necessary_data => :environment do
-    auto_setting
    site = Site.first
-    site.update_attribute(:title,'RulingOrbit Demo Site')
-    site.update_attribute(:resque_namespace,@resque_namespace)
+    site.title = 'RulingOrbit Demo Site'
+    site.save

    # home_trans = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
    design = Design.first
+    site = Site.first
    site.design = design
    site.save
    theme = design.themes.first
@@ -37,78 +31,6 @@ namespace :site do

    home.title_translations = {"zh_tw"=>"首頁", "en"=>"Home"}
    home.save 
-
-    puts "Rember to restart server after you setup all sites for starting God"
  end

-  task :start_auto_setting => :environment do
-    auto_setting
-  end
-
-  def auto_setting
-    puts "Enter your resque namespace[Orbit]:......"
-    @resque_namespace = STDIN.gets.gsub("\n",'')
-    @resque_namespace = APP_CONFIG['orbit'] if @resque_namespace.empty?
-
-
-    puts "Is this the only site [ Entry site? ] on this mechine?[Default No]:......"
-    site_is_alone = false
-    site_is_alone = STDIN.gets.gsub("\n",'')
-    site_is_alone = true if site_is_alone.downcase == 'yes'
-
-    puts "Is this a primary site?[Default No]:......"
-    site_is_primary = false
-    site_is_primary = STDIN.gets.gsub("\n",'')
-    site_is_primary = true if site_is_primary.downcase == 'yes'
-
-    puts "Traffic heavy?[Default No]:......"
-    traffic_heavy = false
-    traffic_heavy = STDIN.gets.gsub("\n",'')
-    traffic_heavy = true if traffic_heavy.downcase == 'yes'
-
-    @traffic_rate = traffic_heavy ? 2 : 1
-
-    if site_is_alone
-        @resque_workers = 5 * @traffic_rate  #Entry Site 
-    else
-        if site_is_primary
-            @resque_workers = 2  * @traffic_rate  #Primary Site 
-        else
-            @resque_workers = 1  * @traffic_rate  #Secondary Site 
-        end
-    end
-    
-    resque_setting = ERB.new(File.new("lib/template/setting/resque.god.erb").read)
-    File.open("config/resque.god", 'w') { |file| file.write(resque_setting.result) }
-
-    resque_schedule_setting = ERB.new(File.new("lib/template/setting/resque_schedule.god.erb").read)
-    File.open("config/resque_schedule.god", 'w') { |file| file.write(resque_schedule_setting.result) }
-
-    if site_is_primary
-        solr_setting = ERB.new(File.new("lib/template/setting/solr.god.erb").read)
-        File.open("config/solr.god", 'w') { |file| file.write(solr_setting.result) }        
-        create_rulingcom_logrotate
-    end  
-  end
-
-
-def create_rulingcom_logrotate
-    `sudo mkdir -p /var/log/rulingcom` unless File.directory? "/var/log/rulingcom"
-    @project_folder = ENV["PWD"]
-    puts "Is your Orbit folder: #{@project_folder} (If YES => Press enter,or enter your path)"
-    user_enter_project_folder = STDIN.gets.gsub("\n",'')
-    @project_folder = user_enter_project_folder unless user_enter_project_folder.empty?
-
-    @user_home_folder = ENV["HOME"]
-    puts "Is your Home folder: #{@user_home_folder} (If YES => Press enter,or enter your path)"
-    user_enter_home_folder = STDIN.gets.gsub("\n",'')
-    @user_home_folder = user_enter_home_folder unless user_enter_home_folder.empty?
-
-    logrotate_setting = ERB.new(File.new("lib/template/setting/rulingcom_log.erb").read)
-    File.open("#{@project_loc}/tmp/logrotate_setting", 'w') { |file| file.write(logrotate_setting.result) } 
-
-    `sudo cp #{@project_loc}/tmp/logrotate_setting /etc/logrotate.d/rulingcom` 
-    `logrotate -v -f /etc/logrotate.conf`
-end
-
 end
@@ -1,14 +0,0 @@
-# encoding: utf-8 
-namespace :system_check do
-  task :god_can_start => :environment do
-     unless File.directory? "/var/log/rulingcom"
-       puts "Creating Rulingcom log folder"
-       `sudo mkdir -p /var/log/rulingcom`
-     end
-  end
-  task :set_resque_namespace,[:namespace] => :environment do |t,args|
-    site = Site.first
-    site.resque_namespace = args[:namespace]
-    site.save
-  end
-end
@@ -1,59 +0,0 @@
-rails_env   = ENV['RAILS_ENV']  || "production"
-rails_root  = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/..'
-user_home = ENV['HOME'] || File.dirname(__FILE__) + '/../..'
-development_uid = ''
-development_gid = ''
-
-  God.watch do |w|
-    w.dir        = rails_root
-    w.name    = "<%= @resque_namespace.nil? ? "" : "#{@resque_namespace}-" %>resque-scheduler"
-    w.group   = 'rulingcom'
-    w.interval = 10.seconds
-    w.pid_file = "#{rails_root}/tmp/#{w.name}.pid"
-
-    w.env       = {"QUEUE"=>"*", "RAILS_ENV"=>rails_env,"HOME"=>user_home, "RAILS_ENV"=>rails_env}
-    w.start     = "rake -f #{rails_root}/Rakefile resque:scheduler"
-    w.stop = "sudo kill -KILL $(cat #{w.pid_file})"
-    w.uid = (rails_env == 'production' )? "root" : development_uid
-    w.gid = (rails_env == 'production' )? "root" : development_gid
-  
-    w.log = (rails_env == 'production' )? "/var/log/#{w.group}/#{w.name}.log":"#{rails_root}/log/dev-#{w.name}.log"
-
-    # restart if memory gets too high
-    w.transition(:up, :restart) do |on|
-      on.condition(:memory_usage) do |c|
-        c.above = 350.megabytes
-        c.times = 2
-      end
-    end
-
-    # determine the state on startup
-    w.transition(:init, { true => :up, false => :start }) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-      end
-    end
-
-    # determine when process has finished starting
-    w.transition([:start, :restart], :up) do |on|
-      on.condition(:process_running) do |c|
-        c.running = true
-        c.interval = 5.seconds
-      end
-
-      # failsafe
-      on.condition(:tries) do |c|
-        c.times = 5
-        c.transition = :start
-        c.interval = 5.seconds
-      end
-    end
-
-    # start if process is not running
-    w.transition(:up, :start) do |on|
-      on.condition(:process_running) do |c|
-        c.running = false
-      end
-    end
-  end
-
@@ -1,33 +0,0 @@
-/var/log/rulingcom/*.log  {
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Resque
-<%= "#{@project_folder}/nginx/logs/access.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#DB log
-/var/log/mongodb{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-
-#Orbit
-<%= "#{@project_folder}/log/*production.log" %>{
-    daily
-    dateext
-    compress
-    rotate 30
-}
-# end of Orbit,EXTEND IF NEEDED
-
-#Remember to save this file as /etc/logrotate.d/rulingcom
@@ -1,55 +1,24 @@
-var banners = [];
-var banner_index = 0;
-
 $(document).ready(function() {
+	
 	$.each($(".dymanic_load"),function(){
 		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
+		
 		if($(this).attr("path")!=''){
-			if($(this).attr("path").indexOf("show_banner")>0){
-				ajax_load_proc($(this),$(this).attr("path"),"true"); 	
-			}else{
-				ajax_load_proc($(this),$(this).attr("path"),$(this).attr("path"));
+				 ajax_load_proc($(this),$(this).attr("path"));
+				} 
 			}
-		}});
+			);
 	$("#main_content").addClass("module");
-});
-
-function ajax_load_proc(wapper,url,isBanner){
-	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
-		if (textSta == 'success') {
-			if(isBanner=="true"){
-				wapper.html(respText);
-				var banner = banners[banner_index];
-				$(banner.banner_name+" > img").each(function(){
-					$(this).load(function(){ banner.image_loaded++; });
-				});
-				BannerCycle(banner_index);
-				banner_index++;
-			}else{
-				wapper.html(respText);
-			}	
-		};
-		if(textSta == 'error')
-			wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
 	});
-}

-function BannerCycle(banner_index){
-	var banner = banners[banner_index];
-	if (!!$.prototype.cycle && (banner.image_loaded==$(banner.banner_name+" img").length)){
-    	$(banner.banner_name).ready(function() {
-			$(banner.banner_name).cycle({
-				delay: -1000,
-				fx: banner.banner_fx,
-				timeoutFn: getTimeout,
-				pager: banner.banner_pager,
-				pagerAnchorBuilder: function(idx, slide) { return "<li><a href='#'></a></li>"; }
-			});
-		});
-	}else{
-		if(!$.prototype.cycle) $.getScript('/static/jquery.cycle.all.latest.js');
-		setTimeout("BannerCycle("+banner_index+")",500);
-	}
+function ajax_load_proc(wapper,url){
+	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
+			if (textSta == 'success') {
+				wapper.html(respText);	
+			};
+			if(textSta == 'error')
+				wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
+	});
 }

 // Ad Banner FX code [start]
@@ -1,78 +0,0 @@
-
-.mega_tab_block {
-    clear: both;
-    position: relative;
-}
-
-.mega_tab_block h3 {
-    font: 22px/100% 'arial',sans-serif;
-    margin: 0 0 10px;
-    padding: 0;
-}
-
-.mega_tab_block .pagination {
-    float: left;
-    height: auto;
-    margin: 10px 0 0;
-    width: auto;
-}
-.mega_tab_block .pagination a {
-    background: none repeat scroll 0 0 #EEEEEE;
-    display: block;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-
-.tag_block {
-    clear: both;
-    margin: 0 0 20px;
-    position: relative;
-}
-.mega_tab_block .tag_list {
-    background: none repeat scroll 0 0 #EEEEEE;
-    margin: 0;
-    overflow: hidden;
-    padding: 0 0 0 5px;
-}
-.mega_tab_block .tag_list li {
-    float: left;
-    list-style: none outside none;
-}
-.mega_tab_block .tag_list li a {
-    background: none repeat scroll 0 0 #DDDDDD;
-    float: left;
-    margin: 0 5px 0 0;
-    padding: 10px;
-}
-
-.news_block {
-    clear: both;
-    margin: 0 0 20px;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .news_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .news_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}
-
-
-.links_block {
-    clear: both;
-    overflow: hidden;
-    position: relative;
-}
-.mega_tab_block .links_list {
-    margin: 0;
-    padding: 0;
-}
-.mega_tab_block .links_list li {
-    list-style: none outside none;
-    padding: 5px 0;
-}
@@ -95,8 +95,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
  # GET /bulletins/1/edit
  def edit
    @bulletin = Bulletin.find(params[:id])
-    # if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
-    if (@bulletin.create_user_id !=  current_or_guest_user.id) and !is_manager?
+    if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
      redirect_to :action => :index
    else
      # @summary_variable = @bulletin.summary_variable
@@ -138,11 +137,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController

      @bulletin.create_user_id = current_user.id
      @bulletin.update_user_id = current_user.id
-      # if(is_manager? || is_admin?)
+      if(is_manager? || is_admin?)
        @bulletin.is_checked = true
        @bulletin.is_rejected = false
        @bulletin.de_pending
-      # end
+      end

      respond_to do |format|
        if @bulletin.save
@@ -222,11 +221,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
      respond_to do |format|

        if @bulletin.update_attributes(params[:bulletin])
-          # if(is_manager? || is_admin?)
+          if(is_manager? || is_admin?)
            @bulletin.is_checked = true
            @bulletin.is_rejected = false
            @bulletin.de_pending!
-          # end
+          end
          # if (params[:bulletin][:is_checked] == "false")
          #   @bulletin.is_rejected = true
          #   @bulletin.save!
@@ -252,9 +251,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
  # DELETE /bulletins/1
  # DELETE /bulletins/1.xml
  def destroy
-
    @bulletin = Bulletin.find(params[:id])
-
    # @bulletin.bulletin_files.destroy
    @bulletin.destroy

@@ -264,8 +261,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
      # format.xml  { head :ok }
      format.js
    end
-
-
  end

  # def top_edit
@@ -66,75 +66,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
    
  end
  
-  def bulletins_and_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-
-    date_now = Time.now
-
-    if !params[:tag_id].blank?
-      @tags = Tag.any_in(:_id => params[:tag_id]).asc(:created_at)
-    elsif params[:tag_id].blank? and !@part.tag.blank?
-      @tags = Tag.any_in(:_id => @part.tag).asc(:created_at)
-    else
-      @ModuleApp_b = ModuleApp.first(:conditions => {:key=>'announcement'})
-      @tags = Tag.where(:module_tag_id => @ModuleApp_b.id).asc(:created_at)
-    end
-
-    @selected_tag = Tag.find(params[:id]).first rescue @tags[0]
-
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
-
-    if @part.widget_style == 'bulletins_and_web_links'
-      @ModuleApp_w = ModuleApp.first(:conditions => {:key=>'web_resource'})
-      @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp_w.id})
-      @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
-    end
-    
-  end
-  
  def reload_bulletins
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    @title = @part.title_translations[I18n.locale.to_s]
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort).page(params[:page]).per(5) rescue nil
  end
  
  def reload_web_links
-  
-    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
-    
-    if !@part.blank? and @part.widget_data_count
-      @page_num = @part.widget_data_count
-    else
-      @page_num = 5
-    end
-    
-    date_now = Time.now
-
-    @selected_tag = Tag.find(params[:tag_id]).first
-    @ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
-    @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
-    @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
+    @selected_tag = Tag.find(params[:tag_id])
+    @web_links = WebLink.where(:name => @selected_tag.name).where(:is_hidden => false).desc(:is_top, sort).available_for_lang(I18n.locale).page(params[:page]).per(5) rescue nil
  end

  def bulletins_side_bar
@@ -34,7 +34,7 @@
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<% if (bulletin.create_user_id ==  current_or_guest_user.id) || is_manager? %>
-					<%# if current_or_guest_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
+					<% if current_or_guest_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
 						<li><%= link_to t(:edit), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
 						<li class="dropdown">
 							<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
@@ -46,7 +46,7 @@
 								<li><%#= link_to t(:file_), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
 							</ul>
 						</li>
-					<%# end %>
+					<% end %>

 				<% end -%>
 				<% if show_delete_link(bulletin) %>
@@ -1,10 +1,10 @@
 <% @bulletins.each do |bulletin| %>
 	<li>
-		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :part_id => params[:part_id], :tag_id => [@selected_tag.id] )  %>
+		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :tag_id => @selected_tag.id )  %>
 	</li>
 <% end %>

 <div class='pagination'>
-	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>
@@ -1,3 +1,3 @@
 <li>
-	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:inner=>true, :id => [tag.id], :part_id=>params[:part_id]), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
 </li>
@@ -5,6 +5,6 @@
 <% end %>

 <div class='pagination'>
-	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>
@@ -1,36 +0,0 @@
-<div class="mega_tab_block">
-
-	<div class="tag_block">
-		<ul id='bulletins_web_links_tags' class="tag_list">
-			<%= render :partial => 'tag', :collection => @tags %>
-		</ul>
-	</div>
-
-	<div class="news_block">
-		<h3 class="news_title2">
-			<%#= link_to t("announcement.bulletins"), panel_announcement_front_end_bulletins_path, :class => 'more' %>
-			<%= link_to @title, panel_announcement_front_end_bulletins_path, :class => 'more' %>
-		</h3>
-		<ul id='bulletins_web_links_bulletins' class="news_list">
-			<%= render 'bulletins' if @bulletins %>
-		</ul>
-	</div>
-
-	<% if @part.widget_style == 'bulletins_and_web_links' %>
-
-	<div class="links_block">
-		<h3 class="links_title"><%= t(:related_links) %></h3>
-		<ul id='bulletins_web_links_web_links' class="links_list">
-			<%= render 'web_links' if @web_links %>
-		</ul>
-	</div>
-
-	<% end %>
-
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "news_link" %>
-<% end %>
-
-<%= stylesheet_link_tag "announcement/bulletins_and_web_links" %>
@@ -1,3 +0,0 @@
-$('#bulletins_web_links_tags').html("<%= j render :partial => 'tag', :collection => @tags %>")
-$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' if @bulletins %>")
-$('#bulletins_web_links_web_links').html("<%= j render 'web_links' if @web_links %>")
@@ -35,6 +35,6 @@ en:
    update_bulletin_category_success: Update Category Successfully
    url: URL
    widget:
-      bulletins_and_web_links: Differential Nav.
+      bulletins_and_web_links: Bulletins and Web Resources
      index: Index
      search: Search
@@ -35,6 +35,6 @@ zh_tw:
    update_bulletin_category_success: 更新類別成功
    url: 連結位置
    widget:
-      bulletins_and_web_links: 分眾頁籤
+      bulletins_and_web_links: 索引
      index: 索引
      search: 搜尋
@@ -29,8 +29,7 @@ module Announcement

    widgets do
      default_widget do
-	  sorting 'desc(:postdate)'
-        query 'Bulletin.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+        query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
        enable ["typeA","typeB_style3","typeC"]
        image :image
        field :postdate
@@ -52,11 +51,6 @@ module Announcement
        widget_i18n "announcement.widget.search"
      end

-      customize_widget "bulletins_and_web_links" do
-        widget_i18n "announcement.widget.bulletins_and_web_links"
-        style ["bulletins_and_links","bulletins_only"]
-      end
-
      # item "index","announcement.widget.index",:default_template=>true,:fields=>["title","category","postdate"]
      # item "bulletins_and_web_links","announcement.widget.bulletins_and_web_links"
    end
@@ -0,0 +1,50 @@
+module Ask
+  OrbitApp.registration "Ask",:type=> 'ModuleApp' do
+    module_label 'ask.ask'
+    base_url File.expand_path File.dirname(__FILE__)
+    # personal_plugin :enable => true,:path=>"panel/faq/plugin/profile",:i18n=>'admin.faq'
+
+    version "0.1"
+    organization "Rulingcom"
+    author "RD dep"
+    intro "I am intro"
+    update_info 'some update_info'
+
+    front_end do
+      app_page 'ask_questions' do
+        frontend_i18n 'ask.ask'
+      end
+
+    end
+
+    widgets do
+      default_widget do
+      end
+    end
+
+    side_bar do
+      head_label_i18n 'ask.ask', icon_class: 'icons-light-bulb'
+      available_for [:admin,:manager,:sub_manager]
+      active_for_controllers({ private: ['ask_questions'] })
+      head_link_path "panel_ask_back_end_ask_questions_path"
+
+      context_link 'categories', link_path: 'panel_ask_back_end_ask_categories_path',
+                               priority: 1,
+                               active_for_action: {:ask_categories=>:index},
+                               available_for: [:all]
+
+      context_link 'ask.acknowledgement', link_path: 'panel_ask_back_end_ask_acknowledgements_path',
+                               priority: 1,
+                               available_for: [:all]
+
+      context_link 'ask.admin', link_path: 'panel_ask_back_end_ask_admins_path',
+                               priority: 1,
+                               available_for: [:all]
+
+      context_link 'ask.export', link_path: 'export_panel_ask_back_end_ask_questions_path',
+                               priority: 1,
+                               available_for: [:all]
+    end
+
+  end
+end
@@ -14,7 +14,6 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
  def create
    @ask_question = AskQuestion.new(params[:ask_question])
    if gotcha_valid? && @ask_question.save
-     @acknowledgement = AskAcknowledgement.last
      @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
      #@ask_question.save
      redirect_to root_path
@@ -31,7 +30,6 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
  end

  def thank_you
-    @acknowledgement = AskAcknowledgement.last
    @item = Page.find(params[:page_id]) rescue nil
    if @item
      if @item.frontend_data_count
@@ -42,5 +40,7 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
      @frontend_style = @item.frontend_style
    end
    @item = Page.find(params[:page_id]) rescue nil
+>>>>>>> a4fa967... Fix mailing redirect
  end
+
 end
@@ -1 +1,12 @@
+<% #if @ask_question.errors.empty? %>
+  //$('html,body').scrollTop(0);
+  //$('#acknowledgement')
+  //      .html('<%= j simple_format(@ask_acknowledgement.content) %>')
+  //      .fadeIn(600)
+  //      .delay(3000)
+   //     .fadeOut(600);
+<% #else %>
+  //alert('<%= @ask_question.errors.full_messages.join('\n') %>');
+  //Recaptcha.reload()
+<% #end %>
 window.location.href= "<%= panel_ask_front_end_thank_you_path %>"
@@ -1,34 +1,4 @@
 <link href='/assets/ask.css' rel='stylesheet' type='text/css' />
-<style type="text/css">
-  .spinner {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    margin-left: -50px; /* half width of the spinner gif */
-    margin-top: -50px; /* half height of the spinner gif */
-    text-align:center;
-    z-index:1234;
-    overflow: auto;
-    width: 100px; /* width of the spinner gif */
-    height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */
-} 
-</style>
-<script type="text/javascript">
-$(document).ready(function(){
-    $("#spinner").bind("ajaxSend", function() {
-        $(this).show();
-    }).bind("ajaxStop", function() {
-        $(this).hide();
-    }).bind("ajaxError", function() {
-        $(this).hide();
-    });
- 
-     });
-</script>
-
-<div id="spinner" class="spinner" style="display:none;">
-    Sending Mail <%= image_tag 'loading.gif', :id => "img-spinner"%>
-</div>
 <div id="new-ask-question" class="ask-question">
  <div id="acknowledgement"></div>
  <%= form_for @ask_question, url: panel_ask_front_end_ask_questions_path(standalone: true), html: {class: 'form-horizontal'} do |f| %>
@@ -92,18 +62,11 @@ $(document).ready(function(){
    </div>
   
    <div class="form-actions">
-      <%= f.submit t('submit'), class: 'btn btn-primary', :id => 'button-mail' %>
+      <%= f.submit t('submit'), class: 'btn btn-primary' %>
      <%= f.button t('cancel'), type: 'reset', class: 'btn' %>
    </div>
  <% end %>
 </div>
-<script type="text/javascript">
-$(document).ready(function(){
-    $('#button-mail').click(function() {
-        $('#spinner').show();
-    });
-});
-</script>
 <script type="text/javascript">
  $(function() {
    $('#new-ask-question .required').each(function() {
@@ -1 +1 @@
-<h3><%= @acknowledgement.content.html_safe%></h3>
+<h3>Thank you for your email, we will get back to you soon.</h3>
@@ -3,10 +3,9 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController

  # before_filter :force_order_for_user, :except => [:index,:get_album_json,:get_imgs_json]

-  before_filter :force_order_for_visitor,:only=>[:index,:show,:get_imgs_json,:get_albums,:imgs]
-  before_filter :force_order_for_user,:except => [:index,:show,:get_album_json,:get_albums,:imgs,:get_image_json]
-  before_filter :for_app_sub_manager,:except => [:index,:show,:get_album_json,:get_albums,:imgs,:get_image_json]
-
+  before_filter :force_order_for_visitor,:only=>[:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
+  before_filter :force_order_for_user,:except => [:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
+  before_filter :for_app_sub_manager,:except => [:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
  # before_filter lambda
  
  def index
@@ -127,18 +126,17 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
        album_cover_file: "http://#{request.host_with_port}#{album.cover_path}",
        album_name: album.name,
        album_tag_names: tag_names,
-        album_link:"http://#{request.host_with_port}/panel/gallery/back_end/albums/get_image_json?album_id=#{album.id}"
+        album_link:"http://#{request.host_with_port}#{panel_gallery_back_end_album_get_imgs_json_path(album)}"
      }
    end

    render :json=>JSON.pretty_generate(output)
  end

-  def get_image_json
-    album = GalleryAlbum.where(:_id => params[:album_id])
-    if album.first.present?
-      images = album.first.gallery_images.all
-      output = Array.new
+  def get_imgs_json
+    album = GalleryAlbum.find(params[:album_id])
+    images = album.gallery_images.all
+    output = Array.new

    images.each do |image|
      tags = Tag.find(image.tagged_ids).map{|t| t.name}
@@ -152,7 +150,6 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
    end

    render :json=>JSON.pretty_generate(output)
-   end
  end

  def imgs
@@ -9,38 +9,15 @@ class Panel::Gallery::Widget::AlbumsController < OrbitWidgetController
 		@album = GalleryAlbum.find(@part.widget_options['album_id']) rescue nil
 		@album_images = @album.gallery_images if @album

-		
 		@settings = {"vertical"=>vertical,"horizontal"=>horizontal}   #[note] horizontal has it's limitation from 2 to 6
 		@class = "c" + @settings["horizontal"].to_s
 		@total = @settings["vertical"] * @settings["horizontal"]
 		@rnd = Random.new
 		@images = []
-
-		if @album_images.count > @total
-			@randoms = []
-			until @randoms.count == @total do
-				r = @rnd.rand(0...@album_images.count)
-				if !@randoms.include?r
-					@randoms << r
-					image = @album_images[r]
-					values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
-					@images << values
-				end
-			end
-		elsif @album_images.count == @total
-			@album_images.each do |image|
-				values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
-				@images << values
-			end
-		else
-			@album_images.each do |image|
-				values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
-				@images << values
-			end
-			until @images.count == @total do
-				values = {"show_link"=>"javascript:void(0);","thumb"=>"assets/gallery/nodata.jpg"}
-				@images << values
-			end
+		for i in 0..@total-1
+			image = @album_images[@rnd.rand(0...@album_images.count)]
+			values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
+			@images << values
 		end
 	end

@@ -7,14 +7,13 @@ Rails.application.routes.draw do
      	match "upload_image" => "albums#upload_image"
      	match "save_tags" => "tags#save_tags"
      	match "albums/save_tags" => "tags#save_tags"
-
-        match "albums/get_image_json" => "albums#get_image_json"
        
       	resources :albums do 
      		match "set_cover" => "albums#set_cover"
      		match "imgs" => "albums#imgs"
      		match "upload_panel" => "albums#upload_panel"
      		match "images_tags" => "albums#images_tags"
+          match "get_imgs_json" => "albums#get_imgs_json"

          collection do
            get "get_album_json"
@@ -1,36 +0,0 @@
-class Panel::Location::BackEnd::LocationCategoriesController < OrbitBackendController
-
-	def index
-		@categorylist = LocationCategory.all
-		@new_category = LocationCategory.new
-	end
-
-	def create
-		@category = LocationCategory.new(params[:location_category])
-		@category.save!
-		respond_to do |h|
-			h.js
-		end
-	end
-
-	def edit
-		@category = LocationCategory.find(params[:id])
-		render :layout => false
-	end 
-
-	def update 
-		@category = LocationCategory.find(params[:id])
-		@category.update_attributes(params[:location_category])
-		respond_to do |h|
-			h.js
-		end
-	end
-
-
-	def destroy
-		@category = LocationCategory.find(params['id'])
-		@category.delete
-		render :json=>{"success"=>"true"}.to_json
-	end
-
-end
@@ -14,6 +14,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController

  def new
    @location_info = LocationInfo.new
+
    respond_to do |format|
      format.html # new.html.erb
      format.json { render json: @location }
@@ -8,6 +8,4 @@ class Location
  field :description
  field :longitude, type: Float
  field :latitude, type: Float
-
-  belongs_to :location_category
 end
@@ -1,14 +0,0 @@
-class LocationCategory
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  # include OrbitCoreLib::ObjectAuthable
-
-  # ObjectAuthTitlesOptions = %W{new_album}
-  # APP_NAME = "album"
-
-  field :name, localize: true
-
-  has_many :location_infos, :autosave => true, :dependent => :destroy
-
-end
@@ -9,8 +9,6 @@ class LocationInfo
  field :longitude, type: Float
  field :latitude, type: Float

-  belongs_to :location_category
-
  validates :file, presence: true
  validates :longitude,
            numericality: { less_than_or_equal_to: 180.0, greater_than_or_equal_to: -180.0 },
@@ -1,13 +0,0 @@
-  <div class="tag clear">
-      <div class="tagitem">
-        <i class="icon-folder-close"></i>
-        <% @site_valid_locales.each do |locale| %>
-       		<span class="value" for="<%= locale %>"><%= category.name_translations[locale] rescue nil %> </span>
-       	<% end %>
-      </div>
-      <div class="action">
-        <%= link_to(t(:delete_), panel_location_back_end_location_category_path(category), :method => :delete, :confirm => t("sure?"), :remote => true, :class => "delete") %>
-         <%= link_to(t(:edit), edit_panel_location_back_end_location_category_path(category), :remote => true, :class => "edit") %>
-      	<%#= show_gallery_category_permission_link(category) %>
-      </div>
-    </div>
@@ -1,2 +0,0 @@
-var dom = $("<%= j render :partial => 'category', :object => @category %>");
-$("div#tags").append(dom);
@@ -1,10 +0,0 @@
-<%= form_for @category, :url => panel_location_back_end_location_category_path(@category), :remote => true do |f| %>
-  <%= f.fields_for :name_translations do |name| %>
-    <% @site_valid_locales.each do |locale| %>
-      <%= label_tag(locale,t("location.new_category")+"["+I18nVariable.from_locale(locale)+"]") %>
-      <%= name.text_field locale, :value =>(@category.name_translations[locale]) %> 
-    <% end %>
-  <% end %>
-<%= f.submit "Save", :class=> "btn btn-primary temp_save_btn" %>
-<a href="#" class="btn btn-primary" id="temp_cancel_btn" onclick="return false;"><%= I18n.t(:cancel) %></a>
-<% end %> 
@@ -1,41 +0,0 @@
-<div id="tags" class="clear">
-    <%= render :partial => 'category', :collection => @categorylist %>  
-</div>
-<div class="form-actions form-fixed form-inline pagination-right">
-    <%= form_for @new_category, :url => {:action => "create"}, :remote => true do |f| %>
-        <%= f.fields_for :name_translations do |name| %>
-	          <% @site_valid_locales.each do |locale| %>
-              <%= label_tag(locale,t("location.new_category")+"["+I18nVariable.from_locale(locale)+"]") %>
-              <%= name.text_field locale %> 
-            <% end %>
-        <% end %>
-        <%= f.submit "Save", :class=> "btn btn-primary" %>
-    <% end %> 
-</div>
-
-<script type="text/javascript">
-var deleteCategory = function(a){
-	  	var parent = a.parent().parent();
-       parent.hide("slide",function(){parent.remove();})
-	}
-  var parent;
-	var editCategory = function(a,data){
-    parent = a.parent().parent();
-      var parenthtml = parent.html();
-      var tempdom = $("<div class='tagitem'></div>");
-      tempdom.append(data);
-      parent.html(tempdom);
-      tempdom.find("a#temp_cancel_btn").click(function(){
-        parent.html(parenthtml);
-      })
-	}
-
-  $(document).ready(function(){
-      $("#tags div.action a.delete").live('ajax:success', function(){
-        deleteCategory($(this));
-      })
-      $("#tags div.action a.edit").live('ajax:success',function(evt, data, status, xhr){
-        editCategory($(this),data);
-      })
-  })
-</script>
@@ -1,2 +0,0 @@
-var dom = $("<%= j render :partial => 'category', :object => @category %>");
-parent.html(dom.html());
@@ -9,12 +9,6 @@
      <% end %>
    </div>
  </div>
-  <div class="control-group">
-    <label class="control-label" for=""><%= t "category" %></label>
-    <div class="controls">
-     <%= f.select(:location_category_id, LocationCategory.all.collect {|p| [ p.name, p.id ] },{:prompt => t("location.select_category")},:class => "validate input-xlarge") %>
-    </div>
-  </div>
  <div class="control-group">
    <label class="control-label" for=""><%= t 'picture' %></label>
    <div class="controls">
@@ -26,7 +20,7 @@
    <label class="control-label" for=""><%= t 'coordinates' %></label>
    <div class="controls">
      <%= f.text_field :longitude, :class=>"span2", :placeholder => "Longitude" %>
-      <%= f.text_field :latitude, :class=>"span2", :placeholder => "Lantitude" %>
+      <%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
    </div>
  </div>
  <div class="control-group">
@@ -1,3 +1,3 @@
-<%= form_for @location_info, :url=>  panel_location_back_end_locations_path, :html => { :class=>"form-horizontal",:multipart => true} do |f| %>
+<%= form_for @location_info, :url=>  panel_location_back_end_locations_path, :html => { :class=>"form-horizontal"} do |f| %>
  <%= render :partial => 'form', :locals => {:f => f} %>
 <% end  %>
@@ -1,6 +1,3 @@
 en:
-    location: Location
-    locations: Locations
-    new_category: "New Category"
-    save: Save
-    select_category: "Select Category"
+  location:
+    location: Location
@@ -6,7 +6,6 @@ Rails.application.routes.draw do
        match "locations/get_locations" => "locations#get_locations"

        resources :locations
-        resources :location_categories
      end
    end
  end
@@ -1,6 +1,6 @@
 module Location
  OrbitApp.registration "Location",:type=> 'ModuleApp' do
-    module_label 'locations'
+    module_label 'location.location'
    base_url File.expand_path File.dirname(__FILE__)    
    # personal_plugin :enable => true,:path=>"panel/location/plugin/profile",:i18n=>'admin.location'
    
@@ -32,19 +32,12 @@ module Location
    # end
    
    side_bar do
-      head_label_i18n  'locations',:icon_class=>"icons-location"
+      head_label_i18n  'location.location',:icon_class=>"icons-location"
      available_for [:admin,:guest,:manager,:sub_manager]
      active_for_controllers ({:private=>['locations']})

      head_link_path "panel_location_back_end_locations_path"

-      context_link 'categories',
-                     :link_path=>"panel_location_back_end_location_categories_path" ,
-                     :priority=>1,
-                     :active_for_action=>{:localtion_categories=>:index},
-                     :available_for => [:manager]
-
-
    end
  end
 end
@@ -10,12 +10,10 @@
 						<div class="o-links-list">
 							<ul>
 								<% web_links.page(params[:page_main]).per(@page_num).each do |web_link| %>
-									<% if !web_link.title.empty? %>
-										<li>
-											<%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
-											<div class="o-links-description"><%= web_link.context %></div>
-										</li>
-									<% end %>
+									<li>
+										<%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
+										<div class="o-links-description"><%= web_link.context %></div>
+									</li>
 								<% end %>
 							</ul>
 						</div>
@@ -8,12 +8,10 @@
            <div class="o-links-list">
              <ul>
                <% web_links.page(params[:page_main]).per(@page_num).each do |web_link| %>
-                  <% if !web_link.title.empty? %>
-                    <li>
-                        <%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
-                        <div class="o-links-description"><%= web_link.context %></div>
-                    </li>
-                  <% end %>
+                  <li>
+                    <%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
+                    <div class="o-links-description"><%= web_link.context %></div>
+                  </li>
                <% end %>
              </ul>
            </div>
@@ -1,6 +1,6 @@
 <ul>
 	<% @web_links.each do |widget| -%>
-			<li><%= link_to widget.title, widget.url, {:target => '_blank', :title => widget.title} %></li>
+		<li><%= link_to widget.title, widget.url, {:target => '_blank', :title => widget.title} %></li>
 	<% end -%>		
 </ul>