优化一些弹窗样式

Application/Home/View/Item/setting.html

@@ -426,23 +426,24 @@ $(function(){
 
     //删除成员
     $("#member-list").on("click",'.member-delete',function(){
-      if (!confirm("确定删除成员吗")) { return false;};
       var item_member_id = $(this).data("id");
-        $.post(
-          DocConfig.server+"/api/member/delete",
-          {"item_id": item_id , "item_member_id": item_member_id  },
-          function(data){
-            if (data.error_code == 0) {
-              layer.msg('删除成功',{"time":1000});
-              get_member_list();
-              
-            }else{
-              layer.alert(data.error_message);
-            }
-          },
-          "json"
-
-          );
+      layer.confirm("确定删除成员吗",{},function(){
+          $.post(
+            DocConfig.server+"/api/member/delete",
+            {"item_id": item_id , "item_member_id": item_member_id  },
+            function(data){
+              if (data.error_code == 0) {
+                layer.msg('删除成功',{"time":1000});
+                get_member_list();
+                
+              }else{
+                layer.alert(data.error_message);
+              }
+            },
+            "json"
+
+            );
+      });
       return false;
     })
 

Public/js/catalog/edit.js

@@ -82,7 +82,7 @@ $(function(){
             secondCatList();
             //alert(lang["save_success"]);
           }else{
-            alert(lang["save_fail"]);
+            layer.alert(lang["save_fail"]);
           }
           getCatList();
         },
@@ -94,7 +94,7 @@ $(function(){
 
   //删除目录
   $("#delete-cat").click(function(){
-    if(confirm(lang["confirm_to_delete"])){
+    layer.confirm(lang["confirm_to_delete"],{},function(){
         var cat_id = $("#cat_id").val();
         if (cat_id > 0 ) {
             $.post(
@@ -106,9 +106,9 @@ $(function(){
                     window.location.href="?s=home/catalog/edit&item_id="+item_id;
                   }else{
                     if (data.error_message) {
-                      alert(data.error_message);
+                      layer.alert(data.error_message);
                     }else{
-                      alert(lang["delete_fail"]);
+                      layer.alert(lang["delete_fail"]);
                     }
                     
                   }
@@ -116,7 +116,7 @@ $(function(){
                 "json"
               );
         }
-    }
+      });
 
       return false;
   })

Public/js/lang.en-us.js

@@ -32,7 +32,7 @@ lang["templ_title"] = "Template title";
 lang["operation"] = "Operation";
 lang["use_this_template"] = "Insert this template";
 lang["delete_this_template"] = "Delete template";
-lang["no_templ_msg"] = "<p><br>You have not saved any templates.<br>When you edit the page, click the 'save' button on the right click, select Save as template in the down menu .<br>When you create or edit a new page, click the 'More template' button, then you can use the template you save</p>";
+lang["no_templ_msg"] = "You have not saved any templates.When you edit the page, click the 'save' button on the right click, select Save as template in the down menu .When you create or edit a new page, click the 'More template' button, then you can use the template that you save";
 lang["add_page_comments_msg"] = "Please enter the page comments.It can be page update log , or other you want.It will be showed in page history version convenient for you to check the change of page";
 
 lang["confirm_to_delete_member"] = "Sure to delete this member ?";

Public/js/lang.zh-cn.js

@@ -32,7 +32,7 @@ lang["templ_title"] = "模板标题";
 lang["operation"] = "操作";
 lang["use_this_template"] = "插入此模板";
 lang["delete_this_template"] = "删除模板";
-lang["no_templ_msg"] = "<p><br>你尚未保存过任何模板。<br>你可以在编辑页面时，在“保存”按钮右边点击，在下来菜单中选择“另存为模板”。<br>把页面内容保存为模板后，你下次新建或者编辑页面时便可以使用你之前保存的模板</p>";
+lang["no_templ_msg"] = "你尚未保存过任何模板。你可以在编辑页面时，在“保存”按钮右边点击，在下拉菜单中选择“另存为模板”。把页面内容保存为模板后，你下次新建或者编辑页面时便可以使用你之前保存的模板";
 lang["add_page_comments_msg"] = "请输入页面注释内容。可以填写你对页面的修改注释或者其它注释。添加后，在页面的历史版本处会显示每一个页面版本的注释，方便你查阅、追踪页面的修改";
 
 

Public/js/page/edit.js

@@ -344,29 +344,30 @@ function Change(data)
 //{"Result":[{"name":"test1","list":{"pros":"prosfsf","ppps":{"images":[{"22":"22"}]}}}]}
 
 $("#save-to-templ").click(function(){
-  var template_title =prompt(lang["save_templ_title"],"");
-  if (template_title!=null && template_title!="")
-    {
-        var template_content = $("#page_content").val();
-        $.post(
-            "?s=home/template/save",
-            {"template_title":template_title,"template_content":template_content},
-            function(data){
-                if (data.error_code == 0) {
-                  alert(lang["saved_templ_msg1"]+template_title+lang["saved_templ_msg2"]);
-                } else {
-                  $.bootstrapGrowl(lang["save_fail"]);
-
-                }
-           },
-            "json"
-            );
-    }
-    $("#save-btn-group").removeClass("open");
-    return false;
+      layer.prompt({title: lang["save_templ_title"]}, function(template_title, index){
+      if (template_title!=null && template_title!="")
+        {
+            var template_content = $("#page_content").val();
+            $.post(
+                "?s=home/template/save",
+                {"template_title":template_title,"template_content":template_content},
+                function(data){
+                    if (data.error_code == 0) {
+                      layer.close(index);
+                      layer.alert(lang["saved_templ_msg1"]+template_title+lang["saved_templ_msg2"]);
+                    } else {
+                      $.bootstrapGrowl(lang["save_fail"]);
+
+                    }
+               },
+                "json"
+                );
+        }
+        $("#save-btn-group").removeClass("open");
+        return false;
+      });
   });
 
-
 $("#more-templ").click(function(){
         $.post(
             "?s=home/template/getList",
@@ -383,12 +384,13 @@ $("#more-templ").click(function(){
                         html +='</TR>';
                     };
                     $("#templ-table").html(html);
+                    $("#more-templ-modal").modal();
                 } else {
                   //$.bootstrapGrowl("获取模板列表失败");
-                  $("#templ-table").html(lang["no_templ_msg"]);
+                  $("#more-templ-modal").modal("hide");
+                  layer.alert(lang["no_templ_msg"]);
 
                 }
-                $("#more-templ-modal").modal();
            },
             "json"
             );

composer.json

@@ -5,7 +5,7 @@
     "description": "ShowDoc is a tool greatly applicable for an IT team to share documents online",
     "keywords": ["showdoc","documents","Api"],
     "homepage": "https://github.com/star7th/showdoc",
-    "version":"v1.3.4",
+    "version":"v1.3.5",
     "license": "Apache-2.0",
     "authors": [
         {