diff options
author | Dave Arter <davea@mysociety.org> | 2015-07-23 14:23:15 +0100 |
---|---|---|
committer | Dave Arter <davea@mysociety.org> | 2015-07-24 13:10:21 +0100 |
commit | 6e397b202967e56bd4b983b8ea231dbcac846100 (patch) | |
tree | 4567632b3e369559c204d6a64800d83469313336 | |
parent | 44dc205b516dc591f542418ebbd34a36dd98b458 (diff) |
[MakeMyIsland] Remove MakeMyIsland cobrand
The MakeMyIsland cobrand files now live in a separate repository:
mysociety/fixmystreet-international
The idea is that this repo will be checked out alongside the main fixmystreet
one and cobrand-specific files symlinked into place. To this end, the commit
also adds the MakeMyIsland symlinks to .gitignore.
-rw-r--r-- | .gitignore | 6 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/MakeMyIsland.pm | 12 | ||||
-rw-r--r-- | templates/web/base/index-steps.html | 11 | ||||
-rw-r--r-- | templates/web/makemyisland/_location_buttons.html | 15 | ||||
-rw-r--r-- | templates/web/makemyisland/around/postcode_form.html | 8 | ||||
-rw-r--r-- | templates/web/makemyisland/footer.html | 33 | ||||
-rw-r--r-- | templates/web/makemyisland/front/footer-marketing.html | 0 | ||||
-rw-r--r-- | templates/web/makemyisland/header_logo.html | 2 | ||||
-rw-r--r-- | templates/web/makemyisland/site-name.html | 1 | ||||
-rw-r--r-- | web/cobrands/makemyisland/_colours.scss | 25 | ||||
-rw-r--r-- | web/cobrands/makemyisland/base.scss | 42 | ||||
-rw-r--r-- | web/cobrands/makemyisland/config.rb | 25 | ||||
-rw-r--r-- | web/cobrands/makemyisland/layout.scss | 39 | ||||
-rwxr-xr-x | web/cobrands/makemyisland/make-my-island-logo.gif | bin | 5824 -> 0 bytes | |||
-rw-r--r-- | web/cobrands/makemyisland/undp-logo-2013.png | bin | 1979 -> 0 bytes |
15 files changed, 8 insertions, 211 deletions
diff --git a/.gitignore b/.gitignore index 777f3bafd..508180dba 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,9 @@ phonegap/www/js/config.js phonegap/Android/bin/ phonegap/iPhone/FixMyStreet.xcodeproj/project.xcworkspace/xcuserdata phonegap/Android/gen/ + +/fixmystreet-international +/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm +/templates/email/makemyisland +/templates/web/makemyisland +/web/cobrands/makemyisland diff --git a/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm b/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm deleted file mode 100644 index f263df4cc..000000000 --- a/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm +++ /dev/null @@ -1,12 +0,0 @@ -package FixMyStreet::Cobrand::MakeMyIsland; -use base 'FixMyStreet::Cobrand::Default'; - -use strict; -use warnings; - -sub country { - return 'MV'; -} - -1; - diff --git a/templates/web/base/index-steps.html b/templates/web/base/index-steps.html index fac84faba..431791c20 100644 --- a/templates/web/base/index-steps.html +++ b/templates/web/base/index-steps.html @@ -21,15 +21,8 @@ <li>Or visit the Barangay Center in person</li> <li>Staff? <a href="/auth">Sign in</a> and click on the map! [% ELSE %] - [% IF c.cobrand.moniker == 'makemyisland' %] - <li> - Locate the problem on the - <a href="/around?pc=Fonadhoo">map of the island</a> - </li> - [% ELSE %] - <li>[% question %]</li> - <li>[% loc('Locate the problem on a map of the area') %]</li> - [% END %] + <li>[% question %]</li> + <li>[% loc('Locate the problem on a map of the area') %]</li> <li>[% loc('Enter details of the problem') %]</li> [% IF c.cobrand.is_council %] <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> diff --git a/templates/web/makemyisland/_location_buttons.html b/templates/web/makemyisland/_location_buttons.html deleted file mode 100644 index 3604c466f..000000000 --- a/templates/web/makemyisland/_location_buttons.html +++ /dev/null @@ -1,15 +0,0 @@ -<div id="location-buttons"> - <!-- - Fonadhoo (the island) - Barasil (northern most) - Medhuavah (in the middle) - Kurigam (south) - --> - <div class="island-button"> - <a href="/around?pc=Fonadhoo" class="front-page-button">Fonadhoo island</a> - </div> - <a href="/around?latitude=1.846;longitude=73.510" class="front-page-button">Barasil</a> - <a href="/around?latitude=1.833;longitude=73.501" class="front-page-button">Medhuavah</a> - <a href="/around?latitude=1.822;longitude=73.488" class="front-page-button">Kurigam</a> - -</div> diff --git a/templates/web/makemyisland/around/postcode_form.html b/templates/web/makemyisland/around/postcode_form.html deleted file mode 100644 index 81cf948ef..000000000 --- a/templates/web/makemyisland/around/postcode_form.html +++ /dev/null @@ -1,8 +0,0 @@ -<div id="front-main"> - <div id="front-main-container"> - <h1>Report, view, or discuss local problems</h1> - <h2>(dumping waste, street lighting, erosion)</h2> - [% INCLUDE '_location_buttons.html' %] - </div> -</div> - diff --git a/templates/web/makemyisland/footer.html b/templates/web/makemyisland/footer.html deleted file mode 100644 index 318e620bf..000000000 --- a/templates/web/makemyisland/footer.html +++ /dev/null @@ -1,33 +0,0 @@ - [% IF pagefooter %] - <footer role="contentinfo"> - [% INCLUDE 'front/footer-marketing.html' %] - </footer> - [% END %] - </div><!-- .content role=main --> - </div><!-- .container --> - </div><!-- .table-cell --> - - <div class="nav-wrapper"> - <div class="nav-wrapper-2"> - <div id="main-nav" role="navigation"> - <ul id="main-menu"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/"[% END %] class="report-a-problem-btn" - >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/reports"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/privacy"[% END - %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> - </ul> - </div> - </div> - </div> - - </div> <!-- .wrapper --> -</body> -</html> diff --git a/templates/web/makemyisland/front/footer-marketing.html b/templates/web/makemyisland/front/footer-marketing.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/makemyisland/front/footer-marketing.html +++ /dev/null diff --git a/templates/web/makemyisland/header_logo.html b/templates/web/makemyisland/header_logo.html deleted file mode 100644 index 5d8b285dc..000000000 --- a/templates/web/makemyisland/header_logo.html +++ /dev/null @@ -1,2 +0,0 @@ - <a href="http://www.undp.org/" id="united-nations-dp-logo">UNDP</a> - <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html -%]</a> diff --git a/templates/web/makemyisland/site-name.html b/templates/web/makemyisland/site-name.html deleted file mode 100644 index 3eb903cd1..000000000 --- a/templates/web/makemyisland/site-name.html +++ /dev/null @@ -1 +0,0 @@ -MakeMyIsland diff --git a/web/cobrands/makemyisland/_colours.scss b/web/cobrands/makemyisland/_colours.scss deleted file mode 100644 index 56816bb77..000000000 --- a/web/cobrands/makemyisland/_colours.scss +++ /dev/null @@ -1,25 +0,0 @@ -/* COLOURS */ - - -// colours specified by MakeMyIsland team -// from http://www.w3schools.com/cssref/css_colorsfull.asp - -$blue: #4169E1; // "RoyalBlue" -$green: #40E0D0; // "Turquoise" - -$primary: $green; -$primary_b: #000000; -$primary_text: #222222; - -$base_bg: $blue; -$base_fg: $primary_text; - -$map_nav_bg: $blue; -$nav_fg: #fff; -$nav_fg_hover: $primary; - -$col_click_map: $blue; -$col_click_map_dark: darken($blue, 10%); - -$col_fixed_label: #00BD08; -$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/makemyisland/base.scss b/web/cobrands/makemyisland/base.scss deleted file mode 100644 index 234a9783f..000000000 --- a/web/cobrands/makemyisland/base.scss +++ /dev/null @@ -1,42 +0,0 @@ -@import "../sass/h5bp"; -@import "./_colours"; -@import "../sass/mixins"; -@import "compass"; - -@import "../sass/base"; - -#site-logo { - background: url(/cobrands/makemyisland/make-my-island-logo.gif) 0px 0px no-repeat; - background-size: contain; - background-color: $blue; -} - -#united-nations-dp-logo { - display: none; -} - -#site-header, -body.frontpage #site-header, -body.mappage #site-header, -{ - min-height: 3em; - @include background(none); - background-color: $blue; -} - -div#location-buttons { - margin: 1.333em auto; - .island-button { - margin:0 auto 1.5em auto; - } - a.front-page-button { - // @include button-reset(#FFD000, #cc9000, #aa7000, #300, #FFD000, #cc9000, #aa7000, #300); - @include button-reset($blue, darken($blue, 10%), darken($blue, 30%), white, $blue, darken($blue, 20%), darken($blue, 30%), white); - #front-main & { - text-decoration: none; - } - &:visited, &:hover { - color:white; - } - } -} diff --git a/web/cobrands/makemyisland/config.rb b/web/cobrands/makemyisland/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/makemyisland/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/makemyisland/layout.scss b/web/cobrands/makemyisland/layout.scss deleted file mode 100644 index 28b265240..000000000 --- a/web/cobrands/makemyisland/layout.scss +++ /dev/null @@ -1,39 +0,0 @@ -@import "_colours"; - -@import "../sass/layout"; - -#site-logo, -body.frontpage #site-logo { - margin-top: -8px; - margin-left: 10px; - height: 100px; - background: url(make-my-island-logo.gif) 0px 0px no-repeat; -} - -body.mappage #site-logo { - height: 60px; - background-size: contain; -} - -body.frontpage #site-logo { - margin-top: -35px; - width: 100px; -} - -body.frontpage #united-nations-dp-logo { - display: block; - float:right; - position: relative; - background: url(undp-logo-2013.png) top right no-repeat; - background-size: contain; - background-color: transparent; - text-indent: -999999px; - height: 100px; - width: 51px; - margin: 10px 10px 0 0; - z-index:3; // clear of the nav container -} - -ul#main-menu { - margin-right: 70px; // to clear the UNDP logo -}
\ No newline at end of file diff --git a/web/cobrands/makemyisland/make-my-island-logo.gif b/web/cobrands/makemyisland/make-my-island-logo.gif Binary files differdeleted file mode 100755 index f7b6b8d5a..000000000 --- a/web/cobrands/makemyisland/make-my-island-logo.gif +++ /dev/null diff --git a/web/cobrands/makemyisland/undp-logo-2013.png b/web/cobrands/makemyisland/undp-logo-2013.png Binary files differdeleted file mode 100644 index ed537e6cf..000000000 --- a/web/cobrands/makemyisland/undp-logo-2013.png +++ /dev/null |