Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

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

Closed
wants to merge 1 commit into from

2 participants

@groovecoder
Collaborator

using icons from Iconic

@philipn
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

@groovecoder
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

@philipn
Owner

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

@philipn philipn closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 22, 2013
  1. @groovecoder

    fix #381 - add edit button to maps on pages

    groovecoder authored
    using icons from Iconic
This page is out of date. Refresh to see the latest.
View
2  sapling/maps/templates/maps/attribution.html
@@ -1,2 +1,2 @@
{% load i18n %}
-<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>
+<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>
View
2  sapling/pages/templates/pages/attribution.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+<span id="icon_attribution">{% trans "Some icons" %} CC-BY-SA <a href="http://somerandomdude.com/work/iconic/">Iconic</a>.</span>
View
1  sapling/pages/templates/pages/base.html
@@ -33,5 +33,6 @@
{{ block.super }}
{% if map %}
{% include "maps/attribution.html" %}
+ {% include "pages/attribution.html" %}
{% endif %}
{% endblock %}
View
2  sapling/pages/templates/pages/page_detail.html
@@ -37,7 +37,7 @@
{% if map %}
<div id="map">
{{ map }}
- <div class="info"><a href="{% url maps:show slug=page.pretty_slug %}">{% trans "View map" %}</a></div>
+ <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>
</div>
{% endif %}
View
11 sapling/themes/sapling/assets/css/site.css
@@ -330,11 +330,16 @@ textarea, input, select {
padding-top: 0.3em;
}
#map .info a {
- background-image: url(../img/magnifying_glass.png);
- background-repeat: no-repeat;
- background-position: 9px 50%;
padding-left: 25px;
font-size: 90%;
+ background-repeat: no-repeat;
+ background-position: 9px 50%;
+}
+#map .info a.view {
+ background-image: url(../img/magnifying_glass.png);
+}
+#map .info a.edit {
+ background-image: url(../img/edit_icon.png);
}
#map .simple_pagination {
padding-top: 0.4em;
View
BIN  sapling/themes/sapling/assets/img/edit_icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Something went wrong with that request. Please try again.