Merge pull request #273 from LBAB-Humboldt/release/2.5.6

Release/2.5.6
PEM-Humboldt · Oct 19, 2020 · 2c5f7de · 2c5f7de
2 parents a416492 + 7b1018a
commit 2c5f7de
Show file tree

Hide file tree

Showing 17 changed files with 224 additions and 317 deletions.
diff --git a/README.MD b/README.MD
@@ -1,4 +1,4 @@
-# BioModelos v2.5.5
+# BioModelos v2.5.6
 
 [BioModelos](http://biomodelos.humboldt.org.co) is a web app that facilitates the generation, validation and consultation of hypothesis of species distribution for the continental biodiversity of Colombia. As such, it provides tools to (1) improve existing species distribution models (SDMs) by integrating expert's opinion, (2) generate expert maps and (3) publish SDMs. Our objective is to provide freely and openly access to the most up to date information on species distributions, validated by a large network of researchers, to support national environmental decision making processes and research.
 
@@ -65,17 +65,12 @@ RECAPTCHA_SECRET_KEY: [secret key]
 \# Mail Server Gmail
 GMAIL_USERNAME: [username]
 GMAIL_PASSWORD: [password]
-
-\# API GATEWAY
-GATEWAY_API_KEY: [site key]
-GATEWAY_HOST: [header host]
 ```
 There, you should put information about:
 - Rails Application key.
 - Google maps key.
 - Recaptcha key.
 - SMTP credentials.
-- Credentials for api gateway
 
 ## Run
 

diff --git a/app/assets/javascripts/biovisor.js b/app/assets/javascripts/biovisor.js
@@ -59,14 +59,6 @@ var _BioModelosVisorModule = function() {
 
 	var imageBounds = [[13,-60],[-14, -83]];
 
-	var addNiceScroll = function(){
-		$('.regscroller').niceScroll({
-			cursorcolor: "#124c5e",
-			cursorwidth: "7px",
-			cursorborder: "none"
-		});
-	}
-
 	var init = function(){
 		var latlng = new L.LatLng(4, -72),
         	zoom = 6,
@@ -405,7 +397,9 @@ var _BioModelosVisorModule = function() {
 
 		        popup = new L.Popup({
 		        	keepInView: true,
-		        	closeButton: false
+                    closeButton: false,
+                    maxWidth: 350,
+                    maxHeight: 450
 		        });
 
 		    if (type === 'marker') {
@@ -776,5 +770,5 @@ $(document).ready(function() {
   	$("body").on("click","#popUpCancelBtn",function(e){
         e.preventDefault();
 		_BioModelosVisorModule.cancelAddPoint();
-  	});
+	  });
 });
diff --git a/app/assets/javascripts/controllers/users_controller.js b/app/assets/javascripts/controllers/users_controller.js
@@ -1,16 +1,4 @@
 $(document).ready(function(){
-    $('.cajaperfil').niceScroll({
-    	cursorcolor: "#5d5e5e",
-    	cursorwidth: "7px",
-    	cursorborder: "none"
-	});
-
-	$('#centerbox').niceScroll({
-		cursorcolor: "#5d5e5e",
-		cursorwidth: "7px",
-		cursorborder: "none"
-	});
-
 	$( ".tareaspp:odd" ).css( "background-color", "#f2f2f2" );
 
 	$(".user_tasks_tab").click(function(e){

diff --git a/app/assets/stylesheets/styles.css.erb b/app/assets/stylesheets/styles.css.erb
@@ -421,8 +421,12 @@ a.lang {
 	background-image: url(<%= asset_path 'searchome.png' %>);
 }
 
-.hlink, .spptit, .spp, .top5, .top5users, .cobert {
+.spptit, .spp, .top5, .top5users, .cobert {
 	display: flex;
+    justify-content: space-between;
+}
+
+.hlink {
     justify-content: end;
 }
 
@@ -3732,6 +3736,7 @@ label.checkboxdown {
 	max-height: -webkit-calc(100% - 181px);
 	max-height: calc(100% - 181px);
 	padding: 5px 15px 15px 8px;
+	overflow-y: auto;
 }
 
 .btnedicion {
@@ -3802,18 +3807,22 @@ label.checkboxdown {
 	padding-top: 9px;
 }
 
-.col4 {
-	width: 22%;
-	display: inline-block;
-	*display: inline;
-	*zoom: 1;
-	margin-left: 2%;
-	margin-bottom: 5px;
+#months {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	padding-right: 12 px;
+}
+
+#months * {
+	flex: 1 1 13.6%;
+}
+
+#months label {
+	flex-grow: 2;
 }
 
 .meschk{
-	vertical-align: middle;
-	float: left;
 	margin: 5px 5px 0 0;
 }
 
@@ -3999,14 +4008,6 @@ label.checkboxdown {
 	line-height: 1.2;
 }
 
-.regscroller {
-	height: 280px;
-	padding-right: 15px;
-	overflow: auto;
-	position: relative;
-	min-width: 271px;
-}
-
 .cajita b {
 	font-weight: 400;
 	color: #db3f2a;
@@ -4044,10 +4045,6 @@ label.checkboxdown {
 	margin-bottom: 10px;
 }
 
-.regform {
-	overflow-y: scroll;
-}
-
 .regform label {
 	padding-right: 4px;
 	padding-left: 4%;

diff --git a/app/models/model.rb b/app/models/model.rb
@@ -2,8 +2,6 @@ class Model
 	include HTTParty
   	format :json
     base_uri BASE_URI + '/models'
-    headers 'authorization' => "apiKey #{ENV['GATEWAY_API_KEY']}"
-    headers 'host' => "#{ENV['GATEWAY_HOST']}"
 
   	attr_accessor :modelID, :modelStatus, :pngUrl, :zipUrl, :thumbUrl, :threshold, :level, :license, :citation, :methodFile, :published
 

diff --git a/app/models/record.rb b/app/models/record.rb
@@ -2,8 +2,6 @@ class Record
 	include HTTParty
   	format :json
   	base_uri BASE_URI + '/records'
-    headers 'authorization' => "apiKey #{ENV['GATEWAY_API_KEY']}"
-    headers 'host' => "#{ENV['GATEWAY_HOST']}"
 
   	def self.find(record_id)
 		JSON.parse(get('/' + record_id.to_s).body)

diff --git a/app/models/species.rb b/app/models/species.rb
@@ -2,8 +2,6 @@ class Species
 	include HTTParty
   	format :json
 		base_uri BASE_URI + '/species'
-    headers 'authorization' => "apiKey #{ENV['GATEWAY_API_KEY']}"
-    headers 'host' => "#{ENV['GATEWAY_HOST']}"
 	# has_many :tasks
 
 	def self.find_name(taxID)

diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb
@@ -93,11 +93,6 @@
 	</div>
 </div>
 <script>
-$('.cajaperfil').niceScroll({
-	cursorcolor: "#5d5e5e",
-	cursorwidth: "7px",
-	cursorborder: "none"
-});
 $( ".tareaspp:odd" ).css( "background-color", "#f2f2f2" );
 $(document).ready(function() {
 	HomeControllerModule.typeahead_f();