From fb460d890cd542f89e15f3cfa0cafdd3e2457e3c Mon Sep 17 00:00:00 2001
From: jdlrobson <jrobson@wikimedia.org>
Date: Wed, 5 Sep 2012 14:36:38 -0700
Subject: [PATCH] replace settings icon with home button, add home button to
 campaign pages (bug 39709)

move settings to welcome page
---
 assets/www/app.css         |   5 +++++
 assets/www/images/home.png | Bin 0 -> 966 bytes
 assets/www/index.html      |  24 ++++++++++++++++++++----
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 assets/www/images/home.png

diff --git a/assets/www/app.css b/assets/www/app.css
index 3e01c36..5d6249a 100644
--- a/assets/www/app.css
+++ b/assets/www/app.css
@@ -158,6 +158,11 @@ header.actionbar.hidden {
 	padding: 4px;
 }
 
+.page header.actionbar img.home {
+	height: 32px;
+	margin-bottom: 6px;
+}
+
 a.upload {
 	display: block;
 	text-align: center;
diff --git a/assets/www/images/home.png b/assets/www/images/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4ea3f6f6a10586ca63d478d6c5c205a225481c9
GIT binary patch
literal 966
zcmeAS@N?(olHy`uVBq!ia0vp^dO$4C!3HE}%>Qo>q&N#aB8wRqxP?KOkzv*x2?hqn
zl+2Kbk_cZPtK|G#y~LFKq*T3%+ybC#1_ql7D<CsBwIorYA~z?m*s8)-39P~j$OZ}P
zD=C1Llw{i~Mfe6NIOi9oDwyb*=ou*4aVaP$*c7FtSp~VcLA3*Uwn`Z#B?VUc`sL;2
zdgaD?`9<mahL)C=`UXb&Mn<|o6}rWhc_oPzx_QOQ5JO<*xTF>*7iAWdWaj57fXq!y
z$}cUkRZ;?31P4%e<`%#$$}5KY3g|!mio^naLp=k1xXD0`Hb6gGITxiSmgE<O<mczu
zIf4Q~!8128JvAsbF{RQ*A6*61N*jHUJCNK3@ibTz=xaMJpiWo_+Hpxgt>R-~VB+v}
zaSVxQeLLe|;cWu}*ZH=)Zp*gF-jI!0rSL{!Pf^?96QVa(DsVM%_VsCRh-rMuH-#^z
zDVDM5fYuV1Ko*w(;qyPve_&#~vA^Dadc%fmM#nxse!f0s&EB<J=R{<8@-FpdyTe%D
zkQw=8{l;V$)pc7e*~Jb_KlVX-!Zg=7S8kR$$8LFKPG%6Dy@c^xgZk35Heos)OLkmJ
z<I*WqIT)$J9Q0tB;a9mC$2Xiyc(mxr_hT27C#*fGnH%)Le75J()QS6fI;#yn^4ZsG
zcmF9ne#cwpC%2^3o8QeH-SekMyKLHYVtVzpIgd}&=kdf(ciqRKc7XB7?msbNKTj3^
zjm!S2v|_bJZeF8$)}`+|?B2RcIf%@AxQb;R)6^R$rQ^De>ur8BQy^ozT9v4{s#eye
z`~x{0nG7$rf@7{82>s}|>Q?vOuKug1%8qb;t6lzR(og1G`~5s=yIP%V?g!QI*#A~K
z@?E;iyG?tW2lMI++wDY@BACt;PHVaKUH76|Z>!`x?}}}v>2LR@-#Kj}rdPPOOnhHg
z!OL6UmorSdD4Tofzwo+@kUAyRs8gG{xwFpyZN9YZJ+pyyf!NMtk=ulYC+;(DxTN;$
z?NR2{`<AHxuKRMtxbzX{+wLP89gcgV<WrwAl!-jLxGwMbG4_wikDGsN{Fv9-zUA<d
z?-TS-EU~S6FK=Mp@k8D0|DBhISN#2RH|nYW{)&Py`N+x`P)_r7^>bP0l+XkKe|&^+

literal 0
HcmV?d00001

diff --git a/assets/www/index.html b/assets/www/index.html
index 20b9c8a..6847ec7 100644
--- a/assets/www/index.html
+++ b/assets/www/index.html
@@ -194,6 +194,11 @@ <h3><msg key="welcome-intro"></msg></h3>
 				<button class="page-link" data-page="uploads-page">
 					<msg key='tabbar-uploads'></msg>
 				</button>
+				<p>
+					<button class="page-link" data-page="settings-page" >
+						<msg key="settings-title"></msg>
+					</button>
+				</p>
 			</div>
 		</div>
 	</div>
@@ -247,6 +252,9 @@ <h2 data-msg-text="about-howto-header"></h2>
 			<h2>
 				<input type="text" id="filter-campaign" placeholder-msg="search-country-placeholder">
 			</h2>
+			<a class='page-link' data-page='welcome-page'>
+				<img class="home" src="images/home.png">
+			</a>
 		</header>
 		<div class="content">
 			<h3><msg key='choose-campaign' /></h3>
@@ -273,7 +281,9 @@ <h2>
 				</select>
 			</h2>
 			<a class="show-search"><img src='images/2-action-search.png' /></a>
-			<a class='page-link' data-page='settings-page'><img src='images/2-action-settings.png' /></a>
+			<a class='page-link' data-page='welcome-page'>
+				<img class="home" src="images/home.png">
+			</a>
 		</header>
 		<header class='actionbar hidden searchbar'>
 			<a class='cancel-search back'  href="#"> </a>
@@ -297,7 +307,9 @@ <h2>
 					<option value="results-page" data-msg-text="dropdown-list-view"></option>
 				</select>
 			</h2>
-			<a class='page-link' data-page='settings-page'><img src='images/2-action-settings.png' /></a>
+			<a class='page-link' data-page='welcome-page'>
+				<img class="home" src="images/home.png">
+			</a>
 		</header>
 		<div class="content" id="map"></div>
 		<div class="mapLoader"></div>
@@ -312,7 +324,9 @@ <h2>
 				<option value="incomplete-uploads-page" data-msg-text="uploads-incomplete"></option>
 			</select>
 			</h2>
-			<a class='page-link' data-page='settings-page'><img src='images/2-action-settings.png' /></a>
+			<a class='page-link' data-page='welcome-page'>
+				<img class="home" src="images/home.png">
+			</a>
 		</header>
 		<div class="content">
 			<ul class="monuments-list"></ul>
@@ -328,7 +342,9 @@ <h2>
 				<option value="uploads-page" data-msg-text="uploads-completed"></option>
 			</select>
 			</h2>
-			<a class='page-link' data-page='settings-page'><img src='images/2-action-settings.png' /></a>
+			<a class='page-link' data-page='welcome-page'>
+				<img class="home" src="images/home.png">
+			</a>
 		</header>
 		<div class="content">
 			<div>