Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f3a68b3d7 | ||
|
|
eeb7f72876 | ||
|
|
a49562e341 | ||
|
|
a3d921c47a | ||
|
|
6d5b3a35e9 | ||
|
|
2e5b3e8ef7 | ||
|
|
635f82db2f | ||
|
|
182729a7fe | ||
|
|
a1840c86de | ||
|
|
3d091b692d |
No files matched your search
@@ -4,7 +4,7 @@ var banner_index = 0;
|
||||
$(document).ready(function() {
|
||||
$.each($(".dymanic_load"),function(){
|
||||
if($(this).attr("path")==''){
|
||||
$(this).html("App setting Failed");
|
||||
$(this).html("");
|
||||
}else{
|
||||
ajax_load_proc($(this),$(this).attr("path"));
|
||||
}
|
||||
@@ -16,7 +16,7 @@ $(document).ready(function() {
|
||||
function ajax_load_proc(wapper,url,isBanner){
|
||||
$.get(encodeURI(url), {}, function(respText,textSta,XML){
|
||||
if (textSta == 'success') {
|
||||
wapper.html(respText);
|
||||
if (respText.indexOf("<title>") == -1) wapper.html(respText);
|
||||
};
|
||||
if(textSta == 'error')
|
||||
wapper.html("Loading Failed<br/> <a href='"+$(this).attr('path')+"'>Go See</a>");
|
||||
|
||||
@@ -111,30 +111,30 @@ function customOpenSlide() {
|
||||
.closest('.navbar-inner')
|
||||
.addClass('active');
|
||||
pageslide.find('.content').css('padding', 0);
|
||||
iFrameContent()
|
||||
// iFrameContent()
|
||||
}
|
||||
});
|
||||
}
|
||||
function iFrameContent() {
|
||||
function iFrameFunction(iContents, pc) {
|
||||
pc.each(function(index, el) {
|
||||
if($(this).siblings('*').length == 0) {
|
||||
var _parentH = $(this).parent('*').outerHeight();
|
||||
$(this).css('height', _parentH);
|
||||
}
|
||||
});
|
||||
iContents.find('#orbit-bar').hide();
|
||||
iContents.find('.main_wrap').css('margin-top', 0);
|
||||
iContents.find('a').not('.edit_link a').on('click', function(event) {
|
||||
event.preventDefault();
|
||||
}).css('cursor', 'default');
|
||||
}
|
||||
$('#pageslide_iframe').load(function() {
|
||||
var $iContents = $(this).contents(),
|
||||
$pc = $iContents.find('.page_content');
|
||||
iFrameFunction($iContents, $pc);
|
||||
});
|
||||
}
|
||||
// function iFrameContent() {
|
||||
// function iFrameFunction(iContents, pc) {
|
||||
// pc.each(function(index, el) {
|
||||
// if($(this).siblings('*').length == 0) {
|
||||
// var _parentH = $(this).parent('*').outerHeight();
|
||||
// $(this).css('min-height', _parentH);
|
||||
// }
|
||||
// });
|
||||
// iContents.find('#orbit-bar').hide();
|
||||
// iContents.find('.main_wrap').css('margin-top', 0);
|
||||
// iContents.find('a').not('.edit_link a').on('click', function(event) {
|
||||
// event.preventDefault();
|
||||
// }).css('cursor', 'default');
|
||||
// }
|
||||
// $('#pageslide_iframe').load(function() {
|
||||
// var $iContents = $(this).contents(),
|
||||
// $pc = $iContents.find('.page_content');
|
||||
// iFrameFunction($iContents, $pc);
|
||||
// });
|
||||
// }
|
||||
|
||||
function pageSetting(id, edit, ps) {
|
||||
$pageModule = $('#pageslide #page_module_app_id');
|
||||
|
||||
@@ -14,7 +14,7 @@ class OrbitBackendController < ApplicationController
|
||||
status << 'is_top'
|
||||
status << 'is_hot'
|
||||
status << 'is_hidden' unless is_guest?
|
||||
if @module_app.is_approvable && is_manager?
|
||||
if @module_app.is_approvable && (is_manager? || is_sub_manager?)
|
||||
status << 'is_pending'
|
||||
status << 'is_checked'
|
||||
status << 'is_rejected'
|
||||
|
||||
@@ -14,7 +14,7 @@ class OrbitMemberController < ApplicationController
|
||||
status << 'is_top'
|
||||
status << 'is_hot'
|
||||
status << 'is_hidden' unless is_guest?
|
||||
if @module_app.is_approvable && is_manager?
|
||||
if @module_app.is_approvable && (is_manager? || is_sub_manager?)
|
||||
status << 'is_pending'
|
||||
status << 'is_checked'
|
||||
status << 'is_rejected'
|
||||
|
||||
@@ -12,13 +12,13 @@ module OrbitBackendHelper
|
||||
|
||||
def show_form_status_field(object)
|
||||
#by_object = (!object.is_expired? and object.is_pending?)
|
||||
by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin?)
|
||||
by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin? or is_sub_manager?)
|
||||
by_user
|
||||
end
|
||||
|
||||
def show_approval_link(object)
|
||||
by_object = (!object.is_expired? and object.is_pending?)
|
||||
by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin?)
|
||||
by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin? or is_sub_manager?)
|
||||
by_object and by_user
|
||||
end
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ module ParserFrontEnd
|
||||
ret = ''
|
||||
part = PagePart.find(front['part_id']) if front['part_id']
|
||||
ret << eval("\"#{front['path']}\"") rescue ''
|
||||
ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args
|
||||
ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args.present?
|
||||
fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
|
||||
end
|
||||
front.swap(fragment)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var Locations = function(ls){
|
||||
|
||||
l = this;
|
||||
this.name = "Locations";
|
||||
this.locations = ls;
|
||||
this.markerCounts = 0;
|
||||
var map = null,
|
||||
@@ -11,7 +11,6 @@ var Locations = function(ls){
|
||||
|
||||
|
||||
var initialize = function() {
|
||||
|
||||
google.maps.visualRefresh = true;
|
||||
var location = ( l.locations.length ? new google.maps.LatLng( l.locations[0].latitude, l.locations[0].longitude ) : default_location ),
|
||||
mapOptions = {
|
||||
@@ -119,10 +118,10 @@ var Locations = function(ls){
|
||||
}
|
||||
return filtered;
|
||||
}
|
||||
|
||||
google.maps.event.addDomListener(window, 'load', initialize);
|
||||
initialize();
|
||||
|
||||
}
|
||||
|
||||
var InvalidObjectError = function(){
|
||||
this.name = "InvalidObjectError";
|
||||
this.message = "Object not valid";
|
||||
|
||||
Vendored
+12
@@ -0,0 +1,12 @@
|
||||
class Panel::Location::FrontEnd::LocationsController < OrbitWidgetController
|
||||
def index
|
||||
@categories = @module_app.categories.enabled
|
||||
@locations = LocationInfo.all
|
||||
|
||||
@location_infos = [];
|
||||
@locations.each do |loc|
|
||||
loc['color'] = Category.find(loc.category_id).custom_value
|
||||
@location_infos << loc
|
||||
end
|
||||
end
|
||||
end
|
||||
Vendored
+17
@@ -0,0 +1,17 @@
|
||||
class Panel::Location::Widget::LocationsController < OrbitWidgetController
|
||||
def location_widget
|
||||
@categories = params[:category_id]
|
||||
locations = LocationInfo.where(:category_id.in => @categories)
|
||||
@url = "http://maps.googleapis.com/maps/api/staticmap?zoom=16&size=400x400&maptype=roadmap%20&sensor=false&"
|
||||
markers = ""
|
||||
locations.each do |loc|
|
||||
color = Category.find(loc.category_id).custom_value
|
||||
color.gsub!("#","")
|
||||
markers = markers + "markers=color:0x#{color}|#{loc.latitude},#{loc.longitude}&"
|
||||
end
|
||||
@url = @url + markers.chop
|
||||
# http://maps.googleapis.com/maps/api/staticmap?zoom=13&size=600x300&maptype=roadmap%20&markers=color:0xCF2C9B|40.702147,-74.015794&markers=color:CF2C9B|label:G|40.711614,-74.012318%20&markers=color:red|color:red|label:C|40.718217,-73.998284&sensor=false
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
Vendored
+40
@@ -0,0 +1,40 @@
|
||||
<%= javascript_include_tag "location" %>
|
||||
<div>
|
||||
Categories :
|
||||
<% @categories.each do |category| %>
|
||||
<input type="checkbox" class="btn cat-filter" data-category='<%= category.id %>' /><%= category.title %>
|
||||
<% end %>
|
||||
</div>
|
||||
<a href="javascript:void(0);" id="clear_filter">Clear Filter</a>
|
||||
<div id="map" style="width: 100%; height: 500px;"></div>
|
||||
<script>
|
||||
var loc = null;
|
||||
var initialize = function(){
|
||||
loc = new Locations(<%= @location_infos.to_json.html_safe %>);
|
||||
}
|
||||
|
||||
jQuery(document).ready(function($) {
|
||||
var filterCategories = [];
|
||||
$("input.cat-filter").bind( "click",function(){
|
||||
var catid = $( this ).data('category');
|
||||
|
||||
if ( !$( this ).is(':checked') ){
|
||||
|
||||
var index = filterCategories.indexOf(filterCategories.filter(function(a,i){ return a == catid })[0]);
|
||||
filterCategories.splice( index, 1 );
|
||||
}else{
|
||||
|
||||
filterCategories.push( catid );
|
||||
}
|
||||
loc.filterMarkers(filterCategories);
|
||||
})
|
||||
|
||||
$("a#clear_filter").bind( "click", function(){
|
||||
filterCategories = [];
|
||||
$("input.cat-filter").prop('checked',false);
|
||||
loc.clearFilter();
|
||||
})
|
||||
|
||||
});
|
||||
</script>
|
||||
<script src="http://maps.google.com/maps/api/js?sensor=true&callback=initialize"></script>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
<a href="<%= panel_location_front_end_locations_path %>" >
|
||||
<%= image_tag @url, :width=>"300", :height=>"300" %>
|
||||
</a>
|
||||
@@ -9,6 +9,12 @@ Rails.application.routes.draw do
|
||||
|
||||
resources :locations
|
||||
end
|
||||
namespace :front_end do
|
||||
resources :locations
|
||||
end
|
||||
namespace :widget do
|
||||
match "location_widget" => "locations#location_widget"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
+16
-8
@@ -4,15 +4,17 @@ module Location
|
||||
base_url File.expand_path File.dirname(__FILE__)
|
||||
# personal_plugin :enable => true,:path=>"panel/location/plugin/profile",:i18n=>'admin.location'
|
||||
|
||||
# version "0.1"
|
||||
# organization "Rulingcom"
|
||||
# author "RD dep"
|
||||
# intro "I am intro"
|
||||
# update_info 'some update_info'
|
||||
version "0.1"
|
||||
organization "Rulingcom"
|
||||
author "RD dep"
|
||||
intro "I am intro"
|
||||
update_info 'some update_info'
|
||||
|
||||
# front_end do
|
||||
# app_page 'bulletins'
|
||||
# end
|
||||
front_end do
|
||||
app_page 'locations' do
|
||||
frontend_i18n 'location.location'
|
||||
end
|
||||
end
|
||||
|
||||
# category ["BulletinCategory"]
|
||||
|
||||
@@ -33,6 +35,12 @@ module Location
|
||||
|
||||
categorizable
|
||||
authorizable
|
||||
|
||||
widgets do
|
||||
customize_widget "location_widget" do
|
||||
widget_i18n "location.location"
|
||||
end
|
||||
end
|
||||
|
||||
side_bar do
|
||||
head_label_i18n 'location.location',:icon_class=>"icons-location"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
quick_edit_link type: 'edit',
|
||||
link: 'edit_panel_page_content_back_end_page_context_path'
|
||||
quick_edit_link type: 'authorization',
|
||||
link: "admin_authorizations_path(@module_app.key, 'page_context', object.id)"
|
||||
link: "admin_authorizations_path(@module_app.key, 'page_context_authorization', object.id)"
|
||||
field type: 'associated',
|
||||
db_field: 'page',
|
||||
model_field: 'path',
|
||||
|
||||
Reference in new issue
Block a user