Changeset 5886

Timestamp:

07/28/08 16:59:09 (4 months ago)

Author:

uta

Message:

2008/07/28 sync

Files:

• rubricks_core/trunk/app/models/rubricks_group.rb (modified) (2 diffs)
• rubricks_core/trunk/app/models/rubricks_lib/character_set/chinese_character_set_convert.rb (modified) (2 diffs)
• rubricks_core/trunk/app/models/rubricks_lib/character_set/english_character_set_convert.rb (modified) (2 diffs)
• rubricks_core/trunk/app/models/rubricks_lib/character_set/japanese_character_set_convert.rb (modified) (2 diffs)
• rubricks_core/trunk/app/models/rubricks_lib/rubricks_character_set_convert_lib.rb (modified) (2 diffs)
• rubricks_core/trunk/app/models/rubricks_mailer.rb (modified) (4 diffs)
• rubricks_core/trunk/app/models/rubricks_user.rb (modified) (1 diff)
• rubricks_core/trunk/db/migrate/014_rubricks_core_schema_014.rb (added)
• rubricks_core/trunk/public/javascripts/rubricks_common.js (modified) (3 diffs)
• rubricks_core/trunk/public/javascripts/src_rubricks_common_rollover.js (modified) (6 diffs)
• rubricks_core/trunk/script/create_mail (modified) (1 diff)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_controller_user_management.rb (modified) (2 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_attachment_helper.rb (modified) (2 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_js_helper.rb (modified) (1 diff)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_language_helper.rb (modified) (3 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_layout_window_helper.rb (modified) (1 diff)

rubricks_core/trunk/app/models/rubricks_group.rb

@@ -66 +66 @@
-
-    def find_rubricks_groups(*args)
-
+:
-      options = {
-        :admin      => true,
@@ -201 +201 @@
-
-  def group_info_editable?
-true
+self.built_in.blank?
-  end
-

rubricks_core/trunk/app/models/rubricks_lib/character_set/chinese_character_set_convert.rb

@@ -1 @@
-# Set of the encode change method to operate Chinese.
-module RubricksCharacterSetConvert
-  def convert_for_ie(str)
@@ -9 +8 @@
-  end
-
-  # Change mail body to Chinese encoding.
-  def convert_mail_body(str)
-    str
-  end
-
-  # Change mail header to Chinese.
-  def convert_mail_header(str)
-    str

rubricks_core/trunk/app/models/rubricks_lib/character_set/english_character_set_convert.rb

@@ -1 @@
-# Set of the encode change method to operate English.
-module RubricksCharacterSetConvert
-  def convert_for_ie(str)
@@ -9 +8 @@
-  end
-
-  # Change mail body to English encode.
-  def convert_mail_body(str)
-    return str
-  end
-
-  # Change mail header to English encode.
-  def convert_mail_header(str)
-    return str

rubricks_core/trunk/app/models/rubricks_lib/character_set/japanese_character_set_convert.rb

@@ -1 @@
-# Set of the encode change method to operate Japanese.
-module RubricksCharacterSetConvert
-  def convert_for_ie(str)
@@ -9 +8 @@
-  end
-
-  # Change mail body to Japanese encoding.
-  def convert_mail_body(str)
-    Kconv::kconv(str, Kconv::JIS)
-  end
-
-  # Change mail header to Japanese.
-  def convert_mail_header(str)
-    Kconv::kconv(str, Kconv::JIS)

rubricks_core/trunk/app/models/rubricks_lib/rubricks_character_set_convert_lib.rb

@@ -2 +2 @@
-  @@charset_converts = {}
-
-
-
+
+
+
+
-  end
-
-  private
-
-
-
-
-
-
+
+
+
+
-      m, cache_mtime = @@charset_converts[lang]
-      return m if mtime <= cache_mtime
-    end
-
-    m = load_charset_file(path)
-
-
+
-    return m
-  end
@@ -25 +23 @@
-  def load_charset_file(path)
-    m = Module.new
-
-    open(path) do |f|
-      m.module_eval(f.read)
-      m.module_eval('extend self::RubricksCharacterSetConvert')
-    end
-
-    return m
-  end

rubricks_core/trunk/app/models/rubricks_mailer.rb

@@ -7 +7 @@
-
-  class << self
-
+(language = nil)
-      if RubricksLib.test_mode?
-        logger.debug 'Selenium Test Mode'
@@ -21 +21 @@
-          :authentication   => (use_auth) ? RubricksConfig.get('mail_smtp_password_encode').to_sym : nil
-        }
+        language ||= RubricksLib.current_lang
+        TMail::Encoder::OPTIONS['UTF8'] = (language == 'japanese') ? '-M' : nil
-        ActionMailer::Base.raise_delivery_errors = true
-        ActionMailer::Base.delivery_method = RubricksConfig.get('mail_method').to_sym
-hl('[_Common_MailCharset]'
+l('[_Common_MailCharset]', language
-      end
-    end
-  end
-
-
+
+
+
+
+
+
-    super
-    @mail.body = line_break(@mail.body)
-    @mail.body = RubricksLib.convert('convert_mail_body', @mail.body)
-    language   = (RubricksLib.current_user && !RubricksLib.guest?) ? RubricksLib.current_user.language : RubricksConfig.get('site_default_language')
-    TMail::Encoder::OPTIONS['UTF8'] = (language == 'japanese') ? '-M' : nil
-  end
-
-  alias :initialize_defaults_original :initialize_defaults unless method_defined?(:initialize_defaults_original)
-  def initialize_defaults(method_name)
-    @headers = {
-      'MIME-Version'                => '1.0',
-      'Content-Transfer-Encoding'   => RubricksLib.hl('[_Common_MailTransferEncoding]')
-    }
-    initialize_defaults_original(method_name)
-  end
-  
-  def deliver!
-    if RubricksLib.test_mode?
@@ -62 +56 @@
-  protected
-  def multi_lang!(str)
-"convert_mail_header"
+'convert_mail_header'
-  end
-
@@ -70 +64 @@
-
-  private
+  def convert(*args)
+    options = args.flex :str, :type
+    method = (options[:type] == :body) ? 'convert_mail_body' : 'convert_mail_header'
+    return RubricksLib.convert(method, options[:str], @language)
+  end
+
+  def create_mail
+    @subject, @from, @body = convert(self.subject), convert(self.from), convert(line_break(self.body), :body)
+    super
+  end
+
-  def line_break(str)
-    result = []

rubricks_core/trunk/app/models/rubricks_user.rb

@@ -531 +531 @@
-      System::SystemMailer.set_config
-      begin
-.name, self.email_by_admin
+
-      rescue Exception => ex
-        logger.error(ex.message)

rubricks_core/trunk/public/javascripts/rubricks_common.js

@@ -749 +749 @@
-var _2=$(_1);
-if(_2){
-rubricks.common.Rollover.onfocus.bindAsEventListener(rubricks.common.Rollover
-rubricks.common.Rollover.onblur.bindAsEventListener(rubricks.common.Rollover
+this.onfocus.bindAsEventListener(this
+this.onblur.bindAsEventListener(this
-}
-},focus_range:function(_3){
-var _4=$(_3);
-rubricks.common.Rollover
+this
-rubricks.common.Rollover.focus(_5);
-});
-},onblur:function(_6,_7){
-
-
-
-
+
-},onfocus:function(_8,_9){
-
-
-
-
+
-},onmouseout:function(_a,_b){
-
-
-
-
+
-},onmouseover:function(_c,_d){
-
-
-
-
+
+
+
+
+
-},swap:function(_e){
-var _f=$(_e);
-if(_f){
-rubricks.common.Rollover.onmouseover.bindAsEventListener(rubricks.common.Rollover
-rubricks.common.Rollover.onmouseout.bindAsEventListener(rubricks.common.Rollover
+this.onmouseover.bindAsEventListener(this
+this.onmouseout.bindAsEventListener(this
-}
-},swap_range:function(_10){
-var _11=$(_10);
-if(_11){
-rubricks.common.Rollover
+this
-rubricks.common.Rollover.swap(_12);
-});
-}
-},start:function(){
-rubricks.common.Rollover._running=true;
-},stop:function(){
-rubricks.common.Rollover._running=false;
-},_activate:function(_13){
+if(!this._running){
+return true;
+}
-_13.className.split(" ").each(function(_14){
-if(_14.indexOf(rubricks.common.Rollover.class_postfix_inactive)>0){
@@ -802 +793 @@
-});
-},_inactivate:function(_15){
+if(!this._running){
+return true;
+}
-_15.className.split(" ").each(function(_16){
-if(_16.indexOf(rubricks.common.Rollover.class_postfix_active)>0){
@@ -809 +803 @@
-});
-}};
-Rollover=rubricks.common.Rollover;
-
-Object.extend(rubricks.common,{rubricks_header_show:function(){

rubricks_core/trunk/public/javascripts/src_rubricks_common_rollover.js

@@ -8 +8 @@
-    var element = $(node);
-    if(element) {
-rubricks.common.Rollover.onfocus.bindAsEventListener(rubricks.common.Rollover
-rubricks.common.Rollover.onblur.bindAsEventListener(rubricks.common.Rollover
+this.onfocus.bindAsEventListener(this
+this.onblur.bindAsEventListener(this
-    }
-  },
-  focus_range: function(node) {
-    var element = $(node);
-rubricks.common.Rollover
+this
-      function(element) {
-        rubricks.common.Rollover.focus(element);
@@ -21 +21 @@
-  },
-  onblur: function(event, node) {
-
-
+
-  },
-  onfocus: function(event, node) {
-
-
+
-  },
-  onmouseout: function(event, node) {
-
-
+
-  },
-  onmouseover: function(event, node) {
-
-
+
+
+
+
+
+
+
-  },
-  swap: function(node) {
-    var element = $(node);
-    if(element) {
-rubricks.common.Rollover.onmouseover.bindAsEventListener(rubricks.common.Rollover
-rubricks.common.Rollover.onmouseout.bindAsEventListener(rubricks.common.Rollover
+this.onmouseover.bindAsEventListener(this
+this.onmouseout.bindAsEventListener(this
-    }
-  },
@@ -46 +48 @@
-    var element = $(node);
-    if(element) {
-rubricks.common.Rollover
+this
-        function(element) {
-          rubricks.common.Rollover.swap(element);
@@ -53 +55 @@
-    }
-  },
-  start: function() {
-    rubricks.common.Rollover._running = true;
-  },
-  stop: function() {
-    rubricks.common.Rollover._running = false;
-  },
-  _activate: function(element) {
+    if(!this._running) {return true;}
-    element.className.split(' ').each(
-      function(class_name) {
@@ -70 +67 @@
-  },
-  _inactivate: function(element) {
+    if(!this._running) {return true;}
-    element.className.split(' ').each (
-      function(class_name) {
@@ -80 +78 @@
-  }
-}
-
-//alias
-Rollover = rubricks.common.Rollover;

rubricks_core/trunk/script/create_mail

@@ -19 +19 @@
-  to      = parser.default_argv[2]
-  from    = parser.default_argv[3]
-  System::SystemMailer.set_config
-  System::SystemMailer.deliver_script(subject, message, to, from)
-rescue OptionParser::ParseError

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_controller_user_management.rb

@@ -161 +161 @@
-        judge_show_group(@options)
-        @focus_id       = params[:focus_id].to_i
-
+
+
-        rubricks_logger({:action_type => :list, :note => 'ALL GROUPS'})
-        render :template => '/system/user_management/group_tree.rhtml'
@@ -276 +277 @@
-        else
-          begin
-
-
+
-          rescue Exception => ex
-            logger.error(ex.message)

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_attachment_helper.rb

@@ -3 +3 @@
-    module AttachmentHelper
-      def render_attachment(ra, options = {})
+        type    = options.delete(:type)
+        type  ||= (ra.image_file?) ? 'image' : 'file'
-        if ra.accessable?
-          type = options.delete(:type)
-          url_options = options[:url_options] || ra.url_options
-          case type.to_s
-          when 'file'
-            return render_attachment_as_file(options, url_options)
-          when 'image'
-            return render_attachment_as_image(options, url_options)
-          else
-
-
-
-
-
+
+
-          end
-        else
@@ -25 +21 @@
-      private
-      def render_attachment_as_file(options, url_options)
+        image_url = url_for("/images/themes/#{RubricksLib.current_theme_name}/icons/icon_attachment.gif")
+        alt     = options.delete(:alt)
+        alt   ||= 'Attachment'
+        text    = options.delete(:text)
+        text  ||= ''
-        image_options = {
-options[:alt] || 'Attachment'
+alt
-          :size     => '16x16',
-          :title    => options[:title],
-        }
-        text = options[:text] || ''
-        image_url = url_for("/images/themes/#{RubricksLib.current_theme_name}/icons/icon_attachment.gif")
-        options.delete(:alt) if options[:alt]
-        options.delete(:text) if options[:text]
-        options.merge!({:type => 'application/octet-stream'})
-        return link_to(image_tag(image_url, image_options) + text, url_options, options)

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_js_helper.rb

@@ -40 +40 @@
-      end
-
+      def rollover_attributes(options = {})
+        %Q| onmouseover="#{options[:onmouseover]};rubricks.common.Rollover.onmouseover(event, this);" onmouseout="#{options[:onmouseout]};rubricks.common.Rollover.onmouseout(event, this);"|
+      end
+
-      def rollover_swap(*dom_ids)
-        html = '<script type="text/javascript">'

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_language_helper.rb

@@ -4 +4 @@
-      def jl(*args)
-        if(args.length == 1)
-
-
-
-
-
-
+
-        else
-
-
+
-        end
-      end
@@ -18 +12 @@
-      def hl(*args)
-        if(args.length == 1)
-
-
-
-
-
-
+
-        else
-
-
+
-        end
-      end
-
-
+
+
-        return '' if arg.nil?
-
-
+
+
+
+
+
+
+
+
+
+
-          if $2.nil?
-            $1 + $3 + $4
@@ -39 +36 @@
-            $1.chop + $2 + $3 + $4.chop
-          else
-
+(language)
-              ''
-            else
-
+
+
+
+
+
+
+
-            end
-          end

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_layout_window_helper.rb

@@ -31 +31 @@
-              <p id="#{options[:contents][:prefix]}message" class="export_window_message">#{hl(options[:contents][:message])}</p>
-              <p style="padding-right:20px; text-align:right;">
-
-
-
+
+
-              </p>
-            </form>