From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 30 Jan 2014 16:31:24 +0000 (+0200)
Subject: Replace pygments with hljs for system hooks help page
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ee296d1fa346ed7d3235a55959ffdccf550878c;p=wvm%2Fgitlab.git

Replace pygments with hljs for system hooks help page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---

diff --git a/app/views/admin/hooks/_data_ex.html.erb b/app/views/admin/hooks/_data_ex.html.erb
deleted file mode 100644
index 5b16dfb39..000000000
--- a/app/views/admin/hooks/_data_ex.html.erb
+++ /dev/null
@@ -1,71 +0,0 @@
-<% data_ex_str = <<eos
-1. Project created:
-{
-          "created_at": "2012-07-21T07:30:54Z",
-          "event_name": "project_create",
-                "name": "StoreCloud",
-         "owner_email": "johnsmith@gmail.com"
-          "owner_name": "John Smit",
-                "path": "stormcloud",
- "path_with_namespace": "jsmith/stormcloud",
-          "project_id": 74,
-}
-
-2. Project destroyed:
-{
-          "created_at": "2012-07-21T07:30:58Z",
-          "event_name": "project_destroy",
-                "name": "Underscore",
-         "owner_email": "johnsmith@gmail.com"
-          "owner_name": "John Smith",
-                "path": "underscore",
- "path_with_namespace": "jsmith/underscore",
-          "project_id": 73,
-}
-
-3. New Team Member:
-{
-     "created_at": "2012-07-21T07:30:56Z",
-     "event_name": "user_add_to_team",
- "project_access": "Master",
-     "project_id": 74, 
-   "project_name": "StoreCloud",
-   "project_path": "storecloud", 
-    "user_email": "johnsmith@gmail.com",
-     "user_name": "John Smith",
-}
-
-4. Team Member Removed:
-{
-     "created_at": "2012-07-21T07:30:56Z",
-     "event_name": "user_remove_from_team",
- "project_access": "Master",
-     "project_id": 74, 
-   "project_name": "StoreCloud",
-   "project_path": "storecloud", 
-    "user_email": "johnsmith@gmail.com",
-     "user_name": "John Smith",
-}
-
-5. User created:
-{ 
-   "created_at": "2012-07-21T07:44:07Z",
-        "email": "js@gitlabhq.com",
-   "event_name": "user_create",
-         "name": "John Smith", 
-      "user_id": 41 
-}
-
-6. User removed:
-{ 
-   "created_at": "2012-07-21T07:44:07Z",
-        "email": "js@gitlabhq.com",
-   "event_name": "user_destroy",
-         "name": "John Smith",
-      "user_id": 41 
-}
-
-eos
-%>
-<% js_lexer = Pygments::Lexer[:js] %>
-<%= raw js_lexer.highlight(data_ex_str) %>
diff --git a/app/views/admin/hooks/_data_ex.html.haml b/app/views/admin/hooks/_data_ex.html.haml
new file mode 100644
index 000000000..9861e372e
--- /dev/null
+++ b/app/views/admin/hooks/_data_ex.html.haml
@@ -0,0 +1,67 @@
+= highlight_js do
+  :erb
+    1. Project created:
+    {
+              "created_at": "2012-07-21T07:30:54Z",
+              "event_name": "project_create",
+                    "name": "StoreCloud",
+             "owner_email": "johnsmith@gmail.com"
+              "owner_name": "John Smit",
+                    "path": "stormcloud",
+     "path_with_namespace": "jsmith/stormcloud",
+              "project_id": 74,
+    }
+
+    2. Project destroyed:
+    {
+              "created_at": "2012-07-21T07:30:58Z",
+              "event_name": "project_destroy",
+                    "name": "Underscore",
+             "owner_email": "johnsmith@gmail.com"
+              "owner_name": "John Smith",
+                    "path": "underscore",
+     "path_with_namespace": "jsmith/underscore",
+              "project_id": 73,
+    }
+
+    3. New Team Member:
+    {
+         "created_at": "2012-07-21T07:30:56Z",
+         "event_name": "user_add_to_team",
+     "project_access": "Master",
+         "project_id": 74, 
+       "project_name": "StoreCloud",
+       "project_path": "storecloud", 
+        "user_email": "johnsmith@gmail.com",
+         "user_name": "John Smith",
+    }
+
+    4. Team Member Removed:
+    {
+         "created_at": "2012-07-21T07:30:56Z",
+         "event_name": "user_remove_from_team",
+     "project_access": "Master",
+         "project_id": 74, 
+       "project_name": "StoreCloud",
+       "project_path": "storecloud", 
+        "user_email": "johnsmith@gmail.com",
+         "user_name": "John Smith",
+    }
+
+    5. User created:
+    { 
+       "created_at": "2012-07-21T07:44:07Z",
+            "email": "js@gitlabhq.com",
+       "event_name": "user_create",
+             "name": "John Smith", 
+          "user_id": 41 
+    }
+
+    6. User removed:
+    { 
+       "created_at": "2012-07-21T07:44:07Z",
+            "email": "js@gitlabhq.com",
+       "event_name": "user_destroy",
+             "name": "John Smith",
+          "user_id": 41 
+    }