Refine our web space some more so that everything we reference is in /ipa

UI: /ipa/ui
XML-RPC: /ipa/xml
errors: /ipa/errors
config: /ipa/config

I had to hardcode that URI into the CSS pages but TurboGears handles the
rest of the translations with tg.url().

Added a version to ipa.conf and ipa-rewrite.conf so we can update them
in the future if needed with ipa-upgradeconfig

440443

5 files changed, 29 insertions, 29 deletions

diff --git a/ipa-server/ipa-gui/ipa_webgui.cfg b/ipa-server/ipa-gui/ipa_webgui.cfg
index 62d251cf3..f7dfb2593 100644
--- a/ipa-server/ipa-gui/ipa_webgui.cfg
+++ b/ipa-server/ipa-gui/ipa_webgui.cfg
@@ -29,11 +29,11 @@ server.thread_pool = 10
 
 # if this is part of a larger site, you can set the path
 # to the TurboGears instance here
-server.webpath="/ipa"
+server.webpath="/ipa/ui"
 
 # Set to True if you are deploying your App behind a proxy
 # e.g. Apache using mod_proxy
-# base_url_filter.on = False
+base_url_filter.on = True
 
 # Set to True if your proxy adds the x_forwarded_host header
 # base_url_filter.use_x_forwarded_host = True
diff --git a/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css b/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css
index 5eafa9b1a..f56971bd3 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css
+++ b/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css
@@ -40,10 +40,10 @@
   text-decoration: underline;
 }
 .sortasc {
-  background-image: url(/static/images/up.gif) !important;
+  background-image: url(/ipa/ui/static/images/up.gif) !important;
 }
 .sortdesc {
-  background-image: url(/static/images/down.gif) !important;
+  background-image: url(/ipa/ui/static/images/down.gif) !important;
 }
 
 .warning_message {
diff --git a/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css b/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css
index bb9e805ab..51d570896 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css
+++ b/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css
@@ -1,19 +1,19 @@
 /* object h1 styles */
 
-#details h1.overview { background-image: url('/static/images/objects/object-overview.png'); }
+#details h1.overview { background-image: url('/ipa/ui/static/images/objects/object-overview.png'); }
 
-#details h1.accesscontrol { background-image: url('/static/images/objects/object-accesscontrol.png'); }
+#details h1.accesscontrol { background-image: url('/ipa/ui/static/images/objects/object-accesscontrol.png'); }
 
-#details h1.user { background-image: url('/static/images/objects/object-user.png'); }
-#details h1.usergroup { background-image: url('/static/images/objects/object-usergroup.png'); }
+#details h1.user { background-image: url('/ipa/ui/static/images/objects/object-user.png'); }
+#details h1.usergroup { background-image: url('/ipa/ui/static/images/objects/object-usergroup.png'); }
 
-#details h1.content-overview { background-image: url('/static/images/objects/object-content.png'); }
-#details h1.channel { background-image: url('/static/images/objects/object-channel.png'); }
-#details h1.channel-new { background-image: url('/static/images/objects/object-channel.png'); }
-#details h1.channels { background-image: url('/static/images/objects/object-channels.png'); }
-#details h1.media { background-image: url('/static/images/objects/object-media.png'); }
+#details h1.content-overview { background-image: url('/ipa/ui/static/images/objects/object-content.png'); }
+#details h1.channel { background-image: url('/ipa/ui/static/images/objects/object-channel.png'); }
+#details h1.channel-new { background-image: url('/ipa/ui/static/images/objects/object-channel.png'); }
+#details h1.channels { background-image: url('/ipa/ui/static/images/objects/object-channels.png'); }
+#details h1.media { background-image: url('/ipa/ui/static/images/objects/object-media.png'); }
 
-#details h1.system { background-image: url('/static/images/objects/object-system.png'); }
-#details h1.virtualsystem { background-image: url('/static/images/objects/object-virtualsystem.png'); }
+#details h1.system { background-image: url('/ipa/ui/static/images/objects/object-system.png'); }
+#details h1.virtualsystem { background-image: url('/ipa/ui/static/images/objects/object-virtualsystem.png'); }
 
-#details h1.policy { background-image: url('/static/images/objects/object-policy.png'); }
+#details h1.policy { background-image: url('/ipa/ui/static/images/objects/object-policy.png'); }
diff --git a/ipa-server/ipa-gui/ipagui/static/css/style_platform.css b/ipa-server/ipa-gui/ipagui/static/css/style_platform.css
index 37f030a84..9168bd1d0 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/style_platform.css
+++ b/ipa-server/ipa-gui/ipagui/static/css/style_platform.css
@@ -12,7 +12,7 @@ html, body {
 }
 
 body {
-  background-image:		url('/static/images/template/background.png');
+  background-image:		url('/ipa/ui/static/images/template/background.png');
   background-repeat:		repeat-x;
   background-color:		#f9f9f9;
   margin:			0px;
@@ -45,7 +45,7 @@ td, th {
   float:			left;
   margin-top:			-10px;
 
-  background:			url('/static/images/branding/logo.png') no-repeat;
+  background:			url('/ipa/ui/static/images/branding/logo.png') no-repeat;
 }
 
 #content {
@@ -53,7 +53,7 @@ td, th {
   min-height:			100%;
 
   background-color:		#f9f9f9;
-  background-image:		url('/static/images/template/background-content.png');
+  background-image:		url('/ipa/ui/static/images/template/background-content.png');
   background-repeat:		repeat-x;
 }
 
@@ -95,7 +95,7 @@ div#search {
   margin: 			0px;
   clear:			both;
 
-  background-image:		url('/static/images/template/background-navbar.png');
+  background-image:		url('/ipa/ui/static/images/template/background-navbar.png');
   background-repeat:		repeat-x;
 
 }
@@ -121,7 +121,7 @@ div#search {
 }
 
 #navbar .active {
-  background-image:		url('/static/images/template/background-navbar-active.png');
+  background-image:		url('/ipa/ui/static/images/template/background-navbar-active.png');
   height:			70px;
   width:			116px;
 
@@ -156,7 +156,7 @@ div#search {
 
   border:			1px solid #aaa;
   background-color:		#ccc;
-  background-image:		url('/static/images/template/background-sidebar.png');
+  background-image:		url('/ipa/ui/static/images/template/background-sidebar.png');
   background-repeat:		repeat-y;
 }
 
@@ -477,7 +477,7 @@ div.instructions {
   padding-top: 2ex;
   width: 40%;
   float: right;
-  background-image:     url('/static/images/template/background-search.png');
+  background-image:     url('/ipa/ui/static/images/template/background-search.png');
   background-repeat:        repeat-y;
   background-color: white;
 } 
diff --git a/ipa-server/ipa-gui/ipagui/templates/master.kid b/ipa-server/ipa-gui/ipagui/templates/master.kid
index ac850178a..d8b341428 100644
--- a/ipa-server/ipa-gui/ipagui/templates/master.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/master.kid
@@ -24,13 +24,13 @@
     <title py:replace="''">Your title goes here</title>
     <meta py:replace="item[:]"/>
     <style type="text/css" media="all">
-    @import "/static/css/style_platform.css";
-    @import "/static/css/style_platform-objects.css";
-    @import "/static/css/style_freeipa.css";
+    @import "${tg.url('/static/css/style_platform.css')}";
+    @import "${tg.url('/static/css/style_platform-objects.css')}";
+    @import "${tg.url('/static/css/style_freeipa.css')}";
     </style>
-    <script type="text/javascript" charset="utf-8" src="/static/javascript/prototype.js"></script>
-    <script type="text/javascript" charset="utf-8" src="/static/javascript/scriptaculous.js?load=effects"></script>
-    <script type="text/javascript" charset="utf-8" src="/static/javascript/ipautil.js"></script>
+    <script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/prototype.js')}"></script>
+    <script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/scriptaculous.js?load=effects')}"></script>
+    <script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/ipautil.js')}"></script>
 </head>
 
 <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">