Skip to content

Plusone like #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jj0hns0n merged 7 commits into from
May 5, 2012
Merged

Plusone like #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e02f49
Add request to context processors.
chrisjones-brack3t Oct 31, 2011
0c6c938
Add head_extra_meta block and end_body_js block to base template.
chrisjones-brack3t Oct 31, 2011
1e55eae
Facebook like button somewhat functional. Having issues with cross do…
chrisjones-brack3t Oct 31, 2011
7b6ce6b
Both +1 and Like buttons are working for maps.
chrisjones-brack3t Nov 2, 2011
3ba82e3
Added a start_body_js block to the base page layout template.
chrisjones-brack3t Nov 2, 2011
f735cf7
+1 and Like buttons on both maps and layers. Must be a publicly avail…
chrisjones-brack3t Nov 2, 2011
8211953
Merge remote-tracking branch 'eldarion/plusone-like'
dwins Mar 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/GeoNodePy/geonode/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.request",
"geonode.maps.context_processors.resource_urls",
)

Expand Down
28 changes: 27 additions & 1 deletion src/GeoNodePy/geonode/templates/maps/layer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,25 @@
</script>
{% endblock %}

{% block start_body_js %}
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
{% endblock %}


{% block main %}
<div class="twocol">
<div id="description"> <h3> {{ layer.resource.title|default:layer.typename }} </h3> </div>
<div id="description">
<h3>{{ layer.resource.title|default:layer.typename }}</h3>
<g:plusone size="small" href="http://{{ request.get_host }}{{ request.get_full_path }}"></g:plusone>
<div class="fb-like" data-href="http://{{ request.get_host }}{{ request.get_full_path }}" data-send="false" data-width="50" data-layout="button_count" data-show-faces="false"></div>
</div>
<p> <strong>{% trans "Abstract" %}:</strong> {{ layer.abstract|default:_("No abstract for this layer.") }} </p>

<div id="preview_map"></div>
Expand Down Expand Up @@ -307,3 +323,13 @@ <h3>{% trans "Permissions" %}</h3>
{% endif %}
</div>
{% endblock %}

{% block end_body_js %}
<script type="text/javascript">
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
</script>
{% endblock %}
25 changes: 25 additions & 0 deletions src/GeoNodePy/geonode/templates/maps/mapinfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,29 @@
</script>
{% endblock %}

{% block start_body_js %}
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
{% endblock %}

{% block main %}
<div class="twocol">
<h3>{{map.title}}</h3>
<g:plusone size="small" href="http://{{ request.get_host }}{{ request.get_full_path }}"></g:plusone>
<div class="fb-like" data-href="http://{{ request.get_host }}{{ request.get_full_path }}" data-send="false" data-width="50" data-layout="button_count" data-show-faces="false"></div>
<p><strong>{% trans "Abstract:" %}</strong> {{map.abstract}}</p>

<div id="embedded_map">
</div>
<p><strong>{% trans "Contact:" %}</strong> <a href="{{ map.owner.get_profile.get_absolute_url }}">{{ map.owner }}</a></a></p>

<h3>Social</h3>
</div>
{% endblock %}
{% block sidebar %}
Expand Down Expand Up @@ -96,3 +111,13 @@ <h3>{% trans "Permissions" %}</h3>
{% endif %}
</div>
{% endblock %}

{% block end_body_js %}
<script type="text/javascript">
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
</script>
{% endblock %}
3 changes: 3 additions & 0 deletions src/GeoNodePy/geonode/templates/page_layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<head>
<title>{% block title %} {{ SITENAME }} {% endblock %}</title>
<link rel="shortcut icon" href="{{ STATIC_URL }}theme/img/favicon.ico"/>
{% block head_extra_meta %}{% endblock %}
{% block head %}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}theme/boilerplate-min.css" media="screen" />
<!--[if lte IE 6]><link rel="stylesheet" href="{{ STATIC_URL }}theme/boilerplate-ie-min.css" type="text/css" media="screen" charset="utf-8"><![endif]-->
Expand All @@ -13,6 +14,7 @@
{% endblock %}
</head>
<body>
{% block start_body_js %}{% endblock %}
<div id="header">
<div class="wrap selfclear">
<a id="logo" href="{% url geonode.views.index %}">GeoNode</a>
Expand Down Expand Up @@ -85,5 +87,6 @@
{% endblock %}
</div><!-- /.wrap -->
</div><!-- /#footer -->
{% block end_body_js %}{% endblock %}
</body>
</html>