From a1084264125af61fc3db76d8cc7de8a8cee0ec7b Mon Sep 17 00:00:00 2001 From: Saurabh Bhatia Date: Tue, 14 Jan 2014 11:20:30 +0800 Subject: [PATCH] Updated Module Store to Install a Module directly from Store.tp --- .../admin/module_store_controller.rb | 40 ++++++ .../admin/template_store_controller.rb | 4 +- app/views/admin/module_store/index.html.erb | 35 ++++- app/views/admin/module_store/show.html.erb | 12 +- config/initializers/store.rb | 2 + config/routes.rb | 1 + config/store_config.yml | 2 + .../app/assets/javascripts/gprs/.gitkeep | 0 .../app/assets/javascripts/location.js | 131 ------------------ .../panel/gprs/back_end/locations.js | 2 + .../location_categories_controller.rb | 19 --- .../location/back_end/locations_controller.rb | 50 +------ .../front_end/locations_controller.rb | 12 -- .../location/widget/locations_controller.rb | 17 --- .../location_categories/_category.html.erb | 21 --- .../location_categories/_form.html.erb | 12 -- .../location_categories/index.html.erb | 66 --------- .../location_categories/list.html.erb | 21 --- .../back_end/locations/_form.html.erb | 2 +- .../back_end/locations/index.html.erb | 40 ------ .../front_end/locations/index.html.erb | 40 ------ .../widget/locations/location_widget.html.erb | 3 - .../location/config/routes.rb | 12 +- vendor/built_in_modules/location/init.rb | 34 ++--- 24 files changed, 99 insertions(+), 479 deletions(-) create mode 100644 config/initializers/store.rb create mode 100644 config/store_config.yml create mode 100644 vendor/built_in_modules/location/app/assets/javascripts/gprs/.gitkeep delete mode 100644 vendor/built_in_modules/location/app/assets/javascripts/location.js create mode 100644 vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js delete mode 100644 vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb delete mode 100644 vendor/built_in_modules/location/app/controllers/panel/location/front_end/locations_controller.rb delete mode 100644 vendor/built_in_modules/location/app/controllers/panel/location/widget/locations_controller.rb delete mode 100644 vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_category.html.erb delete mode 100644 vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_form.html.erb delete mode 100644 vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/index.html.erb delete mode 100644 vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/list.html.erb delete mode 100644 vendor/built_in_modules/location/app/views/panel/location/front_end/locations/index.html.erb delete mode 100644 vendor/built_in_modules/location/app/views/panel/location/widget/locations/location_widget.html.erb diff --git a/app/controllers/admin/module_store_controller.rb b/app/controllers/admin/module_store_controller.rb index b5ccc1a4..44fb040a 100644 --- a/app/controllers/admin/module_store_controller.rb +++ b/app/controllers/admin/module_store_controller.rb @@ -1,9 +1,49 @@ class Admin::ModuleStoreController < OrbitBackendController + @@store = STORE_CONFIG[:store_settings]["url"] + def index + @extensions = get_extensions end def show + @extension = get_extension(params[:id]) rescue nil end + def download + #get extension related values + extension = get_extension(params[:id]) rescue nil + download_link = @@store + "/"+ extension["extension"]["extension"]["url"] + downloaded_file_name = extension["extension_filename"] + module_app_name = downloaded_file_name.split(/(.zip)/).first + + #check if the directory exists or not + if Dir.exists?("#{Rails.root}/vendor/built_in_modules/#{module_app_name}") + flash[:notice] = "This module is already installed" + else + download_extension(download_link, downloaded_file_name,module_app_name) + flash[:notice] = "This module has been successfully installed" + end + redirect_to admin_module_store_path + end + + protected + + def get_extensions + JSON.parse(open("#{@@store}/api/extensions").read) + end + + def get_extension(id) + JSON.parse(open("#{@@store}/api/extensions/#{id}").read) + end + + def download_extension(download_link, downloaded_file_name,module_app_name) + puts %x(wget "#{download_link}") + puts %x(unzip "#{downloaded_file_name}") + puts %x(mv #{module_app_name} "#{Rails.root}/vendor/built_in_modules/") + puts %x(rm "#{downloaded_file_name}") + + Rails.logger.info"@@@@@@@@"+Dir.exists?("#{Rails.root}/vendor/built_in_modules/location").inspect + site_restart + end end \ No newline at end of file diff --git a/app/controllers/admin/template_store_controller.rb b/app/controllers/admin/template_store_controller.rb index e38d66c9..4a24902c 100644 --- a/app/controllers/admin/template_store_controller.rb +++ b/app/controllers/admin/template_store_controller.rb @@ -1,7 +1,7 @@ class Admin::TemplateStoreController < OrbitBackendController - @@store_domain = "http://store.tp.rulingcom.com" + @@store_domain = STORE_CONFIG[:store_settings]["url"] def index @store = @@store_domain @templates = JSON.parse(get_templates) @@ -33,6 +33,4 @@ class Admin::TemplateStoreController < OrbitBackendController response.body end - - end \ No newline at end of file diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb index dfbf0991..d6be7adb 100644 --- a/app/views/admin/module_store/index.html.erb +++ b/app/views/admin/module_store/index.html.erb @@ -14,8 +14,14 @@ <%= javascript_include_tag 'lib/retina' %> <%= javascript_include_tag 'lib/mudole_templates_status' %> + - + <%= flash[:notice] rescue nil%> + +
@@ -25,6 +31,28 @@ + <% @extensions.each do |extension|%> + + + + + + + <% end %> + +
Module Title
+
+ <%= image_tag "module_icon.png"%> +
+
<%=link_to extension["title"], admin_module_store_show_path(extension["_slugs"][0])%>
+

<%=extension["author"]%>

+ 		2013/07/12 + <%= extension["description"].html_safe%> <%= link_to 'Read More', admin_module_store_show_path(extension["_slugs"][0]) %> + <%= link_to 'Download', admin_module_store_download_path(:id => extension["_slugs"][0]), :class=>"act btn btn-mini btn-success" %>
+ + + + \ No newline at end of file diff --git a/app/views/admin/module_store/show.html.erb b/app/views/admin/module_store/show.html.erb index 003cbf30..9d152f3a 100644 --- a/app/views/admin/module_store/show.html.erb +++ b/app/views/admin/module_store/show.html.erb @@ -22,7 +22,7 @@
-

Module Name

+

<%= @extension.first["title"] %>

free download
  • downloads<%= Random.new.rand(10..100) %>
    • @@ -38,16 +38,12 @@
-

description

-
Pixel Union’s Jitensha defines storefront minimalism. Japanese for “bicycle,” Jitensha offers clean typography and easy usability, including full color, font, logo, and footer customization. With its painless social media and blog integration, Jitensha gorgeously accomodates every aspect of your business. Any questions before you launch? Don’t hesitate to email us: Support@PixelUnion.net.
+

Description

+
<%= @extension.first["description"].html_safe%>

screen shot

- Thumbnail 1 - Thumbnail 2 - Thumbnail 3 - Thumbnail 4 - Thumbnail 5 + <%= image_tag "#{STORE_CONFIG[:store_settings]["url"]}/#{@extension.first['preview']['preview']['url']}"%>
diff --git a/config/initializers/store.rb b/config/initializers/store.rb new file mode 100644 index 00000000..5a7644cc --- /dev/null +++ b/config/initializers/store.rb @@ -0,0 +1,2 @@ +data = File.open(File.join(Rails.root, 'config', 'store_config.yml')).read +STORE_CONFIG = YAML::load(ERB.new(data).result(binding)).symbolize_keys \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index d3d4ebaa..3599ab72 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -262,6 +262,7 @@ Orbit::Application.routes.draw do match 'module_store' => 'module_store#index' match 'module_store/show' => 'module_store#show' + match 'module_store/download' => 'module_store#download' match 'template_store' => 'template_store#index' match 'template_store/download_theme' => "template_store#download_theme" match 'template_store/template/:id' => 'template_store#show', :as => :template_store_template diff --git a/config/store_config.yml b/config/store_config.yml new file mode 100644 index 00000000..cd0fd3ba --- /dev/null +++ b/config/store_config.yml @@ -0,0 +1,2 @@ +store_settings: + url: "http://store.tp.rulingcom.com" diff --git a/vendor/built_in_modules/location/app/assets/javascripts/gprs/.gitkeep b/vendor/built_in_modules/location/app/assets/javascripts/gprs/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/built_in_modules/location/app/assets/javascripts/location.js b/vendor/built_in_modules/location/app/assets/javascripts/location.js deleted file mode 100644 index 3edb22cb..00000000 --- a/vendor/built_in_modules/location/app/assets/javascripts/location.js +++ /dev/null @@ -1,131 +0,0 @@ -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 = "
", - 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 = $( "
" ); - 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; diff --git a/vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js b/vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js new file mode 100644 index 00000000..dee720fa --- /dev/null +++ b/vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb deleted file mode 100644 index 7dd5e220..00000000 --- a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb +++ /dev/null @@ -1,19 +0,0 @@ -class Panel::Location::BackEnd::LocationCategoriesController < OrbitBackendController - def index - @module_app_id = @module_app.id rescue nil - @categories = get_categories_for_index - @categories = @categories.page(params[:page]).per(10) - respond_to do |format| - format.html # index.html.erb - format.json { render json: @categories } - end - end - - def list - @module_app_id = @module_app.id rescue nil - @categories = get_categories_for_index - @categories = @categories.page(params[:page]).per(10) - render :layout => false - end - -end \ No newline at end of file diff --git a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb index e3baf793..c1a2bab2 100644 --- a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb +++ b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb @@ -1,15 +1,9 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController include AdminHelper - open_for_visitor :only => [:get_location_categories, :get_categorywise_locations] def index - @locations = LocationInfo.all + @location_infos = 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 } @@ -28,8 +22,6 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController def edit @location_info = LocationInfo.find(params[:id]) - @categories = get_categories_for_index - end def show @@ -42,7 +34,6 @@ 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 @@ -90,43 +81,4 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController render :json => JSON.pretty_generate(@data) end - - def get_location_categories - check_mobile_api_openness - location_categories = get_categories_for_index - @data = Array.new - - location_categories.each do |category| - I18n.locale = :en - name_en = category.title - I18n.locale = :zh_tw - name_zh_tw = category.title - category_id = category.id.to_s - @data << { name_en: name_en, name_zh_tw: name_zh_tw, category_id: category_id, location_link: "http://#{request.host_with_port}"+"/#{panel_location_back_end_locations_get_categorywise_locations_path}"+"?category_id=#{category_id}"} - end - - render :json => JSON.pretty_generate(@data) - end - - def get_categorywise_locations - check_mobile_api_openness - location_infos = LocationInfo.where(:category_id => params[:category_id]) - @data = Array.new - - location_infos.each do |location| - - picurl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.url}" - thumburl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.thumb.url}" - - @data << { id: location.id.to_s, - name: location.name, - pic_url: picurl, - thumb_url: thumburl, - longitude: location.longitude, - latitude: location.latitude, - description: location.description } - end - - render :json => JSON.pretty_generate(@data) - end end diff --git a/vendor/built_in_modules/location/app/controllers/panel/location/front_end/locations_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/location/front_end/locations_controller.rb deleted file mode 100644 index 4be3e2ec..00000000 --- a/vendor/built_in_modules/location/app/controllers/panel/location/front_end/locations_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -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 \ No newline at end of file diff --git a/vendor/built_in_modules/location/app/controllers/panel/location/widget/locations_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/location/widget/locations_controller.rb deleted file mode 100644 index f03e8087..00000000 --- a/vendor/built_in_modules/location/app/controllers/panel/location/widget/locations_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -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 \ No newline at end of file diff --git a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_category.html.erb b/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_category.html.erb deleted file mode 100644 index 096260c6..00000000 --- a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_category.html.erb +++ /dev/null @@ -1,21 +0,0 @@ - - <% @site_valid_locales.each_with_index do |locale, i| %> - - <%= category.title_translations[locale] %> - <% if i == 0 %> -
- -
- <% end %> - - <% end %> - <%= category.custom_value %> - \ No newline at end of file diff --git a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_form.html.erb b/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_form.html.erb deleted file mode 100644 index 59f9d791..00000000 --- a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_form.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<%= flash_messages %> -<%= f.error_messages %> -<%= label_tag("color", t("location.color")) %> -
- <%= f.text_field :custom_value, id: "color", :class => "color-picker miniColors input-small", :size => "7", :maxlength => "7", :autocomplete=>"off",:value=>"9100FF" %> -
-<%= f.fields_for :title_translations do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= label_tag "name-#{locale}", "#{t(:name)} (#{I18nVariable.from_locale(locale)})" %> - <%= f.text_field locale, :class => 'input-large', :value => (@category.title_translations[locale] rescue ''), placeholder: t(:name), id: locale %> - <% end %> -<% end %> diff --git a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/index.html.erb b/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/index.html.erb deleted file mode 100644 index 2c0ae280..00000000 --- a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/index.html.erb +++ /dev/null @@ -1,66 +0,0 @@ -<%= stylesheet_link_tag "jquery.miniColors" %> - -<%= javascript_include_tag "jquery.miniColors.min" %> - -<%= javascript_include_tag "admin/categories" %> - -
- - - - <% @site_valid_locales.each_with_index do |locale, i| %> - - <% end %> - - - - - <%= render partial: 'category', collection: @categories %> - -
<%= t(:_locale, :locale => locale) %><%= t('event_category.color') %>
- - -
-
- <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), '#', class: "btn btn-primary open-slide", data: {title: t(:add_category), id: 'new', module: @module_app_id.to_s } %> -
- -
-
-
-
- - - - -
-
-
-
- <%= form_for :category, url: nil, html:{:id=>"color"}, remote: true do |f| %> -
- <%= render :partial => "form", :locals => { :f => f } %> -
- <%= t(:cancel) %> - <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %> -
-
- <% end %> -
-
-
-
- \ No newline at end of file diff --git a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/list.html.erb b/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/list.html.erb deleted file mode 100644 index 38d45712..00000000 --- a/vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/list.html.erb +++ /dev/null @@ -1,21 +0,0 @@ - - - - <% @site_valid_locales.each_with_index do |locale, i| %> - - <% end %> - - - - - <%= render partial: 'category', collection: @categories %> - -
<%= t(:_locale, :locale => locale) %><%= t('location_category.color') %>
-
-
- <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), '#', class: "btn btn-primary open-slide", data: {title: t(:add_category), id: 'new', module: @module_app_id.to_s } %> -
- -
\ No newline at end of file diff --git a/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/_form.html.erb b/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/_form.html.erb index 41a6560c..e3d4e53e 100644 --- a/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/_form.html.erb +++ b/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/_form.html.erb @@ -19,8 +19,8 @@
- <%= f.text_field :latitude, :class=>"span2", :placeholder => "Latitude" %> <%= f.text_field :longitude, :class=>"span2", :placeholder => "Longitude" %> + <%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
diff --git a/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb b/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb index cbd1c516..3190012b 100644 --- a/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb +++ b/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb @@ -1,5 +1,3 @@ - -<%= javascript_include_tag "location" %> @@ -30,44 +28,6 @@ <% end %>
-
- Categories : -
-
- <% @categories.each do |category| %> - - <% end %> -
-Clear Filter -
<%if is_manager? %> <%= link_to 'Add', new_panel_location_back_end_location_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn"%> <% end %> - diff --git a/vendor/built_in_modules/location/app/views/panel/location/front_end/locations/index.html.erb b/vendor/built_in_modules/location/app/views/panel/location/front_end/locations/index.html.erb deleted file mode 100644 index 58fb2367..00000000 --- a/vendor/built_in_modules/location/app/views/panel/location/front_end/locations/index.html.erb +++ /dev/null @@ -1,40 +0,0 @@ -<%= javascript_include_tag "location" %> -
- Categories : - <% @categories.each do |category| %> - <%= category.title %> - <% end %> -
-Clear Filter -
- - diff --git a/vendor/built_in_modules/location/app/views/panel/location/widget/locations/location_widget.html.erb b/vendor/built_in_modules/location/app/views/panel/location/widget/locations/location_widget.html.erb deleted file mode 100644 index 8b8cada2..00000000 --- a/vendor/built_in_modules/location/app/views/panel/location/widget/locations/location_widget.html.erb +++ /dev/null @@ -1,3 +0,0 @@ - - <%= image_tag @url, :width=>"300", :height=>"300" %> - \ No newline at end of file diff --git a/vendor/built_in_modules/location/config/routes.rb b/vendor/built_in_modules/location/config/routes.rb index bc9389bd..dac4a423 100644 --- a/vendor/built_in_modules/location/config/routes.rb +++ b/vendor/built_in_modules/location/config/routes.rb @@ -2,22 +2,12 @@ Rails.application.routes.draw do namespace :panel do namespace :location do namespace :back_end do - match 'location_categories/list' => "location_categories#list" - match "locations/get_locations" => "locations#get_locations" - match "locations/get_categorywise_locations" => "locations#get_categorywise_locations" - match "locations/get_location_categories" => "locations#get_location_categories" - resources :location_categories + match "locations/get_locations" => "locations#get_locations" match "locations/get_categories" => "locations#get_categories" resources :locations end - namespace :front_end do - resources :locations - end - namespace :widget do - match "location_widget" => "locations#location_widget" - end end end end diff --git a/vendor/built_in_modules/location/init.rb b/vendor/built_in_modules/location/init.rb index 3e71da77..a0767bc7 100644 --- a/vendor/built_in_modules/location/init.rb +++ b/vendor/built_in_modules/location/init.rb @@ -4,17 +4,15 @@ 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 'locations' do - frontend_i18n 'location.location' - end - end + # front_end do + # app_page 'bulletins' + # end # category ["BulletinCategory"] @@ -35,37 +33,31 @@ 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" available_for [:admin,:guest,:manager,:sub_manager] - active_for_controllers ({:private=>['locations','location_categories']}) + active_for_controllers ({:private=>['locations']}) head_link_path "panel_location_back_end_locations_path" context_link 'location.all_locations', :link_path=>"panel_location_back_end_locations_path" , :priority=>1, - :active_for_action=>{:locations=>:index}, + :active_for_action=>{:localtions=>:index}, :available_for => [:manager] context_link 'location.add_location', :link_path=>"new_panel_location_back_end_location_path" , :priority=>1, - :active_for_action=>{:locations=>:new}, + :active_for_action=>{:localtions=>:new}, :available_for => [:manager] context_link 'location.categories', - :link_path=>"panel_location_back_end_location_categories_path" , + :link_path=>"admin_module_app_categories_path(get_module_app)" , :priority=>1, - :active_for_category => 'Location', + :active_for_action=>{:localtion_categories=>:index}, :available_for => [:manager] end