From 2f05ab149110705cf4947de3eff877391c94f9cb Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Mon, 15 Oct 2012 23:38:35 +0200
Subject: Rename tree/tree_file partial to tree/blob

---
 app/views/tree/_blob.html.haml      | 42 +++++++++++++++++++++++++++++++++++++
 app/views/tree/_tree.html.haml      |  2 +-
 app/views/tree/_tree_file.html.haml | 42 -------------------------------------
 3 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 app/views/tree/_blob.html.haml
 delete mode 100644 app/views/tree/_tree_file.html.haml

(limited to 'app')

diff --git a/app/views/tree/_blob.html.haml b/app/views/tree/_blob.html.haml
new file mode 100644
index 00000000000..bae5b5388f7
--- /dev/null
+++ b/app/views/tree/_blob.html.haml
@@ -0,0 +1,42 @@
+.file_holder
+  .file_title
+    %i.icon-file
+    %span.file_name
+      = blob.name.force_encoding('utf-8')
+      %small #{blob.mode}
+    %span.options
+      .btn-group.tree-btn-group
+        = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
+        = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
+        = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
+        = link_to "edit", edit_project_tree_path(@project, @id), class: "btn very_small"
+  - if blob.text?
+    - if gitlab_markdown?(blob.name)
+      .file_content.wiki
+        = preserve do
+          = markdown(blob.data)
+    - elsif markup?(blob.name)
+      .file_content.wiki
+        = raw GitHub::Markup.render(blob.name, blob.data)
+    - else
+      .file_content.code
+        - unless blob.empty?
+          %div{class: current_user.dark_scheme ? "black" : "white"}
+            = preserve do
+              = raw blob.colorize(options: { linenos: 'True'})
+        - else
+          %h4.nothing_here_message Empty file
+
+  - elsif blob.image?
+    .file_content.image_file
+      %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
+
+  - else
+    .file_content.blob_file
+      %center
+        = link_to project_blob_path(@project, @id) do
+          %div.padded
+            %br
+            = image_tag "download.png", width: 64
+            %h3
+              Download (#{blob.mb_size})
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index 2937a474bd9..57d04071205 100644
--- a/app/views/tree/_tree.html.haml
+++ b/app/views/tree/_tree.html.haml
@@ -12,7 +12,7 @@
 
 %div#tree-content-holder.tree-content-holder
   - if tree.is_blob?
-    = render partial: "tree/tree_file", object: tree
+    = render partial: "tree/blob", object: tree
   - else
     %table#tree-slider{class: "table_#{@hex_path} tree-table" }
       %thead
diff --git a/app/views/tree/_tree_file.html.haml b/app/views/tree/_tree_file.html.haml
deleted file mode 100644
index 5202126792a..00000000000
--- a/app/views/tree/_tree_file.html.haml
+++ /dev/null
@@ -1,42 +0,0 @@
-.file_holder
-  .file_title
-    %i.icon-file
-    %span.file_name
-      = tree_file.name.force_encoding('utf-8')
-      %small #{tree_file.mode}
-    %span.options
-      .btn-group.tree-btn-group
-        = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
-        = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
-        = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
-        = link_to "edit", edit_project_tree_path(@project, @id), class: "btn very_small"
-  - if tree_file.text?
-    - if gitlab_markdown?(tree_file.name)
-      .file_content.wiki
-        = preserve do
-          = markdown(tree_file.data)
-    - elsif markup?(tree_file.name)
-      .file_content.wiki
-        = raw GitHub::Markup.render(tree_file.name, tree_file.data)
-    - else
-      .file_content.code
-        - unless tree_file.empty?
-          %div{class: current_user.dark_scheme ? "black" : "white"}
-            = preserve do
-              = raw tree_file.colorize(options: { linenos: 'True'})
-        - else
-          %h4.nothing_here_message Empty file
-
-  - elsif tree_file.image?
-    .file_content.image_file
-      %img{ src: "data:#{tree_file.mime_type};base64,#{Base64.encode64(tree_file.data)}"}
-
-  - else
-    .file_content.blob_file
-      %center
-        = link_to project_blob_path(@project, @id) do
-          %div.padded
-            %br
-            = image_tag "download.png", width: 64
-            %h3
-              Download (#{tree_file.mb_size})
-- 
cgit v1.2.3