diff --git a/app/assets/images/MetamapsLogo.png b/app/assets/images/MetamapsLogo.png new file mode 100644 index 00000000..b655a146 Binary files /dev/null and b/app/assets/images/MetamapsLogo.png differ diff --git a/app/assets/images/RibbonDonateBitcoin.png b/app/assets/images/RibbonDonateBitcoin.png deleted file mode 100644 index 4ef580d9..00000000 Binary files a/app/assets/images/RibbonDonateBitcoin.png and /dev/null differ diff --git a/app/assets/images/TVWlogo.png b/app/assets/images/TVWlogo.png new file mode 100644 index 00000000..2c1f8ed9 Binary files /dev/null and b/app/assets/images/TVWlogo.png differ diff --git a/app/assets/images/TVWmetamaps.png b/app/assets/images/TVWmetamaps.png new file mode 100644 index 00000000..99a4aa35 Binary files /dev/null and b/app/assets/images/TVWmetamaps.png differ diff --git a/app/assets/images/TVWtext.png b/app/assets/images/TVWtext.png new file mode 100644 index 00000000..68c0ec1f Binary files /dev/null and b/app/assets/images/TVWtext.png differ diff --git a/app/assets/images/homepage-bg.png b/app/assets/images/homepage-bg.png deleted file mode 100644 index 9bfb1040..00000000 Binary files a/app/assets/images/homepage-bg.png and /dev/null differ diff --git a/app/assets/images/icons/TVW_GNRL_agreement.png b/app/assets/images/icons/TVW_GNRL_agreement.png index 812fd3d1..3a9be22d 100644 Binary files a/app/assets/images/icons/TVW_GNRL_agreement.png and b/app/assets/images/icons/TVW_GNRL_agreement.png differ diff --git a/app/assets/images/icons/TVW_GNRL_event.png b/app/assets/images/icons/TVW_GNRL_event.png index b363e3f9..5835a9e6 100644 Binary files a/app/assets/images/icons/TVW_GNRL_event.png and b/app/assets/images/icons/TVW_GNRL_event.png differ diff --git a/app/assets/images/icons/TVW_GNRL_foresight.png b/app/assets/images/icons/TVW_GNRL_foresight.png new file mode 100644 index 00000000..b7c57112 Binary files /dev/null and b/app/assets/images/icons/TVW_GNRL_foresight.png differ diff --git a/app/assets/images/icons/TVW_GNRL_media.png b/app/assets/images/icons/TVW_GNRL_media.png new file mode 100644 index 00000000..1369817d Binary files /dev/null and b/app/assets/images/icons/TVW_GNRL_media.png differ diff --git a/app/assets/images/icons/TVW_GNRL_reference.png b/app/assets/images/icons/TVW_GNRL_reference.png index 732dcf1e..e7d6f8a6 100644 Binary files a/app/assets/images/icons/TVW_GNRL_reference.png and b/app/assets/images/icons/TVW_GNRL_reference.png differ diff --git a/app/assets/images/icons/TVW_GNRL_research.png b/app/assets/images/icons/TVW_GNRL_research.png new file mode 100644 index 00000000..10108a9b Binary files /dev/null and b/app/assets/images/icons/TVW_GNRL_research.png differ diff --git a/app/assets/images/icons/TVW_GNRL_wildcard.png b/app/assets/images/icons/TVW_GNRL_wildcard.png index 500b372a..40477a78 100644 Binary files a/app/assets/images/icons/TVW_GNRL_wildcard.png and b/app/assets/images/icons/TVW_GNRL_wildcard.png differ diff --git a/app/assets/images/mm-homepage-bg-image.png b/app/assets/images/mm-homepage-bg-image.png deleted file mode 100644 index 9bfb1040..00000000 Binary files a/app/assets/images/mm-homepage-bg-image.png and /dev/null differ diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js b/app/assets/javascripts/src/Metamaps.GlobalUI.js index 66850cc5..41bc19d7 100644 --- a/app/assets/javascripts/src/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js @@ -54,10 +54,7 @@ $(document).ready(function () { Metamaps[prop].init(); } } - - if (Metamaps.Active.Mapper) { - Metamaps.GlobalUI.Search.authInit(); - } + }); Metamaps.GlobalUI = { diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 95d96c02..8f20b72a 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -87,14 +87,8 @@ } .logo { - color: #9E9E9E; - font-family: "vinyl", sans-serif; - font-style: italic; - text-transform: uppercase; - font-weight: 400; - font-size: 30px; - line-height: 30px; - text-align: center; + height: 37px; + background: url(TVWlogo.png) no-repeat center center; } .bottomLinks { color: #9e9e9e; @@ -626,66 +620,107 @@ /* homepage */ .homeWrapper { - width: 560px; - margin: 56px auto 72px; + position: absolute; + left: 50%; + width: 708px; + margin: 56px 0 72px -480px; color: #424242; } -.homeTitle { - font-size: 48px; - line-height: 48px; - text-align: center; - margin-bottom: 20px; +.homeTextWrapper { + width: 460px; + float: left; } -.homeIntro { - font-size: 23px; - line-height: 26px; +.homeTextWrapper .homeLogo { + width: 460px; + height: 200px; + background: url(TVWmetamaps.png) no-repeat 0 0; +} + +.homeText { + padding: 0 14px; + font-size: 24px; text-align: justify; - margin-bottom: 20px; } -.homeWrapper .green { - color: #4fc059; -} - -.homeVideo { - margin-bottom: 20px; -} - -.callToAction a { - display: block; - width: 220px; - height: 12px; - padding: 16px 0; +.learnMore { + font-size: 21px; text-align: center; + margin-top: 64px; +} +.homeLinks { + margin-top: 16px; + padding: 0 14px; +} +#toMetamaps { + display: inline-block; + width: 170px; + height: 36px; + background: url(MetamapsLogo.png) no-repeat 0 0; + margin-bottom: -5px; +} +#toTheValueWeb { + display: inline-block; + width: 204px; + height: 25px; + background: url(TVWtext.png) no-repeat 0 0; + margin-left:54px; +} + + +.homeWrapper #new_user { + margin-left: 48px; + margin-top: 160px; + width: 200px; + float: left; +} + +.homeWrapper #new_user .accountInput { + width: 200px; + margin: 0 0 10px; +} +.homeWrapper #new_user input[type="email"], .homeWrapper #new_user input[type="password"] { + width: 200px; + height: 32px; border-radius: 2px; - font-size: 12px; - box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24); - margin: 0 auto; - color: #FFFFFF; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + background-color: #ffffff; + color: #424242 !important; + font-family: din-medium; + font-size: 14px; + text-align: left; + padding: 5px 0px 0px 10px; + direction: ltr; + -webkit-appearance: none; + appearance: none; + margin: 0px 0px; + background: #fff; + border: none; + outline: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + letter-spacing: normal; + word-spacing: normal; + text-transform: none; + text-indent: 0px; + text-shadow: none; } -.callToAction .requestInviteCTA { - background-color: #4fc059; - margin-bottom: 15px; +.homeWrapper #new_user .accountSubmit { + margin-left: 0; } -.callToAction .requestInviteCTA:hover { - background-color: #49ad4e; +.homeWrapper #new_user .accountRememberMe { + margin-right: 0; } -.callToAction .exploreFeaturedCTA { - background-color: #a354cd; -} -.callToAction .exploreFeaturedCTA:hover { - background-color: #9150bc; +.homeWrapper #new_user .accountForgotPass { + margin: 8px 0 0 0; } -.github-fork-ribbon-wrapper { - display:none; -} -.homePage .github-fork-ribbon-wrapper { - display: block; -} +/* 204x25 , 170x36 */ + /* end home page */ diff --git a/app/assets/stylesheets/uservoice.css b/app/assets/stylesheets/uservoice.css index 7b2bca26..1eaaf9d7 100644 --- a/app/assets/stylesheets/uservoice.css +++ b/app/assets/stylesheets/uservoice.css @@ -10,7 +10,7 @@ div.uv-icon.uv-bottom-left { left:0; margin-left:0px; text-indent:-100000px; - top:25%; + top:65%; width:25px; z-index:100000; opacity: 1; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a6497619..fde10c0a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -36,7 +36,9 @@ private path = request.env["PATH_INFO"] - unless path == "/" || path == new_user_registration_path || path == new_user_session_path + accessible_urls = ["/", new_user_registration_path, new_user_session_path, new_user_password_path, edit_user_password_path] + + unless accessible_urls.include?(path) store_location_for(:user, path) and redirect_to root_url, notice: "You must be logged in." return false end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 97da10cd..e49555fa 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,11 +14,17 @@ <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> - - - - + + + + + + + + + +