Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2 files changed, 43 insertions, 0 deletions

diff --git a/app/helpers/gitlab/page_layout_helper.rb b/app/helpers/gitlab/page_layout_helper.rb
index d7a85186155..c89b2c2ba2c 100644
--- a/app/helpers/gitlab/page_layout_helper.rb
+++ b/app/helpers/gitlab/page_layout_helper.rb
@@ -24,5 +24,14 @@ module Gitlab
         @sidebar
       end
     end
+
+    def fluid_layout(enabled = false)
+      if @fluid_layout.nil?
+        @fluid_layout = enabled
+      else
+        @fluid_layout
+      end
+    end
   end
+
 end
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
new file mode 100644
index 00000000000..8473d6d75d0
--- /dev/null
+++ b/app/helpers/page_layout_helper.rb
@@ -0,0 +1,34 @@
+module PageLayoutHelper
+  def page_title(*titles)
+    @page_title ||= []
+
+    @page_title.push(*titles.compact) if titles.any?
+
+    @page_title.join(" | ")
+  end
+
+  def header_title(title = nil, title_url = nil)
+    if title
+      @header_title     = title
+      @header_title_url = title_url
+    else
+      @header_title_url ? link_to(@header_title, @header_title_url) : @header_title
+    end
+  end
+
+  def sidebar(name = nil)
+    if name
+      @sidebar = name
+    else
+      @sidebar
+    end
+  end
+
+  def fluid_layout(enabled = false)
+    if @fluid_layout.nil?
+      @fluid_layout = enabled
+    else
+      @fluid_layout
+    end
+  end
+end