diff --git a/app/assets/images/mobile/apple-startup-iPhone-RETINA.png b/app/assets/images/mobile/apple-startup-iPhone-RETINA.png index d45c2c04f..b58c7bee1 100644 Binary files a/app/assets/images/mobile/apple-startup-iPhone-RETINA.png and b/app/assets/images/mobile/apple-startup-iPhone-RETINA.png differ diff --git a/app/assets/images/mobile/apple-startup-iPhone-Tall-RETINA.png b/app/assets/images/mobile/apple-startup-iPhone-Tall-RETINA.png index 4139168b4..f2f2b8234 100644 Binary files a/app/assets/images/mobile/apple-startup-iPhone-Tall-RETINA.png and b/app/assets/images/mobile/apple-startup-iPhone-Tall-RETINA.png differ diff --git a/app/assets/images/mobile/apple-startup-iPhone.png b/app/assets/images/mobile/apple-startup-iPhone.png index d6e6717d6..e00a1c2ed 100644 Binary files a/app/assets/images/mobile/apple-startup-iPhone.png and b/app/assets/images/mobile/apple-startup-iPhone.png differ diff --git a/app/assets/images/mobile/apple-touch-icon.png b/app/assets/images/mobile/apple-touch-icon.png index c9cf6891f..dcfedd6fb 100644 Binary files a/app/assets/images/mobile/apple-touch-icon.png and b/app/assets/images/mobile/apple-touch-icon.png differ diff --git a/app/assets/images/mobile/apple-touch-icon@2x.png b/app/assets/images/mobile/apple-touch-icon@2x.png index 452698eaa..9dc285d2c 100644 Binary files a/app/assets/images/mobile/apple-touch-icon@2x.png and b/app/assets/images/mobile/apple-touch-icon@2x.png differ diff --git a/app/assets/stylesheets/mobile/orbit-mobile.css.erb.css b/app/assets/stylesheets/mobile/orbit-mobile.css.erb.css index c558fc472..ca1901650 100644 --- a/app/assets/stylesheets/mobile/orbit-mobile.css.erb.css +++ b/app/assets/stylesheets/mobile/orbit-mobile.css.erb.css @@ -179,6 +179,7 @@ div[data-role="page"] { } .content .orbit-cycle-slideshow { height: 300px; + overflow: hidden; } .content .orbit-cycle-slideshow img { width: 100%; @@ -325,13 +326,22 @@ div[id^="dialog"] .content { margin-bottom: 5px; } @media(min-width:320px){ + .content .orbit-cycle-slideshow { + height: 130px; + } } @media(min-width: 480px){ + .content .orbit-cycle-slideshow { + height: 170px; + } .content .newitem { width: 440px; } } @media(min-width:600px) { + .content .orbit-cycle-slideshow { + height: 200px; + } .main-menu ul { width: 420px; } @@ -340,6 +350,9 @@ div[id^="dialog"] .content { } } @media(min-width:768px) { + .content .orbit-cycle-slideshow { + height: 250px; + } .main-menu ul { width: 480px; } @@ -351,6 +364,9 @@ div[id^="dialog"] .content { } } @media(min-width:800px) { + .content .orbit-cycle-slideshow { + height: 330px; + } .main-menu ul { width: 480px; } @@ -359,6 +375,9 @@ div[id^="dialog"] .content { } } @media(min-width:961px) { + .content .orbit-cycle-slideshow { + height: 380px; + } .main-menu ul { width: 480px; } diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index cd02d9676..92dfe62a3 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -2,6 +2,7 @@ class PagesController < ApplicationController include ApplicationHelper before_filter :get_item, :only => [:index_from_link, :show_from_link] before_filter :check_frontend_open, :only => [:index,:show] + before_filter :get_last_update_date, :only => [:index,:show] # caches_page :index def index @@ -216,4 +217,8 @@ class PagesController < ApplicationController return false end end + + def get_last_update_date + @last_update_date = t(:total_visitors)+' : '+ Impression.count.to_s+' | '+t(:update_at)+' : '+Bulletin.order_by(:updated_at.desc).limit(1).first[:updated_at].to_s + end end diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb index 83e575094..e197ef076 100644 --- a/app/views/layouts/page_layout.html.erb +++ b/app/views/layouts/page_layout.html.erb @@ -41,5 +41,6 @@ } <% end %> + diff --git a/app/views/mobile/dialog_contact.mobile.erb b/app/views/mobile/dialog_contact.mobile.erb index 9f208a978..0e892405b 100644 --- a/app/views/mobile/dialog_contact.mobile.erb +++ b/app/views/mobile/dialog_contact.mobile.erb @@ -3,9 +3,7 @@ <% end %> diff --git a/app/views/mobile/map.mobile.erb b/app/views/mobile/map.mobile.erb index 51e69dbf5..abfe99cee 100644 --- a/app/views/mobile/map.mobile.erb +++ b/app/views/mobile/map.mobile.erb @@ -5,6 +5,6 @@
\ No newline at end of file