Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

2015-11-10 17:12:41 +08:00 · 2015-11-10 17:12:41 +08:00 · bebda15582
parent 74f2827a8b db0978c657
commit bebda15582
4 changed files with 141 additions and 97 deletions
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@ -128,6 +128,11 @@
        });

        $mail.blur(function (event) {
+            if (/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
+                $('#mail_req').html( '<span style="color: red">邮件格式不对</span>').show();
+                $mail_correct = false;
+                return ;
+            }
            if ($(this).is('#user_mail')) {
                $.get('<%=account_valid_ajax_path%>',
                        { valid: "mail",
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@ -1,96 +1,5 @@
 <%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %>
-<script>
-    function add_class(id){
-        if($("#"+id).hasClass("sortArrowActiveD")){
-            $("#"+id).removeClass("sortArrowActiveD");
-            $("#"+id).addClass("sortArrowActiveU");
-            $.ajax({
-                type: 'GET',
-                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=asc&page='+<%= @topic_pages.page%>

-            });
-        }else if($("#"+id).hasClass("sortArrowActiveU")){
-            $("#"+id).removeClass("sortArrowActiveU");
-            $("#"+id).addClass("sortArrowActiveD");
-            $.ajax({
-               type: 'GET',
-                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
-
-            });
-        }else{
-            $("#"+id).addClass("sortArrowActiveD");
-            $.ajax({
-                type: 'GET',
-                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
-
-           });
-        }
-    }
-    $(function() {
-        $("#complex").click(function(){
-            $("#reorder_popu").removeClass("sortArrowActiveU");
-            $("#reorder_popu").removeClass("sortArrowActiveD");
-            $("#reorder_time").removeClass("sortArrowActiveD");
-            $("#reorder_time").removeClass("sortArrowActiveU");
-            add_class("reorder_complex");
-        });
-        $("#popu").click(function () {
-            $("#reorder_complex").removeClass("sortArrowActiveD");
-            $("#reorder_complex").removeClass("sortArrowActiveU");
-            $("#reorder_time").removeClass("sortArrowActiveD");
-            $("#reorder_time").removeClass("sortArrowActiveU");
-            add_class("reorder_popu");
-        });
-        $("#time").click(function () {
-            $("#reorder_complex").removeClass("sortArrowActiveD");
-            $("#reorder_complex").removeClass("sortArrowActiveU");
-            $("#reorder_popu").removeClass("sortArrowActiveU");
-            $("#reorder_popu").removeClass("sortArrowActiveD");
-            add_class("reorder_time");
-        });
-        <% if @errors %>
-            $('#create_memo_div').slideToggle();$('#create_memo_btn').slideToggle();
-            $("#error").html('<%= @errors.html_safe %>').show();
-        <% end %>
-    });
-
-    function check_and_submit(){
-        if(!check_memo_name()){
-            return;
-        }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
-            memo_content.sync();
-            $("#new_memo").submit();
-        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
-            $("#error").html("主题和内容不能为空").show();
-        }
-        else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
-            $("#error").html("主题不能为空").show();
-        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
-            $("#error").html("内容不能为空").show();
-        }
-    }
-
-    function check_memo_name(){
-        if($("#memo_subject").val().trim().length > 50){
-            $("#error").html("主题 过长（最长为 50 个字符）").show();
-            return false;
-        }
-       if(memo_content.html().length > 30000){
-            $("#error").html("内容 过长（最长为 30000 个字符）").show();
-           return false;
-        }
-        return true;
-    }
-
-    function create_cancle(){
-        $('#create_memo_div').slideToggle();
-        $('#create_memo_btn').slideToggle();
-        $('#memo_subject').val('');
-        memo_content.html('')
-        $('#error').html('').hide();
-    }
-</script>
 <div class="postRightContainer">
  <div id="create_memo_div" style="display: none">
    <div id="error" class="red fl mb10" style="display: none">error</div>
@ -141,4 +50,97 @@
  <!--</div>-->
  <!--<div class="cl"></div>-->
 </div>
-</div>
+</div>
+<script>
+    function add_class(id){
+        if($("#"+id).hasClass("sortArrowActiveD")){
+            $("#"+id).removeClass("sortArrowActiveD");
+            $("#"+id).addClass("sortArrowActiveU");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=asc&page='+<%= @topic_pages.page%>
+
+            });
+        }else if($("#"+id).hasClass("sortArrowActiveU")){
+            $("#"+id).removeClass("sortArrowActiveU");
+            $("#"+id).addClass("sortArrowActiveD");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
+
+            });
+        }else{
+            $("#"+id).addClass("sortArrowActiveD");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
+
+            });
+        }
+    }
+    $(function() {
+        $("#complex").click(function(){
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_complex");
+        });
+        $("#popu").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_popu");
+        });
+        $("#time").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            add_class("reorder_time");
+        });
+        <% if @errors %>
+        $('#create_memo_div').slideToggle();$('#create_memo_btn').slideToggle();
+        $("#error").html('<%= @errors.html_safe %>').show();
+        <% end %>
+    });
+
+    function check_and_submit(){
+        if(!check_memo_name()){
+            return;
+        }
+        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
+            memo_content.sync();
+            $("#new_memo").submit();
+        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
+            $("#error").html("主题和内容不能为空").show();
+        }
+        else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
+            $("#error").html("主题不能为空").show();
+        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
+            $("#error").html("内容不能为空").show();
+        }
+    }
+
+    function check_memo_name(){
+        if($("#memo_subject").val().trim().length > 50){
+            $("#error").html("主题 过长（最长为 50 个字符）").show();
+            return false;
+        }
+        if(memo_content.html().length > 30000){
+            $("#error").html("内容 过长（最长为 30000 个字符）").show();
+            $("html,body").animate({scrollTop:$("#error").offset().top},1000)
+            return false;
+        }
+        return true;
+    }
+
+    function create_cancle(){
+        $('#create_memo_div').slideToggle();
+        $('#create_memo_btn').slideToggle();
+        $('#memo_subject').val('');
+        memo_content.html('')
+        $('#error').html('').hide();
+    }
+</script>
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@ -7,10 +7,11 @@
              $("#error").html('主题不能超过50个字符').show();
              return;
          }
-//          if(memo_content.html().trim().length > 5000 ){
-//              $("#error").html('内容不能超过5000个字符').show();
-//              return;
-//          }
+          if(memo_content.html().length > 30000){
+              $("#error").html("内容 过长（最长为 30000 个字符）").show();
+              $("html,body").animate({scrollTop:$("#error").offset().top},1000)
+              return false;
+          }
          memo_content.sync();
          $("#edit_memo").submit();
      }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
--- a/public/javascripts/feedback.js
+++ b/public/javascripts/feedback.js
@ -1,5 +1,10 @@
 (function($){
    $.fn.fix = function(options){
+        var u = navigator.userAgent;
+        if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
+            $("#scrollsidebar").css("display","none");
+            return;
+        }
        var defaults = {
            float : 'right',
            minStatue : true,
@ -73,6 +78,11 @@ function cookieget(n)


 $(function(){
+    var u = navigator.userAgent;
+    if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
+        $("#scrollsidebar").css("display","none");
+        return;
+    }
    $(".closeSidebar").click(function(){
        $(".show_btn").css("display","none");
        $("#scrollsidebar").css("display","none");
@ -109,4 +119,30 @@ $(function(){
            $("#textCount").text(50-$("#subject").val().length)
        }
    });
-});
+});
+
+//var browser={
+//    versions:function(){
+//        var u = navigator.userAgent, app = navigator.appVersion;
+//        return {//移动终端浏览器版本信息
+//            trident: u.indexOf('Trident') > -1, //IE内核
+//            presto: u.indexOf('Presto') > -1, //opera内核
+//            webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
+//            gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核
+//            mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端
+//            ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端
+//            android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器
+//            iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器
+//            iPad: u.indexOf('iPad') > -1, //是否iPad
+//            webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部
+//        };
+//    }(),
+//    language:(navigator.browserLanguage || navigator.language).toLowerCase()
+//}
+//document.writeln("语言版本: "+browser.language);
+//document.writeln(" 是否为移动终端: "+browser.versions.mobile);
+//document.writeln(" ios终端: "+browser.versions.ios);
+//document.writeln(" android终端: "+browser.versions.android);
+//document.writeln(" 是否为iPhone: "+browser.versions.iPhone);
+//document.writeln(" 是否iPad: "+browser.versions.iPad);
+//document.writeln(navigator.userAgent);