SONAR-4328 revert

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb
index e52268adeef30f0f2658c4d06e667d9323661a9d..e4beec054dc35b71d7d19540867bedf51da7c518 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb
@@ -25,8 +25,8 @@ class MarkdownController < ApplicationController
   skip_before_filter :check_database_version, :check_authentication
   
   def help
-    verify_ajax_request
-    render :partial => 'markdown/help'
+    params[:layout] = 'false'
+    render :action => 'help'
   end
   
 end
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_help.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_help.html.erb
deleted file mode 100644 (file)
index a1b3a29..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_help.html.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="modal-head"><h2>Markdown Syntax</h2></div>
-<div class="modal-body">
-  <table class="width100 table table-bordered spacer-bottom">
-    <thead>
-    <tr>
-      <th>Write :</th>
-      <th>To display :</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr class="even">
-      <td>*this text is bold*</td>
-      <td><b>this text is bold</b></td>
-    </tr>
-    <tr class="odd">
-      <td>http://sonarsource.org</td>
-      <td><a href="http://sonarsource.org">http://sonarsource.org</a></td>
-    </tr>
-    <tr class="even">
-      <td valign="top">* bulleted point</td>
-      <td class="discussionComment">
-        <ul>
-          <li>bulleted point</li>
-        </ul>
-      </td>
-    </tr>
-    <tr class="odd">
-      <td valign="top">``Lists#newArrayList()``</td>
-      <td><code>Lists#newArrayList()</code></td>
-    </tr>
-    <tr class="even">
-      <td valign="top">
-        ``<br>
-        // code on multiple lines<br>
-        public void foo() {<br>
-        &nbsp;&nbsp;// do some logic here<br>
-        }<br>
-        ``
-      </td>
-      <td valign="top"><pre style="border: 1px dashed #DDD;padding: 5px;color: #444;font-size: 12px;">
-<code>
-  // code on multiple lines
-  public void foo() {
-  // do some logic here
-  }
-</code>
-      </pre>
-      </td>
-    </tr>
-    </tbody>
-  </table>
-</div>
-<div class="modal-foot">
-  <input type="button" onclick="return closeModalWindow()" id="markdown-tip-close" value="<%= h message('close') -%>"/>
-</div>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb
index 27a85906f413523b20c086c69b54ef2dfce5a97f..546d38240d2faf7c8cd12a91a2929cd27d269d68 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb
@@ -1,4 +1,4 @@
 <div class="markdown-tips">
-  <a href="<%= ApplicationController.root_context -%>/markdown/help" onclick="$j(this).openModal();return false;"><%= message('markdown.helplink')-%></a> :
+  <a href="#" onclick="window.open(baseUrl + '/markdown/help','markdown','height=300,width=600,scrollbars=1,resizable=1');return false;"><%= message('markdown.helplink')-%></a> :
   &nbsp; *<%= message('bold') -%>*  &nbsp;&nbsp; ``<%= message('code') -%>``  &nbsp;&nbsp; * <%= message('bulleted_point') -%>
 </div>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb
new file mode 100644 (file)
index 0000000..86024ca
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb
@@ -0,0 +1,52 @@
+<div id="markdown-full-help">
+  <h2 class="spacer-bottom">Markdown Syntax</h2>
+  <table class="width100 table table-bordered spacer-bottom">
+    <thead>
+    <tr>
+      <th>Write :</th>
+      <th>To display :</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="even">
+      <td>*this text is bold*</td>
+      <td><b>this text is bold</b></td>
+    </tr>
+    <tr class="odd">
+      <td>http://sonarsource.org</td>
+      <td><a href="http://sonarsource.org">http://sonarsource.org</a></td>
+    </tr>
+    <tr class="even">
+      <td valign="top">* bulleted point</td>
+      <td class="discussionComment">
+        <ul>
+          <li>bulleted point</li>
+        </ul>
+      </td>
+    </tr>
+    <tr class="odd">
+      <td valign="top">``Lists#newArrayList()``</td>
+      <td><code>Lists#newArrayList()</code></td>
+    </tr>
+    <tr class="even">
+      <td valign="top">
+        ``<br>
+        // code on multiple lines<br>
+        public void foo() {<br>
+        &nbsp;&nbsp;// do some logic here<br>
+        }<br>
+        ``
+      </td>
+      <td valign="top"><pre style="border: 1px dashed #DDD;padding: 5px;color: #444;font-size: 12px;">
+<code>
+  // code on multiple lines
+  public void foo() {
+  // do some logic here
+  }
+</code>
+      </pre>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file