Skip to content
This repository has been archived by the owner on Jul 5, 2018. It is now read-only.

replace settings icon with home button, add home button to campaign page... #246

Merged
merged 1 commit into from
Sep 7, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions assets/www/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file added assets/www/images/home.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 20 additions & 4 deletions assets/www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down