diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 1763aef2..92a2b732 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -6,8 +6,10 @@ def new_user_waiting_for_approval(user) # Thus the default URL is sent. @url = BASE_URL + '/users/edit/' + user.id.to_s admins = User.find_all_by_is_admin true + role3 = User.where(role_id: [3]) addr_list = Array.new admins.each do |admin| addr_list.push(admin.email) end + role3.each do |user| addr_list.push(user.email) end mail(to: addr_list, subject: "New User Awaiting Approval: #{@user.first_name} #{@user.last_name}") end diff --git a/app/models/user.rb b/app/models/user.rb index 80acab36..41c70548 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -82,8 +82,9 @@ def self.canAccessObject(current_user, object) def self.getCurrentCity(current_user, cookies) - return (current_user and current_user.role_id == 1) ? (City.find_by_id(current_user.city_id)) : - (City.find_by_id(cookies['city']) or City.first) + return (current_user and ((current_user.role_id == 1) or (current_user.role_id == 3))) ? + (City.find_by_id(current_user.city_id)) : + (City.find_by_id(cookies['city']) or City.first) end end diff --git a/app/views/home/_lamilo_about.html.erb b/app/views/home/_lamilo_about.html.erb index 9681734c..4de7143b 100644 --- a/app/views/home/_lamilo_about.html.erb +++ b/app/views/home/_lamilo_about.html.erb @@ -1,59 +1,120 @@
+

Features overview

+ +

+ Smart City Logistics enables you to design and build a greener city logistics. It offers a wide range of features that simplify communication and decision making about urban logistics. +

+ + + + +

Team

+

- Smart City Logistics is based on the open source geospatial software framework iGUESS built on the Open Geospatial Consortium (OGC) Standards. It allows easy and transparent ways of data integration and exchange, the integration and linking of modelling tools and the visualisation of information. iGUESS provides a basis for web based decision support platforms in the fields of Urban logistics, Energy planning, Water management, Air Pollution and Ecosystems Services to make our Cities smarter. + The team is composed of multidisciplinary engineers. + For more information about the Smart City Logistics platform and iGUESS, please contact the product manager + . + For more information about the LaMiLo project, please contact the project manager + .

+ +

Technology

- For further information on OGC standards please see http://youtu.be/bfkCdir-yO8. + Smart City Logistics has been developed and is hosted by the Luxembourg Institute of Science and Technology. It was part of the LaMiLo project, an initiative funded by the programme Interreg IVB NWE +

+ Smart City Logistics is based on the open source geospatial software framework iGUESS built on the Open Geospatial Consortium (OGC) Standards. It allows easy and transparent ways of data integration and exchange, the integration and linking of modelling tools and the visualisation of information. iGUESS provides a basis for web based decision support platforms in the fields of Urban Logistics, Energy planning, Water management, Air Pollution and Ecosystems Services to make our Cities smarter.

-

The iGUESS Team

-
\ No newline at end of file diff --git a/db/seeds.rb b/db/seeds.rb index 2daa0e74..fee1a9c8 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -317,3 +317,16 @@ end +# ---------- Users ---------- # + +# New role: 3 +# GitHub: https://github.com/ERIN-LIST/iguess/issues/278 +# Mantis: http://iguess-support.kirchberg.tudor.lu/view.php?id=228 +guerlain = User.where('email LIKE ?', '%guerlain%').all +guerlain.each do |g| + g.role_id = 3 + g.save +end + + + diff --git a/public/site_styles/lamilo.css b/public/site_styles/lamilo.css index 9d98bcfb..9be10c02 100644 --- a/public/site_styles/lamilo.css +++ b/public/site_styles/lamilo.css @@ -88,6 +88,15 @@ ul.footer-menu li a:before, ul.footer-menu li .item:before, ul.footer-menu li .s vertical-align: middle; } +ul.about +{ + list-style: disc; +} + +li.about +{ + margin-left: 20px; +} .home-page-text { text-align: left;