Skip to content

W
warm_city
Commit 33761f70 by Mykhailo Makohin
Options

start integrate gmaps

parent 4b2e0636
Showing with 85 additions and 22 deletions
Gemfile
...@@ -17,6 +17,7 @@ gem 'turbolinks', '~> 5' ...@@ -17,6 +17,7 @@ gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5' gem 'jbuilder', '~> 2.5'
gem 'haml' gem 'haml'
gem 'bootstrap-sass' gem 'bootstrap-sass'
gem 'gmaps4rails'
group :development, :test do group :development, :test do
gem 'byebug', platform: :mri gem 'byebug', platform: :mri
......
Gemfile.lock
...@@ -61,6 +61,7 @@ GEM ...@@ -61,6 +61,7 @@ GEM
ffi (1.11.1) ffi (1.11.1)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gmaps4rails (2.1.2)
haml (5.1.2) haml (5.1.2)
temple (>= 0.8.0) temple (>= 0.8.0)
tilt tilt
...@@ -171,6 +172,7 @@ DEPENDENCIES ...@@ -171,6 +172,7 @@ DEPENDENCIES
bootstrap-sass bootstrap-sass
byebug byebug
coffee-rails (~> 4.2) coffee-rails (~> 4.2)
gmaps4rails
haml haml
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-rails jquery-rails
......
app/assets/javascripts/application.js
...@@ -16,5 +16,6 @@ ...@@ -16,5 +16,6 @@
//= require_tree . //= require_tree .
//= require bootstrap.js //= require bootstrap.js
//= require gmaps/google
app/assets/stylesheets/main.scss
...@@ -1923,7 +1923,7 @@ textarea.form-control:focus { ...@@ -1923,7 +1923,7 @@ textarea.form-control:focus {
font-style: normal; font-style: normal;
} }
.five_segment_graph .square_content { .five_segment_graph .square_content {
background: transparent url(../img/graph_img2.png) top center/99.5% no-repeat; background: transparent url(graph_img2.png) top center/99.5% no-repeat;
} }
.five_segment_graph .graph_item_one, .five_segment_graph .graph_item_one,
.five_segment_graph .graph_item_two { .five_segment_graph .graph_item_two {
...@@ -2784,6 +2784,10 @@ h1 { ...@@ -2784,6 +2784,10 @@ h1 {
margin-top: 0px; margin-top: 0px;
} }
/*end popover*/ /*end popover*/
.tab-pane_people {
background: url(main_head_bg1.jpg) center center/cover no-repeat;
padding-top: 140px;
}
.tab-pane_businesse { .tab-pane_businesse {
background: transparent url(main_head_bg2.jpg) no-repeat center center; background: transparent url(main_head_bg2.jpg) no-repeat center center;
......
app/views/home/open_project.html.haml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%a.info_link{"data-target" => "#modal3", "data-toggle" => "modal"} urbanspaceradio.com %a.info_link{"data-target" => "#modal3", "data-toggle" => "modal"} urbanspaceradio.com
%h2.heading_with_btn %h2.heading_with_btn
%span Urban Space Radio %span Urban Space Radio
%a.btn.btn_default{"data-target" => "#modal", "data-toggle" => "modal", :href => "#"} %a.btn.btn_default{"data-target" => "#modal", "data-toggle" => "modal"}
%i.icon.icon_plus> %i.icon.icon_plus>
підтримати проект підтримати проект
.large_progress_wrap .large_progress_wrap
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
= succeed "." do = succeed "." do
%strong Urban Space 100 у центрі міста %strong Urban Space 100 у центрі міста
.twentytwenty-container .twentytwenty-container
%img{:src => "img/1_1.jpg"}/ = image_tag ("1_1.jpg")
%img{:src => "img/1_2.jpg"}/ = image_tag ("1_2.jpg")
%p %p
Радіо мовитиме в інтернеті, в «Urban Space 100», а також частково в Радіо мовитиме в інтернеті, в «Urban Space 100», а також частково в
%a{:href => "#"} FM-діапазоні %a{:href => "#"} FM-діапазоні
......
app/views/layouts/application.html.haml
...@@ -6,16 +6,21 @@ ...@@ -6,16 +6,21 @@
= csrf_meta_tags = csrf_meta_tags
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
%meta{:charset => "utf-8"}/ %meta{:charset => "utf-8"}
%meta{:content => "", :name => "description"}/ %meta{:content => "", :name => "description"}/
%meta{:content => "width=device-width", :name => "viewport"}/ %meta{:content => "width=device-width", :name => "viewport"}/
%meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/ %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
%link{:href => "//fonts.googleapis.com/css?family=Open+Sans:400,600,700", :rel => "stylesheet", :type => "text/css"}/ %link{:href => "//fonts.googleapis.com/css?family=Open+Sans:400,600,700", :rel => "stylesheet", :type => "text/css"}/
%link{:href => "//fonts.googleapis.com/css?family=PT+Sans:400,700italic,700,400italic", :rel => "stylesheet", :type => "text/css"}/ %link{:href => "//fonts.googleapis.com/css?family=PT+Sans:400,700italic,700,400italic", :rel => "stylesheet", :type => "text/css"}/
%link{:href => "//fonts.googleapis.com/css?family=Noto+Serif:400,400italic&subset=latin,cyrillic-ext", :rel => "stylesheet", :type => "text/css"}/ %link{:href => "//fonts.googleapis.com/css?family=Noto+Serif:400,400italic&subset=latin,cyrillic-ext", :rel => "stylesheet", :type => "text/css"}/
:javascript
var GOOGLE_API_KEY="#{ENV['AIzaSyALmxk-nEaCo8KVfJTdAiVFPBKA9s0VnmM']}"
= javascript_include_tag 'application'
= javascript_include_tag "//maps.googleapis.com/maps/api/js?libraries=places&key=#{ENV['AIzaSyALmxk-nEaCo8KVfJTdAiVFPBKA9s0VnmM']}"
%link{:href => "//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700&subset=cyrillic-ext", :rel => "stylesheet"}/ %link{:href => "//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700&subset=cyrillic-ext", :rel => "stylesheet"}/
%link{:href => "//fonts.googleapis.com/css?family=Roboto+Slab:300,400&subset=cyrillic-ext", :rel => "stylesheet"}/ %link{:href => "//fonts.googleapis.com/css?family=Roboto+Slab:300,400&subset=cyrillic-ext", :rel => "stylesheet"}/
%link{:href => "//fonts.googleapis.com/css?family=Roboto:300,500&subset=cyrillic-ext", :rel => "stylesheet"}/ %link{:href => "//fonts.googleapis.com/css?family=Roboto:300,500&subset=cyrillic-ext", :rel => "stylesheet"}/
/
%link{:href => "img/favicons/apple-touch-icon57.png", :rel => "icon", :type => "image/png"}/ %link{:href => "img/favicons/apple-touch-icon57.png", :rel => "icon", :type => "image/png"}/
%link{:href => "img/favicons/apple-touch-icon57.png", :rel => "apple-touch-icon", :sizes => "57x57"}/ %link{:href => "img/favicons/apple-touch-icon57.png", :rel => "apple-touch-icon", :sizes => "57x57"}/
%link{:href => "img/favicons/apple-touch-icon60.png", :rel => "apple-touch-icon", :sizes => "60x60"}/ %link{:href => "img/favicons/apple-touch-icon60.png", :rel => "apple-touch-icon", :sizes => "60x60"}/
...@@ -25,7 +30,10 @@ ...@@ -25,7 +30,10 @@
%body %body
= render 'partials/modal' = render 'partials/modal'
= render 'partials/header' - if current_page?(root_path)
= render 'partials/black_header'
- else
= render 'partials/white_header'
= yield = yield
= render 'partials/footer-site' = render 'partials/footer-site'
= render 'partials/footer' = render 'partials/footer'
......
app/views/partials/_black_header.html.haml 0 → 100644
.content
.main_head
.main_head_top.clearfix
.main_menu
%nav.navbar.navbar-default
.container-fluid
/ Brand and toggle get grouped for better mobile display
.navbar-header
%button.navbar-toggle.collapsed{"aria-expanded" => "false", "data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", :type => "button"}
%span.sr-only Toggle navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
/ Collect the nav links, forms, and other content for toggling
#bs-example-navbar-collapse-1.collapse.navbar-collapse
%ul.nav.navbar-nav
%li
%a{:href => "#"} про палатформу
%li
%a{:href => "#"} Ґранти
%li
%a{:href => "#"} Проекти
%li
%a{:href => "#"} Партнери
%li
%a{:href => "#"} DIGITAL WORKSHOP
%li
%a{:href => "#"} Про нас
%li
%a{:href => "#"} Новини
%li
%a{:href => "#"} Звіти
%li
%a{:href => "#"} connectif
%ul.nav.nav-tabs.nav_btns
%li.active
%a{"data-toggle" => "tab", :href => "#1"} Люди
%li
%a{"data-toggle" => "tab", :href => "#2"} Бізнеси
.show_tip
Ознайомтесь з дружніми бізнесами
які допомагають формувати
та покрищувати наше місто
.login_wrap
%div
%button.login_btn{"data-target" => "#modal3", "data-toggle" => "modal"}
= image_tag ("login.png")
.search_block
%input#search_field.search_field{:placeholder => "Пошук за іменем... ", :type => "text"}/
%button.search_btn
%i.icon.icon_search
\ No newline at end of file
app/views/partials/_footer-site.html.haml
...@@ -41,7 +41,5 @@ ...@@ -41,7 +41,5 @@
%span © %span ©
2015 2016 Warm-city. All Rights Reserved 2015 2016 Warm-city. All Rights Reserved
.footer_links .footer_links
%a.footer_link_item{:href => "#"} %a.footer_link_item{:href => "https://bvblogic.com/"}
=image_tag ('bvb_logo.png') =image_tag ('bvb_logo.png')
%a.footer_link_item{:href => "#"}
%i.icon.icon_shape
app/views/partials/_footer.html.haml
#outdated
%h6 Your browser is out-of-date!
%p
Update your browser to view this website correctly.
%a#btnUpdateBrowser{:href => "http://outdatedbrowser.com/", :target => "_blank"} Update my browser now
%p.last
%a#btnCloseUpdateBrowser{:href => "#", :title => "Close"} ×
/ /
Javascript Javascript
\================================================== \==================================================
......
app/views/partials/_header.html.haml → app/views/partials/_white_header.html.haml
.warapper %header.header
%header.header
.container .container
.main_menu .main_menu
%a.logo{href: '#'} %a.logo{:href => "#"}
%img{alt: '', src: ''}/ = image_tag ("logo.svg")
%nav.navbar.navbar-default %nav.navbar.navbar-default
.container-fluid .container-fluid
/ Brand and toggle get grouped for better mobile display
.navbar-header .navbar-header
%button.navbar-toggle.collapsed{"aria-expanded" => "false", "data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", :type => "button"} %button.navbar-toggle.collapsed{"aria-expanded" => "false", "data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", :type => "button"}
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
%span.icon-bar %span.icon-bar
%span.icon-bar %span.icon-bar
%span.icon-bar %span.icon-bar
/ Collect the nav links, forms, and other content for toggling
#bs-example-navbar-collapse-1.collapse.navbar-collapse #bs-example-navbar-collapse-1.collapse.navbar-collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li %li
...@@ -20,8 +21,10 @@ ...@@ -20,8 +21,10 @@
%a{:href => "#"} Ґранти %a{:href => "#"} Ґранти
%li %li
%a{:href => "#"} Проекти %a{:href => "#"} Проекти
%li %li.active
%a{:href => "#"} Партнери %a{:href => "#"}
Партнери
%span.sr-only (current)
%li %li
%a{:href => "#"} DIGITAL WORKSHOP %a{:href => "#"} DIGITAL WORKSHOP
%li %li
......
config/secrets.yml
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
development: development:
secret_key_base: b1b8b2c8f26c31fb891d8f8eaf37f5bc26ea31ac8913a4acfe7e9013853eeb3df5e681187e8ed35df9e6526d9528973791f904727fe56d250d903ff21083ece6 secret_key_base: b1b8b2c8f26c31fb891d8f8eaf37f5bc26ea31ac8913a4acfe7e9013853eeb3df5e681187e8ed35df9e6526d9528973791f904727fe56d250d903ff21083ece6
GOOGLE_MAP_API_KEY: AIzaSyALmxk-nEaCo8KVfJTdAiVFPBKA9s0VnmM
test: test:
secret_key_base: dd24cc39a6555956e85cb7d60612c685b91249ed8760a957b155ced0177eb172674137f73ba33d8b886f14089469703830d76ddbd42a996897d8b77aac43b33a secret_key_base: dd24cc39a6555956e85cb7d60612c685b91249ed8760a957b155ced0177eb172674137f73ba33d8b886f14089469703830d76ddbd42a996897d8b77aac43b33a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment