Changeset 5707

Timestamp:

03/17/08 10:18:37 (8 months ago)

Author:

uta

Message:

2008/03/17 sync

Files:

• rubricks_core/trunk/components/system/login_controller.rb (modified) (1 diff)
• rubricks_core/trunk/languages/chinese.rb (modified) (1 diff)
• rubricks_core/trunk/public/javascripts/components/system/src_system_admin_menu.js (modified) (2 diffs)
• rubricks_core/trunk/public/javascripts/components/system/system.js (modified) (2 diffs)
• rubricks_core/trunk/public/javascripts/spinelz/calendar.js (modified) (1 diff)
• rubricks_core/trunk/public/javascripts/spinelz/spinelz_for_rubricks.js (modified) (1 diff)
• rubricks_core/trunk/public/javascripts/src_spinelz/calendar.js (modified) (1 diff)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_realtime_validator_helper.rb (modified) (1 diff)

rubricks_core/trunk/components/system/login_controller.rb

@@ -145 +145 @@
-
-  def login_plain
-
+
+
+
-    if login_result[:login_message].blank?
-      Thread.current[:current_user] = login_result[:user]

rubricks_core/trunk/languages/chinese.rb

@@ -17 +17 @@
-      '_Common_Admit_Return_Confirm'            => '确实芁退回吗',
-      '_Common_Admit_Confirm'                   => '确实芁批准吗',
+      '_Common_AjaxUploader_Failed'             => '文件䞍正确、升级倱莥。',
-      '_Common_Application'                     => '应甚',
-      '_Common_Approval_Return_Failed'          => '%s退回倱莥。',

rubricks_core/trunk/public/javascripts/components/system/src_system_admin_menu.js

@@ -86 +86 @@
-    objDiv.appendChild(objSpan);
-    objLi.appendChild(objDiv);
-    objScript               = document.createElement('script');
-    objScript.type          = 'text/javascript';
-    objScript.text          = "rubricks.common.Rollover.swap('new_item_" + this.menu_item_create_count + "_edit_form'); rubricks.common.Rollover.swap('new_item_" + this.menu_item_create_count + "_delete_form');";
-    objLi.appendChild(objScript);
-    objDiv                  = document.createElement('div');
-    objDiv.id               = 'new_item_' + this.menu_item_create_count + '_title';
@@ -102 +98 @@
-    $('sortable_item_list_' + menu_icon_id).appendChild(objLi);
-    this.sortable_menus.refresh();
+    this.menu_item_create_swap();
-    this.menu_item_create_count++;
+  },
+  menu_item_create_swap: function() {
+    rubricks.common.Rollover.swap('new_item_' + this.menu_item_create_count + '_edit_form');
+    rubricks.common.Rollover.swap('new_item_' + this.menu_item_create_count + '_delete_form');
-  },
-  menu_item_delete: function(button_id) {

rubricks_core/trunk/public/javascripts/components/system/system.js

@@ -457 +457 @@
-_8.appendChild(_9);
-_7.appendChild(_8);
-_a=document.createElement("script");
-_a.type="text/javascript";
-_a.text="rubricks.common.Rollover.swap('new_item_"+this.menu_item_create_count+"_edit_form'); rubricks.common.Rollover.swap('new_item_"+this.menu_item_create_count+"_delete_form');";
-_7.appendChild(_a);
-_8=document.createElement("div");
-_8.id="new_item_"+this.menu_item_create_count+"_title";
@@ -473 +469 @@
-$("sortable_item_list_"+_6).appendChild(_7);
-this.sortable_menus.refresh();
+this.menu_item_create_swap();
-this.menu_item_create_count++;
+},menu_item_create_swap:function(){
+rubricks.common.Rollover.swap("new_item_"+this.menu_item_create_count+"_edit_form");
+rubricks.common.Rollover.swap("new_item_"+this.menu_item_create_count+"_delete_form");
-},menu_item_delete:function(_b){
-var _c=_b.replace("_delete_button","");

rubricks_core/trunk/public/javascripts/spinelz/calendar.js

@@ -877 +877 @@
-_f9=_f9.join(" ");
-_fb=_fb.inject("",function(_fd,_fe){
-'"+_fe.value+"'
-
-'"+_f9+"'
+\""+_fe.value+"\"
+
+\""+_f9+"\"
-},beforeBuild:function(){
-this.column={};

rubricks_core/trunk/public/javascripts/spinelz/spinelz_for_rubricks.js

@@ -1187 +1187 @@
-_f9=_f9.join(" ");
-_fb=_fb.inject("",function(_fd,_fe){
-'"+_fe.value+"'
-
-'"+_f9+"'
+\""+_fe.value+"\"
+
+\""+_f9+"\"
-},beforeBuild:function(){
-this.column={};

rubricks_core/trunk/public/javascripts/src_spinelz/calendar.js

@@ -1248 +1248 @@
-    className = className.join(' ');
-    attributes = attributes.inject('', function(html, pair) {
-'" + pair.value + "'
-
-'" + className + "'
+\"" + pair.value + "\"
+
+\"" + className + "\"
-  },
-

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

@@ -588 +588 @@
-        msg = (value.class == Hash) ? value[:msg] : '[_Common_Validate_Required]'
-        res = <<-"EOS"
+          if (!UserAgent.isIE() && element.value && element.value.match(/^\\n$/)) {
+            element.value = ' ';
+            element.value = '';
+          }
-          if (element.value == null || element.value == '') {
-            return _box['validates_#{@validator_name}_error']('#{css_id}', element) + '#{msg}';