Merge branch 'V4' into V5

Author: sanluan

publiccms-parent/publiccms/src/main/resources/templates/admin/common/import.html

@@ -33,7 +33,7 @@
                 <span class="info"><@t.page 'default_font.description'/></span>
             </dd>
         </dl>
-        <dl class="nowrap">
+        <dl class="nowrap marked hide">
             <dt><@t.page 'markdown'/>:</dt>
             <dd>
                 <textarea cols="80" rows="8"></textarea>
@@ -49,6 +49,9 @@
     </div>
 </form>
 <script>
+if(marked){
+    $(".marked",$.pdialog.getCurrent()).removeClass("hide");
+}
 $(".pageFormContent",$.pdialog.getCurrent()).on("change","input[type=file],textarea",function(){
     if($(this).length && $(this)[0].files){
         var filenames=$(this)[0].files[0].name.toLowerCase().split('.');
@@ -63,7 +66,7 @@
         } else {
             $('.font',$.pdialog.getCurrent()).hide();
         }
-        if('md' == filenames[filenames.length-1]){
+        if('md' == filenames[filenames.length-1] && marked){
             var reader = new FileReader();
             reader.onload = function(e) {
                 $(".pageFormContent",$.pdialog.getCurrent()).val(e.target.result);
@@ -75,7 +78,7 @@
             $("button[type=submit]",$.pdialog.getCurrent()).prop("disabled",false).removeClass("hide");
             $(".mdImport",$.pdialog.getCurrent()).addClass("hide");
         }
-    }else if($(this).val()){
+    }else if($(this).val() && marked){
         $("button[type=submit]",$.pdialog.getCurrent()).prop("disabled",true).addClass("hide");
         $(".mdImport",$.pdialog.getCurrent()).removeClass("hide");
     }

publiccms-parent/publiccms/src/test/resources/generator/java/directive.ftl

@@ -5,7 +5,6 @@ package ${base}.${directivePack};
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 

publiccms-parent/publiccms/src/test/resources/generator/java/directiveList.ftl

@@ -3,7 +3,6 @@ package ${base}.${directivePack};
 // Generated ${.now?date} by com.publiccms.common.generator.SourceGenerator
 
 import java.io.IOException;
-import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 

publiccms-parent/publiccms/src/test/resources/generator/java/service.ftl

@@ -2,8 +2,6 @@ package ${base}.${servicePack};
 
 // Generated ${.now?date} by com.publiccms.common.generator.SourceGenerator
 
-import javax.annotation.Resource;
-
 <#include "../include_imports/field_type.ftl">
 
 import org.springframework.stereotype.Service;