diff --git a/app/views/desktop/books.html.erb b/app/views/desktop/books.html.erb
index 861a9926..6e8dd0dc 100644
--- a/app/views/desktop/books.html.erb
+++ b/app/views/desktop/books.html.erb
@@ -13,8 +13,8 @@
-
-
- List -
- Add/Edit +
- List +
- Add/Edit
- Books
- Co-Authors
- Tags & Keywords diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 039ae65f..701e5c08 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -1,59 +1,64 @@
+
-
-
- +
-
-
- +
-
-
- +
-
-
- +
-
-
- +
-
-
- +
-
-
- - List -
- Add/Edit +
- List +
- Add/Edit
- Domains
- Co-Authors
- Tags & Keywords diff --git a/app/views/desktop/research_p.html.erb b/app/views/desktop/research_p.html.erb index 43eab7be..085d3af4 100644 --- a/app/views/desktop/research_p.html.erb +++ b/app/views/desktop/research_p.html.erb @@ -13,8 +13,8 @@
- No Connection -
Facebook
+ 
Facebook
- @@ -16,7 +16,7 @@
- No Connection -
Twitter
+ 
Twitter
- @@ -28,7 +28,7 @@
- No Connection -
Gmail
+ 
Gmail
-
diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb
index 6a3c34f8..fb1ac8a5 100644
--- a/app/views/desktop/settings/themes.html.erb
+++ b/app/views/desktop/settings/themes.html.erb
@@ -12,7 +12,7 @@
@@ -63,18 +63,18 @@<% @themes.each do |theme| %> -+<%= theme.name %>
<% end %><%= theme.name %>
-
-
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ <%= f.text_field :color, :class => "color-picker miniColors input-small", :maxlength => "5", :autocomplete=>"off",:value=>@calendar.color %>
+
+ <%= f.fields_for :name_translations do |name| %>
+ <% @site_valid_locales.each_with_index do |locale, i| %>
+
- <%= f.submit t("calendar.save"), :class=>"btn btn-primary" %>
-
-
+
+
+
+
+
-
-<%= form_for @newlocation, :url=>{:action => "create"}, :remote => true, :class=>"form-horizontal" do |f| %>
- <%= link_to 'New', new_panel_gprs_back_end_location_path %>
diff --git a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/new.html.erb b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/new.html.erb
new file mode 100644
index 00000000..4f911d83
--- /dev/null
+++ b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/new.html.erb
@@ -0,0 +1,3 @@
+<%= form_for @location, :url=> panel_gprs_back_end_locations_path, :html => { :class=>"form-horizontal"} do |f| %>
+ <%= render :partial => 'form', :locals => {:f => f} %>
+<% end %>
diff --git a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/show.html.erb b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/show.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/vendor/built_in_modules/gprs/config/routes.rb b/vendor/built_in_modules/gprs/config/routes.rb
index 050b2cbd..0ba8a27c 100644
--- a/vendor/built_in_modules/gprs/config/routes.rb
+++ b/vendor/built_in_modules/gprs/config/routes.rb
@@ -1,14 +1,12 @@
Rails.application.routes.draw do
- namespace :panel do
- namespace :gprs do
- namespace :back_end do
+ namespace :panel do
+ namespace :gprs do
+ namespace :back_end do
- match "locations/get_locations" => "locations#get_locations"
-
- resources :locations
-
- end
- end
- end
+ match "locations/get_locations" => "locations#get_locations"
+ resources :locations
+ end
+ end
+ end
end
diff --git a/vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb b/vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
new file mode 100644
index 00000000..bb6d0908
--- /dev/null
+++ b/vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class Panel::Gprs::BackEnd::LocationsControllerTest < ActionController::TestCase
+ test "should get index" do
+ get :index
+ assert_response :success
+ end
+
+ test "should get edit" do
+ get :edit
+ assert_response :success
+ end
+
+end
diff --git a/vendor/built_in_modules/gprs/test/unit/helpers/panel/gprs/back_end/locations_helper_test.rb b/vendor/built_in_modules/gprs/test/unit/helpers/panel/gprs/back_end/locations_helper_test.rb
new file mode 100644
index 00000000..e1302ea2
--- /dev/null
+++ b/vendor/built_in_modules/gprs/test/unit/helpers/panel/gprs/back_end/locations_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Panel::Gprs::BackEnd::LocationsHelperTest < ActionView::TestCase
+end
<%= f.submit t("calendar.save"), :class=>"btn btn-primary" %>
<% end %>
diff --git a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
index 59c251a4..bf32b693 100644
--- a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
+++ b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
@@ -1,190 +1,232 @@
class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
-include AdminHelper
-
- # before_filter :force_order_for_visitor,:only=>[:index]
- before_filter :force_order_for_user#,:except => [:index]
+ include AdminHelper
- def index
- if is_manager? || is_admin? || is_sub_manager?
- @authenticated = true #turn this value to false for view only
- else
- @authenticated = false
- end
- @categorylist = GalleryCategory.all
- @cid = params['cat']
- @tags = GalleryTag.all
- end
+ before_filter :force_order_for_user, :except => [:index,:get_album_json]
- def show
- if is_manager? || is_admin? || is_sub_manager?
- @authenticated = true #turn this value to false for view only
- else
- @authenticated = false
- end
- @album = GalleryAlbum.find(params[:id])
- @tags = GalleryTag.all
- end
+ def index
+ if is_manager? || is_admin? || is_sub_manager?
+ @authenticated = true #turn this value to false for view only
+ else
+ @authenticated = false
+ end
+ @categorylist = GalleryCategory.all
+ @cid = params['cat']
+ @tags = GalleryTag.all
+ end
- def new
- if is_manager? || is_admin?
- @categorylist = GalleryCategory.all
- elsif is_sub_manager?
- @categorylist = GalleryCategory.authed_for_user(current_user,"new_album")
- end
- @album = GalleryAlbum.new
- render :layout => false
- end
+ def show
+ if is_manager? || is_admin? || is_sub_manager?
+ @authenticated = true #turn this value to false for view only
+ else
+ @authenticated = false
+ end
+ @album = GalleryAlbum.find(params[:id])
+ @tags = GalleryTag.all
+ end
- def create
- album = GalleryAlbum.new(params[:gallery_album])
- album.save!
- respond_to do |h|
- h.js
- end
- end
+ def new
+ if is_manager? || is_admin?
+ @categorylist = GalleryCategory.all
+ elsif is_sub_manager?
+ @categorylist = GalleryCategory.authed_for_user(current_user,"new_album")
+ end
+ @album = GalleryAlbum.new
+ render :layout => false
+ end
- def get_albums
- @categoryids = params["cid"]
- @tags = params["tid"]
- @albums = Array.new
- if @categoryids == "all"
- if @tags
- if @tags.kind_of?(Array)
- @tags.each do |tag|
- @albums << GalleryAlbum.where(tag_ids: tag)
- end
- else
- @albums << GalleryAlbum.where(tag_ids: @tags)
- end
- else
- @albums << GalleryAlbum.all
- end
- else
- @categoryids.each do |id|
- category = GalleryCategory.find(id)
- if @tags
- if @tags.kind_of?(Array)
- @tags.each do |tag|
- @albums << category.gallery_albums.where(tag_ids: tag)
- end
- else
- @albums << category.gallery_albums.where(tag_ids: @tags)
- end
- else
- @albums << category.gallery_albums.all
- end
- end
- end
- @output = Array.new
- @albums.each do |album|
- @albs = Array.new
- album.each do |values|
- tags = Array.new
- values.tag_ids.each do |tag|
- tags << GalleryTag.find(tag)[I18n.locale]
- end
- category = GalleryCategory.find(values.gallery_category_id).name
- @albs << {"_id"=>values.id,"show_path"=>panel_gallery_back_end_album_path(values),"cover"=>values.cover,"cover_path"=>values.cover_path,"description"=>values.description,"category_name"=>category,"gallery_category_id" => values.gallery_category_id,"name"=>values.name,"tag_ids"=>values.tag_ids,"tag_names"=>tags}
- end
- @output << @albs
- end
- render :json=>@output.to_json
- end
+ def create
+ album = GalleryAlbum.new(params[:gallery_album])
+ album.save!
+ respond_to do |h|
+ h.js
+ end
+ end
- def destroy
- album = GalleryAlbum.find(params[:id])
- album.delete
- render :json =>{"success"=>true}.to_json
- end
+ def get_albums
+ @categoryids = params["cid"]
+ @tags = params["tid"]
+ @albums = Array.new
+ if @categoryids == "all"
+ if @tags
+ if @tags.kind_of?(Array)
+ @tags.each do |tag|
+ @albums << GalleryAlbum.where(tag_ids: tag)
+ end
+ else
+ @albums << GalleryAlbum.where(tag_ids: @tags)
+ end
+ else
+ @albums << GalleryAlbum.all
+ end
+ else
+ @categoryids.each do |id|
+ category = GalleryCategory.find(id)
+ if @tags
+ if @tags.kind_of?(Array)
+ @tags.each do |tag|
+ @albums << category.gallery_albums.where(tag_ids: tag)
+ end
+ else
+ @albums << category.gallery_albums.where(tag_ids: @tags)
+ end
+ else
+ @albums << category.gallery_albums.all
+ end
+ end
+ end
+ @output = Array.new
+ @albums.each do |album|
+ @albs = Array.new
+ album.each do |values|
+ tags = Array.new
+ values.tag_ids.each do |tag|
+ tags << GalleryTag.find(tag)[I18n.locale]
+ end
+ category = GalleryCategory.find(values.gallery_category_id).name
+ @albs << {"_id"=>values.id,"show_path"=>panel_gallery_back_end_album_path(values),"cover"=>values.cover,"cover_path"=>values.cover_path,"description"=>values.description,"category_name"=>category,"gallery_category_id" => values.gallery_category_id,"name"=>values.name,"tag_ids"=>values.tag_ids,"tag_names"=>tags}
+ end
+ @output << @albs
+ end
+ render :json=>@output.to_json
+ end
- def edit
- if is_manager? || is_admin? || is_sub_manager?
- @album = GalleryAlbum.find(params[:id])
- @images = @album.gallery_images.all
- @album_name = @album.name_translations
- @cover = @album.cover
- @tags = GalleryTag.all
- end
- end
+ def destroy
+ album = GalleryAlbum.find(params[:id])
+ album.delete
+ render :json =>{"success"=>true}.to_json
+ end
- def set_cover
- album = GalleryAlbum.find(params[:album_id])
- image = GalleryImage.find(params[:imageid])
- album.update_attributes({:cover_path => image.file.thumb.url, :cover=>params[:imageid]})
- render :json =>{"success"=>true}.to_json
- end
+ def edit
+ if is_manager? || is_admin? || is_sub_manager?
+ @album = GalleryAlbum.find(params[:id])
+ @images = @album.gallery_images.all
+ @album_name = @album.name_translations
+ @cover = @album.cover
+ @tags = GalleryTag.all
+ end
+ end
- def imgs
- @album = GalleryAlbum.find(params[:album_id])
- @tag_names = Array.new
- @images = @album.gallery_images.all
- @output = Array.new
- @images.each do |values|
- tags = Array.new
- values.tag_ids.each do |tag|
- tags << GalleryTag.find(tag)[I18n.locale]
- end
- @output << {"_id"=>values.id,"theater_link"=>panel_gallery_back_end_album_image_path(values),"description"=>values.description,"title"=>values.title,"file"=>values.file,"gallery_album_id"=>values.gallery_album_id,"tag_ids"=>values.tag_ids,"tag_names"=>tags}
- end
- if is_manager? || is_admin? || is_sub_manager?
- @authenticated = true #turn this value to false for view only
- else
- @authenticated = false
- end
- if @authenticated
- render :json=>{"images" => @output, "tags" => @album.tag_ids}.to_json
- else
- @album.tag_ids.each do |tag|
- @tag_names << GalleryTag.find(tag)[I18n.locale]
- end
- render :json=>{"images" => @output, "tags" => @album.tag_ids, "tag_names" => @tag_names}.to_json
- end
- end
- def upload_panel
- @album = GalleryAlbum.find(params[:album_id])
- render :layout => false
- end
- def upload_image
- @album = GalleryAlbum.find(params[:album_id])
- @files = params['files']
- a = Array.new
- @files.each do |file|
- @image = @album.gallery_images.new
- @image.file = file
- @image.save!
- a << {"thumbnail_url"=>@image.file.thumb.url}
- end
- render :json=>a.to_json
- end
- def images_tags
- album = GalleryAlbum.find(params[:album_id])
- tags = Array.new
- images = album.gallery_images.all
- images.each do |image|
- tags << {"id"=>image.id, "tags" => image.tag_ids}
- end
- render :json=>tags.to_json
- end
+ def set_cover
+ album = GalleryAlbum.find(params[:album_id])
+ image = GalleryImage.find(params[:imageid])
+ album.update_attributes({:cover_path => image.file.thumb.url, :cover=>params[:imageid]})
+ render :json =>{"success"=>true}.to_json
+ end
- def update
- @album = GalleryAlbum.find(params[:id])
- @album.update_attributes(params[:gallery_album])
- if is_manager? || is_admin? || is_sub_manager?
- @authenticated = true #turn this value to false for view only
- else
- @authenticated = false
- end
- if params['delete_cover'] == "true"
- @album.update_attributes(:cover=>"default")
- end
- @tags = GalleryTag.all
- render :action => :show
- end
+ def get_album_json
+ albums = GalleryAlbum.all
+ output = Array.new
+ albums.each do |album|
+ tag_names = Array.new
+ all_image = Array.new
+
+ images = album.gallery_images.all
+ images.each do |image|
+ tags = Array.new
+
+ image.tag_ids.each do |tag|
+ tags << GalleryTag.find(tag)[I18n.locale]
+ end
+
+ all_image << {
+ image_title: image.title,
+ image_description: image.description,
+ image_file: { url: "http://#{request.host_with_port+image.file.url}",
+ thumb: "http://#{request.host_with_port+image.file.thumb.to_s}"},
+ image_tag_names: tags}
+ end
+
+ album.tag_ids.each do |tag|
+ tag_names << GalleryTag.find(tag)[I18n.locale]
+ end
+
+ output << {
+ album_cover_file: "http://#{request.host_with_port+album.cover_path}",
+ album_name: album.name,
+ album_tag_names: tag_names,
+ images: all_image
+ }
+ end
+
+ #render :json=>{:images => @output,
+ # :tag_names => @tag_names}.to_json
+ render :json=>JSON.pretty_generate(output)
+ end
+
+ def imgs
+ @album = GalleryAlbum.find(params[:album_id])
+ @tag_names = Array.new
+ @images = @album.gallery_images.all
+ @output = Array.new
+ @images.each do |values|
+ tags = Array.new
+ values.tag_ids.each do |tag|
+ tags << GalleryTag.find(tag)[I18n.locale]
+ end
+ @output << { _id: values.id,
+ theater_link: panel_gallery_back_end_album_image_path(values),
+ description: values.description,
+ title: values.title,
+ file: values.file,
+ gallery_album_id: values.gallery_album_id,
+ tag_ids: values.tag_ids,
+ tag_names: tags}
+ end
+ if is_manager? || is_admin? || is_sub_manager?
+ @authenticated = true #turn this value to false for view only
+ else
+ @authenticated = false
+ end
+ if @authenticated
+ render :json=>{"images" => @output, "tags" => @album.tag_ids}.to_json
+ else
+ @album.tag_ids.each do |tag|
+ @tag_names << GalleryTag.find(tag)[I18n.locale]
+ end
+ render :json=>{"images" => @output, "tags" => @album.tag_ids, "tag_names" => @tag_names}.to_json
+ end
+ end
+
+ def upload_panel
+ @album = GalleryAlbum.find(params[:album_id])
+ render :layout => false
+ end
+
+ def upload_image
+ @album = GalleryAlbum.find(params[:album_id])
+ @files = params['files']
+ a = Array.new
+ @files.each do |file|
+ @image = @album.gallery_images.new
+ @image.file = file
+ @image.save!
+ a << {"thumbnail_url"=>@image.file.thumb.url}
+ end
+ render :json=>a.to_json
+ end
+ def images_tags
+ album = GalleryAlbum.find(params[:album_id])
+ tags = Array.new
+ images = album.gallery_images.all
+ images.each do |image|
+ tags << {"id"=>image.id, "tags" => image.tag_ids}
+ end
+ render :json=>tags.to_json
+ end
+
+ def update
+ @album = GalleryAlbum.find(params[:id])
+ @album.update_attributes(params[:gallery_album])
+ if is_manager? || is_admin? || is_sub_manager?
+ @authenticated = true #turn this value to false for view only
+ else
+ @authenticated = false
+ end
+ if params['delete_cover'] == "true"
+ @album.update_attributes(:cover=>"default")
+ end
+ @tags = GalleryTag.all
+ render :action => :show
+ end
end
-
-
-
-
-
-
diff --git a/vendor/built_in_modules/gallery/config/routes.rb b/vendor/built_in_modules/gallery/config/routes.rb
index 77de541e..8795594b 100644
--- a/vendor/built_in_modules/gallery/config/routes.rb
+++ b/vendor/built_in_modules/gallery/config/routes.rb
@@ -1,54 +1,55 @@
Rails.application.routes.draw do
- namespace :panel do
- namespace :gallery do
- namespace :back_end do
- match "get_albums" => "albums#get_albums"
- match "upload_image" => "albums#upload_image"
- match "save_tags" => "tags#save_tags"
- match "albums/save_tags" => "tags#save_tags"
- resources :albums do
- match "set_cover" => "albums#set_cover"
- match "imgs" => "albums#imgs"
- match "upload_panel" => "albums#upload_panel"
- match "images_tags" => "albums#images_tags"
- end
+ namespace :panel do
+ namespace :gallery do
+ namespace :back_end do
+ match "get_albums" => "albums#get_albums"
+ match "upload_image" => "albums#upload_image"
+ match "save_tags" => "tags#save_tags"
+ match "albums/save_tags" => "tags#save_tags"
+ resources :albums do
+ match "set_cover" => "albums#set_cover"
+ match "imgs" => "albums#imgs"
+ match "upload_panel" => "albums#upload_panel"
+ match "images_tags" => "albums#images_tags"
+ collection do
+ get "get_album_json"
+ end
+ end
- match "album_images/#!/:id" => "album_images#show"
-
- resources :album_images
+ match "album_images/#!/:id" => "album_images#show"
+ resources :album_images
+ resources :gallery_categories
+ resources :tags
- resources :gallery_categories
- resources :tags
-
- end
- namespace :front_end do
- match "get_albums" => "albums#get_albums"
- # match "orbit_galleries" => "orbit_galleries#index"
- # match "gallery_category_save" => "orbit_galleries#new_category"
- # match "categorylist" => "orbit_galleries#categorylist"
- # match "gallery_category_delete" => "orbit_galleries#gallery_category_delete"
- # match "add_album" => "orbit_galleries#add_album"
- # match "create_album" => "orbit_galleries#create_album"
- # match "get_albums" => "orbit_galleries#get_albums"
- # match "upload_image" => "orbit_galleries#upload_image"
- # match "upload_panel" => "orbit_galleries#upload_panel"
- # match "get_images" => "orbit_galleries#get_images"
- # match "theater" => "orbit_galleries#theater"
- # match "delete_album" => "orbit_galleries#delete_album"
- # match "edit_album" => "orbit_galleries#edit_album"
- # match "set_cover" => "orbit_galleries#set_cover"
- # match "delete_images" => "orbit_galleries#delete_images"
- # match "update_album" => "orbit_galleries#update_album"
- # match "save_tags" => "orbit_galleries#save_tags"
- resources :albums do
- member do
- get "imgs"
- get "theater"
- end
- end
- resources :album_images
- end
- end
- end
+ end
+ namespace :front_end do
+ match "get_albums" => "albums#get_albums"
+ # match "orbit_galleries" => "orbit_galleries#index"
+ # match "gallery_category_save" => "orbit_galleries#new_category"
+ # match "categorylist" => "orbit_galleries#categorylist"
+ # match "gallery_category_delete" => "orbit_galleries#gallery_category_delete"
+ # match "add_album" => "orbit_galleries#add_album"
+ # match "create_album" => "orbit_galleries#create_album"
+ # match "get_albums" => "orbit_galleries#get_albums"
+ # match "upload_image" => "orbit_galleries#upload_image"
+ # match "upload_panel" => "orbit_galleries#upload_panel"
+ # match "get_images" => "orbit_galleries#get_images"
+ # match "theater" => "orbit_galleries#theater"
+ # match "delete_album" => "orbit_galleries#delete_album"
+ # match "edit_album" => "orbit_galleries#edit_album"
+ # match "set_cover" => "orbit_galleries#set_cover"
+ # match "delete_images" => "orbit_galleries#delete_images"
+ # match "update_album" => "orbit_galleries#update_album"
+ # match "save_tags" => "orbit_galleries#save_tags"
+ resources :albums do
+ member do
+ get "imgs"
+ get "theater"
+ end
+ end
+ resources :album_images
+ end
+ end
+ end
end
diff --git a/vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js b/vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
new file mode 100644
index 00000000..dee720fa
--- /dev/null
+++ b/vendor/built_in_modules/gprs/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/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css b/vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
new file mode 100644
index 00000000..afad32db
--- /dev/null
+++ b/vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
@@ -0,0 +1,4 @@
+/*
+ Place all the styles related to the matching controller here.
+ They will automatically be included in application.css.
+*/
diff --git a/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb b/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
index c09b1379..884e5d13 100644
--- a/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
+++ b/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
@@ -1,29 +1,77 @@
class Panel::Gprs::BackEnd::LocationsController < OrbitBackendController
-
- def index
- @newlocation = Location.new
- end
- def create
- debugger
- @newlocation = Location.new(params[:location])
- @newlocation.save!
- render :action => "index"
- end
+ #before_filter :clean_values, :only => [:create, :update]
- def get_locations
- locations = Location.all
- @data = Array.new
+ before_filter :force_order_for_visitor,:only => [:index, :new, :edit, :delete]
+ before_filter :force_order_for_user,:except => :get_locations
+ #before_filter :for_app_sub_manager,:except => [:index, :new, :edit, :delete, :get_locations]
- locations.each do |location|
- picurl = "http://"+request.host + location.file.url
- thumburl = "http://"+request.host + location.file.thumb.url
- @data << {"name"=>location.name,"pic_url"=>picurl,"thumb_url"=>thumburl,"description"=>location.description}
- end
- render :json => @data.to_json
- end
-
+ def index
+ @locations = Location.all
+ respond_to do |format|
+ format.html # new.html.erb
+ format.json { render json: @locations }
+ end
+ end
+
+ def new
+ @location = Location.new
+
+ respond_to do |format|
+ format.html # new.html.erb
+ format.json { render json: @location }
+ end
+ end
+
+ def edit
+ @location = Location.find(params[:id])
+ end
+
+ def show
+ @location = Location.find(params[:id])
+ respond_to do |format|
+ format.html
+ format.json { render json: @location }
+ end
+ end
+
+ def create
+ @location = Location.new(params[:location])
+ @location.save!
+ redirect_to panel_gprs_back_end_locations_url
+ end
+
+ def update
+ @location = Location.find(params[:id])
+ @location.update_attributes(params[:location])
+ redirect_to panel_gprs_back_end_locations_url
+ end
+
+ def destroy
+ @location = Location.find(params[:id])
+ @location.destroy
+ redirect_to panel_gprs_back_end_locations_url
+
+ end
+
+ def get_locations
+ locations = Location.all
+ @data = Array.new
+
+ locations.each do |location|
+ picurl = "http://#{request.host_with_port + location.file.url}",
+ thumburl = "http://#{request.host_with_port + location.file.thumb.url}"
+ @data << { name: location.name,
+ pic_url: picurl,
+ thumb_url: thumburl,
+ longitude: location.longitude,
+ latitude: location.latitude,
+ description: location.description }
+ end
+
+ #print readable json
+ render :json => JSON.pretty_generate({location: @data})
+
+ #render :json => {location: @data}.to_json
+ end
end
-
-
-
diff --git a/vendor/built_in_modules/gprs/app/helpers/panel/gprs/back_end/locations_helper.rb b/vendor/built_in_modules/gprs/app/helpers/panel/gprs/back_end/locations_helper.rb
new file mode 100644
index 00000000..50985d54
--- /dev/null
+++ b/vendor/built_in_modules/gprs/app/helpers/panel/gprs/back_end/locations_helper.rb
@@ -0,0 +1,2 @@
+module Panel::Gprs::BackEnd::LocationsHelper
+end
diff --git a/vendor/built_in_modules/gprs/app/models/location.rb b/vendor/built_in_modules/gprs/app/models/location.rb
index 2f955205..f6455920 100644
--- a/vendor/built_in_modules/gprs/app/models/location.rb
+++ b/vendor/built_in_modules/gprs/app/models/location.rb
@@ -1,12 +1,11 @@
class Location
- include Mongoid::Document
- include Mongoid::Timestamps
+ include Mongoid::Document
+ include Mongoid::Timestamps
- mount_uploader :file, GprsUploader
+ mount_uploader :file, GprsUploader
- field :name
- field :description
- field :longitude, type: Float
- field :latitude, type: Float
-
-end
\ No newline at end of file
+ field :name
+ field :description
+ field :longitude, type: Float
+ field :latitude, type: Float
+end
diff --git a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/_form.html.erb b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/_form.html.erb
new file mode 100644
index 00000000..62e8b21b
--- /dev/null
+++ b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/_form.html.erb
@@ -0,0 +1,30 @@
+
+
+
+
+ <%= f.text_field :name, :class=>"span4", :placeholder => "Area" %>
+
+
+
+
+
+ <%= f.file_field :file %>
+
+
+
+
+
+ <%= f.text_field :longitude, :class=>"span2", :placeholder => "Longitude" %>
+ <%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
+
+
+
+
+
+ <%= f.text_area :description, :class=>"span4", :cols=>"30", :row=>"5" %>
+
+
+
diff --git a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/edit.html.erb b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/edit.html.erb
new file mode 100644
index 00000000..82a59afa
--- /dev/null
+++ b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/edit.html.erb
@@ -0,0 +1,4 @@
+<%= form_for @location, :url=> panel_gprs_back_end_location_path(@location), :html => { :class=>"form-horizontal"} do |f| %>
+ <%= render :partial => 'form', :locals => {:f => f} %>
+<% end %>
+
diff --git a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
index 912c0184..6731688d 100644
--- a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
+++ b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
@@ -1,42 +1,28 @@
+
+ <%= f.submit "Save", :class=>"btn" %>
+
+ | <%= t('location.picture') %> | +<%= t('location.name') %> | +<%= t('location.longitude') %> | +<%= t('location.latitude') %> | +<%= t('location.description') %> | +<%= t('location.edit') %> | +<%= t('location.delete') %> | +
|---|---|---|---|---|---|---|
| <%= image_tag(location.file, alt: location.file, size: "50x50" )%> | +<%= location.name%> | +<%= location.longitude%> | +<%= location.latitude%> | +<%= location.description%> | +<%= link_to 'Edit', edit_panel_gprs_back_end_location_path(location) %> | +<%= link_to 'Destroy', panel_gprs_back_end_location_path(location), method: :delete , :confirm => t(:sure?) %> | +
-
-
-
-
- <%= f.text_field :name, :class=>"span4", :placeholder => "Area" %>
-
-
-
-
-
-
- <%= f.file_field :file %>
-
-
-
-
-
-
- <%= f.text_field :longitude, :class=>"span2", :placeholder => "Longitude" %>
- <%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
-
-
-
-
-
-
-
-
- <%= f.text_area :description, :class=>"span4", :cols=>"30", :row=>"5" %>
-
-
-
- <% end %>
-
\ No newline at end of file
+
-
- <%= f.submit "Save", :class=>"btn" %>
-
-