Skip to content

Commit

Permalink
move markers (for header map) in to inc file; make status #2 markers …
Browse files Browse the repository at this point in the history
…grey
  • Loading branch information
thisisaaronland committed Jul 2, 2012
1 parent f13e051 commit bea3a6d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
6 changes: 6 additions & 0 deletions www/css/main.css
Expand Up @@ -212,6 +212,12 @@ q {
-webkit-border-radius: 10px !important;
-khtml-border-radius: 10px !important;
border-radius: 10px !important;
z-index:100;
}

.marker-header-todo {
background-color:#adadad;
z-index:50;
}

.map-tile {
Expand Down
8 changes: 8 additions & 0 deletions www/templates/inc_map_header_markers.txt
@@ -0,0 +1,8 @@
{foreach from=$markers item="row"}
{* 2 == i want to go there *}
{if $row.status_id==2}
<div class="marker marker-header marker-header-todo" data-location="{$row.latitude|escape},{$row.longitude|escape}"><span class="marker-history-text"></span></div>
{else}
<div class="marker marker-header" data-location="{$row.latitude|escape},{$row.longitude|escape}"><span class="marker-history-text"></span></div>
{/if}
{/foreach}
4 changes: 1 addition & 3 deletions www/templates/page_user_history.txt
Expand Up @@ -20,9 +20,7 @@ Okee dookee, your checkin has been deleted.
{/if}

<div id="displaymap" class="map" data-extent="{$geo_stats.bounding_box|@join:","|escape}" data-hash="false" data-interactive="false" data-provider="toner">
{foreach from=$checkins item="row"}
<div class="marker marker-header" data-location="{$row.latitude|escape},{$row.longitude|escape}"><span class="marker-history-text"></span></div>
{/foreach}
{include file="inc_map_header_markers.txt markers=$checkins}
</div>

{if $when}
Expand Down
4 changes: 1 addition & 3 deletions www/templates/page_user_place.txt
Expand Up @@ -2,9 +2,7 @@
{include file="inc_head.txt"}

<div id="displaymap" class="map" data-extent="{$geo_stats.bounding_box|@join:","|escape}" data-hash="false" data-interactive="false" data-provider="toner">
{foreach from=$venues item="row"}
<div class="marker marker-header" data-location="{$row.latitude|escape},{$row.longitude|escape}"><span class="marker-history-text"></span></div>
{/foreach}
{include file="inc_map_header_markers.txt markers=$venues}
</div>

<h3 class="header-right">{$locality.name|escape}</h3>
Expand Down
4 changes: 1 addition & 3 deletions www/templates/page_user_places.txt
Expand Up @@ -2,9 +2,7 @@
{include file="inc_head.txt"}

<div id="displaymap" class="map" data-extent="{$geo_stats.bounding_box|@join:","|escape}" data-hash="false" data-interactive="false" data-provider="toner">
{foreach from=$places item="row"}
<div class="marker marker-header" data-location="{$row.latitude|escape},{$row.longitude|escape}"><span class="marker-history-text"></span></div>
{/foreach}
{include file="inc_map_header_markers.txt markers=$places}
</div>

{foreach from=$places item="row"}
Expand Down

0 comments on commit bea3a6d

Please sign in to comment.