From 91830f86aaa162d572f3d86a1eabd380cb145421 Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Wed, 16 Jan 2013 08:14:42 +0800
Subject: [PATCH] Fix bug for mobile app routes

---
 app/controllers/application_controller.rb |  2 +-
 app/controllers/mobile_controller.rb      |  2 +-
 app/views/mobile/_footer.mobile.erb       |  4 ++--
 app/views/mobile/_header.mobile.erb       |  2 +-
 app/views/mobile/_menu.mobile.erb         |  6 ++---
 app/views/mobile/announcement.mobile.erb  |  2 +-
 app/views/mobile/index.mobile.erb         |  2 +-
 app/views/mobile/page.mobile.erb          |  2 +-
 config/routes.rb                          | 28 +++++++++++------------
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b0fc4adb5..7f4ea0fa8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -130,7 +130,7 @@ class ApplicationController < ActionController::Base
       respond_to do |format|
         format.html { render :text => parse_page_content(@item), :layout => 'page_layout' }
         format.rss { render_main_rss }
-        format.mobile { redirect_to mobile_path }
+        format.mobile { redirect_to mobile_path(:app => params[:app]) }
       end
     else
       render :text => '404 Not Found'
diff --git a/app/controllers/mobile_controller.rb b/app/controllers/mobile_controller.rb
index d07e9a878..369bfa220 100644
--- a/app/controllers/mobile_controller.rb
+++ b/app/controllers/mobile_controller.rb
@@ -54,7 +54,7 @@ class MobileController < ApplicationController
   protected
 
   def no_footer_for_app
-    @no_footer = true if request.path.starts_with?("/app")
+    @no_footer = true if request.path =~ /app/
   end
 
 end
diff --git a/app/views/mobile/_footer.mobile.erb b/app/views/mobile/_footer.mobile.erb
index 8bff0fa03..17a38e904 100644
--- a/app/views/mobile/_footer.mobile.erb
+++ b/app/views/mobile/_footer.mobile.erb
@@ -7,12 +7,12 @@
         <% end %>
       </li>
       <li>
-        <%= link_to mobile_map_path, {"data-transition" => "flip"} do %>
+        <%= link_to mobile_map_path(:app => params[:app]), {"data-transition" => "flip"} do %>
           <i class="icons-location"></i>
         <% end %>
       </li>
       <li>
-        <%= link_to mobile_dialog_contact_path, {"data-rel" => "dialog"} do %>
+        <%= link_to mobile_dialog_contact_path(:app => params[:app]), {"data-rel" => "dialog"} do %>
           <i class="icons-phone"></i>
         <% end %>
       </li>
diff --git a/app/views/mobile/_header.mobile.erb b/app/views/mobile/_header.mobile.erb
index 428d689bd..3e0df5619 100644
--- a/app/views/mobile/_header.mobile.erb
+++ b/app/views/mobile/_header.mobile.erb
@@ -3,7 +3,7 @@
     <%= image_tag asset_path('mobile/logo.png') %>
   </h1>
   <i class="openmenu icons-arrow-down-5"></i>
-  <%= link_to mobile_dialog_language_path, {:class => "ui-btn-right language", "data-iconpos" => "notext", "data-icon" => "search", "data-rel" => "dialog"} do %>
+  <%= link_to mobile_dialog_language_path(:app => params[:app]), {:class => "ui-btn-right language", "data-iconpos" => "notext", "data-icon" => "search", "data-rel" => "dialog"} do %>
     <i class="icons-earth"></i>
   <% end %>
 </header>
\ No newline at end of file
diff --git a/app/views/mobile/_menu.mobile.erb b/app/views/mobile/_menu.mobile.erb
index eecc82263..ec92ea84d 100644
--- a/app/views/mobile/_menu.mobile.erb
+++ b/app/views/mobile/_menu.mobile.erb
@@ -1,7 +1,7 @@
 <section class="main-menu">
   <ul class="clear">
-    <li><%= link_to content_tag(:i, nil, :class => "icons-house") + content_tag(:span, t('mobile.home')), mobile_path %></li>
-    <li><%= link_to content_tag(:i, nil, :class => "icons-megaphone") + content_tag(:span, t('mobile.bulletin')), mobile_announcement_path %></li>
-    <li><%= link_to content_tag(:i, nil, :class => "icons-newspaper") + content_tag(:span, t('mobile.page')), mobile_page_path %></li>
+    <li><%= link_to content_tag(:i, nil, :class => "icons-house") + content_tag(:span, t('mobile.home')), mobile_path(:app => params[:app]) %></li>
+    <li><%= link_to content_tag(:i, nil, :class => "icons-megaphone") + content_tag(:span, t('mobile.bulletin')), mobile_announcement_path(:app => params[:app]) %></li>
+    <li><%= link_to content_tag(:i, nil, :class => "icons-newspaper") + content_tag(:span, t('mobile.page')), mobile_page_path(:app => params[:app]) %></li>
   </ul>
 </section>
\ No newline at end of file
diff --git a/app/views/mobile/announcement.mobile.erb b/app/views/mobile/announcement.mobile.erb
index 247ca2148..ff2ea10fe 100644
--- a/app/views/mobile/announcement.mobile.erb
+++ b/app/views/mobile/announcement.mobile.erb
@@ -1,7 +1,7 @@
 <ul data-role="listview" class="list">
   <% @bulletins.each do |bulletin| %>
     <li data-corners="false" data-shadow="false" data-iconshadow="true" data-wrapperels="div" data-icon="arrow-r" data-iconpos="right"  data-theme="c">
-      <%= link_to mobile_announcement_content_path(bulletin), :class => "ui-link-inherit" do %>
+      <%= link_to mobile_announcement_content_path(:app => params[:app], :id => bulletin), :class => "ui-link-inherit" do %>
         <%= image_tag bulletin.image.url, :class => "ui-li-thumb" %>
         <h3><%= bulletin.title %></h3>
         <p class="ui-li-aside ui-li-desc"><%= display_date(bulletin.postdate) %></p>
diff --git a/app/views/mobile/index.mobile.erb b/app/views/mobile/index.mobile.erb
index e283c0023..7bbf2607a 100644
--- a/app/views/mobile/index.mobile.erb
+++ b/app/views/mobile/index.mobile.erb
@@ -12,7 +12,7 @@
         <%= image_tag bulletin.image.url %>
       </div>
       <h3 class="newstitle">
-        <%= link_to bulletin.title, mobile_announcement_content_path(bulletin) %>
+        <%= link_to bulletin.title, mobile_announcement_content_path(:app => params[:app], :id => bulletin) %>
       </h3>
       <p class="newsDate"><%= display_date(bulletin.postdate) %></p>
       <div class="newsummary"><%= bulletin.subtitle %></div>
diff --git a/app/views/mobile/page.mobile.erb b/app/views/mobile/page.mobile.erb
index 91c8ab71f..8e6952e40 100644
--- a/app/views/mobile/page.mobile.erb
+++ b/app/views/mobile/page.mobile.erb
@@ -1,7 +1,7 @@
 <ul data-role="listview" class="list">
   <% @page_contexts.each do |page_context| %>
     <li>
-      <%= link_to mobile_page_content_path(page_context) do %>
+      <%= link_to mobile_page_content_path(:app => params[:app], :id => page_context) do %>
         <h3><%= page_context.page.title %></h3>
       <% end %>
     </li>
diff --git a/config/routes.rb b/config/routes.rb
index 0d51680ad..af7b4866c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -237,7 +237,7 @@ Orbit::Application.routes.draw do
   #match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
   # match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
 
-  def controller_paths(controller, actions) 
+  def controller_paths(controller, actions, scope=nil) 
     actions.each do |action| 
       if action.eql? 'index'
         match "#{controller}" => "#{controller}##{action}", :as => "#{controller}"
@@ -248,21 +248,21 @@ Orbit::Application.routes.draw do
   end
 
   controller_paths :front, %w[show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap]
-  controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
+  # controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
 
-  scope 'app' do
-    controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
-  end
+  # scope 'app' do
+  #   controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
+  # end
 
-  scope '/mobile' do
-    match 'announcement' => 'mobile#announcement', :as => 'mobile_announcement'
-    match 'announcement_content/:id' => 'mobile#announcement_content', :as => 'mobile_announcement_content'
-    match 'dialog_contact' => 'mobile#dialog_contact', :as => 'mobile_dialog_contact'
-    match 'dialog_copyright' => 'mobile#dialog_copyright', :as => 'mobile_dialog_copyright'
-    match 'dialog_language' => 'mobile#dialog_language', :as => 'mobile_dialog_language'
-    match 'map' => 'mobile#map', :as => 'mobile_map'
-    match 'page' => 'mobile#page', :as => 'mobile_page'
-    match 'page_content/:id' => 'mobile#page_content', :as => 'mobile_page_content'
+  scope '/mobile(/:app)' do
+    match '/announcement' => 'mobile#announcement', :as => 'mobile_announcement'
+    match '/announcement_content/:id' => 'mobile#announcement_content', :as => 'mobile_announcement_content'
+    match '/dialog_contact' => 'mobile#dialog_contact', :as => 'mobile_dialog_contact'
+    match '/dialog_copyright' => 'mobile#dialog_copyright', :as => 'mobile_dialog_copyright'
+    match '/dialog_language' => 'mobile#dialog_language', :as => 'mobile_dialog_language'
+    match '/map' => 'mobile#map', :as => 'mobile_map'
+    match '/page' => 'mobile#page', :as => 'mobile_page'
+    match '/page_content/:id' => 'mobile#page_content', :as => 'mobile_page_content'
     root :to => 'mobile#index', :as => 'mobile'
   end