This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/models/photo.rb b/app/models/photo.rb | |
index 32009d9..0f0ff89 100644 | |
--- a/app/models/photo.rb | |
+++ b/app/models/photo.rb | |
@@ -350,9 +350,9 @@ class Photo < ActiveRecord::Base | |
def url(type) | |
if self.status == 'available' | |
- "http://#{SERVER_URL}/"+sys_filename(self.status,filename,type).gsub(/^public\//, '') | |
+ "/"+sys_filename(self.status,filename,type).gsub(/^public\//, '') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb | |
index 1980e4f..88bb036 100644 | |
--- a/app/controllers/main_controller.rb | |
+++ b/app/controllers/main_controller.rb | |
@@ -1,7 +1,9 @@ | |
class MainController < ApplicationController | |
def index | |
- @javascripts = [ 'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js', 'jquery/jquery.json-2.2.min', 'jquery/boxer.js', 'http://www.openlayers.org/api/OpenLayers.js', '/openlayers/OpenStreetMap', 'OSV', 'OSVMain', 'OSVPhoto' ] | |
+ # jquery/jquery-1.3.2.min.js = http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js |