Commit @caca57b94b84f9e5051535faa0aa5469697b318f

insanehong 2015-02-11

CodeBrowser: Fix render for markdown files

@caca57b94b84f9e5051535faa0aa5469697b318f

4726fe8

caca57b

app/assets/stylesheets/less/_page.less

--- app/assets/stylesheets/less/_page.less

+++ app/assets/stylesheets/less/_page.less


         border-top: none;
         font-size: 14px;
         padding: 25px;
+
+        p {
+            margin: 15px 0;
+            text-align: left;
+        }
     }
 
     /** list **/

4726fe8

caca57b

app/utils/TemplateHelper.scala

--- app/utils/TemplateHelper.scala

+++ app/utils/TemplateHelper.scala


 
 import play.mvc.Call
 import org.joda.time.DateTimeConstants
+import org.apache.commons.io.FilenameUtils
 import play.i18n.Messages
 import controllers.routes
 import controllers.UserApp

         <a href="%s">%d</a>
       </span> """.format(strong, icon, link, count))
   }
+
+  def isMarkdownExtension(path: String):Boolean = {
+    var ext = FilenameUtils.getExtension(path).toLowerCase()
+    var markdownExtenstions = List("markdown", "mdown", "mkdn", "mkd", "md", "mdwn")
+
+    markdownExtenstions.contains(ext)
+
+  }
+
 }

4726fe8

caca57b

app/views/code/partial_view_file.scala.html

--- app/views/code/partial_view_file.scala.html

+++ app/views/code/partial_view_file.scala.html


 @import utils.TemplateHelper._
 @import utils.TemplateHelper.CodeBrowser._
 @import java.net.URLEncoder
+@import utils.Markdown
 
 @defining(path.substring(path.lastIndexOf("/") + 1)) { fileName =>
 @defining(getFileRev(project.vcs, files)) { revId=>

           </p>
         }
         case _ => {
+          @if(isMarkdownExtension(path)) {
+          <div id="codeVal" class="markdown-wrap codebrowser-markdown">
+            @if(files.get("data") != null){
+            @Html(Markdown.render(fieldText(files, "data"), project))
+            }
+          </div>
+          } else {
           <div id="codeVal" class="hidden">@if(files.get("data") != null){@fieldText(files, "data")}</div>
           <pre id="showCode" class="code-wrap" data-mimeType="@files.get("mimeType")"></pre>
+          }
         }
       }
     }

 }
 }
 }
-@common.markdown(project)
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/ace/ace.js")"></script>

Add a comment

Open 0
Closed 0

List

...	...	@@ -4147,6 +4147,11 @@
4147	4147	border-top: none;
4148	4148	font-size: 14px;
4149	4149	padding: 25px;
	4150	+
	4151	+ p {
	4152	+ margin: 15px 0;
	4153	+ text-align: left;
	4154	+ }
4150	4155	}
4151	4156
4152	4157	/ list /

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import play.mvc.Call
4	4	import org.joda.time.DateTimeConstants
	5	+import org.apache.commons.io.FilenameUtils
5	6	import play.i18n.Messages
6	7	import controllers.routes
7	8	import controllers.UserApp
...	...	@@ -543,4 +544,13 @@
543	544	<a href="%s">%d</a>
544	545	</span> """.format(strong, icon, link, count))
545	546	}
	547	+
	548	+ def isMarkdownExtension(path: String):Boolean = {
	549	+ var ext = FilenameUtils.getExtension(path).toLowerCase()
	550	+ var markdownExtenstions = List("markdown", "mdown", "mkdn", "mkd", "md", "mdwn")
	551	+
	552	+ markdownExtenstions.contains(ext)
	553	+
	554	+ }
	555	+
546	556	}

...	...	@@ -23,6 +23,7 @@
23	23	@import utils.TemplateHelper._
24	24	@import utils.TemplateHelper.CodeBrowser._
25	25	@import java.net.URLEncoder
	26	+@import utils.Markdown
26	27
27	28	@defining(path.substring(path.lastIndexOf("/") + 1)) { fileName =>
28	29	@defining(getFileRev(project.vcs, files)) { revId=>
...	...	@@ -97,8 +98,16 @@
97	98	</p>
98	99	}
99	100	case _ => {
	101	+ @if(isMarkdownExtension(path)) {
	102	+ <div id="codeVal" class="markdown-wrap codebrowser-markdown">
	103	+ @if(files.get("data") != null){
	104	+ @Html(Markdown.render(fieldText(files, "data"), project))
	105	+ }
	106	+ </div>
	107	+ } else {
100	108	<div id="codeVal" class="hidden">@if(files.get("data") != null){@fieldText(files, "data")}</div>
101	109	<pre id="showCode" class="code-wrap" data-mimeType="@files.get("mimeType")"></pre>
	110	+ }
102	111	}
103	112	}
104	113	}
...	...	@@ -108,5 +117,4 @@
108	117	}
109	118	}
110	119	}
111		-@common.markdown(project)
112	120	<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/ace/ace.js")"></script>

Delete comment