--- a/README-GITLAB.txt
+++ b/README-GITLAB.txt
@@ -11,12 +11,6 @@ Gitorious so I don't expect any of it to get merged up.
 It was simpler to merge Gitlab in than rip the Git code I needed out of
 Gitorious (I found the project via Grit).
 
-Initally I'm merging in without removing (if possible) Gitorious code, there
-is an application_mode set in the config yml that can be tested, if it's
-MODE_GITLAB then the rendering changes etc., setting MODE_GITORIOUS should
-render the existing Gitorious app. I've mainly done this so I can (hopefully)
-pull future Gitorious changes safely.
-
 Notes:
 
 - model and views with fixtures will be first stage, controllers and other

--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -23,8 +23,6 @@ class ApplicationController < ActionController::Base
     end
   end
   
-  layout :layout_skin
-  
   protected
   
     def require_user_has_ssh_keys
@@ -62,24 +60,7 @@ class ApplicationController < ActionController::Base
     end
     
     def render_not_found
-      case $application_mode
-      when MODE_GITLAB
-        render :file => "#{RAILS_ROOT}/public/ac_404.html", :status => 404
-      when MODE_GITORIOUS
-        render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
-      end
-    end
-    
-    # Swithes to /views/layouts/[mode]
-    def layout_skin
-      case GitoriousConfig["application_mode"]
-      when MODE_GITORIOUS
-        $application_mode = MODE_GITORIOUS
-        "application"
-      when MODE_GITLAB
-        $application_mode = MODE_GITLAB
-        "gitlab"
-      end
+      render :file => "#{RAILS_ROOT}/public/ac_404.html", :status => 404
     end
 
 end

--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -13,17 +13,8 @@ class CommitsController < ApplicationController
     @commit = @git.commit(params[:id])
     @diffs = @commit.diffs
     @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.id})
-    case $application_mode
-    when MODE_GITLAB
-      @title = "View Commit " << @commit.id_abbrev
-      render :action => "ac_show"
-    when MODE_GITORIOUS
-      respond_to do |format|
-        format.html
-        # TODO: format.diff { render :content_type => "text/plain" }
-      end
-    end
-    
+    @title = "View Commit " << @commit.id_abbrev
+    render :action => "ac_show"
   end
   
 end

--- a/app/controllers/logs_controller.rb
+++ b/app/controllers/logs_controller.rb
@@ -11,15 +11,8 @@ class LogsController < ApplicationController
     @git = @repository.git
     @commits = @repository.paginated_commits(params[:id], params[:page])
     @atom_auto_discovery_url = project_repository_formatted_log_feed_path(@project, @repository, params[:id], :atom)
-    case $application_mode
-    when MODE_GITLAB
-      @title = "&lsquo;" << @repository.git.git.name_rev({}, @commits.first.id).split(" ").last << "&rsquo; Commit History"
-      render :action => "ac_show"
-    when MODE_GITORIOUS
-      respond_to do |format|
-        format.html
-      end
-    end
+    @title = "&lsquo;" << @repository.git.git.name_rev({}, @commits.first.id).split(" ").last << "&rsquo; Commit History"
+    render :action => "ac_show"
   end
   
   def feed

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -4,26 +4,14 @@ class ProjectsController < ApplicationController
   before_filter :require_user_has_ssh_keys, :only => [:new, :create]
   before_filter :find_project, :except => [:index, :category, :new, :create]
   
-  after_filter :increment_project_view if $application_mode == MODE_GITLAB
+  after_filter :increment_project_view
   
   def index
-    case $application_mode
-    when MODE_GITORIOUS
-      @projects = Project.paginate(:all, :order => "projects.created_at desc", 
-                    :page => params[:page], :include => [:tags])
-      @atom_auto_discovery_url = formatted_projects_path(:atom)
-      respond_to do |format|
-        format.html { @tags = Project.top_tags }
-        format.xml  { render :xml => @projects }
-        format.atom { }
-      end
-    when MODE_GITLAB
-      @title = "Projects"
-      @public_projects = Project.find_all_active_public_projects(current_user)
-      #flash[:error] = "No public projects exist." if @public_projects.size == 0
-      @member_projects = Project.find_all_active_member_projects(current_user) if logged_in?
-      render :action => "ac_list"
-    end
+    @title = "Projects"
+    @public_projects = Project.find_all_active_public_projects(current_user)
+    #flash[:error] = "No public projects exist." if @public_projects.size == 0
+    @member_projects = Project.find_all_active_member_projects(current_user) if logged_in?
+    render :action => "ac_list"
   end
   
   def category
@@ -42,19 +30,10 @@ class ProjectsController < ApplicationController
   end
   
   def show
-    case $application_mode
-    when MODE_GITORIOUS
-      @repositories = @project.repositories.find(:all)
-      respond_to do |format|
-        format.html
-        format.xml { render :xml => @project }
-      end
-    when MODE_GITLAB
-      @wiki = @project.wiki
-      @title = @wiki.title
-      @url_suffix = ""
-      render :action => "ac_show"
-    end
+    @wiki = @project.wiki
+    @title = @wiki.title
+    @url_suffix = ""
+    render :action => "ac_show"
   end
   
   def new

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -7,24 +7,19 @@ class RepositoriesController < ApplicationController
   session :off, :only => [:writable_by]
   
   def index
-    case $application_mode
-    when MODE_GITLAB
-      if params[:project_id] != nil
-        @project = Project.find_by_slug(params[:project_id], current_user)
-        if @project != nil
-          @repositories = @project.repositories.find(:all)
-          @title, @url_suffix = Project.tab_settings(PRJ_TAB_REPOS)
-          render :action => "ac_index"
-        else
-          flash[:error] = "Project not found."
-          redirect_to projects_path
-        end
+    if params[:project_id] != nil
+      @project = Project.find_by_slug(params[:project_id], current_user)
+      if @project != nil
+        @repositories = @project.repositories.find(:all)
+        @title, @url_suffix = Project.tab_settings(PRJ_TAB_REPOS)
+        render :action => "ac_index"
       else
-        flash[:error] = "No project specified."
+        flash[:error] = "Project not found."
         redirect_to projects_path
       end
-    when MODE_GITORIOUS
-      redirect_to(project_path(@project))
+    else
+      flash[:error] = "No project specified."
+      redirect_to projects_path
     end
   end
     
@@ -37,19 +32,8 @@ class RepositoriesController < ApplicationController
     else
       @commits = []
     end
-    case $application_mode
-    when MODE_GITORIOUS
-      @atom_auto_discovery_url = formatted_project_repository_path(@project, @repository, :atom)
-      respond_to do |format|
-        format.html
-        format.xml  { render :xml => @repository }
-        format.atom { render :template => "logs/feed.atom.builder" }
-      end
-    when MODE_GITLAB
-      #PRJ_TAB_REPOS
-      @title = "Repo: &lsquo;" << @repository.name << "&rsquo;"
-      render :action => "ac_show"
-    end
+    @title = "Repo: &lsquo;" << @repository.name << "&rsquo;"
+    render :action => "ac_show"
   end
   
   # note the #new+#create actions are members in the routes, hence they require

--- a/app/controllers/searches_controller.rb
+++ b/app/controllers/searches_controller.rb
@@ -9,10 +9,7 @@ class SearchesController < ApplicationController
       @results = @search.results
     end
 
-    case $application_mode
-      when MODE_GITLAB
-        render :action => 'ac_search'
-    end
+    render :action => 'ac_search'
   end
 
 end

--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -2,7 +2,7 @@
 class SessionsController < ApplicationController
   # render new.rhtml
   def new
-    render :action => session_mode_page
+    render :action => "ac_new"
   end
 
   def create
@@ -16,7 +16,7 @@ class SessionsController < ApplicationController
       flash[:notice] = "Logged in successfully"
     else
       flash.now[:error] = "Username/password didn't match, please try again."
-      render :action => session_mode_page
+      render :action => "ac_new"
     end
   end
 
@@ -28,13 +28,4 @@ class SessionsController < ApplicationController
     redirect_back_or_default('/')
   end
 
-  def session_mode_page
-    case $application_mode
-    when MODE_GITORIOUS
-      "new"
-    when MODE_GITLAB
-      "ac_new"
-    end
-  end
-
 end

--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -2,13 +2,8 @@ class SiteController < ApplicationController
   before_filter :login_required, :only => [:dashboard]
   
   def index
-    case $application_mode
-      when MODE_GITORIOUS
-        @projects = Project.find(:all, :limit => 10, :order => "id desc")
-      when MODE_GITLAB
-        @articles = Article.find_home(current_user)
-        render :action => 'gitlab_index'
-    end
+    @articles = Article.find_home(current_user)
+    render :action => 'gitlab_index'
   end
   
   def dashboard
@@ -24,14 +19,11 @@ class SiteController < ApplicationController
   end
   
   def about
-    case $application_mode
-    when MODE_GITLAB
-      # Main wiki - default page
-      @wiki = Wiki.find_by_slug("about")
-      @wiki_breadcrumb = false
-      @title = "About"
-      render :action => 'ac_about'
-    end
+    # Main wiki - default page
+    @wiki = Wiki.find_by_slug("about")
+    @wiki_breadcrumb = false
+    @title = "About"
+    render :action => 'ac_about'
   end
   
   def faq    

--- a/app/controllers/trees_controller.rb
+++ b/app/controllers/trees_controller.rb
@@ -17,13 +17,8 @@ class TreesController < ApplicationController
     end
     path = params[:path].blank? ? [] : ["#{params[:path].join("/")}/"] # FIXME: meh, this sux
     @tree = @git.tree(@commit.tree.id, path)
-    
-    case $application_mode
-    when MODE_GITLAB
-      @title = "&lsquo;" << @repository.git.git.name_rev({}, @commit.id).split(" ").last << "&rsquo; Source Tree"
-      render :action => "ac_show"
-    when MODE_GITORIOUS
-    end
+    @title = "&lsquo;" << @repository.git.git.name_rev({}, @commit.id).split(" ").last << "&rsquo; Source Tree"
+    render :action => "ac_show"
   end
   
   def archive

--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -1,6 +1,6 @@
 module MembersHelper
 
-  include ProjectsHelper #if $application_mode == MODE_GITLAB
+  include ProjectsHelper
   
   #
   # FIXME pointless, and should be in model

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -1,11 +1,7 @@
 module ProjectsHelper
 
-  # Gitlab
-    include BlueclothHelper if $application_mode == MODE_GITLAB
+  include BlueclothHelper
   
-  #
-  # Gitlab specific
-  #
   def get_project_audience_suffix (project)
     project.audience == :members_only ? " (Private)" : ""
   end

--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -1,8 +1,7 @@
 module RepositoriesHelper  
   
-  # Gitlab
-  include ProjectsHelper if $application_mode == MODE_GITLAB
-  include RepotreeHelper if $application_mode == MODE_GITLAB
+  include ProjectsHelper
+  include RepotreeHelper
   
   def log_path(objectish = "master", options = {})
     if options.blank? # just to avoid the ? being tacked onto the url

--- a/app/helpers/site_helper.rb
+++ b/app/helpers/site_helper.rb
@@ -1,6 +1,5 @@
 module SiteHelper
   
-  # Gitlab
-  include ArticlesHelper if $application_mode == MODE_GITLAB
+  include ArticlesHelper
 
 end

--- a/app/helpers/tickets_helper.rb
+++ b/app/helpers/tickets_helper.rb
@@ -1,7 +1,6 @@
 module TicketsHelper
 
-  # Gitlab
-  include ProjectsHelper if $application_mode == MODE_GITLAB
+  include ProjectsHelper
   
   def render_project_tickets
   end

--- a/app/helpers/wikis_helper.rb
+++ b/app/helpers/wikis_helper.rb
@@ -1,6 +1,6 @@
 module WikisHelper
 
-  include ProjectsHelper #if $application_mode == MODE_GITLAB
+  include ProjectsHelper
   include BlueclothHelper
   
 end

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -10,14 +10,10 @@ class Project < ActiveRecord::Base
   has_many    :repository_clones, :conditions => ["mainline = ?", false],
     :class_name => "Repository"
 
-  # Gitlab membership system
-  if $application_mode == MODE_GITLAB then
-    belongs_to :wiki
-    has_many :members, :dependent => :destroy
-    has_many :users, :through => :members
-    has_many :articles
-  end
-
+  belongs_to :wiki
+  has_many :members, :dependent => :destroy
+  has_many :users, :through => :members
+  has_many :articles
     
   is_indexed :fields => ["title", "description", "slug"],
     :concatenate => [

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,98 +1,62 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<% if request.env['HTTP_HOST'] != "88.97.241.226" %>
+<html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title><%= @page_title ? @page_title + " - " : "" -%>Gitorious</title>
-	<meta name="author" content="Johan Sørensen">
-	<%= stylesheet_link_tag "base" -%>
-  <%= syntax_themes_css -%>
-  <%= javascript_include_tag :defaults, :cache => true -%>
-  <%  if @atom_auto_discovery_url -%>  
-    <%= auto_discovery_link_tag(:atom, @atom_auto_discovery_url) -%>
-  <% end -%>
-  <%= GitoriousConfig["extra_html_head_data"] -%>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="icon" href="/favicon.ico" type="image/ico">
+<link rel="shortcut icon" href="/favicon.ico">
+<link rel='alternate' type='application/rss+xml' title='RSS Feed' href='/rss.xml'/>
+<title><%= yield(:title) %> - <%= SITENAME %></title>
+<%= stylesheet_link_tag 'gitlab' %>
 </head>
 
-<body id="<%= controller.controller_name -%>">
+<body>
+<div id='page'>
+
   <% unless GitoriousConfig["system_message"].blank? -%>
   <div id="system_message">
     <p><strong>System notice:</strong> <%= GitoriousConfig["system_message"] -%></p>
   </div>
   <% end -%>
-  <div id="header">
-    <h1 id="logo">
-      <%= link_to image_tag("logo-white.png"), root_path -%>
-        <!-- <h1><%= link_to "Gitorious", root_path -%></h1> -->
-    </h1>
-    <ul id="menu">
-      <% unless logged_in? -%>
-        <li><%= link_to "Home", root_path -%></li>
-      <% end -%>
-      <% if logged_in? -%>
-        <li><%= link_to "Dashboard", dashboard_path -%></li>
-      <% end -%>
-        <li><%= link_to "Projects", projects_path -%></li>
-        <li><%= link_to "Search", search_path -%></li>
-      <% if logged_in? -%>
-        <li><%= link_to "FAQ", faq_path -%></li>
-      <% else -%>
-        <li><%= link_to "About", about_path -%></li>
-      <% end -%>
-      <%- if logged_in? -%>
-        <li class="secondary">( <%= link_to "My account", account_path -%></li>
-        <li class="secondary"><%= link_to "Logout", logout_path -%> )</li>
-      <%- else -%>
-        <li class="secondary"><%= link_to "Register", new_user_path -%></li>
-        <li class="secondary"><%= link_to "Login", login_path -%></li>
-      <%- end -%>
-    </ul>
-    <ul id="submenu">
-      <% if @project -%>
-        <li class="<%= selected_if_current_page(project_path(@project)) -%>">
-          <%= link_to h(@project.title), project_path(@project) -%>
-        </li>
-        <% if @repository -%>
-          <!-- <li class="menu_title"><%= h(@repository.name) -%>:</li> -->
-          <li class="<%= selected_if_current_page(project_repository_path(@project, @repository)) -%>">
-            <%= link_to "#{h(@repository.name)} repository", project_repository_path(@project, @repository) -%>
-          </li>
-          <li class="<%= selected_if_current_page(project_repository_logs_path(@project, @repository)) -%>">
-            <%= link_to "Commits", project_repository_logs_path(@project, @repository) -%>
-          </li>
-          <% if @repository.head_candidate -%>
-          <li class="<%= selected_if_current_page(project_repository_tree_path(@project, @repository, @repository.head_candidate.name)) -%>">
-            <%= link_to "Source Tree", project_repository_tree_path(@project, @repository, @repository.head_candidate.name) -%>
-          </li>
-          <% end -%>
-        <% end -%>
-      <% end -%>
-      <%= yield :submenu -%>
-    </ul>
+
+  <div id="system_message">
+    <p><strong>Notice:</strong> **BROKEN DURING REFACTOR** This site is unstable work-in-progress, source for it is available on <a href='http://gitorious.org/projects/gitlab/'>gitorious.org</a>. Contact <a href='mailto:mtkd@prj2.com'>mtkd@prj2.com</a></p>
   </div>
-  <div id="container">
-    <% unless @content_for_sidebar.blank? -%>
-    <div id="main">
-    <% end -%>
-      <div id="content">
-        <%= flashes %>
-        <%= yield -%>
-      </div>
-    <% unless @content_for_sidebar.blank? -%>
-    </div>
-    <div id="sidebar">
-      <%= yield :sidebar -%>
-    </div>
-    <div class="clear"></div>
-    <% end -%>
-    <div id="footer">
-      <ul>
-        <li><%= link_to "Home", root_path -%> | </li>
-        <li><%= link_to "About", about_path -%> | </li>
-        <li><%= link_to "FAQ", faq_path -%> | </li>
-        <li><%= link_to "Discussion group", "http://groups.google.com/group/gitorious" -%></li>
+
+  <div id='header'>
+    <div id='menu'>
+      <ul class='item'>
+        <li><%= link_to("Home", root_path) %></li>
+        <li><%= link_to("Projects", projects_path) %></li>
+        <li><%= link_to("Archive", articles_path) %></li>
+        <li><%= link_to("Forum", forums_path) %></li>
+        <li><%= link_to("Wiki", wikis_path) %></li>
+        <li><%= link_to("Search", search_path) %></li>
+        <li><%= link_to("About", about_path) %></li>
       </ul>
     </div>
   </div>
+
+  <% if flash[:error] %><div id='flash_error'><%= flash[:error] %></div><% end %>
+  <% if flash[:notice] %><div id='flash_notice'><%= flash[:notice] %></div><% end %>
+
+  <%= yield %>
+
+  <div id='footer'>
+    <div class='text'>
+      All content and applications are <a href='/wikis/gnu-agpl-license'>GNU AGPL</a> unless stated otherwise. This site is built using <a href='/projects/<%= APPNAME.downcase %>'><%= APPNAME %></a> for Rails.
+    </div>
+  </div>
+
+</div>
 </body>
+
+</html>
+<% else %>
+
+<html>
+No site  
 </html>
+  
+<% end %>
\ No newline at end of file