dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19309
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8361: Introduced new logo for login page, light blue and green skin. Added svg versions to resources.
------------------------------------------------------------
revno: 8361
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-03 12:33:08 +0200
message:
Introduced new logo for login page, light blue and green skin. Added svg versions to resources.
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.jpg
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.png
resources/logo/
resources/logo/png/
resources/logo/png/logo_banner.png
resources/logo/png/logo_front.png
resources/logo/svg/
resources/logo/svg/logo_banner.svg
resources/logo/svg/logo_front.svg
resources/logo/svg/logo_promo1.svg
resources/logo/svg/logo_promo2.svg
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_front.png
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-09-22 09:19:40 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-10-03 10:33:08 +0000
@@ -67,14 +67,13 @@
top: 0px;
left: 0px;
right: 0px;
- box-shadow: 0 0 2px #000;
}
img#headerBanner
{
position: absolute;
- top: 4px;
- left: 59px;
+ top: 13px;
+ left: 55px;
}
img#menuSeparator1
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png 2012-02-20 14:25:48 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png 2012-10-03 10:33:08 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-09-21 13:55:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-10-03 10:33:08 +0000
@@ -73,8 +73,8 @@
img#headerBanner
{
position: absolute;
- top: 4px;
- left: 59px;
+ top: 13px;
+ left: 55px;
}
img#menuSeparator1
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png 2011-04-26 13:11:49 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png 2012-10-03 10:33:08 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css 2012-09-29 14:17:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css 2012-10-03 10:33:08 +0000
@@ -28,7 +28,7 @@
{
position: absolute;
top: 15px;
- left: 15px;
+ left: 20px;
border: 1px solid #d5d5d5;
border-radius: 2px;
width: 105px;
@@ -39,21 +39,21 @@
{
position: absolute;
top: 17px;
- left: 140px;
+ left: 145px;
font-size: 18px;
}
#loginField
{
position: relative;
- margin: 115px auto 0 auto;
- width: 340px;
+ margin: 120px auto 0 auto;
+ width: 350px;
text-align: center;
}
#bannerArea
{
- margin-bottom: 11%;
+ margin-bottom: 42px;
border: none;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css 2011-09-28 19:31:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css 2012-10-03 10:33:08 +0000
@@ -73,11 +73,10 @@
*
*/
body div#header {
- height: 20px;
+ height: 17px;
background-color: #1d5288;
border-bottom: 4px solid #184572;
- padding-top: 2px;
- padding-bottom: 2px;
+ padding: 4px;
margin-bottom: .5em;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2012-09-29 14:17:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2012-10-03 10:33:08 +0000
@@ -8,10 +8,10 @@
$('#j_username').focus();
$('#loginForm').bind('submit', function() {
- $('#submit').attr('disabled', 'disabled');
- $('#reset').attr('disabled', 'disabled');
+ $('#submit').attr('disabled', 'disabled');
+ $('#reset').attr('disabled', 'disabled');
- sessionStorage.removeItem( 'orgUnitSelected' );
+ sessionStorage.removeItem( 'orgUnitSelected' );
});
});
</script>
@@ -19,16 +19,16 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
- <div id="headerArea">
- #if ( $keyFlag )
- <img id="flagArea" src="../flags/${keyFlagImage}">
- #end
- #if ( $applicationTitle )
- <span id="titleArea">$encoder.htmlEncode( $applicationTitle )</span>
- #end
- </div>
+ <div id="headerArea">
+ #if ( $keyFlag )
+ <img id="flagArea" src="../flags/${keyFlagImage}">
+ #end
+ #if ( $applicationTitle )
+ <span id="titleArea">$encoder.htmlEncode( $applicationTitle )</span>
+ #end
+ </div>
<div id="loginField">
- <div id="bannerArea"><a href="http://dhis2.org";><img alt="" src="logo_front.png"></a></div>
+ <div id="bannerArea"><a href="http://dhis2.org";><img src="logo_front.png"></a></div>
<form id="loginForm" action="../../dhis-web-commons-security/login.action" method="post">
<table>
@@ -43,15 +43,15 @@
<tr>
<td></td>
<td>
- <input id="submit" class="button" type="submit" value="Login" style="width:120px">
+ <input id="submit" class="button" type="submit" value="Login" style="width:120px">
<input id="reset" class="button" type="reset" value="Clear" style="width:120px">
- </td>
+ </td>
</tr>
</table>
</form>
#if( $failed == true )
<span id="loginMessage">Wrong username or password</span>
- #end
+ #end
</div>
</body>
</html>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm 2012-09-29 14:17:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm 2012-10-03 10:33:08 +0000
@@ -13,7 +13,7 @@
<div id="wrap">
<div id="header">
- <a href="login.action" tabindex="-1"><img src="logo_front.png" alt="DHIS2" width="47" height="20"></a>
+ <a href="login.action" tabindex="-1"><img src="logo_mobile.png" width="88" height="24" alt="DHIS 2"></a>
</div>
<div id="content" align="center" style="text-align: left;">
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_front.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_front.png 2012-09-29 14:17:38 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_front.png 2012-10-03 10:33:08 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.jpg'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.jpg 2011-09-26 07:51:12 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.jpg 1970-01-01 00:00:00 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.png 2012-10-03 10:33:08 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-10-03 08:51:03 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-10-03 10:33:08 +0000
@@ -20,8 +20,6 @@
var threshold = parseInt( 350 );
var remaining = parseInt( docHeight - ( fromTop + windowHeight ) );
- log("--");log(fromTop);log(docHeight);log(windowHeight);log(remaining);
-
if ( remaining < threshold )
{
loadNextPage();
=== added directory 'resources/logo'
=== added directory 'resources/logo/png'
=== added file 'resources/logo/png/logo_banner.png'
Binary files resources/logo/png/logo_banner.png 1970-01-01 00:00:00 +0000 and resources/logo/png/logo_banner.png 2012-10-03 10:33:08 +0000 differ
=== added file 'resources/logo/png/logo_front.png'
Binary files resources/logo/png/logo_front.png 1970-01-01 00:00:00 +0000 and resources/logo/png/logo_front.png 2012-10-03 10:33:08 +0000 differ
=== added directory 'resources/logo/svg'
=== added file 'resources/logo/svg/logo_banner.svg'
--- resources/logo/svg/logo_banner.svg 1970-01-01 00:00:00 +0000
+++ resources/logo/svg/logo_banner.svg 2012-10-03 10:33:08 +0000
@@ -0,0 +1,88 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="logo_banner.svg"
+ inkscape:export-filename="/home/larshelg/Documents/logo/opensans.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.6224503"
+ inkscape:cx="227.02622"
+ inkscape:cy="793.59999"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer3"
+ showgrid="false"
+ inkscape:window-width="1868"
+ inkscape:window-height="1056"
+ inkscape:window-x="52"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <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:groupmode="layer"
+ id="layer3"
+ inkscape:label="Background">
+ <rect
+ style="fill:#1d5288;fill-opacity:1;stroke:#ffffff;stroke-width:0.14421695;stroke-opacity:1"
+ id="rect3753-7-3"
+ width="104.88103"
+ height="59.826866"
+ x="160.49948"
+ y="188.07941"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot3755-1-1"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold"
+ transform="matrix(1.233384,0,0,1.1158536,6.1703882,-116.75791)"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ inkscape:export-filename="/home/larshelg/Documents/logo/logo_banner.png"><flowRegion
+ id="flowRegion3757-9-8"><rect
+ id="rect3759-9-3"
+ width="424.28571"
+ height="224.28572"
+ x="140"
+ y="288.07648"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold" /></flowRegion><flowPara
+ id="flowPara3761-4-7">dhis<flowSpan
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#7ecffd;fill-opacity:1;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold"
+ id="flowSpan4954-2-8">2</flowSpan></flowPara></flowRoot> </g>
+ <g
+ inkscape:label="text"
+ inkscape:groupmode="layer"
+ id="layer1" />
+</svg>
=== added file 'resources/logo/svg/logo_front.svg'
--- resources/logo/svg/logo_front.svg 1970-01-01 00:00:00 +0000
+++ resources/logo/svg/logo_front.svg 2012-10-03 10:33:08 +0000
@@ -0,0 +1,88 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="logo-front.svg"
+ inkscape:export-filename="/home/larshelg/Documents/logo/opensans.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.6224503"
+ inkscape:cx="227.02622"
+ inkscape:cy="627.27082"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer3"
+ showgrid="false"
+ inkscape:window-width="1868"
+ inkscape:window-height="1056"
+ inkscape:window-x="52"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <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:groupmode="layer"
+ id="layer3"
+ inkscape:label="Background">
+ <rect
+ style="fill:#1d5288;fill-opacity:1;stroke:#ffffff;stroke-width:0.26483545;stroke-opacity:1"
+ id="rect3753-7"
+ width="191.18385"
+ height="110.67807"
+ x="127.1858"
+ y="336.96692"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot3755-1"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans Semi-Bold"
+ transform="matrix(1.7510912,0,0,1.5842279,-74.180707,-87.036464)"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ inkscape:export-filename="/home/larshelg/Documents/logo/logo_front.png"><flowRegion
+ id="flowRegion3757-9"><rect
+ id="rect3759-9"
+ width="424.28571"
+ height="224.28572"
+ x="140"
+ y="288.07648"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;font-family:Open Sans;-inkscape-font-specification:Open Sans Semi-Bold" /></flowRegion><flowPara
+ id="flowPara3761-4">dhis<flowSpan
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#7ec4fd;fill-opacity:1;font-family:Open Sans;-inkscape-font-specification:Open Sans Semi-Bold"
+ id="flowSpan4954-2">2</flowSpan></flowPara></flowRoot> </g>
+ <g
+ inkscape:label="text"
+ inkscape:groupmode="layer"
+ id="layer1" />
+</svg>
=== added file 'resources/logo/svg/logo_promo1.svg'
--- resources/logo/svg/logo_promo1.svg 1970-01-01 00:00:00 +0000
+++ resources/logo/svg/logo_promo1.svg 2012-10-03 10:33:08 +0000
@@ -0,0 +1,88 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="logo-front (copy).svg"
+ inkscape:export-filename="/home/larshelg/Documents/logo/opensans.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.2807296"
+ inkscape:cx="365.84598"
+ inkscape:cy="552.91189"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer3"
+ showgrid="false"
+ inkscape:window-width="1868"
+ inkscape:window-height="1056"
+ inkscape:window-x="52"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <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:groupmode="layer"
+ id="layer3"
+ inkscape:label="Background">
+ <rect
+ style="fill:#1d5288;fill-opacity:1;stroke:#ffffff;stroke-width:0.99996185;stroke-opacity:1"
+ id="rect3753-7"
+ width="721.8692"
+ height="417.89667"
+ x="11.994241"
+ y="334.21124"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot3755-1"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans Semi-Bold"
+ transform="matrix(10.490986,0,0,9.4912887,-1375.9633,-2317.7796)"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ inkscape:export-filename="/home/larshelg/Documents/logo/logo_front.png"><flowRegion
+ id="flowRegion3757-9"><rect
+ id="rect3759-9"
+ width="424.28571"
+ height="224.28572"
+ x="140"
+ y="288.07648"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;font-family:Open Sans;-inkscape-font-specification:Open Sans Semi-Bold" /></flowRegion><flowPara
+ id="flowPara3761-4">dhis<flowSpan
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#7ec4fd;fill-opacity:1;font-family:Open Sans;-inkscape-font-specification:Open Sans Semi-Bold"
+ id="flowSpan4954-2">2</flowSpan></flowPara></flowRoot> </g>
+ <g
+ inkscape:label="text"
+ inkscape:groupmode="layer"
+ id="layer1" />
+</svg>
=== added file 'resources/logo/svg/logo_promo2.svg'
--- resources/logo/svg/logo_promo2.svg 1970-01-01 00:00:00 +0000
+++ resources/logo/svg/logo_promo2.svg 2012-10-03 10:33:08 +0000
@@ -0,0 +1,99 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="opensans.svg"
+ inkscape:export-filename="/home/larshelg/Documents/logo/opensans.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.80917333"
+ inkscape:cx="414.6101"
+ inkscape:cy="509.78276"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="false"
+ inkscape:window-width="1868"
+ inkscape:window-height="1056"
+ inkscape:window-x="52"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <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:groupmode="layer"
+ id="layer3"
+ inkscape:label="Background">
+ <rect
+ style="fill:#1d5288;fill-opacity:1;stroke:#ffffff;stroke-width:0.85542893;stroke-opacity:1"
+ id="rect3753"
+ width="642.92957"
+ height="343.37216"
+ x="40.770523"
+ y="296.18036"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="two">
+ <path
+ sodipodi:type="arc"
+ style="fill:#1f70c3;fill-opacity:1;stroke:#ffffff;stroke-width:0.99909252;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3793"
+ sodipodi:cx="336.07144"
+ sodipodi:cy="491.64789"
+ sodipodi:rx="74.64286"
+ sodipodi:ry="68.571426"
+ d="m 410.7143,491.64789 a 74.64286,68.571426 0 1 1 -149.28572,0 74.64286,68.571426 0 1 1 149.28572,0 z"
+ transform="matrix(1.5187604,0,0,1.6449102,16.647195,-344.59385)" />
+ </g>
+ <g
+ inkscape:label="text"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot3755"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold"
+ transform="matrix(9.5931332,0,0,9.8022588,-1271.0644,-2481.2571)"><flowRegion
+ id="flowRegion3757"><rect
+ id="rect3759"
+ width="424.28571"
+ height="224.28572"
+ x="140"
+ y="288.07648"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold" /></flowRegion><flowPara
+ id="flowPara3761">dhis2</flowPara></flowRoot> </g>
+</svg>
Follow ups
