Compare commits

...
18 changed files with 283 additions and 20 deletions

No files matched your search

+2 -2
View File
@@ -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>");
+1 -1
View File
@@ -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'
+1 -1
View File
@@ -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'
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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)
Whitespace-only changes.
@@ -0,0 +1,131 @@
var Locations = function(ls){
l = this;
this.name = "Locations";
this.locations = ls;
this.markerCounts = 0;
var map = null,
infowindow = new google.maps.InfoWindow(),
default_location = new google.maps.LatLng( 24.8043107, 121.03042159999995 ),
infowindow_template = "<div class='title'></div><div class='image'><img class='thumbnail' src='' /></div>",
markers = [];
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 = {
zoom: 16,
center: location,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
map = new google.maps.Map( document.getElementById('map'), mapOptions );
for( i = 0; i < l.locations.length; i++ ){
markers.push( addMarker( new google.maps.LatLng(l.locations[i].latitude, l.locations[i].longitude), l.locations[i].color, i, function( index ){
}) );
}
}
var addMarker = function( location, pinColor, index, markerCallback ){
var pin = getPin(( pinColor.substr( 0, 1 ) == "#" ? pinColor.replace("#","") : pinColor )),
marker = new google.maps.Marker({
map: map,
icon: pin.image,
shadow: pin.shadow,
position: location,
zIndex: 10
});
google.maps.event.addListener( marker, 'click', function() {
infowindow.setContent( getTemplate( index ) );
infowindow.open( map, marker );
if( typeof markerCallback == "function" )
markerCallback.call( this, index );
});
l.markerCounts++;
return {"marker" : marker, "category_id" : l.locations[index].category_id};
}
var getTemplate = function( obj ){
var object = ( typeof obj == "number" ? l.locations[obj] : ( typeof obj == "object" ? obj : null ) );
if ( object ){
var template = $( "<div></div>" );
template.html( infowindow_template );
template.find( '.title' ).text( object.name );
template.find( "img.thumbnail" ).attr( "src", object.file.thumb.url );
return template.html();
}else{
throw new InvalidObjectError();
}
}
var getPin = function( color ){
var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + color,
new google.maps.Size(21, 34),
new google.maps.Point(0,0),
new google.maps.Point(10, 34));
var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow",
new google.maps.Size(40, 37),
new google.maps.Point(0, 0),
new google.maps.Point(12, 35));
return {"image":pinImage,"shadow":pinShadow};
}
this.getMarker = function( index ){
return markers[index];
}
this.getAllMarkers = function( ){
return markers;
}
this.clearFilter = function(){
var m = l.getAllMarkers();
for( i = 0; i < m.length; i++ ){
m[i].marker.setVisible(true);
}
}
this.filterMarkers = function( categories ){
var filtered = [],
m = l.getAllMarkers();
for( i = 0; i < m.length; i++ ){
m[i].marker.setVisible(false);
}
for( i = 0; i < categories.length; i++ ){
filtered = filtered.concat(m.filter(function(a){return a.category_id == categories[i]}));
}
for( i = 0; i < filtered.length; i++ ){
filtered[i].marker.setVisible(true);
}
return filtered;
}
initialize();
}
var InvalidObjectError = function(){
this.name = "InvalidObjectError";
this.message = "Object not valid";
}
InvalidObjectError.prototype = new Error();
InvalidObjectError.prototype.constructor = InvalidObjectError;
@@ -1,2 +0,0 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
@@ -2,8 +2,13 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
include AdminHelper
def index
@location_infos = LocationInfo.all
@locations = LocationInfo.all
@categories = get_categories_for_index
@location_infos = [];
@locations.each do |loc|
loc['color'] = Category.find(loc.category_id).custom_value
@location_infos << loc
end
respond_to do |format|
format.html # new.html.erb
format.json { render json: @locations }
@@ -22,6 +27,8 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
def edit
@location_info = LocationInfo.find(params[:id])
@categories = get_categories_for_index
end
def show
@@ -34,6 +41,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
def create
@location_info = LocationInfo.new(params[:location_info])
@categories = get_categories_for_index
if @location_info.save
flash[:success] = "Success!!"
redirect_to panel_location_back_end_locations_url
@@ -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
@@ -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
@@ -19,8 +19,8 @@
<div class="control-group">
<label class="control-label" for=""><%= t 'coordinates' %></label>
<div class="controls">
<%= f.text_field :latitude, :class=>"span2", :placeholder => "Latitude" %>
<%= f.text_field :longitude, :class=>"span2", :placeholder => "Longitude" %>
<%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
</div>
</div>
@@ -1,3 +1,5 @@
<script src="http://maps.google.com/maps/api/js?sensor=true"></script>
<%= javascript_include_tag "location" %>
<table class="table main-list">
<thead>
<tr>
@@ -28,6 +30,44 @@
<% end %>
</tbody>
</table>
<div>
Categories :
</div>
<div class="btn-group">
<% @categories.each do |category| %>
<button class="btn cat-filter" data-category='<%= category.id %>'><%= category.title %></button>
<% end %>
</div>
<a href="javascript:void(0);" id="clear_filter">Clear Filter</a>
<div id="map" style="width: 100%; height: 500px;"></div>
<%if is_manager? %>
<td><%= link_to 'Add', new_panel_location_back_end_location_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn"%></td>
<% end %>
<script>
var loc = new Locations(<%= @location_infos.to_json.html_safe %>);
jQuery(document).ready(function($) {
var filterCategories = [];
$("button.cat-filter").bind( clickEvent,function(){
var catid = $( this ).data('category');
if ( $( this ).hasClass('active') ){
$( this ).removeClass('active');
var index = filterCategories.indexOf(filterCategories.filter(function(a,i){ return a == catid })[0]);
filterCategories.splice( index, 1 );
}else{
$( this ).addClass('active');
filterCategories.push( catid );
}
loc.filterMarkers(filterCategories);
})
$("a#clear_filter").bind( clickEvent, function(){
filterCategories = [];
$("button.cat-filter").removeClass('active');
loc.clearFilter();
})
});
</script>
@@ -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>
@@ -0,0 +1,3 @@
<a href="<%= panel_location_front_end_locations_path %>" >
<%= image_tag @url, :width=>"300", :height=>"300" %>
</a>
+6
View File
@@ -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
View File
@@ -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"
@@ -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',