Fix bug for mobile app routes
This commit is contained in:
1 parent
72e26fd92a
commit
91830f86aa
9 files changed
+25
-25
No files matched your search
@@ -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'
|
||||
|
||||
@@ -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
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in new issue
Block a user