forked from saurabh/orbit4-5
finished widget more and item links .. made method in orbit helper.. now the method finds best suitable page for the item in widget.
This commit is contained in:
parent
6eabe36cb3
commit
f220130f88
|
@ -46,6 +46,7 @@ body {
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
z-index: 999;
|
||||||
font-family: 'Chivo';
|
font-family: 'Chivo';
|
||||||
#open-orbit-nav,
|
#open-orbit-nav,
|
||||||
#open-orbit-login {
|
#open-orbit-login {
|
||||||
|
|
|
@ -182,6 +182,7 @@ class PagesController < ApplicationController
|
||||||
OrbitHelper.set_widget_data_count subpart.data_count
|
OrbitHelper.set_widget_data_count subpart.data_count
|
||||||
OrbitHelper.set_widget_categories subpart.categories
|
OrbitHelper.set_widget_categories subpart.categories
|
||||||
OrbitHelper.set_widget_module_app subpart.module
|
OrbitHelper.set_widget_module_app subpart.module
|
||||||
|
OrbitHelper.set_widget_item_url subpart
|
||||||
custom_value = subpart.custom_string_field || subpart.custom_array_field rescue nil
|
custom_value = subpart.custom_string_field || subpart.custom_array_field rescue nil
|
||||||
if !custom_value.nil?
|
if !custom_value.nil?
|
||||||
OrbitHelper.set_widget_custom_value custom_value
|
OrbitHelper.set_widget_custom_value custom_value
|
||||||
|
|
|
@ -56,6 +56,47 @@ module OrbitHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.set_widget_item_url(widget)
|
||||||
|
@url_widget_for_show = ""
|
||||||
|
module_app = widget.module
|
||||||
|
pages = Page.where(:module => module_app)
|
||||||
|
widget_categories = widget.categories
|
||||||
|
finalpage = nil
|
||||||
|
pages.each do |p|
|
||||||
|
Rails.logger.info "*********************************" + p.name
|
||||||
|
if p.categories == widget_categories
|
||||||
|
finalpage = p
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if finalpage.nil?
|
||||||
|
pages.each do |p|
|
||||||
|
if self.array_include(p.categories, widget_categories)
|
||||||
|
finalpage = p
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
finalpage = pages.first if finalpage.nil?
|
||||||
|
if !finalpage.nil?
|
||||||
|
@url_widget_for_show = "/#{@site_locale.to_s}#{finalpage.url}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.array_include(arr1,arr2)
|
||||||
|
final = []
|
||||||
|
arr2.each do |el|
|
||||||
|
final.push(arr1.include?el)
|
||||||
|
end
|
||||||
|
!final.include?false
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.widget_item_url(obj)
|
||||||
|
@url_widget_for_show + "/" + obj
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.widget_more_url
|
||||||
|
@url_widget_for_show
|
||||||
|
end
|
||||||
|
|
||||||
def page_url(url)
|
def page_url(url)
|
||||||
"#{request.host_with_port}/#{locale}#{url}"
|
"#{request.host_with_port}/#{locale}#{url}"
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p class="more">
|
<p class="more">
|
||||||
<a class="btn btn-sm btn-info" href="#">More</a>
|
<a class="btn btn-sm btn-info" href="{{more_url}}">More</a>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<hr class="dotted">
|
<hr class="dotted">
|
|
@ -4,12 +4,12 @@
|
||||||
<div class="list-group-item" data-list="categories" data-level="0">
|
<div class="list-group-item" data-list="categories" data-level="0">
|
||||||
<h4 class="list-group-item-heading">{{category-title}}</h4>
|
<h4 class="list-group-item-heading">{{category-title}}</h4>
|
||||||
<ul class="list-group-item-text" data-list="archives" data-level="1">
|
<ul class="list-group-item-text" data-list="archives" data-level="1">
|
||||||
<li>{{archive-title}}</li>
|
<li><a href="{{archive_url}}">{{archive-title}}</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p class="more">
|
<p class="more">
|
||||||
<a class="btn btn-sm btn-info" href="/module/archive">More</a>
|
<a class="btn btn-sm btn-info" href="{{more_url}}">More</a>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<hr class="dotted">
|
<hr class="dotted">
|
|
@ -6,7 +6,7 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p class="more">
|
<p class="more">
|
||||||
<a class="btn btn-sm btn-info" href="/module/announcement">More</a>
|
<a class="btn btn-sm btn-info" href="{{more_url}}">More</a>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<hr class="dotted">
|
<hr class="dotted">
|
|
@ -4,7 +4,7 @@
|
||||||
<li class="col-md-4 col-sm-6 col-xs-3"><a href="{{link_to_show}}"><img class="img-rounded" src="{{thumb-src}}" alt=""></a></li>
|
<li class="col-md-4 col-sm-6 col-xs-3"><a href="{{link_to_show}}"><img class="img-rounded" src="{{thumb-src}}" alt=""></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<p class="more">
|
<p class="more">
|
||||||
<a class="btn btn-sm btn-info" href="/module/gallery">More</a>
|
<a class="btn btn-sm btn-info" href="{{more_url}}">More</a>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<hr class="dotted">
|
<hr class="dotted">
|
|
@ -6,3 +6,5 @@ gem 'links', git: 'git@gitlab.tp.rulingcom.com:saurabh/links.git'
|
||||||
gem 'page_content', git: 'git@gitlab.tp.rulingcom.com:saurabh/pagecontent.git'
|
gem 'page_content', git: 'git@gitlab.tp.rulingcom.com:saurabh/pagecontent.git'
|
||||||
gem 'faq', git: 'git@gitlab.tp.rulingcom.com:saurabh/faq.git'
|
gem 'faq', git: 'git@gitlab.tp.rulingcom.com:saurabh/faq.git'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue