Commit @ce52a0c174a659257bca55e772dbbbb1c03447ad

채수원 2015-02-13

Merge branch 'improve/markdown' of dlab/hive

from pull-request 1479

* refs/heads/improve/markdown:
  CodeBrowser: Fix render for markdown files
  ViewPage: remove legacy code for markdown

Reviewed-by: 채수원

@ce52a0c174a659257bca55e772dbbbb1c03447ad

0f3f95f

ce52a0c

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 **/

0f3f95f

ce52a0c

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)
+
+  }
+
 }

0f3f95f

ce52a0c

app/views/board/view.scala.html

--- app/views/board/view.scala.html

+++ app/views/board/view.scala.html


 		<button type="button" class="ybtn" data-dismiss="modal">@Messages("button.no")</button>
 	</div>
 </div>
-
-@common.markdown(project)
 @common.commentDeleteModal()
 
 <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">

0f3f95f

ce52a0c

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>

0f3f95f

ce52a0c

app/views/issue/view.scala.html

--- app/views/issue/view.scala.html

+++ app/views/issue/view.scala.html


     	</div>
     </div>
 </div>
-
-@common.markdown(project)
 @common.commentDeleteModal()
 @common.select2()
 @common.calendar()

0f3f95f

ce52a0c

app/views/milestone/view.scala.html

--- app/views/milestone/view.scala.html

+++ app/views/milestone/view.scala.html


     </div>
 </div>
 
-@common.markdown(project)
-
 <link rel="stylesheet" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)" type="text/css" />
 <script type="text/javascript">
     $(document).ready(function(){

0f3f95f

ce52a0c

app/views/project/partial_readme.scala.html

--- app/views/project/partial_readme.scala.html

+++ app/views/project/partial_readme.scala.html


     <div class="readme-body markdown-wrap">@Html(Markdown.render(project.readme, project, false))</div>
   </div>
 }
-@common.markdown(project)
 </div>

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	}

...	...	@@ -119,8 +119,6 @@
119	119	<button type="button" class="ybtn" data-dismiss="modal">@Messages("button.no")</button>
120	120	</div>
121	121	</div>
122		-
123		-@common.markdown(project)
124	122	@common.commentDeleteModal()
125	123
126	124	<link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">

...	...	@@ -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>

...	...	@@ -328,8 +328,6 @@
328	328	</div>
329	329	</div>
330	330	</div>
331		-
332		-@common.markdown(project)
333	331	@common.commentDeleteModal()
334	332	@common.select2()
335	333	@common.calendar()

...	...	@@ -134,8 +134,6 @@
134	134	</div>
135	135	</div>
136	136
137		-@common.markdown(project)
138		-
139	137	<link rel="stylesheet" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)" type="text/css" />
140	138	<script type="text/javascript">
141	139	$(document).ready(function(){

...	...	@@ -48,5 +48,4 @@
48	48	<div class="readme-body markdown-wrap">@Html(Markdown.render(project.readme, project, false))</div>
49	49	</div>
50	50	}
51		-@common.markdown(project)
52	51	</div>

Delete comment