From 1cec2a5b6f392902adb7c19935a5519834366eaa Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 16 Oct 2013 11:32:48 +0200
Subject: [PATCH] [REM] Obsolete route /admin

bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
---
 addons/website/controllers/main.py         | 6 +-----
 addons/website/static/src/xml/website.xml  | 2 +-
 addons/website/views/website_templates.xml | 6 +++---
 addons/website_blog/controllers/main.py    | 2 +-
 addons/website_sale/views/website_sale.xml | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index baa6b6c780b..083f9f3aef7 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -51,11 +51,7 @@ class Website(openerp.addons.web.controllers.main.Home):
     def index(self, **kw):
         return self.page("website.homepage")
 
-    @http.route('/admin', type='http', auth="none")
-    def admin(self, *args, **kw):
-        return super(Website, self).index(*args, **kw)
-
-     # FIXME: auth, if /pagenew known anybody can create new empty page
+    # FIXME: auth, if /pagenew known anybody can create new empty page
     @website.route('/pagenew/<path:path>', type='http', auth="admin")
     def pagenew(self, path, noredirect=NOPE):
         module = 'website'
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index b3e4cacd32a..409d73f1f27 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -35,7 +35,7 @@
                             </ul>
                         </li>
                         <li>
-                            <a href="/admin#action=website.action_module_website">Apps</a>
+                            <a href="/web#action=website.action_module_website">Apps</a>
                         </li>
                     </ul>
                 </div>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 1071a5bff0e..a6e6579ef1d 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -93,8 +93,8 @@
                                         <div class="collapse navbar-collapse navbar-top-collapse">
                                             <ul class="nav navbar-nav navbar-right" id="top_menu">
                                                 <li name="contactus"><a t-href="/page/website.contactus">Contact us</a></li>
-                                                <li t-if="user_id.id == website.public_user.id"><a href="/admin">Sign in</a></li>
-                                                <li t-if="user_id.id != website.public_user.id"><a href="/admin"><span t-field="user_id.name"/></a></li>
+                                                <li t-if="user_id.id == website.public_user.id"><a href="/web">Sign in</a></li>
+                                                <li t-if="user_id.id != website.public_user.id"><a href="/web"><span t-field="user_id.name"/></a></li>
                                                 <li t-if="request.multilang and
                                                             (len(website.language_ids) &gt; 1 or editable)" class="dropdown">
                                                     <!-- TODO: use flags for language selection -->
@@ -235,7 +235,7 @@
                 </ul>
               </div>
               <t t-if="publish_edit">
-                <a class="btn btn-xs btn-default" title="Edit in backend" t-att-href="'/admin/#model=%s&amp;id=%s' % (object._name, object.id)"><span t-attf-class="glyphicon glyphicon-wrench"></span></a>
+                <a class="btn btn-xs btn-default" title="Edit in backend" t-att-href="'/web#model=%s&amp;id=%s' % (object._name, object.id)"><span t-attf-class="glyphicon glyphicon-wrench"></span></a>
               </t>
             </div>
             </t>
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 7d40e080636..e2341af88aa 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -178,7 +178,7 @@ class WebsiteBlog(http.Controller):
         url = request.httprequest.host_url
         request.session.body = post.get('body')
         if request.context['is_public_user']:  # purpose of this ?
-            return '%s/admin#action=redirect&url=%s/blog/%s/post' % (url, url, blog_post_id)
+            return '%s/web#action=redirect&url=%s/blog/%s/post' % (url, url, blog_post_id)
 
         if request.session.get('body') and blog_post_id:
             request.registry['blog.post'].message_post(
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index b458c36aa0e..a263a01ed2e 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -623,7 +623,7 @@
                 <div class="col-md-8 oe_mycart">
                     <h3 class="page-header mt16">Set Billing Information
                         <small t-if="user_id.id == website.public_user.id"> or 
-                            <a t-if="not partner" t-attf-href="/admin#action=redirect&amp;url=#{ request.httprequest.host_url }/shop/checkout/">sign in</a>
+                            <a t-if="not partner" t-attf-href="/web#action=redirect&amp;url=#{ request.httprequest.host_url }/shop/checkout/">sign in</a>
                         </small>
                     </h3>
                         <div class="row">