From e430be464cff8e98cc48a0c9317e1632537c9d16 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 3 Jun 2013 15:53:00 +0200
Subject: [PATCH] SONAR-4328 revert

---
 .../webapp/WEB-INF/app/controllers/markdown_controller.rb  | 4 ++--
 .../main/webapp/WEB-INF/app/views/markdown/_tips.html.erb  | 2 +-
 .../app/views/markdown/{_help.html.erb => help.html.erb}   | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename sonar-server/src/main/webapp/WEB-INF/app/views/markdown/{_help.html.erb => help.html.erb} (83%)

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 e52268adeef..e4beec054dc 100644
--- 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/_tips.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb
index 27a85906f41..546d38240d2 100644
--- 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
similarity index 83%
rename from sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_help.html.erb
rename to sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb
index a1b3a29817f..86024ca7769 100644
--- 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
@@ -1,5 +1,5 @@
-<div class="modal-head"><h2>Markdown Syntax</h2></div>
-<div class="modal-body">
+<div id="markdown-full-help">
+  <h2 class="spacer-bottom">Markdown Syntax</h2>
   <table class="width100 table table-bordered spacer-bottom">
     <thead>
     <tr>
@@ -49,7 +49,4 @@
     </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
-- 
2.39.5