diff options
85 files changed, 1466 insertions, 86 deletions
diff --git a/cobrands/fixamingata/appstore.png b/cobrands/fixamingata/appstore.png Binary files differnew file mode 100644 index 0000000..f6c6fce --- /dev/null +++ b/cobrands/fixamingata/appstore.png diff --git a/cobrands/fixamingata/config.js b/cobrands/fixamingata/config.js new file mode 100644 index 0000000..e9d5599 --- /dev/null +++ b/cobrands/fixamingata/config.js @@ -0,0 +1,51 @@ +var CONFIG = { + // Language of templates to use ( should be name of directory under www/templates/ ) + LANGUAGE: 'sv', + + // Name of app to use in alert dialog titles amongst other things + APP_NAME: 'FixaMinGata', + + // URL of the fixmystreet install to report to. See also config.xml-example + // Make sure it does *not* end with a slash. + FMS_URL: 'https://fixamingata.se', + + // Name of the cobrand to use for templates, stylesheets etc. + // Cobrand files should be placed in a new directory within www/cobrands/ + // Leave as null to use the default templates. + COBRAND: 'fixamingata', + + // Type of map to use; possible options currently are 'OSM', 'Bing' or + // 'FMS' (UK only). The default is OSM. + MAP_TYPE: 'OSM', + + // namespace for storing drafts etc in. Should not need to change + NAMESPACE: 'fixmystreet', + + // directory to store draft photos in. Should not need to change + FILES_DIR: 'photos', + + // accuracy in meters required before geolocation is successful + ACCURACY: 100, + + // how long, in milliseconds, before photo uploads timeout. Defaults to 120000 ( 2 minutes ) + UPLOAD_TIMEOUT: 120000, + + // Set to 1 to log debug messages to the console + DEBUG: 0, + + // Bing Maps API key if needed + BING_MAPS_API_KEY: '', + + PINS: { + location: { + image: 'images/pin@x2.png', + background: 'images/pin_shadow@x2.png', + image_svg: 'images/pin.svg', + background_svg: 'images/pin_shadow.svg' + } + } +}; + +// This bit is so this can be imported as a nodejs module for hook processing +var module = module || {}; +module.exports = CONFIG; diff --git a/cobrands/fixamingata/config.xml b/cobrands/fixamingata/config.xml new file mode 100644 index 0000000..d1ee816 --- /dev/null +++ b/cobrands/fixamingata/config.xml @@ -0,0 +1,85 @@ +<?xml version='1.0' encoding='utf-8'?> +<widget android-versionCode="42" id="se.sambruk.fixamingata" version="2.0.11" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> + <name>FixaMinGata</name> + <description> + Rapportera problem på FixaMinGata + </description> + <author email="info@fixamingata.se" href="http://www.sambruk.se"> + Sambruk + </author> + <content src="index.html" /> + <access origin="http://127.0.0.1*" /> + <access origin="fixamingata.se" /> + <access origin="a.tile.openstreetmap.org" /> + <access origin="b.tile.openstreetmap.org" /> + <access origin="c.tile.openstreetmap.org" /> + <preference name="android-minSdkVersion" value="16" /> + <preference name="orientation" value="portrait" /> + <preference name="StatusBarOverlaysWebView" value="false" /> + <preference name="StatusBarStyle" value="default" /> + <preference name="AndroidPersistentFileLocation" value="Compatibility" /> + <preference name="StatusBarBackgroundColor" value="#8dbfdc" /> + <preference name="deployment-target" value="6.0" /> + <platform name="android"> + <icon density="ldpi" src="res/fixamingata/android/drawable-ldpi/icon.png" /> + <icon density="mdpi" src="res/fixamingata/android/drawable-mdpi/icon.png" /> + <icon density="hdpi" src="res/fixamingata/android/drawable-hdpi/icon.png" /> + <icon density="xhdpi" src="res/fixamingata/android/drawable-xhdpi/icon.png" /> + <icon density="xxhdpi" src="res/fixamingata/android/drawable-xxhdpi/icon.png" /> + <icon density="xxxhdpi" src="res/fixamingata/android/drawable-xxxhdpi/icon.png" /> + <splash density="ldpi" src="res/fixamingata/android/drawable-ldpi/screen.9.png" /> + <splash density="mdpi" src="res/fixamingata/android/drawable-mdpi/screen.9.png" /> + <splash density="hdpi" src="res/fixamingata/android/drawable-hdpi/screen.9.png" /> + <splash density="xhdpi" src="res/fixamingata/android/drawable-xhdpi/screen.9.png" /> + <splash density="xxhdpi" src="res/fixamingata/android/drawable-xxhdpi/screen.9.png" /> + <splash density="xxxhdpi" src="res/fixamingata/android/drawable-xxxhdpi/screen.9.png" /> + </platform> + <platform name="ios"> + <icon height="180" src="res/fixamingata/ios/icons/Icon-60@3x.png" width="180" /> + <icon height="60" src="res/fixamingata/ios/icons/Icon-60.png" width="60" /> + <icon height="120" src="res/fixamingata/ios/icons/Icon-60@2x.png" width="120" /> + <icon height="76" src="res/fixamingata/ios/icons/Icon-76.png" width="76" /> + <icon height="152" src="res/fixamingata/ios/icons/Icon-76@2x.png" width="152" /> + <icon height="40" src="res/fixamingata/ios/icons/Icon-40.png" width="40" /> + <icon height="80" src="res/fixamingata/ios/icons/Icon-40@2x.png" width="80" /> + <icon height="57" src="res/fixamingata/ios/icons/Icon.png" width="57" /> + <icon height="114" src="res/fixamingata/ios/icons/Icon@2x.png" width="114" /> + <icon height="72" src="res/fixamingata/ios/icons/Icon-72.png" width="72" /> + <icon height="144" src="res/fixamingata/ios/icons/Icon-72@2x.png" width="144" /> + <icon height="29" src="res/fixamingata/ios/icons/Icon-Small.png" width="29" /> + <icon height="58" src="res/fixamingata/ios/icons/Icon-Small@2x.png" width="58" /> + <icon height="50" src="res/fixamingata/ios/icons/Icon-50.png" width="50" /> + <icon height="100" src="res/fixamingata/ios/icons/Icon-50@2x.png" width="100" /> + <splash height="480" src="res/fixamingata/ios/splash/Default~iphone.png" width="320" /> + <splash height="960" src="res/fixamingata/ios/splash/Default@2x~iphone_640x960.png" width="640" /> + <splash height="1024" src="res/fixamingata/ios/splash/Default-Portrait~ipad_768x1024.png" width="768" /> + <splash height="2048" src="res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2048.png" width="1536" /> + <splash height="2008" src="res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2008.png" width="1536" /> + <splash height="1136" src="res/fixamingata/ios/splash/Default-568h@2x~iphone_640x1136.png" width="640" /> + <splash height="1334" src="res/fixamingata/ios/splash/Default-750@2x~iphone6-portrait_750x1334.png" width="750" /> + <splash height="2208" src="res/fixamingata/ios/splash/Default-1242@3x~iphone6s-portrait_1242x2208.png" width="1242" /> + </platform> + <hook src="scripts/prepare_index_html.js" type="after_prepare" /> + <engine name="android" spec="^6.2.3" /> + <plugin name="cordova-plugin-camera" spec="^2.4.1" /> + <plugin name="cordova-plugin-device" spec="~1.1.1" /> + <plugin name="cordova-plugin-dialogs" spec="~1.2.0" /> + <plugin name="cordova-plugin-file" spec="~4.1.1" /> + <plugin name="cordova-plugin-file-transfer" spec="~1.5.0" /> + <plugin name="cordova-plugin-geolocation" spec="~2.1.0" /> + <plugin name="cordova-plugin-inappbrowser" spec="~1.3.0" /> + <plugin name="cordova-plugin-ios-app-language" spec="./cordova-plugin-ios-app-language"> + <variable name="IOS_LOCALIZATION" value="Swedish" /> + </plugin> + <plugin name="cordova-plugin-ios-disableshaketoedit" spec="~1.0.0" /> + <plugin name="cordova-plugin-media" spec="^2.2.0" /> + <plugin name="cordova-plugin-media-capture" spec="^1.2.0"> + <variable name="CAMERA_USAGE_DESCRIPTION" value="För att ta bilder för problemrapportering" /> + <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="För att komma åt dina problemrapporteringsbilder" /> + </plugin> + <plugin name="cordova-plugin-network-information" spec="^1.2.1" /> + <plugin name="cordova-plugin-splashscreen" spec="^3.2.2" /> + <plugin name="cordova-plugin-statusbar" spec="^2.1.3" /> + <plugin name="cordova-plugin-whitelist" spec="^1.2.2" /> + <plugin name="ionic-plugin-keyboard" spec="^2.0.1" /> +</widget> diff --git a/cobrands/fixamingata/ios-portrait.svg b/cobrands/fixamingata/ios-portrait.svg new file mode 100644 index 0000000..68db067 --- /dev/null +++ b/cobrands/fixamingata/ios-portrait.svg @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="744.09448819" + height="1052.3622047" + id="svg3021" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="ios-portrait.svg"> + <defs + id="defs3023"> + <linearGradient + id="linearGradient3814"> + <stop + style="stop-color:#eefaff;stop-opacity:1;" + offset="0" + id="stop3816" /> + <stop + style="stop-color:#b6e7ff;stop-opacity:1;" + offset="1" + id="stop3818" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3814" + id="linearGradient3820" + x1="80.700516" + y1="796.5083" + x2="80.700516" + y2="677.26117" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.5,57.143325,-599.30608)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="4" + inkscape:cx="174.10225" + inkscape:cy="529.89518" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1279" + inkscape:window-height="1534" + inkscape:window-x="1280" + inkscape:window-y="27" + inkscape:window-maximized="0" /> + <metadata + id="metadata3026"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="fill:url(#linearGradient3820);fill-opacity:1;stroke:none" + id="rect3040" + width="120" + height="180" + x="77.490997" + y="416.4693" + rx="0" + ry="86.823524" + inkscape:export-filename="/home/jonkri/fixmystreet-mobile/Default.png" + inkscape:export-xdpi="240" + inkscape:export-ydpi="240" /> + <g + id="g3810" + transform="matrix(0.52415015,0,0,0.52415015,34.244032,89.012897)"> + <path + inkscape:connector-curvature="0" + id="path2982-5-04-3" + d="m 196.97592,677.87178 c -23.83446,0 -43.15204,19.3176 -43.15204,43.1521 0,20.0323 13.64373,36.8758 32.14919,41.7402 l 10.5962,13.5502 10.389,-13.297 c 19.02022,-4.5053 33.17735,-21.5959 33.17735,-41.9934 0,-23.8345 -19.32524,-43.1521 -43.1597,-43.1521 z" + style="color:#000000;fill:#20bbdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.54330707;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:connector-curvature="0" + id="rect3772-9-2-4" + d="m 196.97592,694.18428 c -14.80226,0 -26.83958,12.0373 -26.83958,26.8396 0,14.8022 12.03732,26.8472 26.83958,26.8472 14.80227,0 26.83959,-12.045 26.83959,-26.8472 0,-14.8023 -12.03732,-26.8396 -26.83959,-26.8396 z m 0,3.6829 c 12.81185,0 23.15663,10.3448 23.15663,23.1567 0,12.8118 -10.34478,23.1643 -23.15663,23.1643 -12.81184,0 -23.15662,-10.3525 -23.15662,-23.1643 0,-5.776 2.1014,-11.0487 5.58582,-15.1002 l 8.25598,8.256 1.70337,1.711 0.8747,0.8747 4.05126,4.0436 c 0.0488,0.049 0.0937,0.095 0.14577,0.1381 0.002,0 0.006,0 0.008,0 0.0505,0.041 0.1003,0.08 0.15345,0.1151 0.002,0 0.006,0 0.008,0 0.0531,0.035 0.10578,0.07 0.16114,0.1 0.0591,0.032 0.1153,0.059 0.17647,0.084 0.0593,0.024 0.11569,0.043 0.17648,0.061 0.12432,0.038 0.24797,0.064 0.37596,0.077 0.12488,0.012 0.25111,0.012 0.37598,0 0.18729,-0.018 0.3749,-0.065 0.55245,-0.1381 0.23706,-0.098 0.45708,-0.2422 0.65218,-0.4373 0.0488,-0.049 0.0954,-0.1015 0.13811,-0.1535 0.17071,-0.2083 0.29515,-0.4393 0.36829,-0.6829 0.0366,-0.1218 0.0569,-0.2429 0.0691,-0.3683 0.012,-0.1228 0.0115,-0.2531 0,-0.376 -2.4e-4,0 0,-0.01 0,-0.01 -0.0123,-0.1253 -0.0325,-0.2464 -0.0691,-0.3683 -0.0177,-0.059 -0.0458,-0.1192 -0.069,-0.1764 0,0 0,-0.01 0,-0.01 -0.0976,-0.2375 -0.24224,-0.4571 -0.43736,-0.6522 l -4.04358,-4.0436 -0.8747,-0.8747 -1.71106,-1.711 -8.22528,-8.2253 c 4.00409,-3.3071 9.14362,-5.2943 14.75488,-5.2943 z m -0.45271,8.1716 c -0.44829,0 -0.89179,0.1706 -1.23531,0.5141 l -3.97453,3.9668 1.71103,1.7111 5.20987,-5.2099 -0.46806,-0.468 c -0.34349,-0.3435 -0.79468,-0.5141 -1.243,-0.5141 z m 2.58576,1.8568 -5.20987,5.2099 4.0436,4.0436 c 1.24631,1.2463 1.24631,3.2806 0,4.527 -1.24631,1.2463 -3.28066,1.2463 -4.52697,0 l -4.0436,-4.0436 -5.14846,5.1484 11.92359,11.9236 c 0,0 8.68093,0.9101 12.17678,-2.5857 3.49587,-3.4959 2.70852,-12.2996 2.70852,-12.2996 l -11.92359,-11.9236 z m -7.0897,6.9286 c 0.23004,0 0.46133,0.085 0.63683,0.2609 0.35101,0.351 0.35101,0.9227 0,1.2737 -0.35101,0.351 -0.92268,0.351 -1.27369,0 -0.35101,-0.351 -0.35101,-0.9227 0,-1.2737 0.17551,-0.1755 0.40682,-0.2609 0.63686,-0.2609 z m -5.23288,0.2225 -3.90548,3.9055 c -0.68702,0.687 -0.68702,1.799 0,2.486 l 0.46805,0.468 5.14846,-5.1484 -1.71103,-1.7111 z m 8.77005,3.307 c 0.23003,0 0.45366,0.093 0.62917,0.2686 0.35101,0.351 0.35101,0.915 0,1.266 -0.35101,0.351 -0.915,0.351 -1.26601,0 -0.35101,-0.351 -0.35101,-0.915 0,-1.266 0.17551,-0.1755 0.40682,-0.2686 0.63684,-0.2686 z" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <text + xml:space="preserve" + style="font-size:11.37534237px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="100.23986" + y="512.18622" + id="text4249-3" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4251-8" + x="100.23986" + y="512.18622" + style="font-size:11.37534237px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:ChunkFive;-inkscape-font-specification:ChunkFive">FixaMinGata</tspan></text> + <text + xml:space="preserve" + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="228.75" + y="449.86218" + id="text3933" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3935" + x="228.75" + y="449.86218" + style="font-size:16px">H=180,213</tspan></text> + </g> +</svg> diff --git a/cobrands/fixamingata/ios-square.svg b/cobrands/fixamingata/ios-square.svg new file mode 100644 index 0000000..5438c59 --- /dev/null +++ b/cobrands/fixamingata/ios-square.svg @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="744.09448819" + height="1052.3622047" + id="svg3021" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="ios-square.svg"> + <defs + id="defs3023"> + <linearGradient + id="linearGradient3814"> + <stop + style="stop-color:#eefaff;stop-opacity:1;" + offset="0" + id="stop3816" /> + <stop + style="stop-color:#b6e7ff;stop-opacity:1;" + offset="1" + id="stop3818" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3814" + id="linearGradient3820" + x1="80.700516" + y1="796.5083" + x2="80.700516" + y2="677.26117" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.8" + inkscape:cx="47.70427" + inkscape:cy="376.08929" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1279" + inkscape:window-height="1534" + inkscape:window-x="1280" + inkscape:window-y="27" + inkscape:window-maximized="0" /> + <metadata + id="metadata3026"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="fill:url(#linearGradient3820);fill-opacity:1;stroke:none" + id="rect3040" + width="120" + height="120" + x="20.347672" + y="677.18359" + rx="0" + ry="0" + inkscape:export-xdpi="768" + inkscape:export-ydpi="768" /> + <g + id="g3810" + transform="translate(-116.63208,10.090564)"> + <path + inkscape:connector-curvature="0" + id="path2982-5-04-3" + d="m 196.97592,677.87178 c -23.83446,0 -43.15204,19.3176 -43.15204,43.1521 0,20.0323 13.64373,36.8758 32.14919,41.7402 l 10.5962,13.5502 10.389,-13.297 c 19.02022,-4.5053 33.17735,-21.5959 33.17735,-41.9934 0,-23.8345 -19.32524,-43.1521 -43.1597,-43.1521 z" + style="color:#000000;fill:#20bbdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.54330707;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:connector-curvature="0" + id="rect3772-9-2-4" + d="m 196.97592,694.18428 c -14.80226,0 -26.83958,12.0373 -26.83958,26.8396 0,14.8022 12.03732,26.8472 26.83958,26.8472 14.80227,0 26.83959,-12.045 26.83959,-26.8472 0,-14.8023 -12.03732,-26.8396 -26.83959,-26.8396 z m 0,3.6829 c 12.81185,0 23.15663,10.3448 23.15663,23.1567 0,12.8118 -10.34478,23.1643 -23.15663,23.1643 -12.81184,0 -23.15662,-10.3525 -23.15662,-23.1643 0,-5.776 2.1014,-11.0487 5.58582,-15.1002 l 8.25598,8.256 1.70337,1.711 0.8747,0.8747 4.05126,4.0436 c 0.0488,0.049 0.0937,0.095 0.14577,0.1381 0.002,0 0.006,0 0.008,0 0.0505,0.041 0.1003,0.08 0.15345,0.1151 0.002,0 0.006,0 0.008,0 0.0531,0.035 0.10578,0.07 0.16114,0.1 0.0591,0.032 0.1153,0.059 0.17647,0.084 0.0593,0.024 0.11569,0.043 0.17648,0.061 0.12432,0.038 0.24797,0.064 0.37596,0.077 0.12488,0.012 0.25111,0.012 0.37598,0 0.18729,-0.018 0.3749,-0.065 0.55245,-0.1381 0.23706,-0.098 0.45708,-0.2422 0.65218,-0.4373 0.0488,-0.049 0.0954,-0.1015 0.13811,-0.1535 0.17071,-0.2083 0.29515,-0.4393 0.36829,-0.6829 0.0366,-0.1218 0.0569,-0.2429 0.0691,-0.3683 0.012,-0.1228 0.0115,-0.2531 0,-0.376 -2.4e-4,0 0,-0.01 0,-0.01 -0.0123,-0.1253 -0.0325,-0.2464 -0.0691,-0.3683 -0.0177,-0.059 -0.0458,-0.1192 -0.069,-0.1764 0,0 0,-0.01 0,-0.01 -0.0976,-0.2375 -0.24224,-0.4571 -0.43736,-0.6522 l -4.04358,-4.0436 -0.8747,-0.8747 -1.71106,-1.711 -8.22528,-8.2253 c 4.00409,-3.3071 9.14362,-5.2943 14.75488,-5.2943 z m -0.45271,8.1716 c -0.44829,0 -0.89179,0.1706 -1.23531,0.5141 l -3.97453,3.9668 1.71103,1.7111 5.20987,-5.2099 -0.46806,-0.468 c -0.34349,-0.3435 -0.79468,-0.5141 -1.243,-0.5141 z m 2.58576,1.8568 -5.20987,5.2099 4.0436,4.0436 c 1.24631,1.2463 1.24631,3.2806 0,4.527 -1.24631,1.2463 -3.28066,1.2463 -4.52697,0 l -4.0436,-4.0436 -5.14846,5.1484 11.92359,11.9236 c 0,0 8.68093,0.9101 12.17678,-2.5857 3.49587,-3.4959 2.70852,-12.2996 2.70852,-12.2996 l -11.92359,-11.9236 z m -7.0897,6.9286 c 0.23004,0 0.46133,0.085 0.63683,0.2609 0.35101,0.351 0.35101,0.9227 0,1.2737 -0.35101,0.351 -0.92268,0.351 -1.27369,0 -0.35101,-0.351 -0.35101,-0.9227 0,-1.2737 0.17551,-0.1755 0.40682,-0.2609 0.63686,-0.2609 z m -5.23288,0.2225 -3.90548,3.9055 c -0.68702,0.687 -0.68702,1.799 0,2.486 l 0.46805,0.468 5.14846,-5.1484 -1.71103,-1.7111 z m 8.77005,3.307 c 0.23003,0 0.45366,0.093 0.62917,0.2686 0.35101,0.351 0.35101,0.915 0,1.266 -0.35101,0.351 -0.915,0.351 -1.26601,0 -0.35101,-0.351 -0.35101,-0.915 0,-1.266 0.17551,-0.1755 0.40682,-0.2686 0.63684,-0.2686 z" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + </g> +</svg> diff --git a/cobrands/fixamingata/lang_list b/cobrands/fixamingata/lang_list new file mode 100644 index 0000000..18598f5 --- /dev/null +++ b/cobrands/fixamingata/lang_list @@ -0,0 +1 @@ +sv-se,Swedish,sv_SE diff --git a/cobrands/fixamingata/radar.svg b/cobrands/fixamingata/radar.svg new file mode 100644 index 0000000..d1c08df --- /dev/null +++ b/cobrands/fixamingata/radar.svg @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + x="0px" + y="0px" + width="640px" + height="640px" + viewBox="0 0 640 640" + style="enable-background:new 0 0 640 640;" + xml:space="preserve" + id="svg2" + inkscape:version="0.48.5 r10040" + sodipodi:docname="radar.svg"><metadata + id="metadata74"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs + id="defs72" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2560" + inkscape:window-height="1534" + id="namedview70" + showgrid="false" + inkscape:zoom="2.085965" + inkscape:cx="335.66352" + inkscape:cy="189.41445" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /><g + id="grid"><g + style="opacity:0.2;" + id="g5"><g + id="g7"><path + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + d="M320,640C143.125,640,0,496.875,0,320 S143.125,0,320,0s320,143.125,320,320S496.875,640,320,640z" + id="path9" /><path + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + d="M586.719,320 c0-147.344-119.375-266.719-266.719-266.719S53.281,172.656,53.281,320S172.656,586.719,320,586.719S586.719,467.344,586.719,320 z" + id="path11" /><path + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + d="M320,533.281 c-117.969,0-213.281-95.312-213.281-213.281S202.031,106.719,320,106.719S533.281,202.031,533.281,320 S437.969,533.281,320,533.281z" + id="path13" /><path + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + d="M480,320c0-88.438-71.562-160-160-160 s-160,71.562-160,160s71.562,160,160,160S480,408.438,480,320z" + id="path15" /><path + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + d="M320,426.719 c-58.906,0-106.719-47.812-106.719-106.719S261.094,213.281,320,213.281S426.719,261.094,426.719,320 S378.906,426.719,320,426.719z" + id="path17" /><path + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + d="M373.281,320 c0-29.531-23.75-53.281-53.281-53.281s-53.281,23.75-53.281,53.281s23.75,53.281,53.281,53.281S373.281,349.531,373.281,320z" + id="path19" /></g><g + id="g21"><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="320" + y2="640" + id="line23" /><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="546.25" + y2="546.25" + id="line25" /><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="640" + y2="320" + id="line27" /><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="546.25" + y2="93.75" + id="line29" /><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="320" + y2="0" + id="line31" /><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="93.75" + y2="93.75" + id="line33" /><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="0" + y2="320" + id="line35" /><line + style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;" + x1="320" + y1="320" + x2="93.75" + y2="546.25" + id="line37" /></g></g></g><path + style="color:#000000;fill:#20bbdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.54330707;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 319.99008,222.511 c -61.6933,0 -111.69508,50.00191 -111.69508,111.69533 0,51.85193 35.31554,95.44999 83.21522,108.04107 l 27.42729,35.0736 26.89097,-34.4182 C 395.06056,431.24124 431.705,387.00364 431.705,334.20633 431.705,272.51291 381.68339,222.511 319.99008,222.511 z" + id="path2982-5-04-3-5" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/jonkri/fixamingata/logo/text4249-3-9_.png" + inkscape:export-xdpi="24.84" + inkscape:export-ydpi="24.84" /><path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 322.56067,264.73439 c -38.31428,0 -69.47177,31.15753 -69.47177,69.47194 0,38.3144 31.15749,69.49188 69.47177,69.49188 38.31433,0 69.47181,-31.17748 69.47181,-69.49188 0,-38.31441 -31.15748,-69.47194 -69.47181,-69.47194 z m 0,9.53302 c 33.16229,0 59.93881,26.77653 59.93881,59.93892 0,33.16235 -26.77652,59.95886 -59.93881,59.95886 -33.16227,0 -59.93877,-26.79651 -59.93877,-59.95886 0,-14.95056 5.43928,-28.5986 14.45838,-39.08545 l 21.36985,21.3699 4.40902,4.4289 2.26408,2.26409 10.48631,10.46647 c 0.12631,0.12631 0.24253,0.24693 0.37731,0.35748 0.005,0.007 0.0154,0 0.0207,0 0.13073,0.10639 0.25962,0.20631 0.3972,0.29792 0.005,0 0.0155,-0.007 0.0207,0 0.13746,0.0911 0.27381,0.18198 0.41709,0.25807 0.15298,0.0823 0.29846,0.15323 0.45679,0.21846 0.15349,0.063 0.29946,0.11158 0.4568,0.15894 0.32179,0.0986 0.64184,0.16617 0.97313,0.19854 0.32324,0.0318 0.64997,0.0318 0.9732,0 0.48478,-0.0468 0.97038,-0.16827 1.42996,-0.3575 0.6136,-0.25237 1.18312,-0.62702 1.6881,-1.13208 0.12632,-0.12631 0.24694,-0.26249 0.3575,-0.3972 0.44186,-0.53928 0.76395,-1.13699 0.95329,-1.76756 0.0948,-0.31529 0.14727,-0.62886 0.17886,-0.9533 0.0311,-0.31797 0.0298,-0.65511 0,-0.97321 -6.4e-4,-0.007 0,-0.0129 0,-0.0207 -0.0319,-0.32443 -0.0842,-0.63795 -0.17886,-0.95332 -0.0458,-0.15195 -0.11855,-0.30854 -0.17862,-0.45676 0,-0.007 0,-0.0154 0,-0.0207 -0.25263,-0.6146 -0.62701,-1.18308 -1.13207,-1.68815 l -10.46642,-10.46644 -2.26408,-2.26411 -4.42893,-4.42891 -21.29038,-21.29047 c 10.36423,-8.55994 23.66743,-13.70366 38.19165,-13.70366 z m -1.17179,21.15142 c -1.16035,0 -2.30831,0.4415 -3.19748,1.33063 l -10.28771,10.26788 4.42885,4.42887 13.48526,-13.48525 -1.21153,-1.2115 c -0.88909,-0.88913 -2.05695,-1.33063 -3.21739,-1.33063 z m 6.693,4.80623 -13.48525,13.48525 10.46647,10.46649 c 3.22596,3.22599 3.22596,8.49171 0,11.71769 -3.22595,3.22598 -8.49168,3.22598 -11.71765,0 l -10.46647,-10.46651 -13.32632,13.32642 30.86311,30.86321 c 0,0 22.46979,2.35573 31.51847,-6.69302 9.04874,-9.04872 7.01076,-31.83634 7.01076,-31.83634 l -30.86312,-30.86319 z m -18.35103,17.93398 c 0.59544,0 1.19411,0.22105 1.64837,0.67526 0.90856,0.90857 0.90856,2.38828 0,3.29685 -0.90856,0.90855 -2.38827,0.90855 -3.29682,0 -0.90856,-0.90857 -0.90856,-2.38828 0,-3.29685 0.45429,-0.45426 1.05301,-0.67526 1.64845,-0.67526 z m -13.54483,0.57599 -10.10896,10.10896 c -1.77831,1.77829 -1.77831,4.65651 0,6.4348 l 1.2115,1.21153 13.32631,-13.32643 -4.42885,-4.42886 z m 22.70046,8.55985 c 0.59541,0 1.17426,0.24098 1.62856,0.69515 0.90856,0.90855 0.90856,2.36839 0,3.27692 -0.90857,0.90858 -2.36841,0.90858 -3.27696,0 -0.90855,-0.90853 -0.90855,-2.36837 0,-3.27692 0.45429,-0.4543 1.05301,-0.69515 1.6484,-0.69515 z" + id="rect3772-9-2-4-0" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/jonkri/fixamingata/logo/text4249-3-9_.png" + inkscape:export-xdpi="24.84" + inkscape:export-ydpi="24.84" /></svg>
\ No newline at end of file diff --git a/cobrands/fixamingata/spinner-transparent.xcf b/cobrands/fixamingata/spinner-transparent.xcf Binary files differnew file mode 100644 index 0000000..7564ee1 --- /dev/null +++ b/cobrands/fixamingata/spinner-transparent.xcf diff --git a/locale/FixMyStreetMobileApp.po b/locale/FixMyStreetMobileApp.po index dbb7935..2f162fc 100644 --- a/locale/FixMyStreetMobileApp.po +++ b/locale/FixMyStreetMobileApp.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: struan@mysociety.org\n" -"POT-Creation-Date: 2017-06-22 15:28+0100\n" +"POT-Creation-Date: 2017-06-27 19:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/existing.html:12 templates/strings.js:42 +#: templates/existing.html:12 templates/strings.js:43 msgid "-- Pick a category --" msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "Add an existing photo" msgstr "" -#: templates/strings.js:33 +#: templates/strings.js:34 msgid "An error was encountered when submitting your report: " msgstr "" @@ -89,11 +89,11 @@ msgstr "" msgid "Continue" msgstr "" -#: templates/strings.js:41 +#: templates/strings.js:42 msgid "Could not access location services. Please check permissions." msgstr "" -#: templates/strings.js:44 +#: templates/strings.js:45 msgid "Could not get location." msgstr "" @@ -145,7 +145,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/strings.js:43 +#: templates/strings.js:44 msgid "Got location." msgstr "" @@ -169,11 +169,11 @@ msgstr "" msgid "If you start compiling a report, but don't finish and send it, it'll appear in this menu so you can finish it later" msgstr "" -#: templates/strings.js:46 +#: templates/strings.js:47 msgid "Invalid email" msgstr "" -#: templates/strings.js:47 +#: templates/strings.js:48 msgid "Invalid report" msgstr "" @@ -189,7 +189,7 @@ msgstr "" msgid "Login" msgstr "" -#: templates/strings.js:55 +#: templates/strings.js:56 msgid "More details" msgstr "" @@ -197,6 +197,10 @@ msgstr "" msgid "More than one location matched that name. Select one below or try entering street name and area, or a postcode." msgstr "" +#: templates/strings.js:33 +msgid "Multiple matches found" +msgstr "" + #: templates/submit.html:20 templates/submit.html:59 msgid "Name" msgstr "" @@ -209,7 +213,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/strings.js:54 +#: templates/strings.js:55 msgid "No network connection available for submitting your report. Please try again later." msgstr "" @@ -241,7 +245,7 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/strings.js:49 +#: templates/strings.js:50 msgid "Photo added" msgstr "" @@ -257,7 +261,7 @@ msgstr "" msgid "Please confirm your name, if you want it to be public and optionally your phone number." msgstr "" -#: templates/strings.js:36 +#: templates/strings.js:37 msgid "Please enter a location" msgstr "" @@ -309,7 +313,7 @@ msgstr "" msgid "Please give us some basic details, and you're nearly done." msgstr "" -#: templates/strings.js:39 +#: templates/strings.js:40 msgid "Please search for a street name and area, or postcode." msgstr "" @@ -337,7 +341,7 @@ msgstr "" msgid "Save" msgstr "" -#: templates/strings.js:53 +#: templates/strings.js:54 msgid "Save for Later" msgstr "" @@ -393,7 +397,7 @@ msgstr "" msgid "Skip" msgstr "" -#: templates/strings.js:40 +#: templates/strings.js:41 msgid "Sorry, but we weren't able to establish your location accurately enough to show you a map. Please enter a location in the search box instead" msgstr "" @@ -433,11 +437,11 @@ msgstr "" msgid "There seems to have been a problem starting the app. Please quit and try again." msgstr "" -#: templates/strings.js:38 +#: templates/strings.js:39 msgid "There was a problem checking if we have all the details we need. Please try again later." msgstr "" -#: templates/strings.js:37 +#: templates/strings.js:38 msgid "There was a problem checking we cover this location. Please try again later." msgstr "" @@ -457,19 +461,19 @@ msgstr "" msgid "There was a problem looking up your location." msgstr "" -#: templates/strings.js:34 +#: templates/strings.js:35 msgid "There was a problem submitting your report. Please try again later." msgstr "" -#: templates/strings.js:35 +#: templates/strings.js:36 msgid "There was a problem submitting your report. Please try again." msgstr "" -#: templates/strings.js:48 +#: templates/strings.js:49 msgid "There was a problem taking your photo." msgstr "" -#: templates/strings.js:51 +#: templates/strings.js:52 msgid "There was a problem uploading your report." msgstr "" @@ -497,7 +501,7 @@ msgstr "" msgid "To skip this step in future, you can set a password now." msgstr "" -#: templates/offline.html:2 templates/strings.js:52 +#: templates/offline.html:2 templates/strings.js:53 msgid "Try Again" msgstr "" @@ -509,7 +513,7 @@ msgstr "" msgid "Untitled draft" msgstr "" -#: templates/strings.js:50 +#: templates/strings.js:51 msgid "Uploading images may take some time, please be patient" msgstr "" @@ -573,7 +577,7 @@ msgstr "" msgid "e.g. ‘B2 4QA’ or ‘Tib St, Manchester’" msgstr "" -#: templates/strings.js:45 +#: templates/strings.js:46 msgid "required" msgstr "" diff --git a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po index f7a7cb0..73047be 100644 --- a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po +++ b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: struan@mysociety.org\n" -"POT-Creation-Date: 2017-06-22 15:28+0100\n" +"POT-Creation-Date: 2017-06-27 19:15+0200\n" "PO-Revision-Date: 2013-09-18 18:01+0100\n" "Last-Translator: Struan <struan@mysociety.org>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/existing.html:12 templates/strings.js:42 +#: templates/existing.html:12 templates/strings.js:43 msgid "-- Pick a category --" msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "Add an existing photo" msgstr "" -#: templates/strings.js:33 +#: templates/strings.js:34 msgid "An error was encountered when submitting your report: " msgstr "" @@ -94,11 +94,11 @@ msgstr "" msgid "Continue" msgstr "" -#: templates/strings.js:41 +#: templates/strings.js:42 msgid "Could not access location services. Please check permissions." msgstr "" -#: templates/strings.js:44 +#: templates/strings.js:45 msgid "Could not get location." msgstr "" @@ -150,7 +150,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/strings.js:43 +#: templates/strings.js:44 msgid "Got location." msgstr "" @@ -174,11 +174,11 @@ msgstr "" msgid "If you start compiling a report, but don't finish and send it, it'll appear in this menu so you can finish it later" msgstr "" -#: templates/strings.js:46 +#: templates/strings.js:47 msgid "Invalid email" msgstr "" -#: templates/strings.js:47 +#: templates/strings.js:48 msgid "Invalid report" msgstr "" @@ -194,7 +194,7 @@ msgstr "" msgid "Login" msgstr "" -#: templates/strings.js:55 +#: templates/strings.js:56 msgid "More details" msgstr "" @@ -202,6 +202,10 @@ msgstr "" msgid "More than one location matched that name. Select one below or try entering street name and area, or a postcode." msgstr "" +#: templates/strings.js:33 +msgid "Multiple matches found" +msgstr "" + #: templates/submit.html:20 templates/submit.html:59 msgid "Name" msgstr "" @@ -215,7 +219,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/strings.js:54 +#: templates/strings.js:55 msgid "No network connection available for submitting your report. Please try again later." msgstr "" @@ -247,7 +251,7 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/strings.js:49 +#: templates/strings.js:50 msgid "Photo added" msgstr "" @@ -263,7 +267,7 @@ msgstr "" msgid "Please confirm your name, if you want it to be public and optionally your phone number." msgstr "" -#: templates/strings.js:36 +#: templates/strings.js:37 msgid "Please enter a location" msgstr "" @@ -316,7 +320,7 @@ msgstr "" msgid "Please give us some basic details, and you're nearly done." msgstr "" -#: templates/strings.js:39 +#: templates/strings.js:40 msgid "Please search for a street name and area, or postcode." msgstr "" @@ -345,7 +349,7 @@ msgstr "" msgid "Save" msgstr "" -#: templates/strings.js:53 +#: templates/strings.js:54 msgid "Save for Later" msgstr "" @@ -403,7 +407,7 @@ msgstr "" msgid "Skip" msgstr "" -#: templates/strings.js:40 +#: templates/strings.js:41 msgid "Sorry, but we weren't able to establish your location accurately enough to show you a map. Please enter a location in the search box instead" msgstr "" @@ -443,11 +447,11 @@ msgstr "" msgid "There seems to have been a problem starting the app. Please quit and try again." msgstr "" -#: templates/strings.js:38 +#: templates/strings.js:39 msgid "There was a problem checking if we have all the details we need. Please try again later." msgstr "" -#: templates/strings.js:37 +#: templates/strings.js:38 msgid "There was a problem checking we cover this location. Please try again later." msgstr "" @@ -467,19 +471,19 @@ msgstr "" msgid "There was a problem looking up your location." msgstr "" -#: templates/strings.js:34 +#: templates/strings.js:35 msgid "There was a problem submitting your report. Please try again later." msgstr "" -#: templates/strings.js:35 +#: templates/strings.js:36 msgid "There was a problem submitting your report. Please try again." msgstr "" -#: templates/strings.js:48 +#: templates/strings.js:49 msgid "There was a problem taking your photo." msgstr "" -#: templates/strings.js:51 +#: templates/strings.js:52 msgid "There was a problem uploading your report." msgstr "" @@ -509,7 +513,7 @@ msgstr "" msgid "To skip this step in future, you can set a password now." msgstr "" -#: templates/offline.html:2 templates/strings.js:52 +#: templates/offline.html:2 templates/strings.js:53 msgid "Try Again" msgstr "" @@ -521,7 +525,7 @@ msgstr "" msgid "Untitled draft" msgstr "" -#: templates/strings.js:50 +#: templates/strings.js:51 msgid "Uploading images may take some time, please be patient" msgstr "" @@ -588,7 +592,7 @@ msgstr "" msgid "e.g. ‘B2 4QA’ or ‘Tib St, Manchester’" msgstr "" -#: templates/strings.js:45 +#: templates/strings.js:46 msgid "required" msgstr "" diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po index 12d6404..1275d70 100644 --- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po +++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: my-society\n" "Report-Msgid-Bugs-To: struan@mysociety.org\n" -"POT-Creation-Date: 2017-06-22 15:28+0100\n" +"POT-Creation-Date: 2017-06-27 19:15+0200\n" "PO-Revision-Date: 2017-06-26 15:22+0100\n" "Last-Translator: applingua <team@applingua.com>\n" "Language-Team: Spanish, Dominican Republic\n" @@ -25,7 +25,7 @@ msgstr "" msgid "(optional)" msgstr "(opcional)" -#: templates/existing.html:12 templates/strings.js:42 +#: templates/existing.html:12 templates/strings.js:43 msgid "-- Pick a category --" msgstr "-- Seleccione una categoría --" @@ -57,7 +57,7 @@ msgstr "Añadir una foto " msgid "Add an existing photo" msgstr "Añadir una foto existente" -#: templates/strings.js:33 +#: templates/strings.js:34 msgid "An error was encountered when submitting your report: " msgstr "Un error se ha generado al enviar su informe: " @@ -98,11 +98,11 @@ msgstr "Email de confirmación enviado" msgid "Continue" msgstr "Continuar" -#: templates/strings.js:41 +#: templates/strings.js:42 msgid "Could not access location services. Please check permissions." msgstr "No se pudo acceder a los servicios de ubicación. Por favor, verificar los permisos." -#: templates/strings.js:44 +#: templates/strings.js:45 msgid "Could not get location." msgstr "No se pudo obtener la ubicación." @@ -154,7 +154,7 @@ msgstr "Detalles adicionales" msgid "Go" msgstr "Ir" -#: templates/strings.js:43 +#: templates/strings.js:44 msgid "Got location." msgstr "Ubicación localizada." @@ -178,11 +178,11 @@ msgstr "Ya tengo una - abrir sesión" msgid "If you start compiling a report, but don't finish and send it, it'll appear in this menu so you can finish it later" msgstr "Si comienza a compilar un informe, pero no lo termina ni lo envía, este aparecerá en este menú para que lo pueda completar más tarde" -#: templates/strings.js:46 +#: templates/strings.js:47 msgid "Invalid email" msgstr "Email inválido" -#: templates/strings.js:47 +#: templates/strings.js:48 msgid "Invalid report" msgstr "Informe inválido" @@ -198,7 +198,7 @@ msgstr "Error de ubicación" msgid "Login" msgstr "Abrir sesión" -#: templates/strings.js:55 +#: templates/strings.js:56 msgid "More details" msgstr "Más detalles" @@ -206,6 +206,10 @@ msgstr "Más detalles" msgid "More than one location matched that name. Select one below or try entering street name and area, or a postcode." msgstr "Más de una ubicación corresponde a ese nombre. Seleccione una abajo o pruebe indicando el nombre de la calle y área, o un código postal." +#: templates/strings.js:33 +msgid "Multiple matches found" +msgstr "" + #: templates/submit.html:20 templates/submit.html:59 msgid "Name" msgstr "Nombre" @@ -219,7 +223,7 @@ msgstr "Nuevo informe aquí" msgid "Next" msgstr "Siguiente" -#: templates/strings.js:54 +#: templates/strings.js:55 msgid "No network connection available for submitting your report. Please try again later." msgstr "No hay conexión a la red disponible para enviar su informe. Por favor, inténtelo de nuevo más tarde." @@ -251,7 +255,7 @@ msgstr "Contraseña" msgid "Phone number" msgstr "Número de teléfono" -#: templates/strings.js:49 +#: templates/strings.js:50 msgid "Photo added" msgstr "Foto añadida" @@ -267,7 +271,7 @@ msgstr "Por favor, seleccione una categoría" msgid "Please confirm your name, if you want it to be public and optionally your phone number." msgstr "Por favor confirme si desea mostrar su nombre o telefono en el reporte público." -#: templates/strings.js:36 +#: templates/strings.js:37 msgid "Please enter a location" msgstr "Por favor, indique una ubicación" @@ -320,7 +324,7 @@ msgstr "Por favor, provea detalles del problema." msgid "Please give us some basic details, and you're nearly done." msgstr "Por favor, proporciónenos con algunos detalles básicos, y pronto terminaremos." -#: templates/strings.js:39 +#: templates/strings.js:40 msgid "Please search for a street name and area, or postcode." msgstr "Por favor, busque el nombre de la calle y área o código postal." @@ -349,7 +353,7 @@ msgstr "Reposicione el informe aquí" msgid "Save" msgstr "Guardar" -#: templates/strings.js:53 +#: templates/strings.js:54 msgid "Save for Later" msgstr "Guardar para más tarde" @@ -407,7 +411,7 @@ msgstr "¡Sesión cerrada!" msgid "Skip" msgstr "Saltar" -#: templates/strings.js:40 +#: templates/strings.js:41 msgid "Sorry, but we weren't able to establish your location accurately enough to show you a map. Please enter a location in the search box instead" msgstr "Lo sentimos, no pudimos establecer su ubicación con la precisión necesaria para mostrarle un mapa. Por favor, como alternativa, incluya una ubicación en la casilla de búsqueda" @@ -447,11 +451,11 @@ msgstr "No hay conexión al internet, ¿quiere guardar el presente informe para msgid "There seems to have been a problem starting the app. Please quit and try again." msgstr "Ha sido un problema comenzando el app. Por favour, salirlo y intentar comenzarlo de nuevo." -#: templates/strings.js:38 +#: templates/strings.js:39 msgid "There was a problem checking if we have all the details we need. Please try again later." msgstr "Hubo un problema al verificar si tenemos todos los detalles que necesitamos. Por favor, inténtelo de nuevo más tarde." -#: templates/strings.js:37 +#: templates/strings.js:38 msgid "There was a problem checking we cover this location. Please try again later." msgstr "Hubo un problema al verificar si cubrimos esta ubicación. Por favor, inténtelo de nuevo más tarde." @@ -471,19 +475,19 @@ msgstr "Hubo un problema al cerrar sesión. Por favor, inténtelo de nuevo más msgid "There was a problem looking up your location." msgstr "Hubo un problema al buscar su ubicación." -#: templates/strings.js:34 +#: templates/strings.js:35 msgid "There was a problem submitting your report. Please try again later." msgstr "Hubo un problema al enviar su informe. Por favor, inténtelo de nuevo más tarde." -#: templates/strings.js:35 +#: templates/strings.js:36 msgid "There was a problem submitting your report. Please try again." msgstr "Hubo un problema al enviar su informe. Por favor, inténtelo de nuevo más tarde." -#: templates/strings.js:48 +#: templates/strings.js:49 msgid "There was a problem taking your photo." msgstr "Hubo un problema al tomar su foto." -#: templates/strings.js:51 +#: templates/strings.js:52 msgid "There was a problem uploading your report." msgstr "Hubo un problema al subir su informe." @@ -513,7 +517,7 @@ msgstr "Título" msgid "To skip this step in future, you can set a password now." msgstr "Para saltar este paso en el futuro, puede configurar una contraseña ahora." -#: templates/offline.html:2 templates/strings.js:52 +#: templates/offline.html:2 templates/strings.js:53 msgid "Try Again" msgstr "Inténtelo nuevamente" @@ -525,7 +529,7 @@ msgstr "Informe no enviado" msgid "Untitled draft" msgstr "Borrador sin título" -#: templates/strings.js:50 +#: templates/strings.js:51 msgid "Uploading images may take some time, please be patient" msgstr "Subir imágenes podría demorar, por favor tenga paciencia" @@ -592,7 +596,7 @@ msgstr "eliminar" msgid "e.g. ‘B2 4QA’ or ‘Tib St, Manchester’" msgstr "ej. ‘10103’ o ‘Ave. Alma Mater, Santo Domingo’" -#: templates/strings.js:45 +#: templates/strings.js:46 msgid "required" msgstr "requerido(a)" diff --git a/res/fixamingata/android/drawable-hdpi/icon.png b/res/fixamingata/android/drawable-hdpi/icon.png Binary files differnew file mode 100644 index 0000000..e15fc61 --- /dev/null +++ b/res/fixamingata/android/drawable-hdpi/icon.png diff --git a/res/fixamingata/android/drawable-hdpi/screen.9.png b/res/fixamingata/android/drawable-hdpi/screen.9.png Binary files differnew file mode 100644 index 0000000..c002dcb --- /dev/null +++ b/res/fixamingata/android/drawable-hdpi/screen.9.png diff --git a/res/fixamingata/android/drawable-ldpi/icon.png b/res/fixamingata/android/drawable-ldpi/icon.png Binary files differnew file mode 100755 index 0000000..64f0aee --- /dev/null +++ b/res/fixamingata/android/drawable-ldpi/icon.png diff --git a/res/fixamingata/android/drawable-ldpi/screen.9.png b/res/fixamingata/android/drawable-ldpi/screen.9.png Binary files differnew file mode 100644 index 0000000..7fe08c1 --- /dev/null +++ b/res/fixamingata/android/drawable-ldpi/screen.9.png diff --git a/res/fixamingata/android/drawable-mdpi/icon.png b/res/fixamingata/android/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 0000000..15347db --- /dev/null +++ b/res/fixamingata/android/drawable-mdpi/icon.png diff --git a/res/fixamingata/android/drawable-mdpi/screen.9.png b/res/fixamingata/android/drawable-mdpi/screen.9.png Binary files differnew file mode 100644 index 0000000..7e6632f --- /dev/null +++ b/res/fixamingata/android/drawable-mdpi/screen.9.png diff --git a/res/fixamingata/android/drawable-xhdpi/icon.png b/res/fixamingata/android/drawable-xhdpi/icon.png Binary files differnew file mode 100755 index 0000000..8a488cc --- /dev/null +++ b/res/fixamingata/android/drawable-xhdpi/icon.png diff --git a/res/fixamingata/android/drawable-xhdpi/screen.9.png b/res/fixamingata/android/drawable-xhdpi/screen.9.png Binary files differnew file mode 100644 index 0000000..88c45fa --- /dev/null +++ b/res/fixamingata/android/drawable-xhdpi/screen.9.png diff --git a/res/fixamingata/android/drawable-xxhdpi/icon.png b/res/fixamingata/android/drawable-xxhdpi/icon.png Binary files differnew file mode 100755 index 0000000..d1028d1 --- /dev/null +++ b/res/fixamingata/android/drawable-xxhdpi/icon.png diff --git a/res/fixamingata/android/drawable-xxhdpi/screen.9.png b/res/fixamingata/android/drawable-xxhdpi/screen.9.png Binary files differnew file mode 100644 index 0000000..62e58a3 --- /dev/null +++ b/res/fixamingata/android/drawable-xxhdpi/screen.9.png diff --git a/res/fixamingata/android/drawable-xxxhdpi/icon.png b/res/fixamingata/android/drawable-xxxhdpi/icon.png Binary files differnew file mode 100755 index 0000000..d954f25 --- /dev/null +++ b/res/fixamingata/android/drawable-xxxhdpi/icon.png diff --git a/res/fixamingata/android/drawable-xxxhdpi/screen.9.png b/res/fixamingata/android/drawable-xxxhdpi/screen.9.png Binary files differnew file mode 100644 index 0000000..4bd1976 --- /dev/null +++ b/res/fixamingata/android/drawable-xxxhdpi/screen.9.png diff --git a/res/fixamingata/ios/icons/Icon-40.png b/res/fixamingata/ios/icons/Icon-40.png Binary files differnew file mode 100755 index 0000000..fbbb33c --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-40.png diff --git a/res/fixamingata/ios/icons/Icon-40@2x.png b/res/fixamingata/ios/icons/Icon-40@2x.png Binary files differnew file mode 100755 index 0000000..b434bb0 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-40@2x.png diff --git a/res/fixamingata/ios/icons/Icon-50.png b/res/fixamingata/ios/icons/Icon-50.png Binary files differnew file mode 100755 index 0000000..7e7e544 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-50.png diff --git a/res/fixamingata/ios/icons/Icon-50@2x.png b/res/fixamingata/ios/icons/Icon-50@2x.png Binary files differnew file mode 100755 index 0000000..622238a --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-50@2x.png diff --git a/res/fixamingata/ios/icons/Icon-60.png b/res/fixamingata/ios/icons/Icon-60.png Binary files differnew file mode 100755 index 0000000..66b9280 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-60.png diff --git a/res/fixamingata/ios/icons/Icon-60@2x.png b/res/fixamingata/ios/icons/Icon-60@2x.png Binary files differnew file mode 100755 index 0000000..24a4d4a --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-60@2x.png diff --git a/res/fixamingata/ios/icons/Icon-60@3x.png b/res/fixamingata/ios/icons/Icon-60@3x.png Binary files differnew file mode 100755 index 0000000..5e731ce --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-60@3x.png diff --git a/res/fixamingata/ios/icons/Icon-72.png b/res/fixamingata/ios/icons/Icon-72.png Binary files differnew file mode 100755 index 0000000..e15fc61 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-72.png diff --git a/res/fixamingata/ios/icons/Icon-72@2x.png b/res/fixamingata/ios/icons/Icon-72@2x.png Binary files differnew file mode 100755 index 0000000..5a595f1 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-72@2x.png diff --git a/res/fixamingata/ios/icons/Icon-76.png b/res/fixamingata/ios/icons/Icon-76.png Binary files differnew file mode 100755 index 0000000..0e07161 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-76.png diff --git a/res/fixamingata/ios/icons/Icon-76@2x.png b/res/fixamingata/ios/icons/Icon-76@2x.png Binary files differnew file mode 100755 index 0000000..d1028d1 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-76@2x.png diff --git a/res/fixamingata/ios/icons/Icon-Small.png b/res/fixamingata/ios/icons/Icon-Small.png Binary files differnew file mode 100755 index 0000000..5fa04ed --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-Small.png diff --git a/res/fixamingata/ios/icons/Icon-Small@2x.png b/res/fixamingata/ios/icons/Icon-Small@2x.png Binary files differnew file mode 100755 index 0000000..c90af18 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon-Small@2x.png diff --git a/res/fixamingata/ios/icons/Icon.png b/res/fixamingata/ios/icons/Icon.png Binary files differnew file mode 100644 index 0000000..92201e2 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon.png diff --git a/res/fixamingata/ios/icons/Icon@2x.png b/res/fixamingata/ios/icons/Icon@2x.png Binary files differnew file mode 100755 index 0000000..6c482d0 --- /dev/null +++ b/res/fixamingata/ios/icons/Icon@2x.png diff --git a/res/fixamingata/ios/icons/iTunesArtwork.png b/res/fixamingata/ios/icons/iTunesArtwork.png Binary files differnew file mode 100755 index 0000000..7604bc7 --- /dev/null +++ b/res/fixamingata/ios/icons/iTunesArtwork.png diff --git a/res/fixamingata/ios/icons/iTunesArtwork@2x.png b/res/fixamingata/ios/icons/iTunesArtwork@2x.png Binary files differnew file mode 100755 index 0000000..f6c6fce --- /dev/null +++ b/res/fixamingata/ios/icons/iTunesArtwork@2x.png diff --git a/res/fixamingata/ios/splash/Default-1242@3x~iphone6s-portrait_1242x2208.png b/res/fixamingata/ios/splash/Default-1242@3x~iphone6s-portrait_1242x2208.png Binary files differnew file mode 100755 index 0000000..c1ba99b --- /dev/null +++ b/res/fixamingata/ios/splash/Default-1242@3x~iphone6s-portrait_1242x2208.png diff --git a/res/fixamingata/ios/splash/Default-568h@2x~iphone_640x1136.png b/res/fixamingata/ios/splash/Default-568h@2x~iphone_640x1136.png Binary files differnew file mode 100644 index 0000000..3086b68 --- /dev/null +++ b/res/fixamingata/ios/splash/Default-568h@2x~iphone_640x1136.png diff --git a/res/fixamingata/ios/splash/Default-750@2x~iphone6-portrait_750x1334.png b/res/fixamingata/ios/splash/Default-750@2x~iphone6-portrait_750x1334.png Binary files differnew file mode 100644 index 0000000..e84bec6 --- /dev/null +++ b/res/fixamingata/ios/splash/Default-750@2x~iphone6-portrait_750x1334.png diff --git a/res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2008.png b/res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2008.png Binary files differnew file mode 100755 index 0000000..fd2de44 --- /dev/null +++ b/res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2008.png diff --git a/res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2048.png b/res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2048.png Binary files differnew file mode 100644 index 0000000..ec77aef --- /dev/null +++ b/res/fixamingata/ios/splash/Default-Portrait@2x~ipad_1536x2048.png diff --git a/res/fixamingata/ios/splash/Default-Portrait~ipad_768x1024.png b/res/fixamingata/ios/splash/Default-Portrait~ipad_768x1024.png Binary files differnew file mode 100644 index 0000000..8e5b5aa --- /dev/null +++ b/res/fixamingata/ios/splash/Default-Portrait~ipad_768x1024.png diff --git a/res/fixamingata/ios/splash/Default@2x~iphone_640x960.png b/res/fixamingata/ios/splash/Default@2x~iphone_640x960.png Binary files differnew file mode 100644 index 0000000..098b626 --- /dev/null +++ b/res/fixamingata/ios/splash/Default@2x~iphone_640x960.png diff --git a/res/fixamingata/ios/splash/Default~iphone.png b/res/fixamingata/ios/splash/Default~iphone.png Binary files differnew file mode 100644 index 0000000..a9e52a2 --- /dev/null +++ b/res/fixamingata/ios/splash/Default~iphone.png diff --git a/templates/strings.js b/templates/strings.js index 63e3bed..56c9119 100644 --- a/templates/strings.js +++ b/templates/strings.js @@ -30,6 +30,7 @@ location_error: '[% loc('Location error') %]', location_problem: '[% loc('There was a problem looking up your location.') %]', multiple_locations: '[% loc('More than one location matched that name. Select one below or try entering street name and area, or a postcode.') %]', + multiple_matches: '[% loc('Multiple matches found') %]', sync_error: '[% loc('An error was encountered when submitting your report: ') %]', unknown_sync_error: '[% loc('There was a problem submitting your report. Please try again later.') %]', report_send_error: '[% loc('There was a problem submitting your report. Please try again.') %]', diff --git a/translating.md b/translating.md index 6586bb6..a51f314 100644 --- a/translating.md +++ b/translating.md @@ -6,15 +6,16 @@ FixMyStreet mobile code. Quickstart ---------- -./bin/gettext-extract -./bin/gettext-merge -../fixmystreet/commonlib/bin/gettext-makemo FixMyStreetMobileApp -perl -I../fixmystreet/commonlib/perllib -I../fixmystreet/local bin/localise_templates +On Debian, install "liblocale-maketext-lexicon-perl" and +"libtemplate-perl". On Fedora, install "perl-Locale-gettext" and +"perl-Locale-Maketext-Lexicon". -copy compiled/$lang/*.html to www/templates/$lang -copy compiled/$lang/strings.js to www/js/strings.$short_lang.js - -(NB `$short_lang` should match `CONFIG.LANGUAGE` in your config.js) +- ./bin/gettext-extract +- ./bin/gettext-merge +- ../fixmystreet/commonlib/bin/gettext-makemo FixMyStreetMobileApp +- perl -I../fixmystreet/commonlib/perllib -I../fixmystreet/local bin/localise_templates +- Copy compiled/$lang/*.html to www/templates/$lang +- Copy compiled/lang/strings.js to www/js/strings.$short_lang.js The list of languages to generate templates for should be included in locale/lang_list and should look like locale/lang_list.example diff --git a/www/cobrands/fixamingata/css/config.rb b/www/cobrands/fixamingata/css/config.rb new file mode 100644 index 0000000..5a4dbed --- /dev/null +++ b/www/cobrands/fixamingata/css/config.rb @@ -0,0 +1,2 @@ +css_dir = "." +sass_dir = "." diff --git a/www/cobrands/fixamingata/css/style.css b/www/cobrands/fixamingata/css/style.css new file mode 100644 index 0000000..9b3bf5d --- /dev/null +++ b/www/cobrands/fixamingata/css/style.css @@ -0,0 +1,57 @@ +/* line 6, style.scss */ +.ios7 .ui-bar-a, +body.ios7 { + background-color: #8dbfdc; +} + +/* line 11, style.scss */ +.ios7 .ui-bar-a { + border-color: #8dbfdc; +} + +/* line 15, style.scss */ +#load-screen, +#locating { + background: #8dbfdc; + color: white; +} + +/* line 21, style.scss */ +#locating #progress-bar { + background-color: #20bbdf; +} + +/* line 25, style.scss */ +#view-my-reports .draft_count { + background-color: #4390bd; + color: #fff; + border-color: transparent; +} + +/* line 31, style.scss */ +#display-help { + background-color: #c6deff; + color: grey; +} + +/* line 37, style.scss */ +.ui-bar-a, .ui-btn-up-a, .ui-btn-hover-a, .ui-btn-down-a { + border-color: #529eca; + background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjEuMCIgeTE9IjAuNSIgeDI9IjAuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc5YjRkNiIvPjxzdG9wIG9mZnNldD0iOTglIiBzdG9wLWNvbG9yPSIjYTFjYWUyIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background: -moz-linear-gradient(180deg, #79b4d6, #a1cae2 98%); + background: -webkit-linear-gradient(180deg, #79b4d6, #a1cae2 98%); + background: linear-gradient(-90deg, #79b4d6, #a1cae2 98%); +} + +/* line 42, style.scss */ +.ui-corner-all, +.ui-btn-corner-all { + -webkit-border-radius: 3px; + border-radius: 3px; +} + +/* line 48, style.scss */ +#load-screen .radar, +#locating .radar { + background-image: url("../images/radar-fixamingata.png"); +} diff --git a/www/cobrands/fixamingata/css/style.scss b/www/cobrands/fixamingata/css/style.scss new file mode 100644 index 0000000..27d24b5 --- /dev/null +++ b/www/cobrands/fixamingata/css/style.scss @@ -0,0 +1,51 @@ +@import "compass"; + +$lighterblue: rgb(198, 222, 255); +$darkerblue: rgb(141, 191, 220); + +.ios7 .ui-bar-a, +body.ios7 { + background-color: $darkerblue; +} + +.ios7 .ui-bar-a { + border-color: $darkerblue; +} + +#load-screen, +#locating { + background: $darkerblue; + color: white; +} + +#locating #progress-bar { + background-color: #20bbdf; +} + +#view-my-reports .draft_count{ + background-color: rgb(67, 144, 189); + color: #fff; + border-color: transparent; +} + +#display-help { + background-color: $lighterblue; + color: grey; +} + + +.ui-bar-a, .ui-btn-up-a, .ui-btn-hover-a, .ui-btn-down-a { + border-color: darken($darkerblue, 15%); + @include background(linear-gradient(-90deg, darken($darkerblue, 5%), lighten($darkerblue, 5%) 98%)); +} + +.ui-corner-all, +.ui-btn-corner-all { + -webkit-border-radius: 3px; + border-radius: 3px; +} + +#load-screen .radar, +#locating .radar { + background-image: url('../images/radar-fixamingata.png'); +} diff --git a/www/cobrands/fixamingata/images/ie_front_logo.gif b/www/cobrands/fixamingata/images/ie_front_logo.gif Binary files differnew file mode 100644 index 0000000..998b43c --- /dev/null +++ b/www/cobrands/fixamingata/images/ie_front_logo.gif diff --git a/www/cobrands/fixamingata/images/ie_logo.gif b/www/cobrands/fixamingata/images/ie_logo.gif Binary files differnew file mode 100644 index 0000000..829cd1f --- /dev/null +++ b/www/cobrands/fixamingata/images/ie_logo.gif diff --git a/www/cobrands/fixamingata/images/ie_mysoc_logo.gif b/www/cobrands/fixamingata/images/ie_mysoc_logo.gif Binary files differnew file mode 100644 index 0000000..79602e0 --- /dev/null +++ b/www/cobrands/fixamingata/images/ie_mysoc_logo.gif diff --git a/www/cobrands/fixamingata/images/radar-fixamingata.png b/www/cobrands/fixamingata/images/radar-fixamingata.png Binary files differnew file mode 100644 index 0000000..7808c22 --- /dev/null +++ b/www/cobrands/fixamingata/images/radar-fixamingata.png diff --git a/www/cobrands/fixamingata/images/spinner-yellow.gif b/www/cobrands/fixamingata/images/spinner-yellow.gif Binary files differnew file mode 100644 index 0000000..181712d --- /dev/null +++ b/www/cobrands/fixamingata/images/spinner-yellow.gif diff --git a/www/cobrands/fixamingata/images/sprite.png b/www/cobrands/fixamingata/images/sprite.png Binary files differnew file mode 100644 index 0000000..53c07a8 --- /dev/null +++ b/www/cobrands/fixamingata/images/sprite.png diff --git a/www/cobrands/fixamingata/templates/sv/help.html b/www/cobrands/fixamingata/templates/sv/help.html new file mode 100644 index 0000000..a2ee998 --- /dev/null +++ b/www/cobrands/fixamingata/templates/sv/help.html @@ -0,0 +1,35 @@ +<h1>Om <% print( CONFIG.APP_NAME ) %></h1> +<dl> + <dt>Vad är <% print( CONFIG.APP_NAME ) %>?</dt> + <dd><% print( CONFIG.APP_NAME ) %> är en app för att underlätta rapportering av problem i gatumiljön till kommuner.</dd> + + <dt>Hur används appen?</dt> + <dd>Appen kommer att försöka hitta din position automatiskt, alternativet är att söka på postnummer eller plats. För att rapportera ett problem, navigera kartan så att platsen med problemet lokaliseras och klicka på 'Ny rapportering här'.</dd> + + <dt>Vad händer med informationen som jag anger?</dt> + <dd><strong>All information som du anger kommer att skickas till kommunen.</strong> Din rapports titel, kategori och detaljer kommer att visas offentligt på <% print( CONFIG.APP_NAME ) %>. Som standard visas också ditt namn på <% print( CONFIG.APP_NAME ) %>, men du kan göra ett aktivt val för att dölja uppgiften. <strong>Din e-postadress eller ditt telefonnummer kommer aldrig visas offentligt på <% print( CONFIG.APP_NAME ) %></strong>.</dd> + + <dt>Hur kan jag välja att vara anonym?</dt> + <dd>Avmarkera 'Visa mitt namn offentligt' när du fyller i dina uppgifter så kommer ditt namn inte att visas på <% print( CONFIG.APP_NAME ) %>. <strong>Ditt namn, din e-postadress och ditt telefonnummer (om du anger det) kommer alltid att skickas till kommunen.</strong></dd> + + <dt>Vad gör jag om jag om personlig information angivits i en rapport av misstag?</dt> + <dd>Kontakta <% print( CONFIG.APP_NAME ) %>-supporten på <a href="mailto:info@fixamingata.se">info@fixamingata.se</a> så hjälper vi dig.</dd> + + <dt>Hur kan jag återställa mitt lösenord?</dt> + <dd>Om du har glömt bort ditt lösenord kan det återställas genom att välja 'Sätt ett lösenord'-alternativet vid nästa tillfälle en rapport skapas. Notera att du alltid måste klicka på länken i bekräftelsemejlet för att aktivera eller ändra ditt lösenord.</dd> + + <dt>Vilken sorts problem skall jag rapportera med <% print( CONFIG.APP_NAME ) %>?</dt> + <dd><% print( CONFIG.APP_NAME ) %> är huvudsakligen till för att rapportera saker som är <strong>trasiga, smutsiga, skadade, tippade, eller behöver lagas, rensas eller städas upp</strong>.</dd> + + <dt>Vad är <% print( CONFIG.APP_NAME ) %> inte till för?</dt> + <dd><% print( CONFIG.APP_NAME ) %> är inte till för att kontakta din kommun i andra ärenden än ovan. Vänligen använd bara <% print( CONFIG.APP_NAME ) %> för ärenden som kan kopplas till angivna kategorier.</dd> + + <dt>Är <% print( CONFIG.APP_NAME ) %> gratis?</dt> + <dd>Webbplats och app är gratis att använda.</dd> + + <dt>Vilka ligger bakom <% print( CONFIG.APP_NAME ) %>?</dt> + <dd><% print( CONFIG.APP_NAME ) %> är en e-tjänst som drivs av <a href="http://sambruk.se/">Föreningen Sambruk</a> och är framtagen i samarbete med <a href="http://kivos.se/">KIVOS</a> och <a href="http://ffkp.se/">FFKP</a>. <% print( CONFIG.APP_NAME ) %> är baserad på FixMyStreet, ett projekt skapat av brittiska <a onclick="FMS.openExternal(event); return false;" href="http://www.mysociety.org/">mySociety</a>.</dd> + <dt>Tack till...</dt> + <dd> + <a onclick="FMS.openExternal(event); return false;" href="http://www.openstreetmap.org/">OpenStreetMap</a> och <a onclick="FMS.openExternal(event); return false;" href="http://www.mapquest.com/">MapQuest</a> (för kartorna), fri programvarurörelsen (detta projekt använder Phonegap, Backbone, och jQuery Mobile) och FixMyStreet. Säg till om vi har missat någon.</dd> +</dl> diff --git a/www/cobrands/fixamingata/templates/sv/initial_help.html b/www/cobrands/fixamingata/templates/sv/initial_help.html new file mode 100644 index 0000000..ca5e0ef --- /dev/null +++ b/www/cobrands/fixamingata/templates/sv/initial_help.html @@ -0,0 +1,8 @@ +<h1>Välkommen till <% print( CONFIG.APP_NAME ) %></h1> +<p> +Du kan använda den här appen för att rapportera problem i din lokala gatumiljö till kommuner runtom i Sverige. +</p> + +<p> +Appen går att använda med eller utan tillgång till Internet, eftersom det inte alltid finns täckning. +</p> diff --git a/www/js/strings.sv.js b/www/js/strings.sv.js new file mode 100644 index 0000000..5728b2d --- /dev/null +++ b/www/js/strings.sv.js @@ -0,0 +1,59 @@ +(function (FMS, _) { + _.extend( FMS, { + validationStrings: { + update: 'Ange ditt namn', + title: 'Ange ditt namn', + detail: 'Ange en giltlig e-postadress', + name: { + required: 'Ange ditt namn', + validName: 'Ange ditt fullständiga namn - bocka i alternativet nedan om namnet inte ska visas offentligt på FixaMinGata' + }, + category: 'Sparad i %s-kategorin', + rznvy: { + required: 'Ange en giltlig e-postadress', + email: 'Ange en giltlig e-postadress' + }, + email: { + required: 'Ange en giltlig e-postadress', + email: 'Ange en giltlig e-postadress' + }, + password: 'Ja, jag har ett lösenord' + }, + strings: { + next: 'Nästa', + untitled_draft: 'Namnlöst utkast', + login_error: 'Det har uppstått ett problem. Vänligen avsluta appen och försök igen.', + logout_error: 'Det har uppstått ett problem. Vänligen avsluta appen och försök igen.', + login_details_error: 'Ett problem uppstod vid din inloggning. Vänligen försök igen senare.', + password_problem: 'Det finns ett problem med din e-post/lösenords-kombination. Om du har glömt ditt lösenord, eller inte har ett, kan ett nytt anges genom att gå via e-postfönstret och välja alternativet lösenord. Lösenord aktiveras när du klickar på länken i ditt bekräftelsemejl.', + search_placeholder: 'Sök efter en plats eller ett postnummer', + location_error: 'Platsfel', + location_problem: 'Ett problem uppstod i vid fastställande av plats.', + multiple_locations: 'Mer än en plats hittades. Välj ett av alternativen nedan eller sök på gatunamn och ort, eller postnummer.', + multiple_matches: 'Multiple matches found', + sync_error: 'Ett fel inträffades när din rapport skickades: ', + unknown_sync_error: 'Det har uppstått ett problem. Vänligen avsluta appen och försök igen.', + report_send_error: 'Det har uppstått ett problem. Vänligen avsluta appen och försök igen.', + missing_location: 'Ange ditt namn', + location_check_failed: 'Ett problem uppstod i samband med genomgång av att angiven position stödjs. Vänligen försök igen senare.', + category_extra_check_error: 'Ett problem uppstod i samband med genomgång av de detaljer som behövs för rapporteringen. Vänligen försök igen senare.', + locate_dismissed: 'Sök efter ett postnummer eller gatunamn och ort.', + geolocation_failed: "Tyvärr kunde positionen för din placering inte hittas. Vänligen ange en plats i sökrutan istället", + geolocation_denied: 'Kunde inte använda platstjänst. Vänligen kontrollera rättigheter.', + select_category: '-- Välj en kategori --', + offline_got_position: 'Ange plats för rapportering', + offline_failed_position: 'Position kunde inte hämtas.', + required: 'nödvändigt', + invalid_email: 'Ogiltig e-postadress', + invalid_report: 'Ogiltig rapport', + photo_failed: 'Ett problem uppstod då fotot togs.', + photo_added: 'Foto tillagt', + photo_loading: 'Uppladdning av bilder kan ta en stund, vänligen vänta', + upload_aborted: 'Ett problem uppstod då rapporten laddades upp.', + try_again: 'Försök igen', + save_for_later: 'Spara till senare', + no_connection: 'Ingen nätverksanslutning finns tillgänglig för att skicka din rapport. Vänligen försök igen senare.', + more_details: 'Dina uppgifter' + } + }); +})(FMS, _); diff --git a/www/js/views/around.js b/www/js/views/around.js index cb304ee..f0b8692 100644 --- a/www/js/views/around.js +++ b/www/js/views/around.js @@ -398,7 +398,7 @@ var li = '<li><a class="address" id="location_' + i + '" data-lat="' + loc.lat + '" data-long="' + loc.long + '">' + loc.address + '</a></li>'; multiple = multiple + li; } - $('#front-howto').html('<p>Multiple matches found</p><ul data-role="listview" data-inset="true">' + multiple + '</ul>'); + $('#front-howto').html('<p>' + FMS.strings.multiple_matches + '</p><ul data-role="listview" data-inset="true">' + multiple + '</ul>'); $('.ui-page').trigger('create'); $('#relocate').hide(); $('#front-howto').show(); diff --git a/www/js/views/offline.js b/www/js/views/offline.js index 3c2f7af..ac007d1 100644 --- a/www/js/views/offline.js +++ b/www/js/views/offline.js @@ -49,9 +49,9 @@ toggleNextButton: function() { if ( this.draftHasContent() ) { - $('#offline-next-btn .ui-btn-text').text('Save'); + $('#offline-next-btn .ui-btn-text').text(FMS.strings.save); } else { - $('#offline-next-btn .ui-btn-text').text('Skip'); + $('#offline-next-btn .ui-btn-text').text(FMS.strings.skip); } }, @@ -115,7 +115,7 @@ FMS.saveCurrentDraft(); $('#photo').attr('src', ''); - $('#photo-next-btn .ui-btn-text').text('Skip'); + $('#photo-next-btn .ui-btn-text').text(FMS.strings.skip); $('#display_photo').hide(); $('#add_photo').show(); }); diff --git a/www/js/views/photo.js b/www/js/views/photo.js index 8891298..485b74c 100644 --- a/www/js/views/photo.js +++ b/www/js/views/photo.js @@ -126,7 +126,7 @@ FMS.saveCurrentDraft(true); $('#photo').attr('src', 'images/placeholder-photo.png').addClass('placeholder').removeClass('small'); - $('#photo-next-btn .ui-btn-text').text('Skip'); + $('#photo-next-btn .ui-btn-text').text(FMS.strings.skip); $('#id_photo_button').parents('.ui-btn').show(); $('#id_existing').parents('.ui-btn').show(); }); diff --git a/www/js/views/search.js b/www/js/views/search.js index 6930e2a..0a668e5 100644 --- a/www/js/views/search.js +++ b/www/js/views/search.js @@ -60,7 +60,7 @@ var li = '<li><a class="address" id="location_' + i + '" data-lat="' + loc.lat + '" data-long="' + loc.long + '">' + loc.address + '</a></li>'; multiple = multiple + li; } - $('#front-howto').html('<p>Multiple matches found</p><ul data-role="listview" data-inset="true">' + multiple + '</ul>'); + $('#front-howto').html('<p>' + FMS.strings.multiple_matches + '</p><ul data-role="listview" data-inset="true">' + multiple + '</ul>'); $('.ui-page').trigger('create'); } else { this.validationError( 'pc', FMS.strings.location_problem ); diff --git a/www/templates/sv/address_search.html b/www/templates/sv/address_search.html new file mode 100644 index 0000000..f7a1f38 --- /dev/null +++ b/www/templates/sv/address_search.html @@ -0,0 +1,21 @@ +<div id="search-header" data-role="header"> + <a href="#" id="locate" data-transition="slidedown" class="ui-btn-left">Avbryt</a> + <h1>Sök</h1> +</div> +<div data-role="content"> + <div id="front-main"> + <h3 class="notopmargin">Ange ett närliggande postnummer, eller gatunamn och område</h3> + <form class="inputcard" name="postcodeForm" id="postcodeForm"> + <div> + <input data-role="none" type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="ex.v. '107 25' eller 'Vasagatan, Stockholm'"> + </div> + </form> + <input type="button" value="Sök" id="submit" data-theme="a"> + </div> + + <div id="front-howto"> + <% if (typeof msg != 'undefined' && msg !== '') { %> + <h2><%= msg %></h2> + <% } %> + </div> +</div> diff --git a/www/templates/sv/android_error.html b/www/templates/sv/android_error.html new file mode 100644 index 0000000..d212635 --- /dev/null +++ b/www/templates/sv/android_error.html @@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html> + <head> + <title></title> + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" /> + <meta charset="utf-8"> + + <link rel="stylesheet" href="css/fms.css" type="text/css" media="screen" title="no title" charset="utf-8"> + + </head> + <body> + <div id="load-screen"> + <div class="radar"></div> + <p>Det har uppstått ett problem. Vänligen avsluta appen och försök igen.</p> + </div> + </body> +</html> diff --git a/www/templates/sv/around.html b/www/templates/sv/around.html new file mode 100644 index 0000000..49fb4ec --- /dev/null +++ b/www/templates/sv/around.html @@ -0,0 +1,53 @@ +<div data-id="locate" id="around-header" data-role="header"> + <a id="view-my-reports" class="nodisplay ui-btn ui-btn-left ui-btn-up-a ui-shadow ui-btn-corner-all" data-role="none" href="#"> + <span class="ui-btn-inner"<span class="ui-btn-text">Utkast <span class="draft_count"><% print( FMS.allDrafts.length ) %></span></span></span> + </a> + <a id="cancel" class="nodisplay" data-role="button" data-icon="arrow-l">Avbryt</a> + <h1><% print( CONFIG.APP_NAME ) %></h1> + <a id="login-options" data-icon="fms-account" class="nodisplay ui-btn-right">Konto</a> +</div> + + <div id="locating" class="nodisplay"> + <div class="radar"></div> + <div id="progress"> + <div id="progress-bar"> + </div> + </div> + + <p> + Söker efter din plats + </p> + + <p> + <input data-theme="c" type="button" id="locate_cancel" value="Avbryt"> + </p> + </div> +<div data-role="content"> + <div class="frontpage-menu"> + <form class="inputcard" name="postcodeForm" id="postcodeForm"> + <input type="search" id="pc" name="pc" placeholder="Sök eller navigera via kartan"> + <% if ( FMS.testing ) { %> + <div class="testing"> + Testversion. Rapporter kommer inte att skickas till kommuner. + </div> + <% } %> + </form> + <a data-role="none" id="relocate" class="nodisplay"></a> + + <div class="nodisplay" id="front-howto"></div> + </div> + + <a id="mark-here" data-role="button" data-theme="a" class="map-bottom-btn"> + Ny rapportering här + </a> + <a id="locate-here" data-role="button" data-theme="a" class="map-bottom-btn"> + Ange plats för rapportering + </a> + <a id="reposition" data-role="button" data-theme="c" class="map-bottom-btn nodisplay"> + Omplacera rapporten hit + </a> + <a id="confirm-map" data-role="button" data-theme="a" class="map-bottom-btn"> + Bekräfta läget + </a> + +</div> diff --git a/www/templates/sv/details.html b/www/templates/sv/details.html new file mode 100644 index 0000000..5b07584 --- /dev/null +++ b/www/templates/sv/details.html @@ -0,0 +1,22 @@ +<div data-role="header"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Detaljer</h1> + <a id="next" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Nästa</a> +</div> +<div data-role="content"> + <div class="gmailstyletest"> + <div> + <label for="form_title">Ämne</label> + <input data-role="none" type="text" name="title" id="form_title" placeholder="Ange en titel" value="<%= title %>" required> + </div> + + <div> + <%= categories %> + </div> + + <div class="noborder"> + <label for="form_detail">Detaljer</label> + <textarea data-role="none" name="detail" id="form_detail" placeholder="Fyll i detaljer kring problemet." required><%= details %></textarea> + </div> + </div> +</div> diff --git a/www/templates/sv/details_extra.html b/www/templates/sv/details_extra.html new file mode 100644 index 0000000..6ab8e69 --- /dev/null +++ b/www/templates/sv/details_extra.html @@ -0,0 +1,8 @@ +<div data-role="header" data-position="fixed"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Mer detaljer</h1> + <a id="next" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Nästa</a> +</div> +<div data-role="content" data-enhance="false"> + <%= category_extras %> +</div> diff --git a/www/templates/sv/existing.html b/www/templates/sv/existing.html new file mode 100644 index 0000000..08e9da2 --- /dev/null +++ b/www/templates/sv/existing.html @@ -0,0 +1,35 @@ +<div data-role="header"> + <h1>Oskickad rapport</h1> +</div> +<div data-role="content" role="main"> + <div id="existing_report"> + <% if ( title ) { %> + <h3><%= title %></h3> + <% } %> + + <div class="meta"> + <p> + <% if ( category && category != '-- Välj en kategori --' ) { %> + Sparad i <%= category %>-kategorin + <% } %> + </p> + + <p><% print( moment( created ).fromNow() ) %></p> + </div> + + <% if ( file ) { %> + <div class="photo" style="background-image: url(<%= file %>)"></div> + <% } %> + + <% if ( details ) { %> + <div class="details"><div><%= details %></div></div> + <% } %> + </div> + + + <div class="right"> + <input id="use_report" type="button" value="Slutför rapportering nu" data-role="button" data-theme="a" /> + <input id="save_report" type="button" value="Spara till senare" data-role="button" data-theme="a" /> + <input id="discard" type="button" value="Radera" data-role="button" data-theme="a" /> + </div> +</div> diff --git a/www/templates/sv/home.html b/www/templates/sv/home.html new file mode 100644 index 0000000..e8e0e8c --- /dev/null +++ b/www/templates/sv/home.html @@ -0,0 +1,5 @@ +<div data-role="content"> + <div id="locating"> + <div class="radar"></div> + </div> +</div> diff --git a/www/templates/sv/login.html b/www/templates/sv/login.html new file mode 100644 index 0000000..ce99d1e --- /dev/null +++ b/www/templates/sv/login.html @@ -0,0 +1,43 @@ +<div id="submit-header" data-role="header"> + <a id="reports-next-btn" data-icon="arrow-l" data-iconpos="left" class="ui-btn-left">Hem</a> + <h1>Logga in</h1> +</div> + +<div data-role="content"> + <% if ( FMS.isLoggedIn ) { %> + <div id="signed_in_row"> + <p class="notopmargin">Du är inloggad som <%= email %></p> + <div id="err" class="nodisplay"></div> + <div class="bottom-btn"> + <input type="button" id="logout" name="logout" value="Logga ut" data-theme="a"> + </div> + </div> + <div id="password_row" class="nodisplay"> + <p class="notopmargin"> + Utloggad! + </p> + <% } else { %> + <div id="password_row"> + <% } %> + <form name="signinForm" class="inputcard" id="signinForm"> + <div> + <input data-role="none" type="email" value="" name="email" id="form_email" placeholder="Din e-postadress" required> + </div> + <div> + <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="Ditt lösenord" required> + </div> + <div class="noborder"> + <input type="submit" id="login" name="login" value="Logga in" data-theme="a"> + </div> + </form> + </div> + <div id="success_row" class="nodisplay"> + <p class="notopmargin"> + Inloggad! + </p> + <div id="err" class="nodisplay"></div> + <div class="bottom-btn"> + <input type="button" id="logout" name="logout" value="Logga ut" data-theme="a"> + </div> + </div> +</div> diff --git a/www/templates/sv/offline.html b/www/templates/sv/offline.html new file mode 100644 index 0000000..702ae27 --- /dev/null +++ b/www/templates/sv/offline.html @@ -0,0 +1,71 @@ +<div data-role="header" data-position="fixed"> + <a id="offline-prev-btn" class="ui-btn-left">Försök igen</a> + <h1>Nedkopplad</h1> + <a id="offline-next-btn" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Hoppa över</a> +</div> + <div id="locating" class="nodisplay"> + <div class="radar"></div> + <div id="progress"> + <div id="progress-bar"> + </div> + </div> + + <p> + Söker efter din plats + </p> + + <p> + <input data-theme="c" type="button" id="locate_cancel" value="Avbryt"> + </p> + </div> +<div data-role="content"> + <div> + <p class="notopmargin"> + <% if ( typeof id != 'undefined' ) { %> + Ingen nätverksanslutning finns tillgänglig. Rapporten kan redigeras och skickas senare. + <% } else { %> + Ingen nätverksanslutning finns tillgänglig. Påbörja rapportering och slutför via utkast vid nästa tillfälle du är uppkopplad. + <% } %> + </p> + + <p id="locate_result"> + <% if ( lat ) { %> + Den här rapporten har en angiven plats. + <% } else { %> + <input type="button" data-role="button" data-theme="a" id="locate" value="Hitta plats (valfritt)" > + <% } %> + </p> + + <div class="inputcard"> + <div> + <input data-role="none" type="text" value="<%= title %>" name="title" id="form_title" placeholder="Ange en titel" required> + </div> + + <div> + <textarea data-role="none" rows="7" cols="26" name="detail" id="form_detail" placeholder="Please fill in details of the problem." required><%= details %></textarea> + </div> + </div> + + <% if ( file != '' ) { %> + <div id="add_photo" style="display: none"> + <% } else { %> + <div id="add_photo"> + <% } %> + <label>Lägg till ett foto <em>(valfritt)</em></label> + <input data-icon="fms-photo-new" value="Ta ett nytt foto" type="button" name="photo_button" id="id_photo_button" data-role="button" data-theme="a"> + <input data-icon="fms-photo-existing" value="Lägg till ett befintligt foto" type="button" name="existing" id="id_existing" data-role="button" data-theme="c"> + </div> + + <% if ( file == '' ) { %> + <div id="display_photo" style="display: none"> + <% } else { %> + <div id="display_photo"> + <% } %> + <label>Ditt foto</label> + <div class="photo"> + <img class="small" id="photo" src="<%= file %>" /> + </div> + <input value="Radera foto" type="button" name="del_photo_button" id="id_del_photo_button" data-role="button" data-theme="a"> + </div> + </div> +</div> diff --git a/www/templates/sv/photo.html b/www/templates/sv/photo.html new file mode 100644 index 0000000..8f38a02 --- /dev/null +++ b/www/templates/sv/photo.html @@ -0,0 +1,37 @@ +<div data-role="header"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Lägg till foto</h1> + <% if ( file == '' ) { %> + <a id="photo-next-btn" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Hoppa över</a> + <% } else { %> + <a id="photo-next-btn" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Nästa</a> + <% } %> +</div> +<div data-role="content"> + <% var photoClass = 'nodisplay', nophotoClass = 'nodisplay'; + if ( file != '' ) { + photoClass = ''; + } else { + nophotoClass = ''; + } %> + <h2 id="nophoto_title" class="<% print( nophotoClass ); %>"> + Lägg till ett foto <em>(valfritt)</em> + </h2> + <h2 id="photo_title" class="<% print( photoClass ); %>"> + Foto för rapport + </h2> + <div class="photo-wrapper"> + <div class="photo"> + <% if ( file == '' ) { %> + <img class="placeholder" src="images/placeholder-photo.png" alt="" id="photo"> + <% } else { %> + <img class="small" id="photo" src="<%= file %>" /> + <% } %> + <a data-role="none" id="id_del_photo_button" class="photo-corner-button">X</a> + </div> + </div> + <div class="bottom-btn"> + <input data-icon="fms-photo-existing" type="button" id="id_existing" data-theme="c" value="Lägg till ett befintligt foto" > + <input data-icon="fms-photo-new" id="id_photo_button" type="button" data-theme="a" value="Ta ett nytt foto"> + </div> +</div> diff --git a/www/templates/sv/reports.html b/www/templates/sv/reports.html new file mode 100644 index 0000000..503eac4 --- /dev/null +++ b/www/templates/sv/reports.html @@ -0,0 +1,30 @@ +<div data-role="header" data-position="fixed"> + <a id="reports-next-btn" data-icon="arrow-l" data-iconpos="left" class="ui-btn-left">Hem</a> + <h1>Rapportutkast</h1> +</div> +<div id="drafts"> + <p id="noreports" class="nodisplay">En påbörjad rapport, som inte avslutats, kommer att visas i den här menyn för att avslutas vid ett senare tillfälle.</p> + <div id="report-list" class="nodisplay"> + <p class="notopmargin"> + Här finns utkast/ej insända rapporter. Slutför och skicka in dem, då du är uppkopplad. + </p> + <ul data-role="listview" data-split-theme="c" data-inset="true" data-split-icon="delete" class="notopmargin reports"> + <% drafts.each(function(draft) { + if ( draft ) { + var classes = []; + if ( draft.get('lat') ) { + classes.push('with_location'); + } + if ( draft.get('file') ) { + classes.push('with_photo'); + } + var draftClass = ''; + if ( classes.length ) { + draftClass = 'class="' + classes.join(' ') + '"'; + } + print( '<li id="' + draft.id + '"' + draftClass + '><a href="#" class="use_report">' + draft.description() + '</a><a class="del_report" href="#" title="delete">Ta bort</a></li>' ); + } + } ); %> + </ul> + </div> +</div> diff --git a/www/templates/sv/save_offline.html b/www/templates/sv/save_offline.html new file mode 100644 index 0000000..f58e96a --- /dev/null +++ b/www/templates/sv/save_offline.html @@ -0,0 +1,15 @@ +<div data-role="header"> + <h1>Nedkopplad</h1> +</div> +<div data-role="content"> + <h3 class="notopmargin">Du är inte ansluten till Internet</h3> + + <p> + Du är inte ansluten till Internet, vill du spara rapporten för att skicka in vid ett senare tillfälle? + </p> + + <div class="bottom-btn"> + <input id="save_report" type="button" value="spara"> + <input id="discard" type="button" value="radera"> + </div> +</div> diff --git a/www/templates/sv/sent.html b/www/templates/sv/sent.html new file mode 100644 index 0000000..17f0b63 --- /dev/null +++ b/www/templates/sv/sent.html @@ -0,0 +1,22 @@ +<div id="report-created-header" data-role="header"> + <a class="ui-btn-left">Hem</a> + <h1>Rapporten är skapad</h1> +</div> +<div data-role="content"> + <% if ( typeof email_confirm != 'undefined' && email_confirm === 1 ) { %> + <h3>Bekräftelse via mejl har skickats</h3> + + <p> + Vi har skickat ett bekräftelsemejl till dig. Det kan ta några minuter innan det kommer fram. Klicka på länken i meddelandet för att bekräfta din rapport. + </p> + <% } else { %> + <h3>Tack. Din rapport kommer genast att skickas till kommunen.</h3> + + <p class="center"><input type="button" data-theme="a" id="open_report" value="Visa den på webben"></p> + <% } %> + + + <div class="bottom-btn"> + <input type="button" id="id_report_another" data-theme="a" value="Skapa en ny rapport" > + </div> +</div> diff --git a/www/templates/sv/submit.html b/www/templates/sv/submit.html new file mode 100644 index 0000000..c34ff1f --- /dev/null +++ b/www/templates/sv/submit.html @@ -0,0 +1,99 @@ +<div id="submit-header" data-role="header" data-position="fixed" data-id="locate"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Skicka</h1> +</div> + +<div class="container" data-role="content" data-enhance="false"> + <div class="content" role="main"> + + + <fieldset> + <div id="problem_form"> + <% if ( user && user.password ) { %> + <div id="signed_in"> + <p> + Du är inloggad som <span id="username"><%= user.name %></span> + </p> + + <p id="confirm_details">Bekräfta detaljer</p> + <div id="name_details"> + <label for="form_may_show_name">Namn</label> + <input type="text" class="validName" value="<%= user.name %>" name="name" id="form_name" placeholder="Ditt namn"> + + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" checked> + <label class="inline" for="form_may_show_name">Visa mitt namn offentligt</label> + </div> + + <label for="form_phone">Telefonnummer</label> + <input type="text" value="<%= user.phone %>" name="phone" id="form_phone" placeholder="Ditt telefonnummer (valfritt)"> + </div> + + <div class="form-txt-submit-box"> + <input class="green-btn" type="button" id="submit_signed_in" name="submit_signed_in" value="Rapportera"> + </div> + </div> + <% } else { %> + <div id="signed_out"> + <label for="form_email" id="email_label">Din e-postadress</label> + <input type="email" value="<%= user.email %>" name="email" id="form_email" placeholder="Ange en giltlig e-postadress" required> + + <div id="form_sign_in"> + <h4 id="have_password">Har du ett <%= CONFIG.APP_NAME %>-lösenord?</h4> + + <div id="form_sign_in_yes" class="form-box"> + + <h5><strong>Ja</strong> Jag har ett lösenord</h5> + + <label class="hidden-js n" for="password_sign_in">Ja, jag har ett lösenord</label> + <div class="form-txt-submit-box"> + <input type="password" name="password_sign_in" id="password_sign_in" placeholder="Ditt lösenord" value=""> + <input class="green-btn" type="button" id="submit_sign_in" name="submit_sign_in" value="Rapportera"> + </div> + </div> + + <div id="form_sign_in_no" class="form-box"> + <h5 id="let_me_confirm"><strong>Nej</strong> Låt mig bekräfta min rapport via e-post</h5> + + <div id="name_details"> + <label for="form_may_show_name">Namn</label> + <input type="text" class="validName" value="<%= user.name %>" name="name" id="form_name" placeholder="Ditt namn"> + + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" checked> + <label class="inline" for="form_may_show_name">Visa mitt namn offentligt</label> + </div> + + <label for="form_phone">Telefonnummer</label> + <input type="text" value="<%= user.phone %>" name="phone" id="form_phone" placeholder="Ditt telefonnummer (valfritt)"> + </div> + + <div id="password_surround"> + <label class="form-focus-hidden" for="password_register" id="password_label">Lösenord</label> + </div> + + <div class="form-txt-submit-box form-focus-hidden"> + <input type="password" name="password_register" id="password_register" value="" placeholder="Ange ett lösenord (valfritt)"> + <input class="green-btn" type="button" id="submit_register" name="submit_register" value="Rapportera"> + </div> + + </div> + </div> + </div> + <% } %> + + <div id="report_save" class="form-box"> + <h5>Spara rapportutkast för att färdigställa senare</h5> + <div class="form-txt-submit-box"> + <input class="green-btn" type="button" id="save_report" name="save_report" value="Spara"> + </div> + </div> + </div> + </fieldset> + + <input type="hidden" name="submit_problem" value="1"> + </div> + + </div> + </div> +</div> diff --git a/www/templates/sv/submit_confirm.html b/www/templates/sv/submit_confirm.html new file mode 100644 index 0000000..a852861 --- /dev/null +++ b/www/templates/sv/submit_confirm.html @@ -0,0 +1,40 @@ +<div id="submit-header" data-role="header"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Dina uppgifter</h1> +</div> + +<div data-role="content"> + <p class="notopmargin"> + Du är inloggad som <%= user.email %>. + </p> + + <p> + Bekräfta ditt namn och eventuellt också ditt telefonnummer, och om du vill att ditt namn skall vara offentligt. + </p> + + <div id="errors"></div> + + <div class="inputcard"> + <% if ( typeof model.titles_list !== 'undefined' ) { %> + <div> + <select data-role="none" placeholder="Titel" id="form_title" name="title" required> + <option value="">Titel</option> + <% for ( var i = 0; i < model.titles_list.length; i++ ) { var title = model.titles_list[i]; print( '<option value="' + title + '"' + ( user.title && user.title == title ? ' selected' : '' ) + '>' + title + '</option>' ); } %> + </select> + </div> + <% } %> + <div> + <input data-role="none" type="text" value="<%= user.name %>" name="name" id="form_name" placeholder="Ange ditt namn" required> + </div> + <div> + <input data-role="none" type="tel" value="<%= user.phone %>" name="name" id="form_phone" placeholder="Ange ditt telefonnummer (valfritt)"> + </div> + <div class="checkbox-group noborder"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" <% if ( typeof user.may_show_name == 'undefined' || user.may_show_name ) { %>checked<% } %>> + <label class="inline" for="form_may_show_name">Visa mitt namn offentligt</label> + </div> + </div> + <div class="bottom-btn"> + <input data-role="button" data-theme="a" type="button" id="report" name="report" value="Rapportera"> + </div> +</div> diff --git a/www/templates/sv/submit_email.html b/www/templates/sv/submit_email.html new file mode 100644 index 0000000..97ca26e --- /dev/null +++ b/www/templates/sv/submit_email.html @@ -0,0 +1,26 @@ +<div id="submit-header" data-role="header"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Dina uppgifter</h1> +</div> + +<div data-role="content"> + <div class="inputcard"> + <div> + <input data-role="none" type="email" value="<%= user.email %>" name="email" id="form_email" placeholder="Ange en giltlig e-postadress" required> + </div> + </div> + + <p> + Appen kommer att skicka ett bekräftelsemejl till din e-postadress innan rapporten sänd till kommunen. + </p> + + <p> + Ange ett lösenord för att slippa detta steg i framtiden. + </p> + + <div class="bottom-btn"> + <input data-role="button" data-theme="a" type="button" id="email_confirm" name="email_confirm" value="Jag vill inte ange ett lösenord"> + <input data-role="button" data-theme="a" type="button" id="set_password" name="set_password" value="Jag vill ange ett lösenord"> + <input data-role="button" data-theme="a" type="button" id="have_password" name="have_password" value="Jag har redan en inloggning"> + </div> +</div> diff --git a/www/templates/sv/submit_name.html b/www/templates/sv/submit_name.html new file mode 100644 index 0000000..336b612 --- /dev/null +++ b/www/templates/sv/submit_name.html @@ -0,0 +1,39 @@ +<div id="submit-header" data-role="header"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Dina uppgifter</h1> +</div> + +<div data-role="content"> + <div id="errors"></div> + <p class="top"> + <% if ( nopassword ) { %> + Inga problem - vi gillar inte att förspilla tid med lösenord heller. + <% } %> + Ge oss grundläggande information för att skapa ett ärende. + </p> + <div class="inputcard"> + <% if ( typeof model.titles_list !== 'undefined' ) { %> + <div> + <select data-role="none" placeholder="Titel" id="form_title" name="title" required> + <option value="">Titel</option> + <% for ( var i = 0; i < model.titles_list.length; i++ ) { var title = model.titles_list[i]; print( '<option value="' + title + '"' + ( user.title && user.title == title ? ' selected' : '' ) + '>' + title + '</option>' ); } %> + </select> + </div> + <% } %> + <div> + <input data-role="none" type="text" value="<%= user.name %>" name="name" id="form_name" placeholder="Ange ditt namn" required> + </div> + <div> + <input data-role="none" type="tel" value="<%= user.phone %>" name="name" id="form_phone" placeholder="Ange ditt telefonnummer (valfritt)"> + </div> + <div data-role="fieldcontain"> + <fieldset data-role="controlgroup"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" <% if ( typeof user.may_show_name == 'undefined' || user.may_show_name ) { %>checked<% } %>> + <label for="form_may_show_name">Visa mitt namn offentligt</label> + </fieldset> + </div> + </div> + <div class="bottom-btn"> + <input data-role="button" data-theme="a" type="button" id="send_confirm" name="send_confirm" value="Skicka bekräftelsemejl"> + </div> +</div> diff --git a/www/templates/sv/submit_password.html b/www/templates/sv/submit_password.html new file mode 100644 index 0000000..33e269b --- /dev/null +++ b/www/templates/sv/submit_password.html @@ -0,0 +1,51 @@ +<div id="submit-header" data-role="header"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Dina uppgifter</h1> +</div> + +<div data-role="content"> + <div id="errors"></div> + <form id="passwordForm" name="passwordForm"> + <div id="password_row"> + <div class="inputcard"> + <div> + <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="Ditt lösenord" required> + </div> + </div> + <div class="noborder"> + <input data-role="button" data-theme="a" type="submit" id="report" name="report" value="Rapportera"> + </div> + </div> + <div id="check_name" class="nodisplay"> + <div class="inputcard"> + <p> + Bekräfta ditt namn och eventuellt också ditt telefonnummer, och om du vill att ditt namn skall vara offentligt. + </p> + + <% if ( typeof model.titles_list !== 'undefined' ) { %> + <div> + <select data-role="none" placeholder="Titel" id="form_title" name="title" required> + <option value="">Titel</option> + <% for ( var i = 0; i < model.titles_list.length; i++ ) { var title = model.titles_list[i]; print( '<option value="' + title + '"' + ( user.title && user.title == title ? ' selected' : '' ) + '>' + title + '</option>' ); } %> + </select> + </div> + <% } %> + <div> + <input data-role="none" type="text" value="" id="form_name" name="name"> + </div> + <div> + <input data-role="none"type="tel" value="<%= user.phone %>" name="name" id="form_phone" placeholder="Ange ditt telefonnummer (valfritt)"> + </div> + <div data-role="fieldcontain"> + <fieldset data-role="controlgroup"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" checked> + <label for="form_may_show_name">Visa mitt namn offentligt</label> + </fieldset> + </div> + </div> + <div class="bottom-btn"> + <input data-role="button" data-theme="a" type="submit" id="confirm_name" name="report" value="Bekräfta namn"> + </div> + </div> + </form> +</div> diff --git a/www/templates/sv/submit_set_password.html b/www/templates/sv/submit_set_password.html new file mode 100644 index 0000000..0dac58f --- /dev/null +++ b/www/templates/sv/submit_set_password.html @@ -0,0 +1,23 @@ +<div id="submit-header" data-role="header"> + <a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Bakåt</a> + <h1>Dina uppgifter</h1> +</div> + +<div data-role="content"> + <div id="errors"></div> + <form id="passwordForm" name="passwordForm"> + <div id="password_row"> + <p class="notopmargin"> + Ange ett lösenord för ditt konto. Lösenordet kommer inte att aktiveras förrän du klickar på länken i bekräftelsen som har skickats till din angivna e-postadress. + </p> + <div class="inputcard"> + <div> + <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="Ditt lösenord" required> + </div> + </div> + <div class="noborder"> + <input data-role="button" data-theme="a" type="submit" id="continue" name="report" value="Fortsätt"> + </div> + </div> + </form> +</div> |
