OSDN Git Service

modified - display error message when create grayout window.
authorJunichi Shinohara <junichi@karesansui-project.info>
Fri, 18 Jun 2010 05:27:48 +0000 (14:27 +0900)
committerJunichi Shinohara <junichi@karesansui-project.info>
Fri, 18 Jun 2010 05:27:48 +0000 (14:27 +0900)
karesansui/static/css/error.css
karesansui/templates/default/data/js/ajax.js
karesansui/templates/default/data/js/grayout.js
karesansui/templates/default/guest/guest.part
karesansui/templates/default/include/base.html

index 19f7509..784a9a0 100644 (file)
@@ -5,10 +5,11 @@
     right: 10px;
     bottom: 0px;
     background: url(../images/popup.png) 0 0 no-repeat;
-    z-index: 1;
+    z-index: 9999;
 }
 .error .error-message {
     color: #FFFFFF;
        font-size: .8em;
     padding: 10px;
+    cursor: pointer;
 }
index 9037a32..73e71b4 100644 (file)
@@ -40,8 +40,6 @@ function _ajax_alert_off(){
 
 function _ajax_beforeSend(XMLHttpRequest){
     $("#traffic").attr('src', "${ctx.homepath}/static/images/access.gif");
-
-    _ajax_alert_off();
 }
 
 function _ajax_complete(XMLHttpRequest, textStatus){
index 4d25f9b..39e6bba 100644 (file)
@@ -58,6 +58,7 @@ function grayout_view(type, url, title, reflush, async_flag){
                         $("div[class*='ui-dialog-buttonpane']").prepend($("div.grayout-footer"));
                     },
                     error: function(XMLHttpRequest, textStatus, errorThrown) {
+                        _error(XMLHttpRequest, textStatus, errorThrown);
                         $('#dialog_screen').dialog('close');
                     }
                 });
index 1be880f..f0ec2fe 100644 (file)
@@ -384,7 +384,7 @@ $("#guests div[id*='_']").each(function(){
         // -- replicate
         $("#replicate_guest").click(function(){
             var target_id = get_target_id();
-           var target = get_target_active()
+            var target = get_target_active()
             var _type = get_target_type(target);
 
             if(_type == "export"){
index 94ed990..ad34daf 100644 (file)
@@ -18,6 +18,10 @@ $(document).ready(function(){
 
 $("#ajax").html('<div id="_ajax1_lock" class="error" ><div class="error-message"></div></div>');
 $("#_ajax1_lock").hide();
+$("#ajax").click(function(){
+    $("#_ajax1_lock").hide();
+});
+
 
 ajax_get("#msg .m-panel .m-wrap #mouter #mguide #minner #msg_display",
     "${ctx.homepath}/msg.part", null);