Channel Videos Mobile Sites Partial
This commit is contained in:
1 parent
888f41a959
commit
e87c678eb7
14 files changed
+41
-18
No files matched your search
@@ -22,7 +22,7 @@ class Admin::SitesController < OrbitBackendController
|
||||
|
||||
def update
|
||||
if params[:site][:default_locale] && @site.enable_language_detection.eql?(true)
|
||||
Site.update_all({:enable_language_detection => false})
|
||||
Site.update_all({:enable_language_detection => false})
|
||||
elsif params[:site][:enable_language_detection] && @site.default_locale.present?
|
||||
Site.update_all({:default_locale => nil})
|
||||
end
|
||||
|
||||
@@ -5,6 +5,7 @@ class MobileController < ApplicationController
|
||||
before_filter :no_footer_for_app
|
||||
|
||||
def index
|
||||
@site = Site.first
|
||||
date_now = Time.now
|
||||
@bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page(params[:page_main]).per(15)
|
||||
@ad_banner = AdBanner.find(:all, :conditions => {:title => /Home/i})[0]
|
||||
|
||||
@@ -1,10 +1,3 @@
|
||||
class UserMailer < Devise::Mailer
|
||||
default :from => "noreply@rulingcom.com"
|
||||
|
||||
def password_reset(user, password)
|
||||
@user = user
|
||||
@password = password
|
||||
mail(:to => user.email,
|
||||
:subject => 'Password Reset Notification')
|
||||
end
|
||||
end
|
||||
@@ -19,6 +19,7 @@ class Site
|
||||
field :sitemap_menu_in_header, :type => Boolean, :default => false
|
||||
field :enable_terms_of_use, :type => Boolean, :default => false
|
||||
field :enable_language_detection, :type => Boolean, :default => false
|
||||
field :enable_announcement_mobile, :type => Boolean, :default => false
|
||||
|
||||
field :title_always_on, :type => Boolean, :default => false
|
||||
field :dashbroad_allow_visitor, :type => Boolean, :default => false
|
||||
|
||||
@@ -22,6 +22,11 @@ class User
|
||||
field :cache_dept,type: Hash
|
||||
field :status_record,type: Hash
|
||||
field :approved, type: Boolean, :default => false
|
||||
field :reset_password_token, :type => String
|
||||
field :reset_password_sent_at, :type => Time
|
||||
field :remember_created_at, :type => Time
|
||||
|
||||
attr_accessible :remember_me
|
||||
|
||||
has_and_belongs_to_many :approving_apps, class_name: 'AuthApproval', inverse_of: 'authorized_users'
|
||||
has_and_belongs_to_many :managing_apps, class_name: 'AuthManager', inverse_of: 'authorized_users'
|
||||
|
||||
@@ -20,12 +20,20 @@
|
||||
<!-- Enable Mobile Web -->
|
||||
<div class="control-group">
|
||||
<label class="control-label muted"><%= I18n.t('site.mobile_version')%></label>
|
||||
<div class="controls">
|
||||
<div id="mobile-site" class="controls">
|
||||
<%= f.check_box :mobile_on , :class=>"toggle-check", :data=> { disabled: true } %>
|
||||
<span class="help-block">Enable Mobile Website</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="settings" class="control-group">
|
||||
<label class="control-label muted"><%= I18n.t('site.announcement')%></label>
|
||||
<div class="controls">
|
||||
<%= f.check_box :enable_announcement_mobile , :class=>"toggle-check", :data=> { disabled: true } %>
|
||||
<span class="help-block">Enable Announcements</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label muted"><%= I18n.t('site.mobile_api_openness_on') %></label>
|
||||
<div class="controls">
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
<%= image_tag image.file.url, width: @ad_banner.width, height: @ad_banner.height %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="newlist clear">
|
||||
<% if @site.enable_announcement_mobile %>
|
||||
<div class="newlist clear">
|
||||
<% @bulletins.each do |bulletin| %>
|
||||
<div class="newitem">
|
||||
<div class="newpic">
|
||||
@@ -16,8 +17,8 @@
|
||||
<div class="newsummary"><%= bulletin.subtitle %></div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<% end %>
|
||||
<script type='text/javascript'>
|
||||
$(function(){
|
||||
if($("#slideshow-<%= @ad_banner.title.dehumanize %> img").length > 1){
|
||||
|
||||
Reference in new issue
Block a user