Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add mobile Ireland cobrand for use on mobiles.

  • Loading branch information...
commit a6450998ec8b146ba305dd5728958174d0ee0a08 1 parent c6b1943
@dracos dracos authored
View
1  .gitignore
@@ -30,6 +30,7 @@ FixMyBarangay.po
/web/cobrands/fixmybarangay/*.css
/web/cobrands/barnet/*.css
/web/cobrands/zurich/*.css
+/web/cobrands/irelandmobile/*.css
/web/photo
/local
View
2  bin/make_css
@@ -14,7 +14,7 @@
DIRECTORY=$(cd `dirname $0`/../web && pwd)
# FixMyStreet uses compass
-NEWSTYLE="fixmystreet bromley fixmybarangay barnet zurich default"
+NEWSTYLE="fixmystreet bromley fixmybarangay barnet zurich default irelandmobile"
NEWSTYLE_REGEX=${NEWSTYLE// /\\|}
for site in $NEWSTYLE; do
compass compile --output-style compressed $DIRECTORY/cobrands/$site
View
4 perllib/FixMyStreet/Cobrand/IrelandMobile.pm
@@ -0,0 +1,4 @@
+package FixMyStreet::Cobrand::IrelandMobile;
+use base 'FixMyStreet::Cobrand::Ireland';
+
+1;
View
1  templates/email/irelandmobile
View
2  templates/web/default/reports/council.html
@@ -16,7 +16,7 @@
[% IF c.cobrand.is_council %]
[% ward_text = loc( 'View reports by ward' ) %]
-[% ELSIF c.cobrand.moniker == 'ireland' %]
+[% ELSIF c.cobrand.moniker == 'ireland' or c.cobrand.moniker == 'irelandmobile' %]
[% ward_text = loc( 'Local electoral areas (LEAs) within this council' ) %]
[% ELSE %]
[% ward_text = loc( 'Wards of this council' ) %]
View
2  templates/web/fixmystreet/reports/_rss.html
@@ -5,6 +5,8 @@
'Get updates of reports in Bromley';
ELSIF c.cobrand.moniker == 'bromley';
'Get updates of reports in this ward';
+ ELSIF c.cobrand.moniker == 'irelandmobile' AND thing == 'ward':
+ 'Get updates of problems in this LEA';
ELSIF c.cobrand.is_council;
tprintf(loc('Get updates of %s problems'), thing);
ELSE;
View
6 templates/web/fixmystreet/reports/_ward-list.html
@@ -1,7 +1,11 @@
[% IF location == 'after' AND children.size %]
<section id="council_wards" class="hidden-js">
<h2>[% ward_text %]</h2>
- <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
+ [% IF c.cobrand.moniker == 'irelandmobile' %]
+ <p>[% loc('Follow a LEA link to view only reports within that LEA.') %]</p>
+ [% ELSE %]
+ <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
+ [% END %]
<ul class="issue-list-a full-width">
[% FOR child IN children.values.sort('name') %]
<li><a href="[% child.url %]"><span class="text">[% child.name %]</span></a></li>
View
144 templates/web/irelandmobile/faq/faq-en-gb.html
@@ -0,0 +1,144 @@
+[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %]
+
+<div class="sticky-sidebar">
+ <aside>
+ <ul class="plain-list">
+ <li><a href="#faq">Frequently Asked Questions</a></li>
+ <li><a href="#practical">Practical Questions</a></li>
+ <li><a href="#organisation">Organisation Questions</a></li>
+ <li><a href="/privacy">Privacy and cookies</a></li>
+ </ul>
+ </aside>
+</div>
+
+<h1><a name="faq"></a>Frequently Asked Questions</h1>
+ <dl>
+ <dt>What is FixMyStreet?</dt>
+ <dd>FixMyStreet is a site to help people report, view,
+or discuss local problems they&rsquo;ve found to their local council by
+simply locating them on a map. </dd>
+ <dt>What sort of problems should I report with FixMyStreet?</dt>
+ <dd>FixMyStreet is primarily for reporting things which are
+<strong>broken or dirty or damaged or dumped, and need fixing, cleaning
+or clearing</strong>, such as:
+
+ <ul><li>Abandoned vehicles
+ <li>Dog Fouling
+ <li>Flyposting or graffiti
+ <li>Illegal dumping or litter
+ <li>Streetcleaning, such as broken glass in a cycle lane
+ <li>Unlit lamposts
+ <li>Potholes
+ </ul>
+ </dd>
+
+ <dt>What isn&rsquo;t FixMyStreet for?</dt>
+ <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.is_council ? 'the' : 'your' %] council for all
+ issues &ndash; please use FixMyStreet only for problems such as the above. <strong>You will need to contact [% c.cobrand.is_council ? 'the' : 'your' %] council
+ directly</strong> for problems such as:
+
+ <ul><li>Anti-social behaviour
+ <li>Any urgent or emergency problems
+ <li>Noise pollution or barking dogs
+ <li>Fires and smoke/smell pollution
+ <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc.
+ <li>Complaining about your neighbours
+ <li>Complaining about the council
+ <li>Joy riding, drug taking, animal cruelty, or other criminal activity
+ </ul>
+ <p>Some councils have direct hotlines for these sorts of issues.</p>
+ </dd>
+
+ <dt>How do I use the site?</dt>
+ <dd>After entering a postcode or location, you are presented
+with a map of that area. You can view problems already reported in that area,
+or report ones of your own simply by clicking on the map at the location of
+the problem.</dd>
+ <dt>How are the problems solved?</dt>
+ <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The
+council can then resolve the problem the way they normally would.
+Alternatively, you can discuss the problem on the website with others, and
+then together lobby the council to fix it, or fix it directly yourselves.</dd>
+ <dt>Is it free?</dt>
+ <dd>The site is free to use, yes. FixMyStreet is <strong>run
+by volunteers</strong>, though, so do please bear that in mind if you're contacting us.</dd>
+
+ <dt>Can I use FixMyStreet on my mobile?</dt>
+ <dd>This web site does not yet provide a wonderful web experience on small devices. We're working on fixing that as soon as possible.</dd>
+ <dd>We're making native apps available more quickly. Watch this space. An Android app will become available before the end of September,
+ an iOS app as soon as we can find a developer to publish it for us.</dd>
+ <ul>
+ <li><em>Android:</em> A volunteer from the UK, Anna Powell-Smith, wrote an app
+ which you can find on the
+ <a href="https://play.google.com/store/apps/details?id=ie.fixmystreet">Google Play Store </a>.</li>
+ <li><em>iPhone:</em> Coming <b>very</b> soon.</li><!--Our basic app from 2008 is available for download
+ on the App Store:
+ <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>,-->
+ <!-- <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
+ <a href="http://store.ovi.com/content/107557">Ovi Store</a>.
+ </ul> -->
+ </dd>
+
+ </dl>
+
+ <h2><a name="practical"></a>Practical Questions</h2>
+ <dl>
+ <dt>I&rsquo;m from a council, where do you send the reports?</dt>
+ <dd>You can either leave a test report or <a href="/contact">contact us</a>
+to find out where reports go at the moment. Also <a href="/contact">contact us</a>
+to update the address or addresses we use. If your council is part of the FixYourStreet.ie trial project,
+you'll find reports made here are posted directly to there.</dd>
+ <!--<dt>I&rsquo;m from a council, can we have FixMyStreet on our website?</dt>
+ <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites.
+ <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd> -->
+ <dt>Do you remove silly or illegal content?</dt>
+ <dd>FixMyStreet is not responsible for the content and accuracy
+of material submitted by its users. We reserve the right to edit or remove any
+problems or updates which we consider to be inappropriate upon being informed
+by a user of the site.</dd>
+
+ <dt>Why can&rsquo;t I zoom out more on the reporting map?</dt>
+ <dd>We want to keep FixMyStreet locally focused, so restrict the ability to
+ move radically between areas. The map on Your Reports will let you see all
+ the reports you&rsquo;ve made, wherever they are. If you&rsquo;re from the
+ council then the emailed version of the problem report also contains the
+ closest road and postcode to the pin on the map.</dd>
+
+ <h2><a name="organisation"></a>Organisation Questions</h2>
+ <dl>
+ <dt>Who built FixMyStreet?</dt>
+ <dd>The code for this site was primarily developed to run <a href="http://fixmystreet.com">FixMyStreet.com</a>
+ in the UK by a charity called <a href="http://mysociety.org">MySociety</a>. The modifications required to
+ make this version in Ireland were developed by John Handelaar.</dd>
+ <dt>Who pays for it?</dt>
+ <dd><a href="http://sabrinadent.com">Sabrina Dent</a> and John Handelaar.</dd>
+ <dt>Do you need any help with the project?</dt>
+ <dd>Yes, we can use help in all sorts of ways, technical or
+non-technical. Please <a
+href="/contact/">get in touch</a>.</dd>
+ <dt>I&rsquo;d like a site like this for my own location/ where&rsquo;s the "source code" to this site?</dt>
+ <dd>
+The software behind this site is open source, and available
+to you mainly under the GNU Affero GPL software license. You can <a
+href="http://github.com/mysociety/fixmystreet">download the
+source code</a> and help develop it.
+You&rsquo;re welcome to use it in your own projects (just like we did), although you must also
+make available the source code to any such projects.
+<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code
+being used in a Norwegian version of this site. The original can be found at <a href="http://fixmystreet.com">FixMyStreet.com</a>
+</dd>
+<dt>I&rsquo;d prefer code in a different language?</dt>
+<dd>
+VisibleGovernment.ca wrote their own code for
+<a href="http://www.fixmystreet.ca/">FixMyStreet.ca</a>, which is
+written in GeoDjango and available under an MIT licence at <a
+href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>.
+<a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> was written as modules for
+Drupal.
+</p>
+</dd>
+ <dt>People build things, not organisations. Who <em>actually</em> built it?</dt>
+ <dd>Matthew Somerville and Francis Irving wrote the site.</dd>
+ <dd>John Handelaar made it work for Ireland with some help from Matthew and MySociety.org.</dd>
+ </dl>
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
View
43 templates/web/irelandmobile/footer.html
@@ -0,0 +1,43 @@
+ [% IF pagefooter %]
+ <footer role="content-info">
+ <div class="tablewrapper bordered">
+ <div id="footer-mobileapps">
+ <h4>Mobile apps</h4>
+
+ <ul>
+ [% #<li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li> %]
+ <li><a class="m-app-droid" href="https://play.google.com/store/apps/details?id=ie.fixmystreet">Android</a></li>
+ [% #<li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li> %]
+ </ul>
+ </div>
+ </div>
+ <p><a href="/privacy">Privacy and cookies</a></p>
+ </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="/"[% 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="/my"[% END
+ %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END
+ %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/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="/faq"[% END
+ %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+
+<!-- [% INCLUDE 'debug_footer.html' %] -->
+ </div> <!-- .wrapper -->
+</body>
+</html>
View
57 templates/web/irelandmobile/header.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
+ <head>
+ <meta name="viewport" content="initial-scale=1.0">
+
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+ <meta name="HandHeldFriendly" content="true">
+ <meta name="mobileoptimized" content="0">
+
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+ [% extra_css %]
+ <!--[if (lt IE 9) & (!IEMobile)]>
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <![endif]-->
+
+ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
+ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %]
+ [% extra_js %]
+
+ [% INCLUDE 'tracking_code.html' %]
+ <link rel="stylesheet" href="http://mygov.ie/fms/mobile.css">
+
+ </head>
+ <body class="[% bodyclass | html IF bodyclass %]">
+
+ <div class="wrapper">
+ <div class="table-cell">
+ <header id="site-header" role="banner">
+ <div class="container">
+ <a href="/" id="site-logo">FixMyStreet</a>
+ <a href="#main-nav" id="nav-link">Main Navigation</a>
+ </div>
+ </header>
+
+ <div id="user-meta">
+ [% IF c.user_exists %]
+ <p>
+ [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
+ <a href="/auth/sign_out">[% loc('sign out') %]</a>
+ </p>
+ [% ELSE %]
+ <!-- <a href="/auth">[% loc('Sign in') %]</a> -->
+ [% END %]
+ </div>
+
+ [% pre_container_extra %]
+
+ <div class="container">
+ <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
+
+ <!-- [% INCLUDE 'debug_header.html' %] -->
View
9 web/cobrands/irelandmobile/_colours.scss
@@ -0,0 +1,9 @@
+/* COLOURS */
+
+$primary: #ff6633;
+$primary_b: #000000;
+$primary_text: #222222;
+
+$contrast1: #ffff99;
+$contrast1_dark: darken(#6688ff, 10%);
+$contrast2: #ff9933;
View
7 web/cobrands/irelandmobile/base.scss
@@ -0,0 +1,7 @@
+@import "../fixmystreet/_h5bp";
+@import "./_colours";
+@import "../fixmystreet/_mixins";
+@import "compass";
+
+@import "../fixmystreet/_base";
+
View
25 web/cobrands/irelandmobile/config.rb
@@ -0,0 +1,25 @@
+# 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
View
60 web/cobrands/irelandmobile/layout.scss
@@ -0,0 +1,60 @@
+@import "_colours";
+@import "../fixmystreet/_layout";
+
+/*
+Note: The fact that the below has to override the CSS, though it is for the
+default template, is a sign that the CSS is not best organised. It needs
+refactoring, and making more maintainable through the use of SMACSS, OOCSS
+and similar.
+*/
+
+body {
+ background: #6688ff;
+}
+
+#front-main {
+ color: $primary_text;
+ background: $primary;
+ // layout sets this because base has it slightly lighter
+ h2 {
+ color: $primary_text;
+ }
+ a#geolocate_link {
+ color: $primary_text;
+ }
+}
+
+.nav-wrapper {
+ .nav-wrapper-2 {
+ border-top: 4px solid $primary;
+ @include border-image(none);
+ }
+}
+body.mappage {
+ .nav-wrapper {
+ .nav-wrapper-2 {
+ background: $contrast1;
+ }
+ }
+}
+
+#main-nav {
+ ul {
+ li {
+ a, span {
+ color: #000;
+ }
+ }
+ &#main-menu {
+ li {
+ a:hover {
+ background: $primary;
+ }
+ }
+ }
+ &#mysoc-menu {
+ background: $primary;
+ }
+ }
+}
+
Please sign in to comment.
Something went wrong with that request. Please try again.