OSDN Git Service

(root) / karesansui / karesansui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 58a4a4c)
modified - show response of xml http request
authorJunichi Shinohara <junichi@karesansui-project.info>
Fri, 23 Jul 2010 07:50:35 +0000 (16:50 +0900)
committerJunichi Shinohara <junichi@karesansui-project.info>
Fri, 23 Jul 2010 07:50:35 +0000 (16:50 +0900)
karesansui/static/css/error.css patch | blob | history
karesansui/templates/default/data/js/ajax.js patch | blob | history
karesansui/templates/default/data/js/alert.js patch | blob | history
karesansui/templates/default/include/base.html patch | blob | history

diff --git a/karesansui/static/css/error.css b/karesansui/static/css/error.css
index 784a9a0..c6eb5c6 100644 (file)
--- a/karesansui/static/css/error.css
+++ b/karesansui/static/css/error.css
@@ -9,7 +9,9 @@
 }
 .error .error-message {
     color: #FFFFFF;
-       font-size: .8em;
+    font-size: .8em;
     padding: 10px;
-    cursor: pointer;
+    width: 207px;
+    height: 54px;
+    overflow-y: auto;
 }
diff --git a/karesansui/templates/default/data/js/ajax.js b/karesansui/templates/default/data/js/ajax.js
index 73e71b4..c7d0b39 100644 (file)
--- a/karesansui/templates/default/data/js/ajax.js
+++ b/karesansui/templates/default/data/js/ajax.js
@@ -62,16 +62,7 @@ function _error(xml_http_request, status, e){
     } else if (xml_http_request.status == "409"){
         _ajax_alert_on("ERROR", "${_('Conflict')}" + " [" + xml_http_request.status + "]\n" + xml_http_request.responseText);
     } else {
-        _ajax_alert_on("ERROR", "${_('Illegal Error')}");
-        if('error' == status) {
-            _ajax_notifications("${_('Detail Message: Error')}");
-        } else if('notmodified' == status){
-            _ajax_notifications("${_('Detail Message: Not Modified')}");
-        } else if('timeout' == status){
-            _ajax_notifications("${_('Detail Message: Timeout')}");
-        } else if('parsererror' == status){
-            _ajax_notifications("${_('Detail Message: Parse Error')}");
-        }
+        _ajax_alert_on("ERROR", "${_('Illegal Error')}" + "\n" + xml_http_request.responseText);
     }
 }
 
diff --git a/karesansui/templates/default/data/js/alert.js b/karesansui/templates/default/data/js/alert.js
index b6a7574..7b6a87d 100644 (file)
--- a/karesansui/templates/default/data/js/alert.js
+++ b/karesansui/templates/default/data/js/alert.js
@@ -129,7 +129,7 @@ function show_notifications_msg(msg, status){
     if (msg == "") {
         $("#_ajax1_lock").hide();
     } else {
-        $("#_ajax1_lock .error-message").text(msg);
+        $("#_ajax1_lock .error-message").html('<span style="white-space:pre">' + msg + '</span>');
         $("#_ajax1_lock").show('pulsate',{times:2});
 
         if(status == 'SUCCEED'){
diff --git a/karesansui/templates/default/include/base.html b/karesansui/templates/default/include/base.html
index 29e69f1..67e734e 100644 (file)
--- a/karesansui/templates/default/include/base.html
+++ b/karesansui/templates/default/include/base.html
@@ -16,13 +16,6 @@ ${common.js()}
 <!--
 $(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);
 ajax_get("#tree_display", "${ctx.homepath}/tree.part", null);
@@ -44,7 +37,12 @@ $("img[id*=renew-button]").mousedown(function(){
 </style>
 </head>
 <body>
-<div id="ajax"></div>
+<div id="ajax">
+    <div id="_ajax1_lock" class="error" style="display:none;">
+        <div class="error-message">
+        </div>
+    </div>
+</div>
 <div id="screen" style="display: none"></div>
 <div id="dialog" style="display: none"></div>
 <div id="page">
Git repository of Karesansui.
About OSDN
Find Software
Develop Software
Help