summaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main/hbs
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2014-07-17 09:19:57 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2014-07-17 09:19:57 +0200
commit24abd42922e4adf3eff60b63d4a5434424b3cfab (patch)
tree43a2547da47c9e2f8bb5402d8b039d2a9e202198 /sonar-server/src/main/hbs
parent38fe0c00e056eb42f1abfde4b652f1352792b7b4 (diff)
parent6546586f6fdb0dd677e17a55ec1143b964fdf171 (diff)
downloadsonarqube-24abd42922e4adf3eff60b63d4a5434424b3cfab.tar.gz
sonarqube-24abd42922e4adf3eff60b63d4a5434424b3cfab.zip
Merge remote-tracking branch 'origin/branch-4.4'
Conflicts: sonar-server/src/main/hbs/common/_markdown-tips.hbs sonar-server/src/main/java/org/sonar/server/test/ws/TestsShowAction.java
Diffstat (limited to 'sonar-server/src/main/hbs')
-rw-r--r--sonar-server/src/main/hbs/common/_markdown-tips.hbs4
1 files changed, 4 insertions, 0 deletions
diff --git a/sonar-server/src/main/hbs/common/_markdown-tips.hbs b/sonar-server/src/main/hbs/common/_markdown-tips.hbs
new file mode 100644
index 00000000000..fe5edc9fc35
--- /dev/null
+++ b/sonar-server/src/main/hbs/common/_markdown-tips.hbs
@@ -0,0 +1,4 @@
+<div class="markdown-tips">
+ <a href="#" class="underlined-link" onclick="window.open(baseUrl + '/markdown/help','markdown','height=300,width=600,scrollbars=1,resizable=1');return false;">{{t 'markdown.helplink'}}</a> :
+ &nbsp; *{{t 'bold'}}* &nbsp;&nbsp; ``{{t 'code'}}`` &nbsp;&nbsp; * {{t 'bulleted_point'}}
+</div>