Skip to content
This repository

fix #381 - add edit button to maps on pages #452

Closed
wants to merge 1 commit into from

2 participants

luke crouch Philip Neustrom
luke crouch
Collaborator

using icons from Iconic

Philip Neustrom
Owner

Thanks!

I think we might want to explore using tiny buttons here rather than text links. I haven't had a chance to play around, but the design right now feels cramped. Maybe 'view' and 'edit?'

Would be good to leave the old magnifying glass in there for now too and we can switch over all icons at once, maybe

luke crouch
Collaborator

Changed to "View" and "Edit" with button styling; restored magnifying glass. We should talk about consistent iconography in #444

Preview without having to check out the code: http://screencast.com/t/nVUqgRMjbU

Philip Neustrom
Owner

Fixed up the CSS a bit to have smaller buttons (less prominent and look nicer) and merging

Philip Neustrom philipn closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Mar 22, 2013
luke crouch groovecoder fix #381 - add edit button to maps on pages
using icons from Iconic
f184183
This page is out of date. Refresh to see the latest.
2  sapling/maps/templates/maps/attribution.html
... ... @@ -1,2 +1,2 @@
1 1 {% load i18n %}
2   -<div id="map_attribution">{% trans "Map data" %} CC-BY-SA <a href="http://openstreetmap.org/">OpenStreetMap</a>. {% trans "Map tiles via" %} <a href="http://cloudmade.com/">CloudMade</a>.</div>
  2 +<span id="map_attribution">{% trans "Map data" %} CC-BY-SA <a href="http://openstreetmap.org/">OpenStreetMap</a>. {% trans "Map tiles via" %} <a href="http://cloudmade.com/">CloudMade</a>.</span>
2  sapling/pages/templates/pages/attribution.html
... ... @@ -0,0 +1,2 @@
  1 +{% load i18n %}
  2 +<span id="icon_attribution">{% trans "Some icons" %} CC-BY-SA <a href="http://somerandomdude.com/work/iconic/">Iconic</a>.</span>
1  sapling/pages/templates/pages/base.html
@@ -33,5 +33,6 @@
33 33 {{ block.super }}
34 34 {% if map %}
35 35 {% include "maps/attribution.html" %}
  36 + {% include "pages/attribution.html" %}
36 37 {% endif %}
37 38 {% endblock %}
2  sapling/pages/templates/pages/page_detail.html
@@ -37,7 +37,7 @@
37 37 {% if map %}
38 38 <div id="map">
39 39 {{ map }}
40   - <div class="info"><a href="{% url maps:show slug=page.pretty_slug %}">{% trans "View map" %}</a></div>
  40 + <div class="info"><a class="view button" href="{% url maps:show slug=page.pretty_slug %}">{% trans "View" %}</a><a class="edit button" href="{% url maps:edit slug=page.pretty_slug %}">Edit</a></div>
41 41 </div>
42 42 {% endif %}
43 43
11 sapling/themes/sapling/assets/css/site.css
@@ -330,11 +330,16 @@ textarea, input, select {
330 330 padding-top: 0.3em;
331 331 }
332 332 #map .info a {
333   - background-image: url(../img/magnifying_glass.png);
334   - background-repeat: no-repeat;
335   - background-position: 9px 50%;
336 333 padding-left: 25px;
337 334 font-size: 90%;
  335 + background-repeat: no-repeat;
  336 + background-position: 9px 50%;
  337 +}
  338 +#map .info a.view {
  339 + background-image: url(../img/magnifying_glass.png);
  340 +}
  341 +#map .info a.edit {
  342 + background-image: url(../img/edit_icon.png);
338 343 }
339 344 #map .simple_pagination {
340 345 padding-top: 0.4em;
BIN  sapling/themes/sapling/assets/img/edit_icon.png

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.