Move the web ui down a level in the directories, first step to make i…

…t the 'required' UI [integrity#19]
foca · Jul 26, 2008 · d775d16 · d775d16
1 parent 638f9fb
commit d775d16
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 6 deletions.
diff --git a/bin/integrity b/bin/integrity
@@ -2,4 +2,4 @@
 require File.dirname(__FILE__) + "/../lib/integrity"
 require "sinatra"
 
-load File.dirname(__FILE__) + "/../lib/integrity/ui/web.rb"
+load File.dirname(__FILE__) + "/../lib/integrity/ui.rb"
diff --git a/lib/integrity/ui/web.rb → lib/integrity/ui.rb b/lib/integrity/ui/web.rb → lib/integrity/ui.rb
@@ -1,8 +1,8 @@
 require "authorization"
 
-set :root,   Integrity.root / "lib/integrity/ui/web"
-set :public, Integrity.root / "lib/integrity/ui/web/public"
-set :views,  Integrity.root / "lib/integrity/ui/web/views"
+set :root,   Integrity.root / "lib/integrity/ui"
+set :public, Integrity.root / "lib/integrity/ui/public"
+set :views,  Integrity.root / "lib/integrity/ui/views"
 
 enable :sessions
 

diff --git a/lib/integrity/ui/web/public/buttons.css → lib/integrity/ui/public/buttons.css b/lib/integrity/ui/web/public/buttons.css → lib/integrity/ui/public/buttons.css
diff --git a/lib/integrity/ui/web/public/reset.css → lib/integrity/ui/public/reset.css b/lib/integrity/ui/web/public/reset.css → lib/integrity/ui/public/reset.css
diff --git a/lib/integrity/ui/web/views/build.haml → lib/integrity/ui/views/build.haml b/lib/integrity/ui/web/views/build.haml → lib/integrity/ui/views/build.haml
diff --git a/lib/integrity/ui/web/views/build_info.haml → lib/integrity/ui/views/build_info.haml b/lib/integrity/ui/web/views/build_info.haml → lib/integrity/ui/views/build_info.haml
diff --git a/lib/integrity/ui/web/views/home.haml → lib/integrity/ui/views/home.haml b/lib/integrity/ui/web/views/home.haml → lib/integrity/ui/views/home.haml
diff --git a/lib/integrity/ui/web/views/integrity.sass → lib/integrity/ui/views/integrity.sass b/lib/integrity/ui/web/views/integrity.sass → lib/integrity/ui/views/integrity.sass
diff --git a/lib/integrity/ui/web/views/layout.haml → lib/integrity/ui/views/layout.haml b/lib/integrity/ui/web/views/layout.haml → lib/integrity/ui/views/layout.haml
diff --git a/lib/integrity/ui/web/views/new.haml → lib/integrity/ui/views/new.haml b/lib/integrity/ui/web/views/new.haml → lib/integrity/ui/views/new.haml
diff --git a/lib/integrity/ui/web/views/not_found.haml → lib/integrity/ui/views/not_found.haml b/lib/integrity/ui/web/views/not_found.haml → lib/integrity/ui/views/not_found.haml
diff --git a/lib/integrity/ui/web/views/project.haml → lib/integrity/ui/views/project.haml b/lib/integrity/ui/web/views/project.haml → lib/integrity/ui/views/project.haml
diff --git a/lib/integrity/ui/web/views/unauthorized.haml → lib/integrity/ui/views/unauthorized.haml b/lib/integrity/ui/web/views/unauthorized.haml → lib/integrity/ui/views/unauthorized.haml
diff --git a/spec/ui/web_spec.rb → spec/ui_spec.rb b/spec/ui/web_spec.rb → spec/ui_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe 'Web UI using Sinatra' do
   def mock_project(messages={})
@@ -48,7 +48,7 @@ def provide_valid_credentials!
 
   before(:each) do
     Integrity.stub!(:new)
-    require File.dirname(__FILE__) + '/../../lib/integrity/ui/web'
+    require File.dirname(__FILE__) + '/../lib/integrity/ui'
   end
 
   after(:each) { @project = nil }